驳回撤回再提交修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java

@@ -547,7 +547,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             dto.setComment(notice.getProcessAdvice());
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("approvalStatus", op);
+        if(notice.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject()) || notice.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack()) ) {
+            map.put("approvalStatus", "提交");
+        } else {
+            map.put("approvalStatus", op);
+        }
         dto.setVariable(map);
         //执行流程
         AjaxResult ajaxResult1 = null;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -641,7 +641,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             dto.setComment(notice.getProcessAdvice());
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("approvalStatus", op);
+        if(notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615") ) {
+            map.put("approvalStatus", "提交");
+        } else {
+            map.put("approvalStatus", op);
+        }
+
         dto.setVariable(map);
         //执行流程
         AjaxResult ajaxResult1 = null;