Merge branch 'develop_tzs' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_tzs

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.*;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 气瓶基本信息 Mapper 接口
@@ -20,13 +21,13 @@ public interface TzCylinderMapper extends BaseMapper<CylinderInfo> {
 
     TzCylinderInfoDto getTzCylinderInfoDto(String sequenceNbr);
 
-    String getSequencCode(String sequenceNbr);
+    Map<String, Object> getSequencCode(String sequenceNbr);
 
-    TzCylinderProduceDto getTzCylinderProduceDto(String SequenceCode);
+    TzCylinderProduceDto getTzCylinderProduceDto(String sequenceCode, String appId);
 
-    TzCylinderTagsDto getTzCylinderTagsDto(String sequenceCode);
+    TzCylinderTagsDto getTzCylinderTagsDto(String sequenceCode, String appId);
 
-    List<TzCylinderInspectionDto> getTzCylinderInspectionDto(String sequenceCode);
+    List<TzCylinderInspectionDto> getTzCylinderInspectionDto(String sequenceCode, String appId);
 
     List<TzCylinderFillingDto> getTzCylinderFillingDto(String sequenceCode);
 

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

@@ -96,8 +96,8 @@
         WHERE CI.sequence_nbr = #{sequenceNbr}
     </select>
 
-    <select id="getSequencCode" resultType="java.lang.String">
-        SELECT sequence_code FROM tz_cylinder_info WHERE sequence_nbr=#{sequenceNbr}
+    <select id="getSequencCode" resultType="java.util.Map">
+        SELECT sequence_code, app_id FROM tz_cylinder_info WHERE sequence_nbr=#{sequenceNbr}
     </select>
 
     <select id="getTzCylinderProduceDto" resultType="com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderProduceDto">
@@ -114,7 +114,7 @@
             CI.type_experiments
         FROM
             tz_cylinder_info CI
-        WHERE CI.sequence_code =#{SequenceCode}
+        WHERE CI.sequence_code =#{sequenceCode} and CI.app_id = #{appId}
     </select>
 
     <select id="getTzCylinderTagsDto" resultType="com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderTagsDto">
@@ -125,7 +125,7 @@
             CT.electronic_label_code,
             CT.gas_cylinder_stamp
         FROM tz_cylinder_tags CT
-        WHERE CT.sequence_code = #{SequenceCode}
+        WHERE CT.sequence_code = #{sequenceCode} and CT.app_id = #{appId}
     </select>
 
     <select id="getTzCylinderInspectionDto" resultType="com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderInspectionDto">
@@ -138,7 +138,7 @@
             CI.scrap_quantity,
             CI.next_inspection_date
         FROM tz_cylinder_inspection CI
-        WHERE CI.sequence_code = #{SequenceCode}
+        WHERE CI.sequence_code = #{sequenceCode} and CI.app_id = #{appId}
         ORDER BY CI.inspection_date DESC
     </select>
 

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

@@ -59,8 +59,10 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 	@Override
 	public TzCylinderTraceDto getCylinderTraceDto(String sequenceNbr) {
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-		String orgCode = tzCylinderMapper.getSequencCode(sequenceNbr);
-		TzCylinderProduceDto tzCylinderProduceDto = tzCylinderMapper.getTzCylinderProduceDto(orgCode);
+		Map<String, Object> cylinder = tzCylinderMapper.getSequencCode(sequenceNbr);
+		String appId = String.valueOf(cylinder.get("app_id"));
+		String sequenceCode = String.valueOf(cylinder.get("sequence_code"));
+		TzCylinderProduceDto tzCylinderProduceDto = tzCylinderMapper.getTzCylinderProduceDto(sequenceCode, appId);
 		if(!ValidationUtil.isEmpty(tzCylinderProduceDto.getManufacturingDate())) {
 			if(tzCylinderProduceDto.getManufacturingDate().length()>10) {
 				tzCylinderProduceDto.setManufacturingDate(tzCylinderProduceDto.getManufacturingDate().substring(0,10));
@@ -95,15 +97,15 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 		DataDictionary data3 = iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>()
 				.eq(DataDictionary::getSequenceNbr, tzCylinderInfoDto.getCylinderStatus()));
 		tzCylinderInfoDto.setCylinderStatus(data3 != null ? data3.getName() : null);
-		TzCylinderTagsDto tzCylinderTagsDto = tzCylinderMapper.getTzCylinderTagsDto(orgCode);
+		TzCylinderTagsDto tzCylinderTagsDto = tzCylinderMapper.getTzCylinderTagsDto(sequenceCode, appId);
 
 		if ( !ValidationUtil.isEmpty(tzCylinderTagsDto) && !ValidationUtil.isEmpty(tzCylinderTagsDto.getGasCylinderStamp())) {
 
 			tzCylinderTagsDto.setGasCylinderStamp(tzCylinderTagsDto.getGasCylinderStamp());
 		}
 		List<TzCylinderInspectionDto> tzCylinderInspectionDtoList = tzCylinderMapper
-				.getTzCylinderInspectionDto(orgCode);
-		List<TzCylinderFillingDto> tzCylinderFillingDtoList = tzCylinderMapper.getTzCylinderFillingDto(orgCode);
+				.getTzCylinderInspectionDto(sequenceCode, appId);
+		List<TzCylinderFillingDto> tzCylinderFillingDtoList = tzCylinderMapper.getTzCylinderFillingDto(sequenceCode);
 
 		/**
 		 * 取气瓶追溯详情 充装前检查项 名称和结果列表
@@ -183,9 +185,12 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 
 
 	public CylinderFileUrlDto getFileUrlAndName(String sequenceNbr){
-		String orgCode = tzCylinderMapper.getSequencCode(sequenceNbr);
-		TzCylinderProduceDto tzCylinderProduceDto = tzCylinderMapper.getTzCylinderProduceDto(orgCode);
-		TzCylinderTagsDto tzCylinderTagsDto = tzCylinderMapper.getTzCylinderTagsDto(orgCode);
+
+		Map<String, Object> cylinder = tzCylinderMapper.getSequencCode(sequenceNbr);
+		String appId = String.valueOf(cylinder.get("app_id"));
+		String sequenceCode = String.valueOf(cylinder.get("sequence_code"));
+		TzCylinderProduceDto tzCylinderProduceDto = tzCylinderMapper.getTzCylinderProduceDto(sequenceCode, appId);
+		TzCylinderTagsDto tzCylinderTagsDto = tzCylinderMapper.getTzCylinderTagsDto(sequenceCode, appId);
 		CylinderFileUrlDto dto =new CylinderFileUrlDto();
 		if (!ValidationUtil.isEmpty(tzCylinderProduceDto)) {
 			if (!ValidationUtil.isEmpty(tzCylinderProduceDto.getProductQualified())) {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -393,7 +393,8 @@
         END as equState
         from ${dto.tableName}
         <where>
-            <if test="dto.CODE96333 != '' and dto.CODE96333 != null">CODE96333 like concat('%', #{dto.CODE96333},'%')</if>
+            IS_NOT_ES = 1 and STATUS = '已认领'
+            <if test="dto.CODE96333 != '' and dto.CODE96333 != null">and CODE96333 like concat('%', #{dto.CODE96333},'%')</if>
             <if test="dto.EQU_CODE != '' and dto.EQU_CODE != null">and EQU_CODE like concat('%', #{dto.EQU_CODE},'%')</if>
             <if test="dto.SUPERVISORY_CODE != '' and dto.SUPERVISORY_CODE != null">and SUPERVISORY_CODE like concat('%', #{dto.SUPERVISORY_CODE},'%')</if>
             <if test="dto.USE_UNIT_NAME != '' and dto.USE_UNIT_NAME != null">and USE_UNIT_NAME like concat('%', #{dto.USE_UNIT_NAME},'%')</if>