气瓶充装信息存es修改

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

@@ -81,7 +81,7 @@ public class ESCylinderFillingRecordDto {
     private Double temperature;
 
     //异常情况
-    @Field(type = FieldType.Integer)
+    @Field(type = FieldType.Text)
     private String abnormalStr;
 
 
@@ -118,4 +118,8 @@ public class ESCylinderFillingRecordDto {
     @Field(type = FieldType.Text)
     private String creditCode;
 
+    //行政区划代码
+    @Field(type = FieldType.Text)
+    private String regionCode;
+
 }

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

@@ -197,7 +197,8 @@
             ct.qrCode,
             ct.electronic_label_code,
             ci.app_id,
-            ci.credit_code
+            ci.credit_code,
+            tn.region_code
         FROM
             tz_cylinder_info AS ci
                 LEFT JOIN cb_data_dictionary AS d1 ON d1.TYPE = 'CZJZMC' AND d1.code = ci.filling_media

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java

@@ -619,10 +619,11 @@ public class CylinderInfoController extends BaseController {
         if (ObjectUtils.isEmpty(reginParams)) {
             return null;
         }
-        String companyCode = reginParams.getUserModel().getCompanys().get(0).getCompanyCode();
-        if (companyCode.length() > 6) {
-            cylinderInfoDto.setCreditCode(companyCode);
-        }
+		CompanyModel companyModel = reginParams.getUserModel().getCompanys().get(0);
+		String companyCode = companyModel.getCompanyCode();
+		if("company".equals(companyModel.getLevel())){
+			cylinderInfoDto.setCreditCode(companyCode);
+		}
         if (ValidationUtil.isEmpty(cylinderInfoDto.getRegionCode()) && ValidationUtil.isEmpty(cylinderInfoDto.getCreditCode()) && cylinderInfoDto.getIsWarn() == 0) {
 			return ResponseHelper.buildResponse(new Page<ESCylinderInfoDto>());
         }
@@ -691,10 +692,13 @@ public class CylinderInfoController extends BaseController {
         if (ObjectUtils.isEmpty(reginParams)) {
             return null;
         }
-        String companyCode = reginParams.getUserModel().getCompanys().get(0).getCompanyCode();
-        if (companyCode.length() > 6) {
-            esCylinderFillingRecordDto.setCreditCode(companyCode);
-        }
+		CompanyModel companyModel = reginParams.getUserModel().getCompanys().get(0);
+		String companyCode = companyModel.getCompanyCode();
+		if("company".equals(companyModel.getLevel())){
+			esCylinderFillingRecordDto.setCreditCode(companyCode);
+		} else {
+			esCylinderFillingRecordDto.setRegionCode("organization".equals(companyModel.getLevel()) ? null : companyCode);
+		}
 
         Page<ESCylinderFillingRecordDto> pageResult = cylinderFillingRecordServiceImpl.queryByKeys(esCylinderFillingRecordDto, pageNum, pageSize);
         return ResponseHelper.buildResponse(pageResult);

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

@@ -184,6 +184,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
                         item.setElectronicLabelCode(cyinderFillingRecordInfo.getElectronicLabelCode());
                         item.setAppId(cyinderFillingRecordInfo.getAppId());
                         item.setCreditCode(cyinderFillingRecordInfo.getCreditCode());
+                        item.setRegionCode(cyinderFillingRecordInfo.getRegionCode());
                     }
                 }
                 return item;
@@ -225,7 +226,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
         SearchSourceBuilder builder = new SearchSourceBuilder();
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
-        //匹配当前登录人
+        //匹配统一信用代码
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getCreditCode())) {
             flag = false;
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
@@ -233,6 +234,13 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             boolMust.must(meBuilder);
         }
 
+        //匹配行政区划
+        if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getRegionCode())) {
+            flag = false;
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.matchQuery("regionCode", "*" + esCylinderFillingRecordDto.getRegionCode() + "*"));
+            boolMust.must(query);
+        }
 
         //匹配充装单位
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getFillingUnitName())) {

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

@@ -764,7 +764,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
 		SearchSourceBuilder builder = new SearchSourceBuilder();
 		BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
-		//匹配当前登录人
+		//匹配统一信用代码
 		if (!ObjectUtils.isEmpty(cylinderInfoDto.getCreditCode())) {
 			flag = false;
 			BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();