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/mapper/JgRegistrationHistoryMapper.java

@@ -14,4 +14,7 @@ import org.apache.ibatis.annotations.Select;
 public interface JgRegistrationHistoryMapper extends BaseMapper<JgRegistrationHistory> {
     @Select("select sequence_nbr from tzs_jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}")
     Long getSequenceNbrByEquidAndDocumentId(@Param("equid") String equid, @Param("documentId") String documentId);
+
+    @Select("select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId}")
+    Long getSequenceNbrByRegistratioClassAndDocumentId(@Param("registratioClass") String registratioClass, @Param("documentId") String documentId);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -32,4 +32,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     void updatePromoter(@Param("id")Long id);
 
     List<Map<String, Object>> getDetailById(@Param("id") Long id);
+
+    String getEquType(@Param("record") String record);
 }

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

@@ -192,5 +192,12 @@
         where ur.sequence_nbr = #{id}
 
     </select>
+    <select id="getEquType" resultType="java.lang.String">
+        SELECT ec.name
+        from idx_biz_jg_register_info jri
+                 LEFT JOIN tz_equipment_category ec
+                           on ec.code = jri.EQU_LIST
+        where jri.RECORD = #{record}
+    </select>
 
 </mapper>

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

@@ -52,6 +52,8 @@ import java.util.stream.Collectors;
  */
 @Service
 public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeRegistrationReformDto, JgChangeRegistrationReform, JgChangeRegistrationReformMapper> implements IJgChangeRegistrationReformService {
+
+    private final static String bussinessType= "改造登记";
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
@@ -166,7 +168,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         //使用登记编号
         jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
         //登记类别
-        jgRegistrationHistory.setRegistrationClass("改造登记");
+        jgRegistrationHistory.setRegistrationClass(bussinessType);
         //设备id
         jgRegistrationHistory.setEquId(equipId);
         //修改数据
@@ -188,7 +190,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             this.getBaseMapper().updateById(jgChangeRegistrationReform);
             jgChangeRegistrationReform = this.getBaseMapper().selectById(jgChangeRegistrationReform.getSequenceNbr());
-            jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("applyNo"))));
+            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
+            jgChangeRegistrationReformEq.setEquId(equipId);
+            jgChangeRegistrationReformEqMapper.updateById(jgChangeRegistrationReformEq);
+            jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(bussinessType, String.valueOf(map.get("applyNo"))));
             jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
         } else {
                 //暂存处理
@@ -442,7 +447,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                     .eq("equ_id", equipId)
                     .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
-                    .eq("registration_class", "改造登记"));
+                    .eq("registration_class", bussinessType));
             originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
             detail.putAll(originalData);
         }
@@ -487,7 +492,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id", equipId)
                 .eq("current_document_id", applyNo)
-                .eq("registration_class", "改造登记"));
+                .eq("registration_class", bussinessType));
 
         if (!ObjectUtils.isEmpty(idxBizJgTechParamsElevator) && !ObjectUtils.isEmpty(jgRegistrationHistory)) {
             //历史数据

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 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;
@@ -29,18 +28,21 @@ import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 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.*;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.*;
+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.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StopWatch;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -91,6 +93,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     CmWorkflowServiceImpl cmWorkflowService;
 
+    private static final String DEFINITION_KEY = "useRegistration";
+
     public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
@@ -159,6 +163,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(String.valueOf(map.get("useUnitName")));
         jgUseRegistration.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
+        String equType = this.baseMapper.getEquType(String.valueOf(map.get("equipId")));
         if (map.containsKey("receiveOrgCode")) {
             //维保单位信息
             String[] splitMaintenanceUnitCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
@@ -217,8 +222,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 ArrayList<ActWorkflowStartDTO> list = new ArrayList<>();
-                dto.setProcessDefinitionKey("useRegistration");
-                dto.setBusinessKey("test");
+                dto.setProcessDefinitionKey(DEFINITION_KEY);
+                dto.setBusinessKey("1");
                 dto.setCompleteFirstTask(Boolean.TRUE);
                 // 接受机构
                 dto.setNextExecuteUserCompanyCode(jgUseRegistration.getReceiveCompanyCode());
@@ -246,7 +251,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 数据参数
             dto.setModel(taskMessageDto);
             // 摘要
-            dto.setTaskContent("来自" + "电梯" + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
+            dto.setTaskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
             // 申请单号
             dto.setTaskCode(jgUseRegistration.getApplyNo());
             // 业务类型
@@ -366,8 +371,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         dto.setFlowCreateDate(jgUseRegistration.getCreateDate());
         dto.setTaskName(workflowResultDto.getNextTaskName());
         dto.setTaskCode(workflowResultDto.getNextTaskCode());
-        dto.setTaskDesc("来自" + "电梯" + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
-        dto.setTaskContent("来自" + "电梯" + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
         dto.setRelationId(workflowResultDto.getInstanceId());
         dto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         dto.setTaskStatus(commonServiceImpl.getDictionaryCodeByName(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getPass()));
@@ -389,6 +392,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+        dto.setTaskContent("来自" + this.getBaseMapper().getEquType(jgUseRegistrationEq.getEquId()) + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
         list.add(dto);
         commonServiceImpl.buildTaskModel(list);
     }
@@ -474,6 +478,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setIsDelete(true);
         LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
         lambda.in(JgUseRegistration::getSequenceNbr, ids);
+        // 删除暂存的待办
+        ids.forEach(id -> commonServiceImpl.deleteTaskModel(String.valueOf(id)));
         this.update(jgUseRegistration, lambda);
     }
 
@@ -656,7 +662,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
         lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
         IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(lambdaOth);
-        if (ObjectUtils.isEmpty(otherInfo.getCode96333()) || ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
+        if (ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
             // 使用信息
             LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
             lambda.eq(UseInfo::getRecord, record);