fix（移装报废）: common公共接口修改

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/CommonServiceImpl.java

@@ -25,10 +25,8 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
-import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
@@ -44,11 +42,9 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.servlet.http.HttpServletResponse;
-import java.awt.print.Book;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.UnsupportedEncodingException;
@@ -556,8 +552,8 @@ public class CommonServiceImpl implements ICommonService {
             jgUseRegistrationServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) {
             //兼容业务逻辑代码
-            if(submitType.equals("1")){
-                noticeObj.put("submit","true");
+            if (submitType.equals("1")) {
+                noticeObj.put("submit", "true");
             }
             noticeObj.put("receiveCompanyCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
@@ -575,7 +571,7 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject = new JSONObject(provideMap);
             jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.WBBA.getBusinessCode())) {
-            noticeObj.put("pageType","add");
+            noticeObj.put("pageType", "add");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgMaintenanceContractServiceImpl.saveOrSubmit(submitType, jsonObject, reginParams);
@@ -584,7 +580,7 @@ public class CommonServiceImpl implements ICommonService {
             JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgEquipTransferDto.class);
             JSONObject jsonObject = (JSONObject) JSONObject.toJSON(jgEquipTransferDto);
             jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
-        } else if (type.equals(ApplicationFormTypeEnum.SBZX.getBusinessCode())) {
+        } else if (type.contains(ApplicationFormTypeEnum.SBZX.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCreditCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(SBZX_PAGE_ID, noticeObj);
@@ -631,7 +627,7 @@ public class CommonServiceImpl implements ICommonService {
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
                 if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals("look")) {
-                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams+"&nextExecuteUserIds="+model.getExecuteUserIds());
+                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
                     break;
                 }
             }
@@ -658,7 +654,6 @@ public class CommonServiceImpl implements ICommonService {
      * flowStatusLabel  任务状态枚举code
      * 流程实例id  instanceId
      * flowCode 任务id
-
      **/
     public TaskV2Model updateTaskModel(Map<String, Object> params) {
         String exeUserId = RequestContext.getExeUserId();
@@ -667,7 +662,7 @@ public class CommonServiceImpl implements ICommonService {
         // TaskV2Model model = result.stream().filter(e->e.getFlowCode().equals(params.get("flowCode").toString())).sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
         //         .findFirst()
         //         .orElse(null);
-        TaskV2Model model =  result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())) // 按时间降序排序
+        TaskV2Model model = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())) // 按时间降序排序
                 .findFirst()
                 .orElse(null);
         if (model == null) {
@@ -687,8 +682,8 @@ public class CommonServiceImpl implements ICommonService {
 //        String tarUrl = url.replaceFirst("&executeUserIds=", "");
 //        tarUrl+"&executeUserIds="
 
-       // model.setRoutePath( roleIds[0]+"roleIds="+"55555"+"&userId"+userIds[1]);
-        model.setRoutePath(model.getRoutePath().replace("roleIds=","roleIds=55555&fq="));
+        // model.setRoutePath( roleIds[0]+"roleIds="+"55555"+"&userId"+userIds[1]);
+        model.setRoutePath(model.getRoutePath().replace("roleIds=", "roleIds=55555&fq="));
         Systemctl.taskV2Client.update(model, model.getSequenceNbr());
         //修改model并返回 用于组装新待办
         model.setEndUserId(null);
@@ -708,7 +703,6 @@ public class CommonServiceImpl implements ICommonService {
      * flowStatusLabel  任务状态枚举code
      * 流程实例id  instanceId
      * flowCode 任务id
-
      **/
     public TaskV2Model updateTaskModelNew(Map<String, Object> params) {
         String exeUserId = RequestContext.getExeUserId();
@@ -717,7 +711,7 @@ public class CommonServiceImpl implements ICommonService {
         // TaskV2Model model = result.stream().filter(e->e.getFlowCode().equals(params.get("flowCode").toString())).sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
         //         .findFirst()
         //         .orElse(null);
-        TaskV2Model model =  result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())) // 按时间降序排序
+        TaskV2Model model = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())) // 按时间降序排序
                 .findFirst()
                 .orElse(null);
         if (model != null) {
@@ -727,7 +721,7 @@ public class CommonServiceImpl implements ICommonService {
             model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
             model.setEndUserId(exeUserId);
             model.setEndDate(new Date());
-            model.setRoutePath(model.getRoutePath().replace("roleIds=","roleIds=55555&fq="));
+            model.setRoutePath(model.getRoutePath().replace("roleIds=", "roleIds=55555&fq="));
             Systemctl.taskV2Client.update(model, model.getSequenceNbr());
         } else {
             model = new TaskV2Model();
@@ -749,7 +743,8 @@ public class CommonServiceImpl implements ICommonService {
 
     /**
      * 待办 撤回
-     * @param id 工作流实例id
+     *
+     * @param id  工作流实例id
      * @param obj 自己的实体：taskType为BusinessTypeEnum code；nextExecuteUser
      */
     public void rollbackTask(String id, JSONObject obj) {
@@ -757,7 +752,7 @@ public class CommonServiceImpl implements ICommonService {
         List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
         TaskV2Model model = list.get(0);
         Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr()));
-        if (list.size()>1){
+        if (list.size() > 1) {
             TaskV2Model lastTaskModel = list.get(1);
             lastTaskModel.setEndUserId(null);
             lastTaskModel.setEndDate(null);
@@ -773,7 +768,7 @@ public class CommonServiceImpl implements ICommonService {
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
                 if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("look")) {
-                    model.setRoutePath(map.get("url").toString().replace("{roleIds}",obj.get("nextExecuteUser").toString()) + urlParams);
+                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);
                     break;
                 }
             }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -27,7 +27,7 @@ public enum ApplicationFormTypeEnum {
     DWBG("DWBG", "DJ_DW"),//单位变更登记
     JY("JY", ""),
     JG("JG", ""),// 检验结果
-    SBZX("SBZX", "BF_ZX"),//电梯（设备）注销
+    SBZX("SBZX", "BF"),//电梯（设备）注销
     GMBG("GMBG", "DJ_GM"),//更名变更
     TYQY("TYQY", "SB_QY")//停用启用
     ;