Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/mapper/TzCylinderMapper.java

@@ -29,13 +29,13 @@ public interface TzCylinderMapper extends BaseMapper<CylinderInfo> {
 
     List<TzCylinderInspectionDto> getTzCylinderInspectionDto(String sequenceCode, String appId);
 
-    List<TzCylinderFillingDto> getTzCylinderFillingDto(String sequenceCode);
+    List<TzCylinderFillingDto> getTzCylinderFillingDto(String sequenceCode, String appId);
 
-    TzCylinderBeforeCheckDto getTzCylinderBeforeCheck(String fillingBeforeId);
+    TzCylinderBeforeCheckDto getTzCylinderBeforeCheck(String appId, String fillingBeforeId);
 
     List<TzCylinderCheckDto> getTzCylinderCheckItem();
 
-    TzCylinderAfterCheckDto getTzCylinderAfterCheck(String fillingCheckId);
+    TzCylinderAfterCheckDto getTzCylinderAfterCheck(String appId, String fillingCheckId);
 
     List<TzCylinderCheckDto> getTzCylinderAfterCheckItem();
 

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -5,15 +5,12 @@
     <select id="queryNumAndOutOfDateNum" resultType="java.util.Map">
         SELECT
             count( t.sequence_nbr ) AS cylinderNum,
-            l.expiry_date AS fillingPermitDate,
+            (select expiry_date from tz_base_unit_licence where unit_code = u.credit_code ORDER BY expiry_date desc limit 1) AS fillingPermitDate,
             count( CASE WHEN i.next_inspection_date <![CDATA[ < ]]> now() THEN 1 END ) AS outOfDateNum
         FROM
             tz_cylinder_unit U
                 LEFT JOIN tz_cylinder_info AS t ON  t.app_id = u.app_id
                 LEFT JOIN tz_cylinder_inspection AS i ON i.sequence_code = t.sequence_code
-                LEFT JOIN (SELECT * FROM tz_base_unit_licence
-                           GROUP BY unit_code
-                           ORDER BY expiry_date DESC) AS l ON l.unit_code = u.credit_code
         WHERE
              u.sequence_nbr = #{sequenceNbr}
         GROUP BY u.sequence_nbr

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/TzCylinderMapper.xml

@@ -166,7 +166,8 @@
                 LEFT JOIN tz_cylinder_filling AS CF ON CF.filling_before_id = FR.filling_before_id
                 LEFT JOIN tz_cylinder_filling_check AS FC ON FC.filling_check_id = FR.filling_check_id
         WHERE
-            CF.sequence_code = #{sequence_code}
+            CF.sequence_code = #{sequenceCode}
+        and FR.app_id = #{appId}
         ORDER BY FR.filling_startTime DESC
     </select>
 
@@ -181,7 +182,7 @@
             CF.have_security_documents,
             CF.fill_before_item
         FROM tz_cylinder_filling AS CF
-        WHERE CF.filling_before_id=#{fillingBeforeId}
+        WHERE CF.app_id=#{appId} and CF.filling_before_id=#{fillingBeforeId}
     </select>
 
     <select id="getTzCylinderCheckItem" resultType="com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderCheckDto">
@@ -200,7 +201,7 @@
             FC.abnormal_temperature,
             FC.warning_sign
         FROM tz_cylinder_filling_check AS FC
-        WHERE FC.filling_check_id=#{fillingCheckId}
+        WHERE FC.app_id=#{appId}  and FC.filling_check_id=#{fillingCheckId}
     </select>
 
     <select id="getTzCylinderAfterCheckItem" resultType="com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderCheckDto">

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/TzCylinderServiceImpl.java

@@ -113,7 +113,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 		}
 		List<TzCylinderInspectionDto> tzCylinderInspectionDtoList = tzCylinderMapper
 				.getTzCylinderInspectionDto(sequenceCode, appId);
-		List<TzCylinderFillingDto> tzCylinderFillingDtoList = tzCylinderMapper.getTzCylinderFillingDto(sequenceCode);
+		List<TzCylinderFillingDto> tzCylinderFillingDtoList = tzCylinderMapper.getTzCylinderFillingDto(sequenceCode, appId);
 
 		/**
 		 * 取气瓶追溯详情 充装前检查项 名称和结果列表
@@ -132,7 +132,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 			}
 			List<TzCylinderCheckDto> tzCylinderCheckDtoListResult = new ArrayList<>();
 			TzCylinderBeforeCheckDto tzcylinderBeforeCheckDto = tzCylinderMapper
-					.getTzCylinderBeforeCheck(tzCylinderFillingDto.getFillingBeforeId());
+					.getTzCylinderBeforeCheck(appId, tzCylinderFillingDto.getFillingBeforeId());
 			JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(tzcylinderBeforeCheckDto));
 			for (String str : obj.keySet()) {
 				String explain = map.get(str);
@@ -157,7 +157,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 		for (TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList) {
 			List<TzCylinderCheckDto> tzCylinderAfterCheckDtoListResult = new ArrayList<>();
 			TzCylinderAfterCheckDto tzcylinderAfterCheckDto = tzCylinderMapper
-					.getTzCylinderAfterCheck(tzCylinderFillingDto.getFillingCheckId());
+					.getTzCylinderAfterCheck(appId, tzCylinderFillingDto.getFillingCheckId());;
 			if (!ValidationUtil.isEmpty(tzcylinderAfterCheckDto)) {
 				JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(tzcylinderAfterCheckDto));
 				for (String str : obj.keySet()) {