Forráskód Böngészése

隐患模块更新

zhangyu 4 éve
szülő
commit
58fd230ab1

+ 3 - 2
src/main/java/com/tofly/dyrq/custom/service/impl/CustomTroubleServiceImpl.java

@@ -557,7 +557,7 @@ public class CustomTroubleServiceImpl implements CustomTroubleService {
             /*troubleUpdate.setState("3");
             //如果为抢维修,转移到抢维修申报去
             moveToQwx(troubleId, undersecretaryCheck.getMaintainerUserid());*/
-            troubleUpdate.setDutyUserId(SecurityUtils.getUserId());
+            troubleUpdate.setDutyUserId(undersecretaryCheck.getOtherDutyUserId());
         }
         if ("0".equals(undersecretaryCheck.getState())) {
             //本班组长继续处理工单
@@ -724,6 +724,7 @@ public class CustomTroubleServiceImpl implements CustomTroubleService {
         } else if (trouble.getProcessId() == 4) {
             //添加副部长ID
             troubleUpdate.setUndertakerUserId(SecurityUtils.getUserId());
+            troubleUpdate.setDutyUserId(SecurityUtils.getUserId());
             troubleUpdate.setProcessId((long) 14);
         }
         TroubleAuditScheme troubleAuditScheme = new TroubleAuditScheme();
@@ -1167,7 +1168,7 @@ public class CustomTroubleServiceImpl implements CustomTroubleService {
         troubleCheck.setProcessId(processId);
         //添加1s,区别不同步骤时间
         Date date = new Date();
-        if (processId == 6){
+        if (processId == 6 || processId == 8){
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(date);
             calendar.add(Calendar.SECOND, 1);