添加新备注字段

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

@@ -32,4 +32,7 @@ public class EquipmentFaultKnowledge extends BaseEntity {
     //备用字段
     @TableField("reason")
     private String reason;
+    
+    @TableField("remark")
+    private String remark;
 }

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

@@ -20,32 +20,40 @@ public class EquipmentFaultVO implements Serializable {
     @ApiModelProperty(value = "目录编码")
     private String code;
 
-    @Excel(name = "所属分系统",orderNum ="1")
+    @Excel(name = "所属分系统",orderNum ="3")
     @ApiModelProperty(value = "装备定义名称/所属分系统")
     private String eqName;
+    
+    @Excel(name = "所属单位",orderNum = "2")
+    @ApiModelProperty(value = "所属单位")
+    private String agencyName;
 
-    @Excel(name = "部件编码",orderNum ="2")
+    @Excel(name = "部件编码",orderNum ="4")
     @ApiModelProperty(value = "部件编码")
     private String eqCode;
 
-    @Excel(name = "部件名称",orderNum ="3")
+    @Excel(name = "部件名称",orderNum ="1")
     @ApiModelProperty(value = "部件名称")
     private String name;
 
-    @Excel(name = "故障类型",orderNum ="4")
+    @Excel(name = "故障类型",orderNum ="5")
     @ApiModelProperty(value = "故障类型")
     private String type;
 
-    @Excel(name = "原因分析",orderNum ="5")
+    @Excel(name = "原因分析",orderNum ="7")
     @ApiModelProperty(value = "原因分析")
     private String reason;
 
-    @Excel(name = "处置措施",orderNum = "6")
+    @Excel(name = "处置措施",orderNum = "8")
     @ApiModelProperty(value = "处置措施")
     private String measure;
 
-    @Excel(name = "发生时间",orderNum = "7", format = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "发生时间",orderNum = "6", format = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "故障时间/发生时间")
     private Date faultOccurTime;
+    
 
+    @Excel(name = "备注",orderNum = "9")
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentFaultController.java

@@ -40,10 +40,12 @@ public class EquipmentFaultController {
                                             @RequestParam(required = false) String code,
                                             @RequestParam(required = false)String eqCode,
                                             @RequestParam(required = false)String name,
-                                            @RequestParam(required = false)String faultOccurTime) {
+                                            @RequestParam(required = false)String faultOccurTime,
+                                            @RequestParam(required = false) String type, 
+                                            @RequestParam(required = false) String agencyName) {
         int start = (pageNum - 1) * pageSize;
-        List<EquipmentFaultVO> list = iEquipmentFaultService.selectEquipmentFaultList(start, pageSize, code, eqCode, name, faultOccurTime);
-        int count = iEquipmentFaultService.selectEquipmentFaultListCount(code, eqCode, name, faultOccurTime);
+        List<EquipmentFaultVO> list = iEquipmentFaultService.selectEquipmentFaultList(start, pageSize, code, eqCode, name, faultOccurTime, type, agencyName);
+        int count = iEquipmentFaultService.selectEquipmentFaultListCount(code, eqCode, name, faultOccurTime, type, agencyName);
 
         Page psge = new Page(pageNum, pageSize, count);
         psge.setRecords(list);
@@ -86,10 +88,13 @@ public class EquipmentFaultController {
     public void exportDangerList(@RequestParam(required = false) String code,
                                  @RequestParam(required = false)String eqCode,
                                  @RequestParam(required = false)String name,
-                                 @RequestParam(required = false)String faultOccurTime, HttpServletResponse response) {
+                                 @RequestParam(required = false)String faultOccurTime, 
+                                 @RequestParam(required = false) String type, 
+                                 @RequestParam(required = false) String agencyName,
+                                 HttpServletResponse response) {
         SimpleDateFormat formatter= new SimpleDateFormat("yyyyMMdd");
         String format = formatter.format(new Date());
-        List<EquipmentFaultVO> equipmentFaultVO = iEquipmentFaultService.getAll(code, eqCode, name, faultOccurTime);
+        List<EquipmentFaultVO> equipmentFaultVO = iEquipmentFaultService.getAll(code, eqCode, name, faultOccurTime, type, agencyName);
         FileHelper.exportExcel(equipmentFaultVO, "故障清单", "故障清单", EquipmentFaultVO.class, format + ".xls", response);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentFaultMapper.java

@@ -17,10 +17,10 @@ public interface EquipmentFaultMapper extends BaseMapper<EquipmentDetail> {
     /**
      * 故障管理分页列表
      */
-    List<EquipmentFaultVO> selectEquipmentFaultList(@Param("current") int current, @Param("size") int size, @Param("code") String code, @Param("eqCode") String eqCode, @Param("name") String name, @Param("faultOccurTime") String faultOccurTime);
+    List<EquipmentFaultVO> selectEquipmentFaultList(@Param("current") int current, @Param("size") int size, @Param("code") String code, @Param("eqCode") String eqCode, @Param("name") String name, @Param("faultOccurTime") String faultOccurTime, @Param("type") String type, @Param("agencyName") String agencyName);
 
-    int selectEquipmentFaultListcount(@Param("code") String code, @Param("eqCode") String eqCode, @Param("name") String name, @Param("faultOccurTime") String faultOccurTime);
+    int selectEquipmentFaultListcount(@Param("code") String code, @Param("eqCode") String eqCode, @Param("name") String name, @Param("faultOccurTime") String faultOccurTime, @Param("type") String type, @Param("agencyName") String agencyName);
 
-    List<EquipmentFaultVO> getAll(@Param("code") String code, @Param("eqCode") String eqCode, @Param("name") String name, @Param("faultOccurTime") String faultOccurTime);
+    List<EquipmentFaultVO> getAll(@Param("code") String code, @Param("eqCode") String eqCode, @Param("name") String name, @Param("faultOccurTime") String faultOccurTime, @Param("type") String type, @Param("agencyName") String agencyName);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentFaultService.java

@@ -10,9 +10,9 @@ import java.util.List;
  */
 public interface IEquipmentFaultService {
 
-    List<EquipmentFaultVO> selectEquipmentFaultList(int pageNum, int pageSize, String code, String eqCode, String name, String faultOccurTime);
+    List<EquipmentFaultVO> selectEquipmentFaultList(int pageNum, int pageSize, String code, String eqCode, String name, String faultOccurTime,  String type, String agencyName);
 
-    int selectEquipmentFaultListCount(String code, String eqCode, String name, String faultOccurTime);
+    int selectEquipmentFaultListCount(String code, String eqCode, String name, String faultOccurTime,  String type, String agencyName);
 
-    List<EquipmentFaultVO> getAll(String code, String eqCode, String name, String faultOccurTime);
+    List<EquipmentFaultVO> getAll(String code, String eqCode, String name, String faultOccurTime,  String type, String agencyName);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentFaultServiceImpl.java

@@ -16,7 +16,7 @@ public class EquipmentFaultServiceImpl implements IEquipmentFaultService {
     EquipmentFaultMapper equipmentFaultMapper;
 
     @Override
-    public List<EquipmentFaultVO> selectEquipmentFaultList(int pageNum, int pageSize, String code, String eqCode, String name, String faultOccurTime) {
+    public List<EquipmentFaultVO> selectEquipmentFaultList(int pageNum, int pageSize, String code, String eqCode, String name, String faultOccurTime,  String type, String agencyName) {
         String newCode = "";
         if (code != null){
             char[] chars = code.toCharArray();
@@ -28,11 +28,11 @@ public class EquipmentFaultServiceImpl implements IEquipmentFaultService {
                 }
             }
         }
-        return equipmentFaultMapper.selectEquipmentFaultList(pageNum, pageSize, newCode, eqCode, name, faultOccurTime);
+        return equipmentFaultMapper.selectEquipmentFaultList(pageNum, pageSize, newCode, eqCode, name, faultOccurTime, type, agencyName);
     }
 
     @Override
-    public int selectEquipmentFaultListCount(String code, String eqCode, String name, String faultOccurTime) {
+    public int selectEquipmentFaultListCount(String code, String eqCode, String name, String faultOccurTime,  String type, String agencyName) {
         String newCode = "";
         if (code != null){
             char[] chars = code.toCharArray();
@@ -44,12 +44,12 @@ public class EquipmentFaultServiceImpl implements IEquipmentFaultService {
                 }
             }
         }
-        return equipmentFaultMapper.selectEquipmentFaultListcount(newCode, eqCode, name, faultOccurTime);
+        return equipmentFaultMapper.selectEquipmentFaultListcount(newCode, eqCode, name, faultOccurTime, type, agencyName);
     }
 
     @Override
-    public List<EquipmentFaultVO> getAll(String code, String eqCode, String name, String faultOccurTime) {
-        return equipmentFaultMapper.getAll(code, eqCode, name, faultOccurTime);
+    public List<EquipmentFaultVO> getAll(String code, String eqCode, String name, String faultOccurTime,  String type, String agencyName) {
+        return equipmentFaultMapper.getAll(code, eqCode, name, faultOccurTime, type, agencyName);
     }
 
 }

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

@@ -12,6 +12,8 @@
         wlef.type,
         wlef.reason,
         wlef.measure,
+        wlep.remark,
+        wles.agency_name AS agencyName,
         wlep.create_date AS faultOccurTime
         FROM
         wl_equipment_params wlep
@@ -24,6 +26,8 @@
             <if test="eqCode != null and eqCode != ''"> AND wled.eq_code LIKE CONCAT('%',#{eqCode},'%' )</if>
             <if test="name != null and name != ''"> AND wled.name LIKE CONCAT('%',#{name},'%' )</if>
             <if test="faultOccurTime != null and faultOccurTime != ''"> AND wlep.create_date LIKE CONCAT('%',#{faultOccurTime},'%' )</if>
+        	<if test="type != null and type != ''"> AND wlef.id = #{type}</if>
+        	<if test="agencyName != null and agencyName != ''"> AND wles.agency_name LIKE CONCAT('%',#{agencyName},'%' ) </if>
         </where>
         ORDER BY wlep.create_date DESC
         LIMIT #{current},#{size}
@@ -43,6 +47,8 @@
             <if test="eqCode != null and eqCode != ''"> AND wled.eq_code LIKE CONCAT('%',#{eqCode},'%' )</if>
             <if test="name != null and name != ''"> AND wled.name LIKE CONCAT('%',#{name},'%' )</if>
             <if test="faultOccurTime != null and faultOccurTime != ''"> AND wlep.create_date LIKE CONCAT('%',#{faultOccurTime},'%' )</if>
+        	<if test="type != null and type != ''"> AND wlef.id = #{type}</if>
+        	<if test="agencyName != null and agencyName != ''"> AND wles.agency_name LIKE CONCAT('%',#{agencyName},'%' ) </if>
         </where>
     </select>
 
@@ -57,6 +63,8 @@
             wlef.type,
             wlef.reason,
             wlef.measure,
+            wlep.remark,
+        	wles.agency_name AS agencyName,
             wlep.create_date AS faultOccurTime
         FROM
             wl_equipment_params wlep
@@ -69,6 +77,8 @@
             <if test="eqCode != null and eqCode != ''"> AND wled.eq_code LIKE CONCAT('%',#{eqCode},'%' )</if>
             <if test="name != null and name != ''"> AND wled.name LIKE CONCAT('%',#{name},'%' )</if>
             <if test="faultOccurTime != null and faultOccurTime != ''"> AND wlep.create_date LIKE CONCAT('%',#{faultOccurTime},'%' )</if>
+            <if test="type != null and type != ''"> AND wlef.id = #{type}</if>
+        	<if test="agencyName != null and agencyName != ''"> AND wles.agency_name LIKE CONCAT('%',#{agencyName},'%' ) </if>
         </where>
         ORDER BY wlep.create_date DESC
     </select>