任务 16074 16076

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/EquipmentCategoryMapper.java

@@ -20,18 +20,18 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
     @Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")
     List<EquipmentCategoryDto> selectClassify();
 
-    Map<String, Object> getCategoryCount(@Param("code") String code,@Param("level")String level,@Param("orgCode")String orgCode);
+    Map<String, Object> getCategoryCount(@Param("code") String code, @Param("level") String level,
+                                         @Param("orgCode") String orgCode, @Param("companyCode") String companyCode);
 
     Map<String, Object> getAdministrativeDivision(@Param("division") String division, @Param("county") String county);
 
 
-
     List<Map<String, Object>> getSrcee(@Param("tableName") String tableName,
-                            @Param("orgBranchName")String orgBranchName,
-                            @Param("equList")String equList,
-                            @Param("equCategory")String equCategory,
-                            @Param("usePlace")String usePlace,
-                            @Param("equState")String equState);
+                                       @Param("orgBranchName") String orgBranchName,
+                                       @Param("equList") String equList,
+                                       @Param("equCategory") String equCategory,
+                                       @Param("usePlace") String usePlace,
+                                       @Param("equState") String equState);
 
 
     Map<String, Object> getCategoryAndDefineByRecord(@Param("record") String record);

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

@@ -17,7 +17,7 @@
         ibjoi.claim_status = '6036' AND ibjri."EQU_LIST" = #{code}
         <if test="level == 'company'">
             AND ibjui."USE_UNIT_CREDIT_CODE"
-             LIKE CONCAT('%',#{orgCode},'%')
+             LIKE CONCAT('%',#{companyCode},'%')
         </if>
         <if test="level != 'company'">
          AND ibjsi."ORG_BRANCH_CODE"
@@ -38,7 +38,7 @@
         ibjoi.claim_status = '6035' AND ibjri."EQU_LIST" = #{code}
         <if test="level == 'company'">
             AND ibjui."USE_UNIT_CREDIT_CODE"
-            LIKE CONCAT('%',#{orgCode},'%')
+            LIKE CONCAT('%',#{companyCode},'%')
         </if>
         <if test="level != 'company'">
             AND ibjsi."ORG_BRANCH_CODE"
@@ -59,7 +59,7 @@
         ibjoi.claim_status = '6037' AND ibjri."EQU_LIST" = #{code}
         <if test="level == 'company'">
             AND ibjui."USE_UNIT_CREDIT_CODE"
-            LIKE CONCAT('%',#{orgCode},'%')
+            LIKE CONCAT('%',#{companyCode},'%')
         </if>
         <if test="level != 'company'">
             AND ibjsi."ORG_BRANCH_CODE"

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

@@ -115,9 +115,10 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         JSONObject object = getCompanyType();
         String level = object.getString("level");
         String orgCode = object.getString("orgCode");
+        String companyCode = object.getString("companyCode");
         for (Map map : mapList) {
             Map<String, Object> resultMap = new HashMap<>();
-            Map<String, Object> map1 = equipmentCategoryMapper.getCategoryCount(map.get("code").toString(), level, orgCode);
+            Map<String, Object> map1 = equipmentCategoryMapper.getCategoryCount(map.get("code").toString(), level, orgCode,companyCode);
             resultMap.put("name", map.get("name"));
             resultMap.put("image", map.get("image"));
             resultMap.put("waitClaim", map1.get("waitClaim"));
@@ -173,6 +174,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         }
         if (ObjectUtils.isEmpty(codeMap)) {
             return 0;
+        } else {
+            System.out.println(record + "已生成对应监管码或96333电梯识别码");
         }
         return categoryOtherInfoMapper.updateSupervisorCode(codeMap.get("supervisorCode"), codeMap.get("elevatorCode"), record);
     }
@@ -347,7 +350,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
         StringBuilder elevatorCode = new StringBuilder();
         //判断是否是否需要生成96333电梯码
-        if (EquipmentClassifityEnum.DT.getCode().equals(equipList)) {
+        if (EquipmentClassifityEnum.DT.getCode().equals(equipList) && !"610100".equals(city)) {
             if (!ObjectUtils.isEmpty(otherInfo) && ObjectUtils.isEmpty(otherInfo.getCode())) {
                 List<CategoryOtherInfo> codeList = categoryOtherInfoMapper.selectList(new QueryWrapper<CategoryOtherInfo>().eq("CODE96333", otherInfo.getCode()));
                 if (ObjectUtils.isEmpty(otherInfo.getCode()) || ObjectUtils.isEmpty(codeList)) {