修改总览

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

@@ -13,7 +13,8 @@
         LEFT JOIN tz_equipment_category tec ON ibjri.EQU_CATEGORY = tec.code
         LEFT JOIN tz_equipment_category tec1 ON ibjri.EQU_LIST = tec1.code
         WHERE
-        ibjoi.claim_status = '待认领' AND ibjri."EQU_LIST" = #{code}
+        /*6036代表待认领*/
+        ibjoi.claim_status = '6036' AND ibjri."EQU_LIST" = #{code}
         <if test="level == 'company'">
             AND ibjui."USE_UNIT_CREDIT_CODE"
              LIKE CONCAT('%',#{orgCode},'%')
@@ -33,7 +34,8 @@
         LEFT JOIN tz_equipment_category tec ON ibjri.EQU_CATEGORY = tec.code
         LEFT JOIN tz_equipment_category tec1 ON ibjri.EQU_LIST = tec1.code
         WHERE
-        ibjoi.claim_status = '已认领' AND ibjri."EQU_LIST" = #{code}
+        /**6035代表待认领*/
+        ibjoi.claim_status = '6035' AND ibjri."EQU_LIST" = #{code}
         <if test="level == 'company'">
             AND ibjui."USE_UNIT_CREDIT_CODE"
             LIKE CONCAT('%',#{orgCode},'%')
@@ -53,7 +55,8 @@
         LEFT JOIN tz_equipment_category tec ON ibjri.EQU_CATEGORY = tec.code
         LEFT JOIN tz_equipment_category tec1 ON ibjri.EQU_LIST = tec1.code
         WHERE
-        ibjoi.claim_status = '已拒领' AND ibjri."EQU_LIST" = #{code}
+        /**6037代表待认领*/
+        ibjoi.claim_status = '6037' AND ibjri."EQU_LIST" = #{code}
         <if test="level == 'company'">
             AND ibjui."USE_UNIT_CREDIT_CODE"
             LIKE CONCAT('%',#{orgCode},'%')

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

@@ -46,9 +46,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     @Value("classpath:/json/equipCategory.json")
     private Resource equipCategory;
 
-    @Value("classpath:/json/equipStatus.json")
-    private Resource equipStatus;
-
     @Autowired
     CategoryOtherInfoMapper categoryOtherInfoMapper;
 

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/json/equipStatus.json

-{
-  "rlzt": [
-    {
-      "name": "待认领",
-      "value": "waitClaim"
-    },
-    {
-      "name": "已认领",
-      "value": "alreadyClaim"
-    },
-    {
-      "name": "拒领",
-      "value": "refuseClaim"
-    }
-  ]
-}
\ No newline at end of file