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

@@ -17,4 +17,6 @@ public interface JgRegistrationHistoryMapper extends BaseMapper<JgRegistrationHi
 
     @Select("select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId} and is_delete = 0")
     Long getSequenceNbrByRegistratioClassAndDocumentId(@Param("registratioClass") String registratioClass, @Param("documentId") String documentId);
+
+    JgRegistrationHistory queryLatestRegistrationHistory(@Param("projectContraptionSeq") Long projectContraptionSeq);
 }

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

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper">
 
+    <select id="queryLatestRegistrationHistory" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory">
+        SELECT his.change_data
+        FROM tzs_jg_use_registration tjur
+        LEFT JOIN tzs_jg_registration_history his
+        ON tjur.sequence_nbr = his.current_document_id
+        WHERE tjur.is_delete = 0
+        AND tjur.project_contraption_id = #{projectContraptionSeq}
+        AND tjur.status <![CDATA[ <> ]]> '已作废'
+        ORDER BY tjur.rec_date DESC
+        LIMIT 1
+    </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/JgRegistrationHistoryServiceImpl.java

@@ -60,4 +60,7 @@ public class JgRegistrationHistoryServiceImpl extends BaseService<JgRegistration
         return this.update(history, historyWapper);
     }
 
+    public JgRegistrationHistory queryLatestRegistrationHistory(Long projectContraptionSeq) {
+        return this.baseMapper.queryLatestRegistrationHistory(projectContraptionSeq);
+    }
 }
\ 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/JgUseRegistrationServiceImpl.java

@@ -3977,31 +3977,32 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 .put("projectContraptionId", projectContraptionSeq)
                 .put("projectContraptionNo", projectContraption.getProjectContraptionNo())
                 .put("pipelineLength", totalPipelineLength);
-        setProjectContraptionInfo(projectContraptionSeq, resultBuilder);
+        if (!Objects.nonNull(projectContraption.getUseRegistrationCode())){
+            setProjectContraptionInfo(projectContraption, resultBuilder);
+        }
         return resultBuilder.build();
     }
 
-    private void setProjectContraptionInfo(String projectContraptionSeq, MapBuilder<String, Object> re) {
-        LambdaQueryWrapper<IdxBizJgProjectConstruction> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(IdxBizJgProjectConstruction::getProjectContraptionId, projectContraptionSeq)
-                .orderByDesc(IdxBizJgProjectConstruction::getUscDate).last("limit 1");
-        IdxBizJgProjectConstruction construction = idxBizJgProjectConstructionMapper.selectOne(queryWrapper);
-        if(construction != null){
-            re.put("installLeaderName", construction.getConstructionLeaderName());
-            re.put("installLeaderPhone",construction.getConstructionLeaderPhone());
-            re.put("installStartDate", construction.getUscDate());
-            re.put("installPropertyUnitName", construction.getConstructionLeaderName());
-            re.put("installProxyStatementAttachment", JSON.parse(construction.getProxyStatementAttachment()));
-            re.put("installContractAttachment", JSON.parse(construction.getConstructionContractAttachment()));
-            re.put("insOtherAccessories", JSON.parse(construction.getConstructionOtherAccessories()));
-            re.put("installStreet", construction.getStreetName());
-            re.put("installProvince", construction.getProvinceName());
-            re.put("installAddress", construction.getAddress());
-            re.put("installCity", construction.getCityName());
-            re.put("installIsXixian", construction.getIsXixian());
-            re.put("installCounty", construction.getCountyName());
-            re.put("uscUnitCreditCode", construction.getUscUnitCreditCode());
-            re.put("uscUnitName", construction.getUscUnitName());
+    private void setProjectContraptionInfo(IdxBizJgProjectContraption projectContraption, MapBuilder<String, Object> re) {
+        // 查询最新的历史记录
+        JgRegistrationHistory history = jgRegistrationHistoryService.queryLatestRegistrationHistory(projectContraption.getSequenceNbr());
+
+        if (history != null && history.getChangeData() != null) {
+            JSONObject hisJson = JSON.parseObject(history.getChangeData());
+            Map<String, Object> fieldMappings = new HashMap<>();
+            fieldMappings.put("useRegistrationCode", projectContraption.getUseRegistrationCode());
+            fieldMappings.put("safetyManager", hisJson.get("safetyManager"));
+            fieldMappings.put("useDate", hisJson.get("useDate"));
+            fieldMappings.put("otherAccessories", hisJson.get("otherAccessories"));
+            fieldMappings.put("factoryUseSiteStreet", hisJson.get("factoryUseSiteStreet"));
+            fieldMappings.put("province", hisJson.get("province"));
+            fieldMappings.put("address", hisJson.get("address"));
+            fieldMappings.put("city", hisJson.get("city"));
+            fieldMappings.put("isXixian", hisJson.get("isXixian"));
+            fieldMappings.put("county", hisJson.get("county"));
+            fieldMappings.put("longitudeLatitude", hisJson.get("longitudeLatitude"));
+            fieldMappings.put("estateUnitName", hisJson.get("estateUnitName"));
+            fieldMappings.forEach(re::put);
         }
     }