diff --git a/src/main/java/com/cm/inspection/listener/process/SelfCheckReportCompleteListener.java b/src/main/java/com/cm/inspection/listener/process/SelfCheckReportCompleteListener.java index 389cb3a..ff28085 100644 --- a/src/main/java/com/cm/inspection/listener/process/SelfCheckReportCompleteListener.java +++ b/src/main/java/com/cm/inspection/listener/process/SelfCheckReportCompleteListener.java @@ -34,7 +34,6 @@ public class SelfCheckReportCompleteListener implements TaskListener { delegateTask.setAssignee(leader); return; } - } } diff --git a/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java b/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java index d878efb..f142da1 100644 --- a/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java @@ -16,6 +16,10 @@ import com.cm.inspection.pojo.vos.check.CheckVO; import com.cm.inspection.pojo.vos.hiddendangerreport.HiddenDangerReportVO; import com.cm.inspection.service.BaseService; import com.cm.inspection.service.check.ICheckService; +<<<<<<< HEAD +======= +import com.cm.inspection.service.enterpriseofgridoperator.IEnterpriseOfGridOperatorService; +>>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872 import com.cm.inspection.service.gridpersonnel.IGridPersonnelService; import com.cm.inspection.service.hiddendangerreport.IHiddenDangerReportService; import com.cm.inspection.service.process.IProcessService; @@ -79,6 +83,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService { String businessKey = String.format("check:%s", checkId); params.put("reporter", userId); processService.startProcess(IProcessService.CHECK_SELF_PROCESS, businessKey, params); + Task task = processService.getTaskByAssigneeAndBusinessKey(userId, businessKey); params.clear(); params.put("isCoordination", isCoordination); @@ -96,6 +101,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService { LOG.debug("2.isAllPass: {}", isAllPass); params.put("isAllPass", isAllPass); if (isAllPass == 0) { +<<<<<<< HEAD LOG.debug("3.检查项没有完全通过，需要复查"); params.put("reReporter", userId); processService.setTaskVariableByTaskId(task.getId(), "isReport", 1); @@ -119,6 +125,13 @@ public class CheckServiceImpl extends BaseService implements ICheckService { processService.setTaskVariableByTaskId(task.getId(), "isLeader", 1); LOG.debug("2.标记上一次的检查项"); processService.setTaskVariableByTaskId(task.getId(), "lastCheckId", checkId); +======= + LOG.debug("检查项没有完全通过，需要复查"); + params.put("reReporter", userId); + } + } else { + List gridPersonnelDTOs = gridPersonnelService.listGridPersonnelByUserId(userId); +>>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872 } processService.saveTaskCompleteByTaskId(task.getId(), params); } diff --git a/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java b/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java index 1ab0f1e..994369f 100644 --- a/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java +++ b/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java @@ -109,6 +109,7 @@ public interface IGridPersonnelService { SuccessResultList> listPageGridPersonnel(ListPage page) throws SearchException; /** +<<<<<<< HEAD * 网格人员列表（通过用户名和是否是网格员） * * @param userId @@ -117,4 +118,13 @@ public interface IGridPersonnelService { * @throws SearchException */ List listGridPersonnelByUserIdAndIsGridOperator(String userId, int isGridOperator) throws SearchException; +======= + * 通过UserId + * + * @param userId + * @return + * @throws SearchException + */ + List listGridPersonnelByUserId(String userId) throws SearchException; +>>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872 } diff --git a/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java b/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java index bdf97eb..5f0a336 100644 --- a/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java @@ -143,11 +143,16 @@ public class GridPersonnelServiceImpl extends BaseService implements IGridPerson } @Override +<<<<<<< HEAD public List listGridPersonnelByUserIdAndIsGridOperator(String userId, int isGridOperator) throws SearchException { Map params = getHashMap(2); params.put("userId", userId); params.put("isGridOperator", isGridOperator); return listGridPersonnel(params); +======= + public List listGridPersonnelByUserId(String userId) throws SearchException { + return null; +>>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872 } } diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 6734bc6..bd73bcc 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,6 +1,6 @@ server: port: 7006 - url: http://192.168.0.113:7006/inspection + url: http://192.168.0.106:7006/inspection title: 隐患上报系统 servlet: context-path: /inspection @@ -78,11 +78,11 @@ file: # 安全 security: oauth2: - oauth-server: http://192.168.0.113:7001/usercenter + oauth-server: http://192.168.0.106:7001/usercenter oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} client: - client-id: 89e9c099c0a24e7f90d3cdc0447a86b3 - client-secret: VlQ1WE53RDZ6QVJLaHd2b1dGMUdEdGFjYTRhVHUyOHNpQzZoVzE3V1NDOG1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== + client-id: 32ec344a5fd04fd9911586df5d1dc36b + client-secret: a2NORTAyZmthdTNtVHNwLytGVVo0ckFhNktHQU9JWVFmUks0TGw5L2hQRW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== user-authorization-uri: ${security.oauth2.oauth-server}/oauth/authorize access-token-uri: ${security.oauth2.oauth-server}/oauth/token grant-type: authorization_code diff --git a/src/main/resources/bpmn/check-self.bpmn b/src/main/resources/bpmn/check-self.bpmn index 690ce1b..55ca8e5 100644 --- a/src/main/resources/bpmn/check-self.bpmn +++ b/src/main/resources/bpmn/check-self.bpmn @@ -1,184 +1,176 @@ - - - - - - - - - - - - - - - ${isAllPass==1} - - - - ${isCoordination==0} - - - - - ${isSuccessfulTreatment==0} - - - ${isSuccessfulTreatment==1} - - - - ${isCoordination==1} - - - ${isAllPass==0} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/static/route/check/save-check.html b/src/main/resources/static/route/check/save-check.html index e27ae92..19de391 100644 --- a/src/main/resources/static/route/check/save-check.html +++ b/src/main/resources/static/route/check/save-check.html @@ -22,8 +22,8 @@
- -
+ +
-
-
- -
+
-
-
- -
+
-
-
- -
+
-
-
- -
+