|
@@ -557,7 +557,7 @@ public class CustomTroubleServiceImpl implements CustomTroubleService {
|
|
|
|
|
|
|
|
|
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) {
|
|
|
|
|
|
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);
|
|
|
|
|
|
Date date = new Date();
|
|
|
- if (processId == 6){
|
|
|
+ if (processId == 6 || processId == 8){
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
calendar.setTime(date);
|
|
|
calendar.add(Calendar.SECOND, 1);
|