fix(jg):气瓶履历信息处理

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

@@ -26,14 +26,14 @@ public class JgResumeInfoEq implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
-    private Long sequenceNbr;
+    @TableId(value = "sequence_nbr", type = IdType.UUID)
+    private String sequenceNbr;
 
     /**
      * 履历主表id
      */
     @TableField("resume_id")
-    private Long resumeId;
+    private String resumeId;
 
     /**
      * 设备ID

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

@@ -149,19 +149,27 @@
             t.apply_no AS applyNo,
             t.rec_user_id AS recUserId,
             t.rec_user_name AS recUserName,
-            DATE_FORMAT(rec_date,'%Y-%m-%d %H:%i:%s') as recDate,
+            DATE_FORMAT(t.rec_date,'%Y-%m-%d %H:%i:%s') AS recDate,
             t.approval_unit AS approvalUnit,
             t.status,
             t.route_path AS routePath
-        FROM
-            tzs_jg_resume_info t
-                JOIN (SELECT apply_no, MAX(rec_date) AS max_rec_date
-                      FROM tzs_jg_resume_info
-                      WHERE equ_id =  #{record}
-                      GROUP BY apply_no
-            ) AS latest
-                     ON t.apply_no = latest.apply_no AND t.rec_date = latest.max_rec_date
+        FROM tzs_jg_resume_info t
+        JOIN (
+            SELECT r.apply_no, MAX(r.rec_date) AS max_rec_date
+            FROM tzs_jg_resume_info r
+            LEFT JOIN tzs_jg_resume_info_eq eq
+            ON eq.resume_id = r.sequence_nbr
+            WHERE (r.equ_id = #{record} OR eq.equ_id = #{record})
+            GROUP BY r.apply_no
+        ) latest
+            ON t.apply_no = latest.apply_no
+            AND t.rec_date = latest.max_rec_date
         WHERE t.equ_id = #{record}
+           OR t.sequence_nbr IN (
+            SELECT resume_id
+            FROM tzs_jg_resume_info_eq
+            WHERE equ_id = #{record}
+        )
         ORDER BY t.rec_date ASC
     </select>
     <select id="selectPromoterData" resultType="java.lang.String">

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

@@ -3502,7 +3502,7 @@ public class CommonServiceImpl implements ICommonService {
     public void batchInsertResumeEq(Long resumeId, List<Map<String, Object>> equipmentLists) {
         jgResumeInfoEqService.saveBatchResumeEq(equipmentLists.stream()
                 .map(e -> JgResumeInfoEq.builder()
-                        .resumeId(resumeId)
+                        .resumeId(String.valueOf(resumeId))
                         .equId(String.valueOf(e.get("record")))
                         .build())
                 .collect(Collectors.toList()));

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

@@ -1760,7 +1760,7 @@ public class DataDockServiceImpl {
         jgResumeInfoService.save(info);
         jgResumeInfoEqService.saveBatchResumeEq(records.stream()
                 .map(record -> JgResumeInfoEq.builder()
-                        .resumeId(info.getSequenceNbr())
+                        .resumeId(String.valueOf(info.getSequenceNbr()))
                         .equId(record)
                         .build())
                 .collect(Collectors.toList()));

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

@@ -3927,7 +3927,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         info.setRoutePath(routePath);
         jgResumeInfoService.save(info);
         jgResumeInfoEqMapper.insert(JgResumeInfoEq.builder()
-                .resumeId(info.getSequenceNbr())
+                .resumeId(String.valueOf(info.getSequenceNbr()))
                 .equId(record)
                 .build());
     }

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

@@ -563,7 +563,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
             jgResumeInfoService.save(info);
             jgResumeInfoEqService.saveBatchResumeEq(replenishEqs.stream()
                     .map(eq -> JgResumeInfoEq.builder()
-                            .resumeId(info.getSequenceNbr())
+                            .resumeId(String.valueOf(info.getSequenceNbr()))
                             .equId(eq.getEquId())
                             .build())
                     .collect(Collectors.toList()));

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

@@ -1108,7 +1108,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             jgResumeInfoService.save(resumeInfo);
             jgResumeInfoEqService.saveBatchResumeEq(cylinderEquipIds.stream()
                     .map(e -> JgResumeInfoEq.builder()
-                            .resumeId(resumeInfo.getSequenceNbr())
+                            .resumeId(String.valueOf(resumeInfo.getSequenceNbr()))
                             .equId(e)
                             .build())
                     .collect(Collectors.toList()));

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

@@ -2244,7 +2244,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             jgResumeInfoService.save(resumeInfo);
             jgResumeInfoEqService.saveBatchResumeEq(records.stream()
                     .map(e -> JgResumeInfoEq.builder()
-                            .resumeId(resumeInfo.getSequenceNbr())
+                            .resumeId(String.valueOf(resumeInfo.getSequenceNbr()))
                             .equId(e)
                             .build())
                     .collect(Collectors.toList()));

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

@@ -494,7 +494,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         jgResumeInfoService.save(info);
         jgResumeInfoEqService.saveBatchResumeEq(registrationUnitEqs.stream()
                 .map(eq -> JgResumeInfoEq.builder()
-                        .resumeId(info.getSequenceNbr())
+                        .resumeId(String.valueOf(info.getSequenceNbr()))
                         .equId(eq.getEquId())
                         .build())
                 .collect(Collectors.toList()));

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

@@ -752,7 +752,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         }
         jgResumeInfoEqService.saveBatchResumeEq(eqs.stream()
                 .map(eq -> JgResumeInfoEq.builder()
-                        .resumeId(resumeId)
+                        .resumeId(String.valueOf(resumeId))
                         .equId(eq.getEquId())
                         .build()).collect(Collectors.toList()));
     }

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

@@ -744,7 +744,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
             jgResumeInfoService.save(info);
             jgResumeInfoEqService.saveBatchResumeEq(designInfoList.stream()
                     .map(eq -> JgResumeInfoEq.builder()
-                            .resumeId(info.getSequenceNbr())
+                            .resumeId(String.valueOf(info.getSequenceNbr()))
                             .equId(eq.getRecord())
                             .build())
                     .collect(Collectors.toList()));

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

@@ -1066,7 +1066,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             jgResumeInfoService.save(info);
             jgResumeInfoEqService.saveBatchResumeEq(equipIdList.stream()
                     .map(equipId -> JgResumeInfoEq.builder()
-                            .resumeId(info.getSequenceNbr())
+                            .resumeId(String.valueOf(info.getSequenceNbr()))
                             .equId(equipId)
                             .build())
                     .collect(Collectors.toList()));

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -903,7 +903,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     // TODO 暂存json,在结果录入后，将数据更新技术参数-检验详情使用 考虑兼容老数据
                     if (model.getEquCategory().equals(CylinderTypeEnum.CYLINDER.getCode())){
                         jgResumeInfoEqList.add(JgResumeInfoEq.builder()
-                                        .resumeId(resultSeq)
+                                        .resumeId(String.valueOf(resultSeq))
                                         .equId(applicationEquipModels.get(i).getEquipUnicode())
                                         .build());
                         // 主表只创建一次

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/DPSubBizMapper.xml

@@ -9,19 +9,26 @@
             t.apply_no AS applyNo,
             t.rec_user_id AS recUserId,
             t.rec_user_name AS recUserName,
-            DATE_FORMAT(rec_date,'%Y-%m-%d %H:%i:%s') as recDate,
+            DATE_FORMAT(t.rec_date,'%Y-%m-%d %H:%i:%s') AS recDate,
             t.approval_unit AS approvalUnit,
             t.status,
             t.route_path AS routePath
-        FROM
-            tzs_jg_resume_info t
-        JOIN (SELECT apply_no, MAX(rec_date) AS max_rec_date
-              FROM tzs_jg_resume_info
-              WHERE equ_id =  #{record}
-              GROUP BY apply_no
-            ) AS latest
-        ON t.apply_no = latest.apply_no AND t.rec_date = latest.max_rec_date
+        FROM tzs_jg_resume_info t
+        LEFT JOIN tzs_jg_resume_info_eq eq
+        ON eq.resume_id = t.sequence_nbr
+        JOIN (
+        SELECT r.apply_no, MAX(r.rec_date) AS max_rec_date
+        FROM tzs_jg_resume_info r
+        LEFT JOIN tzs_jg_resume_info_eq eq2
+        ON eq2.resume_id = r.sequence_nbr
+        WHERE r.equ_id = #{record}
+           OR eq2.equ_id = #{record}
+        GROUP BY r.apply_no
+        ) latest
+        ON t.apply_no = latest.apply_no
+        AND t.rec_date = latest.max_rec_date
         WHERE t.equ_id = #{record}
+           OR eq.equ_id = #{record}
         ORDER BY t.rec_date ASC
     </select>