Update:有底盘ID去RETRIEVAL.CHPDPK_ZK查找数据

adcbs-check/src/main/java/com/adc/da/system/dao/CheckCertificateInfoDetailDao.java

@@ -15,5 +15,7 @@ public interface CheckCertificateInfoDetailDao extends BaseMapper<CheckCertifica
 
     List<CdVehicles> getClcpZk(@Param("carTypeCode") String carTypeCode,@Param("group") String group);
 
+    String getRetrievalChpdpkZk(@Param("id")String id,@Param("value") String value);
+
 }
 

adcbs-check/src/main/java/com/adc/da/system/service/impl/CheckCertificateMainInfoServiceImpl.java

@@ -212,27 +212,29 @@ public class CheckCertificateMainInfoServiceImpl
                 fdjxh = certificateEO.getEngineModel().toUpperCase().replaceAll("O", "0");
             }
             if (StringUtils.isNotEmpty(cdVehicles.getFdjxh())) {
-                fdjxhData = cdVehicles.getFdjxh().toUpperCase().replaceAll("O", "0");
+                fdjxhData = getValue(certificateEO,"M发动机") !=null ?
+                        getValue(certificateEO,"M发动机").toUpperCase().replaceAll("O", "0"):
+                        cdVehicles.getFdjxh().toUpperCase().replaceAll("O", "0");
 
             }
             dataCheck("发动机型号", type, fdjxh,
                     fdjxhData, checkResults, id, dataCheckDTOS);
 
             dataCheck("燃料种类", type, certificateEO.getFuelType(),
-                    cdVehicles.getFuelType(), checkResults, id, dataCheckDTOS);
+                    getValue(certificateEO,"燃料种类") !=null ? getValue(certificateEO,"燃料种类"):cdVehicles.getFuelType(), checkResults, id, dataCheckDTOS);
 
             dataCheck("排量", type, certificateEO.getExhaustVolume(),
-                    cdVehicles.getFdjpl(), checkResults, id, dataCheckDTOS);
+                    getValue(certificateEO,"M排量") !=null ? getValue(certificateEO,"M排量"):cdVehicles.getFdjpl(), checkResults, id, dataCheckDTOS);
 
             dataCheck("功率", type, certificateEO.getPower(),
-                    cdVehicles.getFdjgl(), checkResults, id, dataCheckDTOS);
+                    getValue(certificateEO,"M功率") !=null ? getValue(certificateEO,"M功率"):cdVehicles.getFdjgl(), checkResults, id, dataCheckDTOS);
 
             if (StringUtils.isNotEmpty(certificateEO.getEmissionStandards())) {
                 dataCheck("排放标准", type, certificateEO.getEmissionStandards(),
-                        cdVehicles.getEmissionStandard(), checkResults, id, dataCheckDTOS);
+                        getValue(certificateEO,"依据标准") !=null ? getValue(certificateEO,"依据标准"):cdVehicles.getEmissionStandard(), checkResults, id, dataCheckDTOS);
             } else {
                 dataCheck("排放标准", type, "",
-                        cdVehicles.getEmissionStandard(), checkResults, id, dataCheckDTOS);
+                        getValue(certificateEO,"依据标准") !=null ? getValue(certificateEO,"依据标准"):cdVehicles.getEmissionStandard(), checkResults, id, dataCheckDTOS);
             }
 
             dataCheck("油耗", type, certificateEO.getFuelConsumption(),
@@ -334,40 +336,41 @@ public class CheckCertificateMainInfoServiceImpl
             if ("-/-".equalsIgnoreCase(cdVehicles.getSpringLeafCount()) && "".
                     equalsIgnoreCase(numberOfLeafSprings)) {
                 checkResults.add(new CheckDataCheckResult(UUID.randomUUID(), id, "钢板弹簧片数",
-                        "0", type, certificateEO.getNumberOfLeafSprings(), cdVehicles.getSpringLeafCount()));
+                        "0", type, certificateEO.getNumberOfLeafSprings(),
+                        getValue(certificateEO,"弹簧片数") !=null ? getValue(certificateEO,"弹簧片数"):cdVehicles.getSpringLeafCount()));
                 dataCheckDTOS.add(new DataCheckDTO(UUID.randomUUID(), id, "钢板弹簧片数",
-                        "0", type, certificateEO.getNumberOfLeafSprings(), cdVehicles.getSpringLeafCount()));
+                        "0", type, certificateEO.getNumberOfLeafSprings(), getValue(certificateEO,"弹簧片数") !=null ? getValue(certificateEO,"弹簧片数"):cdVehicles.getSpringLeafCount()));
             } else {
                 dataCheck("钢板弹簧片数", type, certificateEO.getNumberOfLeafSprings(),
-                        cdVehicles.getSpringLeafCount(), checkResults, id, dataCheckDTOS);
+                        getValue(certificateEO,"弹簧片数") !=null ? getValue(certificateEO,"弹簧片数"):cdVehicles.getSpringLeafCount(), checkResults, id, dataCheckDTOS);
             }
 
             dataCheck("轮胎数", type, certificateEO.getTireNumber(),
-                    cdVehicles.getTyreCount(), checkResults, id, dataCheckDTOS);
+                    getValue(certificateEO,"轮胎数") !=null ? getValue(certificateEO,"轮胎数"):cdVehicles.getTyreCount(), checkResults, id, dataCheckDTOS);
 
             String tyreSize = "";
             if (StringUtils.isNotEmpty(cdVehicles.getTyreSize())) {
-                tyreSize = cdVehicles.getTyreSize();
+                tyreSize = getValue(certificateEO,"轮胎规格") !=null ? getValue(certificateEO,"轮胎规格"):cdVehicles.getTyreSize();
             }
 
             if (tyreSize.contains(certificateEO.getTireSpecification())) {
                 checkResults.add(new CheckDataCheckResult(UUID.randomUUID(), id,
                         "轮胎规格",
                         "0", type, certificateEO.getTireSpecification(),
-                        cdVehicles.getTyreSize()));
+                        getValue(certificateEO,"轮胎规格") !=null ? getValue(certificateEO,"轮胎规格"):cdVehicles.getTyreSize()));
                 dataCheckDTOS.add(new DataCheckDTO(UUID.randomUUID(), id,
                         "轮胎规格",
                         "0", type, certificateEO.getTireSpecification(),
-                        cdVehicles.getTyreSize()));
+                        getValue(certificateEO,"轮胎规格") !=null ? getValue(certificateEO,"轮胎规格"):cdVehicles.getTyreSize()));
             } else {
                 checkResults.add(new CheckDataCheckResult(UUID.randomUUID(), id,
                         "轮胎规格",
                         "1", type, certificateEO.getTireSpecification(),
-                        cdVehicles.getTyreSize()));
+                        getValue(certificateEO,"轮胎规格") !=null ? getValue(certificateEO,"轮胎规格"):cdVehicles.getTyreSize()));
                 dataCheckDTOS.add(new DataCheckDTO(UUID.randomUUID(), id,
                         "轮胎规格",
                         "1", type, certificateEO.getTireSpecification(),
-                        cdVehicles.getTyreSize()));
+                        getValue(certificateEO,"轮胎规格") !=null ? getValue(certificateEO,"轮胎规格"):cdVehicles.getTyreSize()));
             }
 
 //            dataCheck("轮胎规格", type, certificateEO.getTireSpecification(),
