diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 411e15a..9b13973 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -205,6 +205,7 @@
         <if test="request.deptName != null and request.deptName !=''">
             AND bboi.dept_name like concat('%',#{requestt.deptName},'%')
         </if>
+        order by measure_valid_date DESC
     </select>
 
     <delete id="deleteMeasureApproval">

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 411e15a..9b13973 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -205,6 +205,7 @@
         <if test="request.deptName != null and request.deptName !=''">
             AND bboi.dept_name like concat('%',#{requestt.deptName},'%')
         </if>
+        order by measure_valid_date DESC
     </select>
 
     <delete id="deleteMeasureApproval">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
index dbf1fb3..eda82d4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
@@ -80,6 +80,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -98,6 +101,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 411e15a..9b13973 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -205,6 +205,7 @@
         <if test="request.deptName != null and request.deptName !=''">
             AND bboi.dept_name like concat('%',#{requestt.deptName},'%')
         </if>
+        order by measure_valid_date DESC
     </select>
 
     <delete id="deleteMeasureApproval">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
index dbf1fb3..eda82d4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
@@ -80,6 +80,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -98,6 +101,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
index 44bd150..c99e051 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
@@ -73,6 +73,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -97,6 +100,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         ORDER BY measure_valid_date ASC
     </select>
 

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 411e15a..9b13973 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -205,6 +205,7 @@
         <if test="request.deptName != null and request.deptName !=''">
             AND bboi.dept_name like concat('%',#{requestt.deptName},'%')
         </if>
+        order by measure_valid_date DESC
     </select>
 
     <delete id="deleteMeasureApproval">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
index dbf1fb3..eda82d4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
@@ -80,6 +80,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -98,6 +101,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
index 44bd150..c99e051 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
@@ -73,6 +73,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -97,6 +100,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         ORDER BY measure_valid_date ASC
     </select>
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
index 30a126b..85af3ac 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
@@ -51,6 +51,12 @@
     private Long deptId;
 
     /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称",dataType = "String")
+    private String deptName;
+
+    /**
      * 负责人id
      */
     @ApiModelProperty(value = "负责人id", dataType = "Long")
@@ -87,6 +93,12 @@
     private String labName;
 
     /**
+     * 生产厂家
+     */
+    @ApiModelProperty(value = "生产厂家",dataType = "String")
+    private String manufacturer;
+
+    /**
      * 所属标准装置名称
      */
     @ApiModelProperty(value = "所属标准装置名称",dataType = "String")

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 411e15a..9b13973 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -205,6 +205,7 @@
         <if test="request.deptName != null and request.deptName !=''">
             AND bboi.dept_name like concat('%',#{requestt.deptName},'%')
         </if>
+        order by measure_valid_date DESC
     </select>
 
     <delete id="deleteMeasureApproval">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
index dbf1fb3..eda82d4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
@@ -80,6 +80,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -98,6 +101,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
index 44bd150..c99e051 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
@@ -73,6 +73,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -97,6 +100,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         ORDER BY measure_valid_date ASC
     </select>
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
index 30a126b..85af3ac 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
@@ -51,6 +51,12 @@
     private Long deptId;
 
     /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称",dataType = "String")
+    private String deptName;
+
+    /**
      * 负责人id
      */
     @ApiModelProperty(value = "负责人id", dataType = "Long")
@@ -87,6 +93,12 @@
     private String labName;
 
     /**
+     * 生产厂家
+     */
+    @ApiModelProperty(value = "生产厂家",dataType = "String")
+    private String manufacturer;
+
+    /**
      * 所属标准装置名称
      */
     @ApiModelProperty(value = "所属标准装置名称",dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java
index c6b761f..0b106f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java
@@ -162,7 +162,7 @@
      */
     @ApiModelProperty(value = "部门id", dataType = "Long")
     @TableField("dept_id")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 部门名称
@@ -357,9 +357,9 @@
     @TableField(exist = false)
     private String syncTime;
 
-    @ApiModelProperty(value = "行数据颜色标识(0:没有颜色 1:红色(本日日期超过检定有效期) 2:黄色(超过到期提醒配置日期))",dataType = "String")
+    @ApiModelProperty(value = "行数据颜色标识(0:没有颜色 1:红色(本日日期超过检定有效期) 2:黄色(超过到期提醒配置日期))", dataType = "String")
     @TableField(exist = false)
-    private String colorMark;
+    private Integer colorMark = 0;
 
     @ApiModelProperty(value = "技术指标", dataType = "List")
     @TableField(exist = false)

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 411e15a..9b13973 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -205,6 +205,7 @@
         <if test="request.deptName != null and request.deptName !=''">
             AND bboi.dept_name like concat('%',#{requestt.deptName},'%')
         </if>
+        order by measure_valid_date DESC
     </select>
 
     <delete id="deleteMeasureApproval">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
index dbf1fb3..eda82d4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
@@ -80,6 +80,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -98,6 +101,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
index 44bd150..c99e051 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
@@ -73,6 +73,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -97,6 +100,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         ORDER BY measure_valid_date ASC
     </select>
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
index 30a126b..85af3ac 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
@@ -51,6 +51,12 @@
     private Long deptId;
 
     /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称",dataType = "String")
+    private String deptName;
+
+    /**
      * 负责人id
      */
     @ApiModelProperty(value = "负责人id", dataType = "Long")
@@ -87,6 +93,12 @@
     private String labName;
 
     /**
+     * 生产厂家
+     */
+    @ApiModelProperty(value = "生产厂家",dataType = "String")
+    private String manufacturer;
+
+    /**
      * 所属标准装置名称
      */
     @ApiModelProperty(value = "所属标准装置名称",dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java
index c6b761f..0b106f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java
@@ -162,7 +162,7 @@
      */
     @ApiModelProperty(value = "部门id", dataType = "Long")
     @TableField("dept_id")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 部门名称
@@ -357,9 +357,9 @@
     @TableField(exist = false)
     private String syncTime;
 
-    @ApiModelProperty(value = "行数据颜色标识(0:没有颜色 1:红色(本日日期超过检定有效期) 2:黄色(超过到期提醒配置日期))",dataType = "String")
+    @ApiModelProperty(value = "行数据颜色标识(0:没有颜色 1:红色(本日日期超过检定有效期) 2:黄色(超过到期提醒配置日期))", dataType = "String")
     @TableField(exist = false)
-    private String colorMark;
+    private Integer colorMark = 0;
 
     @ApiModelProperty(value = "技术指标", dataType = "List")
     @TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java
index b1567a4..e2d07c8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java
@@ -188,7 +188,7 @@
      */
     @ApiModelProperty(value = "部门id", dataType = "Long")
     @TableField("dept_id")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 部门名称

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 411e15a..9b13973 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -205,6 +205,7 @@
         <if test="request.deptName != null and request.deptName !=''">
             AND bboi.dept_name like concat('%',#{requestt.deptName},'%')
         </if>
+        order by measure_valid_date DESC
     </select>
 
     <delete id="deleteMeasureApproval">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
index dbf1fb3..eda82d4 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoApprovalMapper.xml
@@ -80,6 +80,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -98,6 +101,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
index 44bd150..c99e051 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentInfoMapper.xml
@@ -73,6 +73,9 @@
         <if test="request.deptId != null and request.deptId !=''">
             and dept_id = #{request.deptId}
         </if>
+        <if test="request.deptName != null and request.deptName !=''">
+            and dept_name = #{request.deptName}
+        </if>
         <if test="request.directorId != null and request.directorId !=''">
             and director_id = #{request.directorId}
         </if>
@@ -97,6 +100,9 @@
         <if test="request.model != null and request.model !=''">
             and model like concat('%',#{request.model},'%')
         </if>
+        <if test="request.manufacturer !=null and request.manufacturer !=''">
+            and manufacturer like concat('%',#{request.manufacturer},'%')
+        </if>
         ORDER BY measure_valid_date ASC
     </select>
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
index 30a126b..85af3ac 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java
@@ -51,6 +51,12 @@
     private Long deptId;
 
     /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称",dataType = "String")
+    private String deptName;
+
+    /**
      * 负责人id
      */
     @ApiModelProperty(value = "负责人id", dataType = "Long")
@@ -87,6 +93,12 @@
     private String labName;
 
     /**
+     * 生产厂家
+     */
+    @ApiModelProperty(value = "生产厂家",dataType = "String")
+    private String manufacturer;
+
+    /**
      * 所属标准装置名称
      */
     @ApiModelProperty(value = "所属标准装置名称",dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java
index c6b761f..0b106f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java
@@ -162,7 +162,7 @@
      */
     @ApiModelProperty(value = "部门id", dataType = "Long")
     @TableField("dept_id")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 部门名称
@@ -357,9 +357,9 @@
     @TableField(exist = false)
     private String syncTime;
 
-    @ApiModelProperty(value = "行数据颜色标识(0:没有颜色 1:红色(本日日期超过检定有效期) 2:黄色(超过到期提醒配置日期))",dataType = "String")
+    @ApiModelProperty(value = "行数据颜色标识(0:没有颜色 1:红色(本日日期超过检定有效期) 2:黄色(超过到期提醒配置日期))", dataType = "String")
     @TableField(exist = false)
-    private String colorMark;
+    private Integer colorMark = 0;
 
     @ApiModelProperty(value = "技术指标", dataType = "List")
     @TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java
index b1567a4..e2d07c8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java
@@ -188,7 +188,7 @@
      */
     @ApiModelProperty(value = "部门id", dataType = "Long")
     @TableField("dept_id")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 部门名称
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index f7d32db..64121f9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -764,9 +764,7 @@
             DateTime validDate = DateUtil.parse(equipmentInfo.getMeasureValidDate());
             boolean after = validDate.isAfter(today);
             if (after) {
-                equipmentInfo.setColorMark("1");
-            } else {
-                equipmentInfo.setColorMark("0");
+                equipmentInfo.setColorMark(1);
             }
             //todo 设备有效期达到到期提醒模块配置时间，需要标注黄色
         }