代码提交

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipTypeImgAmountVO.java

@@ -69,4 +69,8 @@ public class EquipTypeImgAmountVO {
 
     @ApiModelProperty(value = "车牌号")
     private String carNum;
+
+    @ApiModelProperty(value = "分类名称/车或者装备")
+    private String systemType;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentManageVo.java

@@ -129,4 +129,6 @@ public class EquipmentManageVo  implements Serializable {
     private String fullName;
 
     private String categoryCode;
+
+    private String systemStatus;
 }

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -8,6 +8,7 @@
             sys.code as code,
             sys.form_group_id,
             sys.instance_id,
+            sys.system_status as systemStatus,
             date_format(sys.install_date,'%Y-%m-%d') AS installDate,
             date_format(sys.first_maintenance_date,'%Y-%m-%d') AS firstMaintenanceDate,
             sys.charge_person_name as chargePerson,

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -31,6 +31,7 @@
         <result property="status" column="status"></result>
         <result property="type" column="type"></result>
         <result property="code" column="code"></result>
+        <result property="systemType" column="systemType"></result>
         <result property="iotCode" column="iotCode"></result>
         <result property="eqtype" column="eqtype"></result>
         <result property="bizOrgCode" column="bizOrgCode"></result>
@@ -1869,6 +1870,7 @@
         wlc.standard,
         wle.img,
         wlc.`NAME` equipmentName,
+        wec.name as systemType,
         NULL AS full_name,
         wlun.NAME unitName,
         NULL AS systemName,
@@ -1960,6 +1962,7 @@
             wled.standard,
             wle.img,
             wles.name equipmentName,
+            wec.name as systemType,
             concat_ws('-',wlws.full_name,wled.area) as full_name,
             wlws.name as belongBuildName,
             wlun.NAME unitName,
@@ -1997,8 +2000,7 @@
             LEFT JOIN wl_equipment_category wec ON wle.category_id = wec.id
             WHERE 1=1
             <if test="codeHead!=null and codeHead!='' and codeHead!=' '">
-<!--                and LEFT (wle.CODE, #{hierarchy}) = #{codeHead}-->
-                and wec.`code` like concat(#{codeHead}, '%')
+                and wec.`code` like concat(LEFT(#{codeHead}, #{hierarchy}), '%')
             </if>
             <if test="equipTypeAmountPage.industryCode!=null">
                 and wec.industry_code = #{equipTypeAmountPage.industryCode}
@@ -2053,7 +2055,7 @@
             <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
                 AND  s1.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
             </if>
-        order by createDate DESC
+        order by  CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC ,createDate DESC
     </select>
 
     <select id="listByBizOrgCode" resultType="java.util.Map">