Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -248,5 +248,14 @@ public class JgInstallationNoticeDto extends BaseDto {
     @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date handleDate;
 
+    private String createUserCompanyName;
+
+    //下一步任务ID
+    private String nextTaskId;
+
+    /**
+     * 创建人
+     */
+    private String createUserName;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -400,4 +400,19 @@ public class JgInstallationNotice extends BaseEntity {
      */
     private String approvalStatus;
 
+
+    @TableField(value = "\"create_user_company_name\"")
+    private String createUserCompanyName;
+
+    //下一步任务ID
+    @TableField(value = "\"next_taskId\"")
+    private String nextTaskId;
+
+    /**
+     * 创建人
+     */
+    @TableField("\"create_user_name\"")
+    private String createUserName;
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -81,10 +81,13 @@
             isn.install_leader_name AS installLeaderName,
             isn.install_leader_phone AS installLeaderPhone,
             isn.use_unit_name AS useUnitName,
+
+            tec2.name                       AS equCategory,
+            tec1.name                       AS equList,
+            tec.name                        AS equDefine,
+
             isn.equ_register_code AS equRegisterCode,
-            ri.equ_list AS equList,
-            ri.equ_category AS equCategory,
-            ri.EQU_DEFINE AS equDefine,
+
             ri.product_name AS productName,
             ri.brand_name AS brandName,
             ri.equ_type AS equType,
@@ -124,6 +127,9 @@
                 LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
                 LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
                 LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
+                LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
+                 LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
+            LEFT JOIN amos_tzs_biz.tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
         WHERE
             isn.sequence_nbr = #{sequenceNbr}
             LIMIT 1

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

@@ -275,7 +275,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 // 驳回操作
                 jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
-                jgChangeRegistrationReform.setPromoter(null);
+                jgChangeRegistrationReform.setPromoter("");
             }
             if(updateTodoAndCreate) {
                 // 上个代办改为已办
@@ -316,10 +316,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             map.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("relationId", jgChangeRegistrationReform.getInstanceId());
-            TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
-            jgChangeRegistrationReform.setNextTaskId(null);
-            jgChangeRegistrationReform.setNextExecuteUserIds(null);
-            jgChangeRegistrationReform.setNextExecutorIds(null);
+            jgChangeRegistrationReform.setNextExecuteUserIds("");
+            map.put("model",jgChangeRegistrationReform);
+            commonServiceImpl.updateTaskModel(map);
         }
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }
@@ -368,6 +367,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
         }
         jgChangeRegistrationReform.setPromoter(reginParams.getUserModel().getUserId());
+        jgChangeRegistrationReform.setNextTaskId(workflowResultDto.getNextTaskId());
         jgChangeRegistrationReform.setNextExecutorIds(role);
         this.update(jgChangeRegistrationReform, lambda);
 //        commonServiceImpl.deleteTaskModel(instanceId);
