双规小程序接口

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

@@ -221,6 +221,8 @@ public class CheckController extends AbstractBaseController {
         AgencyUserModel user = getUserInfo();
         String userId = user.getUserId();
         String realName = user.getRealName();
+        requestParam.setUserId(userId);
+        requestParam.setUserName(realName);
         requestParam.setIsOffline(requestParam.getIsOffline()==null?false:requestParam.getIsOffline());
         try {
             if (planTask != null) {

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

@@ -518,10 +518,19 @@ public class CheckServiceImpl implements ICheckService {
             check.setOrgCode(requestParam.getOrgCode());
             check.setUserId(requestParam.getUserId());
 
+            StringBuffer deptName = new StringBuffer();
+            if(planTask.getUserDept().indexOf(",") > 0) {
+                List<String> depts = Arrays.asList(planTask.getUserDept().split(","));
+                depts.stream().forEach(dept -> {
+                    deptName.append(dept.split("@")[2]).append(",");
+                });
+            }
+
+            check.setDepName(deptName.substring(0,deptName.length() - 1));
 
             check.setUserName(requestParam.getUserName());
-            check.setDepId(requestParam.getDepId());
-            check.setDepName(requestParam.getDepName());
+            //check.setDepId(requestParam.getDepId());
+            //check.setDepName(requestParam.getDepName());
 
             check.setCheckMode(requestParam.getCheckMode());
 

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

@@ -1151,7 +1151,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             });
         }
         // 生成巡检记录
-        jobService.createCheckRecord(planTask);
+        jobService.createCheckRecord(planTask, userId);
 
     }
 
@@ -1491,6 +1491,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 input.setDataJson(action.getDataJson());
                 input.setIsMultiline(action.getIsMultiline());
                 input.setIsMust(action.getIsMust());
+                input.setInputValue(null);
                 if(null != check) {
                     for (CheckInput ck :check.getCheckInput()
                     ) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/IJobService.java

@@ -62,6 +62,6 @@ public interface IJobService {
 	 */
 	public void msgJobPerform(long msgId,String jobType,String jobName);
 
-	public void createCheckRecord(PlanTask planTask);
+	public void createCheckRecord(PlanTask planTask,String userId);
 	
 }