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

@@ -139,4 +139,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
   @ApiModelProperty(value = "下一步执行人userids")
   private String nextExecuteUserIds;
 
+  @ApiModelProperty(value = "监管码")
+    private  String supervisoryCode;
+
 }

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

@@ -100,13 +100,15 @@
             fi.ins_use_maintain_explain AS insUseMaintainExplain,
             ei.legal_person AS safetyManager,
             ei.legal_phone AS safetyManagerPhone,
-            ei.address AS address
+            ei.address AS address,
+            oi.SUPERVISORY_CODE AS supervisoryCode
         FROM
             tzs_jg_change_registration_unit isn
                 LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.unit_change_registration_id = isn.sequence_nbr
                 LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
                 LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_other_info oi ON oi.record = re.equ_id
                 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

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

@@ -25,7 +25,8 @@
         isn.equ_address AS equAddress,
         isn.handle_date AS handleDate,
         isn.equ_list AS equList,
-        isn.notice_report_url AS noticeReportUrl
+        isn.notice_report_url AS noticeReportUrl,
+        isn.create_user_id as createUserId
         FROM
         tzs_jg_installation_notice isn
         <where>

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

@@ -65,6 +65,7 @@
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     ur.instance_status like concat('%',#{role},'%')
                 </foreach>
+                or ur.create_user_id = #{dto.createUserId}
             </if>
             <if test="dto.type == 'supervision'">
                 AND ur.receive_org_code = #{orgCode}

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

@@ -24,7 +24,8 @@
         tjtn.instance_status AS instanceStatus,
         tjtn.notice_report_url AS noticeReportUrl,
         ec."name" AS equipCateName,
-        tjtn.handle_date AS handleDate
+        tjtn.handle_date AS handleDate,
+        tjtn.create_user_id as createUserId
         FROM
             tzs_jg_transfer_notice tjtn
             LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
@@ -62,8 +63,8 @@
 <!--                AND tjtn.install_unit_credit_code = #{orgCode}-->
 <!--            </if>-->
 
-            <if test="roleIds != null and type == 'supervision'">
-                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+            <if test="param.roleIds != null and type == 'supervision'">
+                <foreach collection='param.roleIds' item='role' open='and (' close=')' separator='or'>
                     tjtn.instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
@@ -659,6 +658,7 @@ public class CommonServiceImpl implements ICommonService {
                 if (flag && map.get("type").equals(obj.getTaskType())
                         && map.get("pageType").equals("draft")){
                     model.setRoutePath(map.get("url").toString()+ urlParams );
+                    break;
                 }
                 //维保需特殊获取页面  状态不等于监管单位审核的页面均取对应编辑页面
                 else if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode())
@@ -689,7 +689,7 @@ public class CommonServiceImpl implements ICommonService {
                 model.setTaskTitle("有一条待提交的草稿");
                 model.setTaskName(BusinessTypeEnum.getNameByType(obj.getTaskType()));
                 model.setTaskTypeLabel(BusinessTypeEnum.getNameByType(obj.getTaskType()));
-                model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
+           //     model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
             }else {
                 model.setTaskStatus(0);
                 model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
@@ -850,17 +850,14 @@ public class CommonServiceImpl implements ICommonService {
      * @param obj 自己的实体：taskType为BusinessTypeEnum code；nextExecuteUser
      */
     public void rollbackTask(String id, JSONObject obj) {
+
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
         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()));
 
         String urlParams = "";
-        try {
-            urlParams = "&" + toQueryParams(obj);
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
+        urlParams = "&" + toQueryParams2(obj);
         List<Map> urlList = JsonUtils.getResourceList(urlInfo);
 
         if (list.size() > 1) {
@@ -911,6 +908,30 @@ public class CommonServiceImpl implements ICommonService {
         }
     }
 
+    private static String toQueryParams2(JSONObject jsonObject) {
+        StringBuilder sb = new StringBuilder();
+        Set<String> keys = jsonObject.keySet();
+        keys.forEach(key->{
+            Object value = jsonObject.get(key);
+            if (sb.length() > 0) {
+                sb.append('&');
+            }
+            try {
+                if(value != null && !"".equals(value)){
+                    sb.append(URLEncoder.encode(key, "UTF-8"))
+                            .append('=')
+                            .append(URLEncoder.encode(value.toString(), "UTF-8"));
+                }
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        });
+        return sb.toString();
+    }
+
+
+
+
     public <T> String toQueryParams(T obj) throws UnsupportedEncodingException {
         StringBuilder sb = new StringBuilder();
 
@@ -938,6 +959,9 @@ public class CommonServiceImpl implements ICommonService {
         return sb.length() > 0 ? sb.substring(0, sb.length() - 1) : "";
     }
 
+
+
+
     /**
      * 根据流程状态name 获取流程状态code
      *

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

@@ -37,6 +37,7 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -409,6 +410,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         JgChangeRegistrationName jgChangeRegistrationName = new JgChangeRegistrationName();
         LambdaQueryWrapper<JgChangeRegistrationName> lambda = new QueryWrapper<JgChangeRegistrationName>().lambda();
         lambda.eq(JgChangeRegistrationName::getInstanceId, instanceId);
+        jgChangeRegistrationName = this.getOne(lambda);
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();
         ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(instanceId);
@@ -426,14 +428,14 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         // 更新下一步可执行人
         String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
         jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
-        this.update(jgChangeRegistrationName, lambda);
+        this.updateById(jgChangeRegistrationName);
         // 删除待办
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationName));
-        jsonObject.put("nextTaskId", jgChangeRegistrationName.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgChangeRegistrationName.getNextExecutorIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
         jsonObject.put("flowStatus", this.getTaskCodeByName(jgChangeRegistrationName.getAuditStatus()));
         jsonObject.put("flowStatusLabel", jgChangeRegistrationName.getAuditStatus());
+        jsonObject.put("changeCertificate",null);
         commonService.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/JgChangeRegistrationReformServiceImpl.java

@@ -379,7 +379,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);
+        jsonObject.put("model",conveterTaskMessageDTO(jgChangeRegistrationReform));
         commonServiceImpl.rollbackTask(instanceId,jsonObject);
     }
 
@@ -404,22 +404,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         if (ObjectUtils.isEmpty(equipId)) {
             equipId = jgChangeRegistrationReformEqMapper.selectEquipId(currentDocumentId);
         }
-        Map<String, Object> detail = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class);
+        Map<String, Object> detail = new HashMap<>();
         Map<String, Object> originalData = new HashMap<>();
         Map<String, Object> originalDataOther = new HashMap<>();
 
-        if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) {
+        if ((jgChangeRegistrationReform.getStatus().equals("已完成") || jgChangeRegistrationReform.getStatus().equals("流程结束"))) {
             originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
             originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
-            originalData.remove("sequenceNbr");
-            originalDataOther.remove("sequenceNbr");
-            originalDataOther.remove("status");
-            if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
-                detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
-            }
-            if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) {
-                detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
-            }
             detail.putAll(originalDataOther);
             detail.put("techInfo",originalData);
         } else {
@@ -428,9 +419,15 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
                     .eq("registration_class", "改造登记"));
             originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
-            originalData.remove("sequenceNbr");
             detail.putAll(originalData);
         }
+        detail.putAll(JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class));
+        if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
+            detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
+        }
+        if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) {
+            detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
+        }
         return detail;
     }
 

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

@@ -1068,7 +1068,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 toDoTask.setStartDate(new Date());
                 toDoTask.setNextExecuteUser(transfer.getNextExecutorIds());
                 TaskMessageDto taskMessageDto = new TaskMessageDto();
-                BeanUtil.copyProperties(sorkflow, taskMessageDto);
+                BeanUtil.copyProperties(transfer, taskMessageDto);
                 toDoTask.setModel(taskMessageDto);
                 toDoTasklist.add(toDoTask);
             }

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

@@ -242,7 +242,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 JgChangeRegistrationUnit notice = new JgChangeRegistrationUnit();
                 JgChangeRegistrationUnit noticeOld = JgChangeRegistrationUnitMapper.selectById(noticeDto.getSequenceNbr());
                 BeanUtils.copyProperties(noticeOld, notice);
-                boolean submit = submit(notice, op);
+       //         boolean submit = submit(notice, op);
                 notice.setChangeCertificate(noticeDto.getChangeCertificate());
                 notice.setRemark(noticeDto.getRemark());
               //  notice.setStatus(taskName[0]);
@@ -251,9 +251,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 } else {
                     notice.setInstanceStatus(String.join(",", roleListAll));
                 }
+                notice.setInstanceId(instanceId);
+                notice.setNextTaskId(nextTaskId);
+                notice.setSupervisoryCode(noticeDto.getSupervisoryCode());
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecutorIds(String.join(",", roleListNext));
                 notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
+                notice.setNextExecuteUserIds(nextUserIds);
                 JgChangeRegistrationUnitMapper.updateById(notice);
                 commonServiceImpl.deleteTaskModel(notice.getSequenceNbr()+"");
                 createTaskModel(notice,taskname,"1", nextUserIds);
@@ -550,6 +554,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             for (JgChangeRegistrationUnit obj : list) {
                 TaskModelDto dto = new TaskModelDto();
                 dto.setModel(obj);
+                dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
                 dto.setTaskCode(obj.getApplyNo());
                 dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
                 dto.setRelationId(obj.getSequenceNbr()+"");
@@ -978,13 +983,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setTaskCode(dto.getApplyNo());
             taskModelDto.setTaskContent(this.buildTaskContent(dto));
             taskModelDto.setTaskDesc("");
-            taskModelDto.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
-            taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
+            taskModelDto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+            taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
             taskModelDto.setRelationId(dto.getInstanceId());
             taskModelDto.setExecuteUserIds(nextUserIds);
+            taskModelDto.setFlowStatus(this.getTaskStatusByName(dto.getStatus()));
+            taskModelDto.setFlowStatusLabel(dto.getStatus());
             taskModelDto.setTaskStatusLabel(dto.getAuditStatus());
-            taskModelDto.setStartUserId(dto.getCreateUserId());
-            taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
+            taskModelDto.setStartUserId(RequestContext.getExeUserId());
+            taskModelDto.setStartUser(reginParams.getUserModel().getUserName());
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
             taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
             taskModelDto.setStartDate(dto.getCreateDate());

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

@@ -899,9 +899,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         } else {
             commMap.put("approvalStatus", op);
         }
+        commMap.put("approvalStatus", op);
         workDto.setVariable(commMap);
         workDto.setComment(jgTransferNotice.getProcessAdvice());
-        workDto.setNextExecuteUserCompanyCode(jgTransferNotice.getReceiveOrgCreditCode());
+        workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCreditCode());
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);

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

@@ -108,6 +108,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     public Page<Map<String, Object>> getList(JgScrapCancelDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         ReginParams reginParams = this.getSelectedOrgInfo();
         String orgCode = reginParams.getCompany().getCompanyCode();
+        dto.setCreateUserId(reginParams.getUserModel().getUserId());
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, orgCode);
         listPage.getRecords().forEach(item -> {
             if (item.containsKey("auditStatus") && Objects.nonNull(item.get("auditStatus"))) {

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

@@ -730,6 +730,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             commMap.put("approvalStatus", op);
         }
         workDto.setNextExecuteUserCompanyCode(jgTransferNotice.getReceiveOrgCode());
+        workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCode());
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);

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

@@ -43,6 +43,12 @@
   },
   {
     "type": "105",
+    "pageType": "draft",
+    "name": "移装告知",
+    "url": "/mixuap?appId=1742358052905971713&id=1736591367150268417&formType=edit&roleIds={roleIds}&userId={userId}"
+  },
+  {
+    "type": "105",
     "pageType": "look",
     "name": "移装告知",
     "url": "/mixuap?appId=1742358052905971713&id=1736722525146083329&formType=detail&roleIds={roleIds}&userId={userId}"
@@ -51,7 +57,7 @@
     "type": "105",
     "pageType": "edit",
     "name": "移装告知",
-    "url": ""
+    "url": "/mixuap?appId=1742358052905971713&id=1736722525146083329&formType=edit&roleIds={roleIds}&userId={userId}"
   },
   {
     "type": "106",
@@ -91,6 +97,11 @@
   },
   {
     "type": "109",
+    "pageType": "draft",
+    "name": "单位变更登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"  },
+  {
+    "type": "109",
     "pageType": "look",
     "name": "单位变更登记",
     "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=look"
@@ -102,11 +113,6 @@
     "url": "/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
-    "type": "109",
-    "pageType": "draft",
-    "name": "单位变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"  },
-  {
     "type": "110",
     "pageType": "look",
     "name": "移装变更登记",