@@ -375,22 +378,22 @@ public class CheckCertificateMainInfoServiceImpl
 
 
             dataCheck("轮距前", type, certificateEO.getFrontTireDistance(),
-                    cdVehicles.getFrontTrack(), checkResults, id, dataCheckDTOS);
+                    getValue(certificateEO,"前轮距") !=null ? getValue(certificateEO,"前轮距"):cdVehicles.getFrontTrack(), checkResults, id, dataCheckDTOS);
 
             dataCheck("轮距后", type, certificateEO.getRearTireDistance(),
-                    cdVehicles.getRearTrack(), checkResults, id, dataCheckDTOS);
+                    getValue(certificateEO,"后轮距") !=null ? getValue(certificateEO,"后轮距"):cdVehicles.getRearTrack(), checkResults, id, dataCheckDTOS);
 
             dataCheck("轴距", type, certificateEO.getWheelbase(),
-                    cdVehicles.getWheelSpace(), checkResults, id, dataCheckDTOS);
+                    getValue(certificateEO,"轴距") !=null ? getValue(certificateEO,"轴距"):cdVehicles.getWheelSpace(), checkResults, id, dataCheckDTOS);
 
             dataCheck("轴荷", type, certificateEO.getAxleLoad(),
                     cdVehicles.getAxleLoad(), checkResults, id, dataCheckDTOS);
 
             dataCheck("轴数", type, certificateEO.getAxisNumber(),
-                    cdVehicles.getAxleCount(), checkResults, id, dataCheckDTOS);
+                    getValue(certificateEO,"轴数") !=null ? getValue(certificateEO,"轴数"):cdVehicles.getAxleCount(), checkResults, id, dataCheckDTOS);
 
             dataCheck("转向形式", type, certificateEO.getSteeringType(),
-                    cdVehicles.getSteeringType(), checkResults, id, dataCheckDTOS);
+                    getValue(certificateEO,"转向形式") !=null ? getValue(certificateEO,"转向形式"):cdVehicles.getSteeringType(), checkResults, id, dataCheckDTOS);
 
             dataCheck("总质量", type, certificateEO.getTotalWeight(),
                     cdVehicles.getTotalMass(), checkResults, id, dataCheckDTOS);
@@ -480,7 +483,7 @@ public class CheckCertificateMainInfoServiceImpl
             dataCheck("最高设计车速", type, certificateEO.getHighestDesignSpeed(),
                     cdVehicles.getMaxSpeed(), checkResults, id, dataCheckDTOS);
             String other = certificateEO.getOther();
-            String vehicleOther = cdVehicles.getVehicleOther();
+            String vehicleOther = getValue(certificateEO,"其它") !=null ? getValue(certificateEO,"其它"):cdVehicles.getVehicleOther();
             List<String> otherList = new ArrayList<>();
             boolean flag = true;
             if (StringUtils.isEmpty(other)) {
@@ -3774,4 +3777,7 @@ public class CheckCertificateMainInfoServiceImpl
             }
         return Result.success("200","同步成功");
     }
+    public String getValue(CertificateEO certificateEO,String value){
+        return  checkCertificateInfoDetailDao.getRetrievalChpdpkZk(certificateEO.getChassisID(),value);
+    }
 }

adcbs-check/src/main/resources/mybatis/mapper/system/CheckCertificateInfoDetailDao.xml

@@ -61,4 +61,10 @@
     AND cz."车辆型号" = #{carTypeCode}
     </select>
 
+    <select id="getRetrievalChpdpkZk" resultType="java.lang.String">
+        SELECT ${value}
+        FROM RETRIEVAL.CHPDPK_ZK
+        WHERE DPID = #{id}
+    </select>
+
 </mapper>