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-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -320,6 +320,7 @@
         ibjoi."CLAIM_STATUS" <![CDATA[ <> ]]> ''
         and ibjui."USE_UNIT_CREDIT_CODE" <![CDATA[ <> ]]> ''
         and ibjri."EQU_LIST" <![CDATA[ <> ]]> ''
+        and ibjui."IS_NOT_ES" = 1
         <if test="unitCodes !=null and unitCodes.size>0">
             and ibjui.USE_UNIT_CREDIT_CODE in
             <foreach collection="unitCodes" separator="," item="unitCode" open="(" close=")">

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

@@ -949,9 +949,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     private List<EquipmentCategoryData> updateEquipmentCategoryData(String unitCode, String orgBranchCode) {
         List<String> unitCodeList = new ArrayList<>();
         unitCodeList.add(unitCode);
-        List<String> orgBranchCodeList = new ArrayList<>();
-        orgBranchCodeList.add(orgBranchCode);
-        List<EquipmentCategoryData> equipmentCategoryData = getCategoryData(unitCodeList, orgBranchCodeList);
+        List<EquipmentCategoryData> equipmentCategoryData = getCategoryData(unitCodeList, null);
         return equipmentCategoryData;
     }
 
@@ -1042,6 +1040,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 if (!ObjectUtils.isEmpty(responseModel) && "200".equals(String.valueOf(responseModel.getStatus()))) {
                     supervisoryCodeInfo.setStatus(EquipmentCategoryEnum.YSY.getCode());
                 } else {
+                    UseInfo useInfo = new UseInfo();
+                    useInfo.setIsNotEs(2);
+                    useInfoMapper.update(useInfo,new QueryWrapper<UseInfo>().eq("SUPERVISORY_CODE",supervisionMap.get("SUPERVISORY_CODE")));
                     supervisoryCodeInfo.setStatus(EquipmentCategoryEnum.BF.getCode());
                 }
             } else if (EquipmentCategoryEnum.DRL.getName().equals(claimStatus)) {
@@ -1061,6 +1062,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            UseInfo useInfo = new UseInfo();
+            useInfo.setIsNotEs(2);
+            useInfoMapper.update(useInfo,new QueryWrapper<UseInfo>().eq("SUPERVISORY_CODE",supervisionMap.get("SUPERVISORY_CODE")));
             supervisoryCodeInfo.setStatus(EquipmentCategoryEnum.BF.getCode());
             ResponseModel<Object> response = new ResponseModel<>();
             response.setDevMessage(e.getMessage());
@@ -1086,7 +1090,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     public Page<Map<String, Object>> getAll(Map<String, Object> map) {
         String tableName = map.get(TABLENAME).toString();
         Assert.hasText(tableName, "表名不能为空");
-        String selectSql = " SELECT * FROM  " + tableName + " WHERE IS_NOT_ES <> 1 or IS_NOT_ES IS NULL ";
+        String selectSql = " SELECT * FROM  " + tableName + " WHERE IS_NOT_ES IS NULL ";
         Integer number = ValidationUtil.isEmpty(map.get("number")) ? 0 : Integer.valueOf(map.get("number").toString());
         Integer size = ValidationUtil.isEmpty(map.get("size")) ? 0 : Integer.valueOf(map.get("size").toString());
         Page<Map<String, Object>> page = new Page<>(number, size);