Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -256,4 +255,10 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
      */
     @TableField("receive_company_org_code")
     private String receiveCompanyOrgCode;
+
+    /**
+     * 移装类型（0区内，1区外）
+     */
+    @TableField("transfer_type")
+    private String transferType;
 }

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

@@ -40,5 +40,28 @@ public class JgChangeRegistrationTransferEq extends BaseEntity {
     @TableField("is_invalid")
     private Boolean isInvalid =false;
 
+    /**
+     * 设备种类
+     */
+    @TableField("equ_list")
+    private String equList;
+
+    /**
+     * 设备类别
+     */
+    @TableField("equ_category")
+    private String equCategory;
+
+    /**
+     * 设备品种
+     */
+    @TableField("equ_define")
+    private String equDefine;
+
+    /**
+     * 设备信息json
+     */
+    @TableField("device_info")
+    private String deviceInfo;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferEqService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq;
 
 /**
@@ -10,7 +11,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq
  * @author system_generator
  * @date 2023-12-20
  */
-public interface IJgChangeRegistrationTransferEqService {
+public interface IJgChangeRegistrationTransferEqService extends IService<JgChangeRegistrationTransferEq> {
 
     boolean saveOrUpdateTransferEqData(JgChangeRegistrationTransferEq transferEq);
 

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

@@ -8,6 +8,12 @@
     </update>
 
     <select id="getListPage" resultType="java.util.Map">
+        WITH crteq_limited AS (
+        SELECT
+        *,
+        ROW_NUMBER() OVER (PARTITION BY equip_transfer_id ORDER BY rec_date desc) as rn
+        FROM tzs_jg_change_registration_transfer_eq
+        )
         select
         crt.sequence_nbr as sequenceNbr,
         crt.audit_status as auditStatus,
@@ -23,23 +29,18 @@
         crt.next_execute_user_ids as nextExecuteUserIds,
         crt.create_user_id as createUserId,
         crt.next_task_id as nextTaskId,
+        crt.full_address as fullAddress,
         use.USE_UNIT_NAME as useUnitName,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
-        use.USE_INNER_CODE as innerCode,
-        crteq.equ_id as equipId,
-        oi.SUPERVISORY_CODE AS supervisoryCode,
-        oi.CODE96333 as code96333,
         concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME") as allAddress,
-        use."ADDRESS" as detailedAddress,
         (SELECT name from tz_equipment_category WHERE code = jri.EQU_LIST) AS equList,
         (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
         (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine
         from tzs_jg_change_registration_transfer crt
-        LEFT JOIN tzs_jg_change_registration_transfer_eq crteq  on crt.sequence_nbr = crteq.equip_transfer_id
+        LEFT JOIN crteq_limited crteq ON crt.sequence_nbr = crteq.equip_transfer_id AND crteq.rn = 1
         LEFT JOIN idx_biz_jg_register_info jri  on crteq.equ_id = jri.RECORD
         LEFT JOIN idx_biz_jg_use_info use on crteq.equ_id = use.RECORD
-        LEFT JOIN idx_biz_jg_other_info oi ON  oi.RECORD = crteq.equ_id
         <where>
             and  crt.is_delete = 0
             <if test="dto.equCategory != null and dto.equCategory != ''">

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

@@ -276,6 +276,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 this.baseMapper.updateById(jgEnableDisable);
                 // 关联设备表
                 for (Map<String, Object> equipment : equipments) {
+                    LambdaQueryWrapper<JgEnableDisableEq> wrapper = new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, jgEnableDisable.getSequenceNbr().toString());
+                    jgEnableDisableEqService.getBaseMapper().delete(wrapper);
                     JgEnableDisableEq jgEnableDisableEq = new JgEnableDisableEq();
                     jgEnableDisableEq.setEquId(String.valueOf(equipment.get("SEQUENCE_NBR")));
                     jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
@@ -353,9 +355,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         dto.setModel(taskMessageDto);
         // 摘要 按原有规则组装
         dto.setTaskContent(
-                String.format("来自%s【%s】的业务办理，【申请单号：%s】",
-                        ObjectUtils.isEmpty(jgEnableDisable.getEquList()) ? "" : jgEnableDisable.getEquList(),
-                        ObjectUtils.isEmpty(jgEnableDisable.getSupervisoryCode()) ? "" : jgEnableDisable.getSupervisoryCode(),
+                String.format("来自%s的业务办理，【申请单号：%s】",
+                        ObjectUtils.isEmpty(jgEnableDisable.getEquListName()) ? "" : jgEnableDisable.getEquListName(),
                         jgEnableDisable.getApplyNo()));
         // 申请单号
         dto.setTaskCode(jgEnableDisable.getApplyNo());
@@ -416,6 +417,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
 
         // 关联设备表
         for (Map<String, Object> equipment : equipments) {
+            LambdaQueryWrapper<JgEnableDisableEq> wrapper = new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, jgEnableDisable.getSequenceNbr().toString());
+            jgEnableDisableEqService.getBaseMapper().delete(wrapper);
             JgEnableDisableEq jgEnableDisableEq = new JgEnableDisableEq();
             jgEnableDisableEq.setEquId(String.valueOf(equipment.get("SEQUENCE_NBR")));
             jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
@@ -454,7 +457,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             taskModelDto.setNextExecuteUser(item.getExecuteSequence());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquListName(), item.getApplyNo()));
             taskModelDtoList.add(taskModelDto);
             if (bool) {
                 // 删除暂存时生成的待办
@@ -477,17 +480,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         String level = reginParams.getCompany().getLevel();
         String userId = reginParams.getUserModel().getUserId();
         SortVo sortMap = commonService.sortFieldConversion(sort);
-        Page<Map<String, Object>> mapPage = this.baseMapper.pageList(page, sortMap, dto, level, userId);
-        List<Map<String, Object>> records = mapPage.getRecords();
-        // 填充 使用登记证编号 useRegistrationCodes
-        records.forEach(equEnable -> {
-            LambdaQueryWrapper<JgEnableDisableEq> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(JgEnableDisableEq::getEnableDisableApplyId, equEnable.get("sequenceNbr"));
-            List<JgEnableDisableEq> eqList = jgEnableDisableEqService.list(queryWrapper);
-
-        });
-        mapPage.setRecords(records);
-        return mapPage;
+        return this.baseMapper.pageList(page, sortMap, dto, level, userId);
     }
 
 
@@ -764,61 +757,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 .build();
     }
 
-    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String role = "";
-        String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
-        ArrayList<String> roleList = new ArrayList<>();
-        JgEnableDisable jgEnableDisable = this.getBaseMapper().selectById(sequenceNbr);
-        try {
-            // 查询下节点任务
-
-            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
-            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
-                JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-                String nextTaskId = nextTask.getString("id");
-                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
-                JSONObject result = nodeInfo.getResult();
-                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
-                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
-                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-                for (Object datum : data) {
-                    if (((Map) datum).containsKey("groupId")) {
-                        roleList.add(((Map) datum).get("groupId").toString());
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
-            role = String.join(",", roleList);
-            jgEnableDisable.setNextExecutorIds(role);
-            jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
-            jgEnableDisable.setInstanceId(instanceId);
-            jgEnableDisable.setApplyDate(new Date());
-            if (!ObjectUtils.isEmpty(jgEnableDisable.getExecuteSequence())) {
-                jgEnableDisable.setExecuteSequence(jgEnableDisable.getExecuteSequence() + "," + role);
-            } else {
-                jgEnableDisable.setExecuteSequence(role);
-            }
-            if ("0".equals(operate)) {
-                // 通过操作
-                jgEnableDisable.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
-            } else {
-                // 驳回操作
-                jgEnableDisable.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
-                jgEnableDisable.setPromoter(null);
-            }
-
-        } else {
-            jgEnableDisable.setAuditStatus(taskCode);
-            jgEnableDisable.setAuditPassDate(new Date());
-        }
-        this.getBaseMapper().updateById(jgEnableDisable);
-    }
-
     @Transactional(rollbackFor = Exception.class)
     public void deleteMessage(Long sequenceNbr) {
         JgEnableDisable jgEnableDisable = this.baseMapper.selectById(sequenceNbr);
@@ -848,12 +786,4 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         return resultMap;
     }
 
-    private void fillRuntimeEquipInfoData(Long sequenceNbr, Map<String, Object> resultMap) {
-        JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr));
-        if (!ObjectUtils.isEmpty(jgEnableDisableEq)) {
-            Map<String, Object> map = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgEnableDisableEq.getEquId());
-            resultMap.putAll(map);
-        }
-    }
-
 }
\ No newline at end of file

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

@@ -358,6 +358,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             for (SearchHit hit : response.getHits().getHits()) {
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
                 JSONObject dto = jsonObject.getJSONObject("sourceAsMap");
+                dto.put("record", dto.get("SEQUENCE_NBR"));
                 list.add(dto);
             }
             totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;