双规小程序接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java

@@ -563,14 +563,14 @@ public class PlanTaskController extends AbstractBaseController {
     @ApiOperation(value = "根据计划任务ID查询计划任务详情和任务点(<font color='blue'>手机app</font>)", notes = "根据计划任务ID查询计划任务详情和任务点(<font color='blue'>手机app</font>)")
     @RequestMapping(value = "/queryPlanTaskByIdNew", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public ResponseModel<Object> qryPlanTaskByIdNew(
-            @ApiParam(value = "巡检计划任务ID", required = true) @RequestParam(required = true) Long planTaskId) {
+            @ApiParam(value = "巡检计划任务ID", required = true) @RequestParam(required = true) String planTaskId) {
         try {
             Map<String, Object> response = new HashMap<String, Object>();
-            Map task = planTaskService.queryPlanTaskById(planTaskId);
+            Map task = planTaskService.queryPlanTaskById(Long.parseLong(planTaskId));
             if (ObjectUtils.isEmpty(task) || ObjectUtils.isEmpty(task.get("planTaskId"))) {
                 return ResponseHelperUtil.buildErrorResponse("该计划已刷新，请重新选择！！！");
             }
-            List points = planTaskService.getPlanTaskPoints(planTaskId);
+            List points = planTaskService.getPlanTaskPoints(Long.parseLong(planTaskId));
 
 
             String[] userIds = task.get("userId").toString().split(",");
@@ -910,10 +910,10 @@ public class PlanTaskController extends AbstractBaseController {
     @ApiOperation(value = "根据任务id和点id获取“未开始”任务点详情(<font color='blue'>手机app</font>)", notes = "根据任务id和点id获取“未开始”任务点详情(<font color='blue'>手机app</font>)")
     @RequestMapping(value = "/queryPointPlanTaskDetail", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public ResponseModel<Object> queryPointPlanTaskDetail(
-            @ApiParam(value = "巡检计划任务ID", required = true) @RequestParam(required = true) Long planTaskId,
-            @ApiParam(value = "巡检点ID", required = true) @RequestParam(required = true) Long pointId) {
+            @ApiParam(value = "巡检计划任务ID", required = true) @RequestParam(required = true) String planTaskId,
+            @ApiParam(value = "巡检点ID", required = true) @RequestParam(required = true) String pointId) {
         try {
-            AppPointCheckRespone result = planTaskService.queryPointPlanTaskDetail(getToken(), getProduct(), getAppKey(), planTaskId, pointId);
+            AppPointCheckRespone result = planTaskService.queryPointPlanTaskDetail(getToken(), getProduct(), getAppKey(), Long.parseLong(planTaskId), Long.parseLong(pointId));
             if (ObjectUtils.isEmpty(result)) {
                 return ResponseHelperUtil.buildErrorResponse("该计划巡检点已更新，请退回重新选择");
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1475,10 +1475,12 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 input.setDataJson(action.getDataJson());
                 input.setIsMultiline(action.getIsMultiline());
                 input.setIsMust(action.getIsMust());
-                for (CheckInput ck :check.getCheckInput()
-                     ) {
-                    if(ck.getInputId().toString().equals(String.valueOf(action.getCheckInputId()))) {
-                        input.setInputValue(ck.getInputValue());
+                if(null != check) {
+                    for (CheckInput ck :check.getCheckInput()
+                    ) {
+                        if(ck.getInputId().toString().equals(String.valueOf(action.getCheckInputId()))) {
+                            input.setInputValue(ck.getInputValue());
+                        }
                     }
                 }
                 input.setItemType(action.getItemType());

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -559,7 +559,7 @@
         SUM ( CASE WHEN pt.finish_status = '3' THEN ( CASE WHEN pl.plan_type = #{type} THEN 1 ELSE 0 END) ELSE 0 END )  timeOut,
         (
         CASE
-        WHEN '2' = #{type} THEN date_part('week',pt.check_date) ELSE ( DATE_FORMAT ( pt.check_date, ( CASE WHEN '1' = #{type} THEN '%Y-%m-%d' ELSE '%Y-%m' END ) ) )
+        WHEN '2' = #{type} ( LEFT ( #{checkTime}, 5 )|| (1+date_part('week',pt.begin_time) - date_part('week', pt.begin_time - ((date_part('day',pt.begin_time)))::interval)) ) ELSE ( DATE_FORMAT ( pt.check_date, ( CASE WHEN '1' = '2' THEN '%Y-%m-%d' ELSE'%Y-%m' END ) ) )
         END
         ) stime,
         pl.plan_type as type