Browse Source

批注接口提交

shenhao 4 years atrás
parent
commit
61c33e0080

+ 3 - 2
src/main/java/com/ssj/api/controller/ApiManagerTeacherController.java

@@ -290,13 +290,14 @@ public class ApiManagerTeacherController extends BaseController {
             }
             List<Map<String,Object>> list = getSalaryList(manager.getUserId());
             data.put("list",list);
+            responseEntity.success(data,"获取列表成功");
         } catch (Exception e) {
             logger.error("薪酬列表异常", e);
             responseEntity.failure(ResponseConstant.CODE_500, "系统繁忙,请稍后重试");
         }
         return responseEntity;
     }
-    @RequestMapping(value = "/exportSalaryList", method = RequestMethod.POST)
+    @RequestMapping(value = "/exportSalaryList", method = RequestMethod.GET)
     @ApiOperation(value = "导出薪酬列表",  notes = "导出薪酬列表")
     @ResponseBody
     public void exportSalaryList(@RequestParam(name = "accessToken") String accessToken,@RequestBody TeacherDelReq req) {
@@ -346,7 +347,7 @@ public class ApiManagerTeacherController extends BaseController {
          }
     }
 
-    @RequestMapping(value = "/exportStatisticsList", method = RequestMethod.POST)
+    @RequestMapping(value = "/exportStatisticsList", method = RequestMethod.GET)
     @ApiOperation(value = "导出数据统计列表",  notes = "导出数据统计列表")
     @ResponseBody
     public void exportStatisticsList(@RequestParam(name = "accessToken") String accessToken,@RequestBody ListReq req) {

+ 2 - 2
src/main/java/com/ssj/dao/sys/homework/dao/impl/HomeworkQueryDaoImpl.java

@@ -269,7 +269,7 @@ public class HomeworkQueryDaoImpl implements HomeworkQueryDao {
         List<Object> paramList = new ArrayList<>();
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT t.child_name as studentName,t12.homework_id as homeworkId,\n ");
-        sql.append("SEC_TO_TIME(timestampdiff(SECOND,min(t12.create_time),NOW())) as waitTime,t12.`subject`,t13.grade  \n ");
+        sql.append("concat(SEC_TO_TIME(timestampdiff(SECOND,min(t12.create_time),NOW())),'')  as waitTime,t12.`subject`,t13.grade  \n ");
         sql.append(" from tb_lib_vip t \n ");
         sql.append("join tb_lib_vip_service t11 on t.id = t11.vip_id  and t11.correct_type=100\n ");
         sql.append("join scon_homework_picture t12 on t.id = t12.vip_id\n ");
@@ -336,7 +336,7 @@ public class HomeworkQueryDaoImpl implements HomeworkQueryDao {
         selSQL.append("left join tb_lib_vip t12 on t.vip_id = t12.id\n");
         selSQL.append(" where t.teacher_id=?\n");
         queryParams.add(teacherId);
-        selSQL.append("where t.is_mark in (0,2)\n");
+        selSQL.append("and t.is_mark in (0,2)\n");
         selSQL.append("group by t.homework_id\n");
         selSQL.append(") a \n");
         selSQL.append(") b order by b.state asc \n");