@@ -375,6 +375,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jsonObject.put("nextTaskId", jgChangeRegistrationReform.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgChangeRegistrationReform.getNextExecutorIds());
         jsonObject.put("taskType",BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
+        jsonObject.put("model",jgChangeRegistrationReform);
         commonServiceImpl.rollbackTask(instanceId,jsonObject);
     }
 

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,13 +10,9 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationNameEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformEqMapper;
@@ -42,13 +37,8 @@ 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.IdxBizJgOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
-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.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
-import fr.opensagres.xdocreport.core.io.IOUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -62,7 +52,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -74,14 +63,10 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.alibaba.fastjson.JSON.parseArray;
-import static com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum.JG_CHANGE_REGISTRATION;
-
 /**
  * 移装变更登记登记服务实现类
  *
@@ -170,7 +155,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         }
         CompanyBo company = reginParams.getCompany();
         String sequenceNbr = (String) map.get("sequenceNbr");
-        String equId = (String) map.get("equipId");
+        String equId = (String) tableData.get("record");
         String receiveOrgCode = (String) tableData.get("receiveOrgCode");
         String receiveOrgName = "";
         String supervisoryCode = "";
@@ -191,14 +176,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 receiveOrgName = receiveOrgCodeList[1];
             }
         }
-        //查询申请单号
-        ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZBG.getCode(), 1);
-        if (!result.getResult().isEmpty()) {
-            //申请编号
-            oldTransfer.setApplyNo(result.getResult().get(0));
-        } else {
-            throw new BadRequest("申请单编号生成失败,请稍后重试!");
-        }
 
         //有sequenceNbr代表修改数据
         if (!ValidationUtil.isEmpty(sequenceNbr)) {
@@ -211,6 +188,15 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 oldHistory = jgRegistrationHistoryService.getDteailByRecord(oldTransferEq.getEquId(), oldTransfer.getApplyNo());
                 useInfo = idxBizJgUseInfoService.getOneData(oldTransferEq.getEquId());
             }
+        }else {
+            //查询申请单号
+            ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(tableData.get("businessCode"))), 1);
+            if (!result.getResult().isEmpty()) {
+                //申请编号
+                oldTransfer.setApplyNo(result.getResult().get(0));
+            } else {
+                throw new BadRequest("申请单编号生成失败,请稍后重试!");
+            }
         }
 
         //登记类别
@@ -392,22 +378,27 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
         ProcessTaskDTO processTask = icmWorkflowService.rollBack(instanceId);
         WorkflowResultDto workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(processTask)).get(0);
-        String taskCode = Optional.ofNullable(workflowResult.getNextTaskCode()).orElse("");
-        String role = Optional.ofNullable(workflowResult.getNextExecutorRoleIds()).orElse("");
+        String taskCode = "";
+        String role = "";
+        if(!ValidationUtil.isEmpty(workflowResult)){
+            taskCode = Optional.ofNullable(workflowResult.getNextTaskCode()).orElse("");
+            role = Optional.ofNullable(workflowResult.getNextExecutorRoleIds()).orElse("");
+            jgTransfer.setNextTaskId(workflowResult.getNextTaskId());
+            // 更新下一步可执行人
+            jgTransfer.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
+        }
         if (!ObjectUtils.isEmpty(taskCode)) {
             jgTransfer.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
             jgTransfer.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
         }
         jgTransfer.setPromoter(reginParams.getUserModel().getUserId());
         jgTransfer.setNextExecutorIds(role);
-        // 更新下一步可执行人
-        jgTransfer.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
-
         this.update(jgTransfer, lambda);
         //待办 撤回
-        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgTransfer));
-        jsonObject.put("nextTaskId", jgTransfer.getNextTaskId());
-        jsonObject.put("nextExecuteUser", jgTransfer.getNextExecutorIds());
+        JgChangeRegistrationTransfer data = this.baseMapper.selectOne(lambda);
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
+        jsonObject.put("nextTaskId", data.getNextTaskId());
+        jsonObject.put("nextExecuteUser", data.getNextExecutorIds());
         jsonObject.put("taskType",BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
         commonService.rollbackTask(instanceId, JSON.parseObject(JSON.toJSONString(jgTransfer)));
     }
@@ -700,6 +691,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             map.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("relationId", jgChangeRegistrationTransfer.getInstanceId());
+            map.put("model", jgChangeRegistrationTransfer);
             TaskV2Model taskV2Model = commonService.updateTaskModel(map);
 
         }

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

@@ -55,8 +55,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.alibaba.fastjson.JSON.parseArray;
-
 /**
  * 设备注销报废服务实现类
  *
@@ -461,6 +459,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         params.put("taskStatusLabel", flowStatusEnum.getName());
         params.put("flowStatus", this.getTaskStatusByName(jgScrapCancelDto.getAuditStatus()));
         params.put("flowStatusLabel", jgScrapCancelDto.getAuditStatus());
+        params.put("model", jgScrapCancelDto);
         return commonService.updateTaskModel(params);
     }
 
@@ -492,7 +491,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
         Map<String, Object> installationInfo = BeanUtil.beanToMap(notice);
         installationInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
-        installationInfo.put("cancelCertificateList", parseArray(installationInfo.get("cancelCertificate").toString()));
+        installationInfo.put("cancelCertificateList", JSON.parseArray(String.valueOf(installationInfo.get("cancelCertificate"))));
         LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
         lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, sequenceNbr);
         JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(lambdaEq);
@@ -540,7 +539,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
-
+    @Transactional
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {
             JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
@@ -606,8 +605,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 更新上一步待办、创建待办
             executeOneStep(scrapCancelDto, taskName, nextUserIds, operate);
         } else {
-            jgScrapCancel.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
-            jgScrapCancel.setAuditPassDate(new Date());
             // 完成时 下一步骤可执行人清空
             jgScrapCancel.setNextExecuteUserIds("");
             // 修改业务信息

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

@@ -592,7 +592,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgInstallationNotice));
         jsonObject.put("taskType", BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
         jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
-        commonService.rollbackTask(jgInstallationNotice.getInstanceId(), JSON.parseObject(JSON.toJSONString(jgInstallationNotice)));
+        commonService.rollbackTask(jgInstallationNotice.getInstanceId(), jsonObject);
     }
 
     @Transactional
@@ -633,6 +633,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                taskMap.put("model", jgTransferNotice);
                 taskV2Model = commonService.updateTaskModel(taskMap);
             } else {
                 jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());

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

@@ -274,7 +274,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             } else {
                 // 驳回操作
                 jgUseRegistration.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
-                jgUseRegistration.setPromoter(null);
+                jgUseRegistration.setPromoter("");
             }
             if (isFirst){
                buildTask(jgUseRegistration, workflowResultDto);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -9,13 +9,13 @@
     "type": "102",
     "pageType": "look",
     "name": "安装告知",
-    "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&sequenceNbr=%s&roleIds=%s&&userId={userId}&nextExecuteIds=%s&formType=detail&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=detail"
   },
   {
     "type": "102",
     "pageType": "edit",
     "name": "安装告知",
-    "url": "/mixuap?appId=1742358052905971713&id=1734127099570057217&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&formType=edit&noticeStatus=%s&instanceId=%s"
+    "url": ""
   },
   {
     "type": "103",