bug25219修改

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

@@ -36,4 +36,6 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
     List<CompanyEquipCountDto> queryForFlowingEquipList();
 
     List<MaintenanceVo> queryMaintenanceInIds(@Param("ids") List<String> ids);
+
+    String getNameByEquDefine(String equDefine);
 }

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

@@ -152,7 +152,7 @@
                jfi.FACTORY_NUM,
                jui.ADDRESS as ADDRESS,
                jui.RECORD record,
-               jri.EQU_DEFINE,
+               (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as EQU_DEFINE,
                jri.PRODUCT_NAME,
                jri.EQU_CODE,
                (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as EQU_LIST,
@@ -165,6 +165,12 @@
         WHERE mc.equip_transfer_id = #{id}
     </select>
 
+    <select id="getNameByEquDefine" resultType="String">
+        select name
+        from tz_equipment_category
+        where code = #{equDefine}
+    </select>
+
     <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
         select a.use_unit_code as companyCode,
                group_concat(b.equ_id) as records

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

@@ -183,6 +183,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     vo.setEquipmentLists(list);
                 }
             } else {
+                //如果EQU_DEFINE是数字进行转换
+                String equDefineCode = objects.getJSONObject(0).getString("EQU_DEFINE");
+                if(equDefineCode.chars().anyMatch(Character::isDigit)){
+                    JSONObject firstObject = objects.getJSONObject(0);
+                    firstObject.put("EQU_DEFINE", maintenanceContractMapper.getNameByEquDefine(equDefineCode));
+                }
                 List equList = objects.toJavaList(Map.class);
                 vo.setEquipmentLists(equList);
             }