添加字段增加参数

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

@@ -106,6 +106,18 @@ public class EquipmentSpecific extends BaseEntity {
     @TableField(exist = false)
     private StockDetail stockDetail;
 
+
+    //新加
+
+    @ApiModelProperty(value = "机构/部门名称")
+    @TableField("biz_org_name")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    @TableField("biz_org_code")
+    private String bizOrgCode;
+
+
     /**
      * 所属部门
      */

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

@@ -49,4 +49,9 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
     
     @ApiModelProperty(value = "所在位置名称")
     private String warehouseStructureName;
+
+    @ApiModelProperty(value = "单位部门名陈")
+    private String bizOrgName;
+    @ApiModelProperty(value = "单位部门org")
+    private String bizOrgCode;
 }

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

@@ -47,4 +47,10 @@ public class EquipTypeImgAmountVO {
     private String eqtype;
     @ApiModelProperty(value = "库存明细id")
     private Long stockDetailId;
+
+    @ApiModelProperty(value = "单位部门名陈")
+    private String bizOrgName;
+    @ApiModelProperty(value = "单位部门org")
+    private String bizOrgCode;
+
 }

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

@@ -32,6 +32,9 @@
         <result property="code" column="code"></result>
         <result property="iotCode" column="iotCode"></result>
         <result property="eqtype" column="eqtype"></result>
+        <result property="bizOrgCode" column="bizOrgCode"></result>
+        <result property="bizOrgName" column="bizOrgName"></result>
+
     </resultMap>
     <select id="getEquiplistBySystemId" resultMap="EquiplistBySystemId">
        SELECT
@@ -586,9 +589,11 @@
             when '12' then '配装'
             else '未入库' END as status,
             wles.create_date as createDate,
-            wled.code as eqtype
+            wled.code as eqtype,
+            wles.biz_org_code as bizOrgCode,
+            wles.biz_org_name as bizOrgName
             FROM
-            (select id,qr_code,code ,iot_code ,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
+            (select id,qr_code,code ,iot_code ,biz_org_code ,biz_org_name,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
             LEFT JOIN (select id,amount,status,equipment_specific_id,warehouse_structure_id from wl_stock_detail ) wlsd on wlsd.equipment_specific_id = wles.id
             LEFT JOIN wl_warehouse_structure wlws on wlsd.warehouse_structure_id = wlws.id
             LEFT JOIN (select id,standard ,name ,area ,code, equipment_id ,manufacturer_id,is_import from wl_equipment_detail) wled on wles.equipment_detail_id = wled.id
@@ -640,6 +645,13 @@
               <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
                  where  s1.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
             </if>
+
+            <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
+                where  s1.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
+            </if>
+
+
+
         </if>
         <if test="(codeHead==null or codeHead=='' or codeHead==' ') and equipTypeAmountPage.status == null and equipTypeAmountPage.warehouseStructureId==null and equipTypeAmountPage.systemId==null">
             union all
@@ -675,7 +687,9 @@
             '报废' ELSE '未入库'
             END AS STATUS,
             wlc.create_date as createDate,
-            '2' as eqtype
+            '2' as eqtype,
+            wlc.biz_org_code as bizOrgCode,
+            wlc.biz_org_name as bizOrgName
             FROM
             wl_car wlc
             LEFT JOIN wl_equipment wle ON wle.id = wlc.equipment_id
@@ -708,6 +722,10 @@
               <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
                  where  s2.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
             </if>
+            <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
+                where  s2.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
+            </if>
+
         </if>
         order by createDate DESC
     </select>