diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
index 29836b4..597e662 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
@@ -100,10 +100,10 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(BridgeInformation bridgeInformation) {
-        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
-        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
-            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
-        }
+//        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
+//        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
+//            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
+//        }
         bridgeInformationService.updateById(bridgeInformation);
         return ResponseData.success();
     }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
index 29836b4..597e662 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
@@ -100,10 +100,10 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(BridgeInformation bridgeInformation) {
-        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
-        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
-            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
-        }
+//        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
+//        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
+//            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
+//        }
         bridgeInformationService.updateById(bridgeInformation);
         return ResponseData.success();
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
index 53f2ec6..be98727 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
@@ -113,9 +113,9 @@
             bridgeMaintenance.setCategory("1".equals(bridgeMaintenance.getCategory()) ? "道路" : "桥梁");
             bridgeMaintenance.setMaintainTimeStr(ToolUtil.isNotEmpty(bridgeMaintenance.getMaintainTime()) ?
                     DateUtil.format(bridgeMaintenance.getMaintainTime(), "yyyy-MM-dd") : null);
-            Person person = bridgeMaintenanceService.getPerson(bridgeMaintenance.getPersonId());
-            if (null != person) {
-                bridgeMaintenance.setPersonName(person.getName());
+            User user=permissionService.getUserById(bridgeMaintenance.getPersonId(),null);
+            if (null != user) {
+                bridgeMaintenance.setPersonName(user.getName());
             }
         });
         return ResponseData.success(super.packForBT(page));
@@ -195,6 +195,18 @@
         return ResponseData.success(resultMap);
     }
 
+
+    /**
+     * 桥按照月份统计维护记录
+     */
+    @RequestMapping(value = "/countByMonth")
+    @ResponseBody
+    public Object countByMonth(@RequestParam(value = "year", required = false) String year) {
+
+        return ResponseData.success(bridgeMaintenanceService.countByMonth(year));
+    }
+
+
     /***
      * 根据类型获取养护内容
      * @param type

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
index 29836b4..597e662 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
@@ -100,10 +100,10 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(BridgeInformation bridgeInformation) {
-        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
-        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
-            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
-        }
+//        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
+//        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
+//            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
+//        }
         bridgeInformationService.updateById(bridgeInformation);
         return ResponseData.success();
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
index 53f2ec6..be98727 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
@@ -113,9 +113,9 @@
             bridgeMaintenance.setCategory("1".equals(bridgeMaintenance.getCategory()) ? "道路" : "桥梁");
             bridgeMaintenance.setMaintainTimeStr(ToolUtil.isNotEmpty(bridgeMaintenance.getMaintainTime()) ?
                     DateUtil.format(bridgeMaintenance.getMaintainTime(), "yyyy-MM-dd") : null);
-            Person person = bridgeMaintenanceService.getPerson(bridgeMaintenance.getPersonId());
-            if (null != person) {
-                bridgeMaintenance.setPersonName(person.getName());
+            User user=permissionService.getUserById(bridgeMaintenance.getPersonId(),null);
+            if (null != user) {
+                bridgeMaintenance.setPersonName(user.getName());
             }
         });
         return ResponseData.success(super.packForBT(page));
@@ -195,6 +195,18 @@
         return ResponseData.success(resultMap);
     }
 
+
+    /**
+     * 桥按照月份统计维护记录
+     */
+    @RequestMapping(value = "/countByMonth")
+    @ResponseBody
+    public Object countByMonth(@RequestParam(value = "year", required = false) String year) {
+
+        return ResponseData.success(bridgeMaintenanceService.countByMonth(year));
+    }
+
+
     /***
      * 根据类型获取养护内容
      * @param type
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
index bb9f349..cd03942 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
@@ -25,4 +25,6 @@
 
     List<StatisticsDTO> maintainCount(@Param("year") String year);
 
+    List<StatisticsDTO> countByMonth(@Param("year") String year);
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
index 29836b4..597e662 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
@@ -100,10 +100,10 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(BridgeInformation bridgeInformation) {
-        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
-        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
-            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
-        }
+//        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
+//        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
+//            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
+//        }
         bridgeInformationService.updateById(bridgeInformation);
         return ResponseData.success();
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
index 53f2ec6..be98727 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
@@ -113,9 +113,9 @@
             bridgeMaintenance.setCategory("1".equals(bridgeMaintenance.getCategory()) ? "道路" : "桥梁");
             bridgeMaintenance.setMaintainTimeStr(ToolUtil.isNotEmpty(bridgeMaintenance.getMaintainTime()) ?
                     DateUtil.format(bridgeMaintenance.getMaintainTime(), "yyyy-MM-dd") : null);
-            Person person = bridgeMaintenanceService.getPerson(bridgeMaintenance.getPersonId());
-            if (null != person) {
-                bridgeMaintenance.setPersonName(person.getName());
+            User user=permissionService.getUserById(bridgeMaintenance.getPersonId(),null);
+            if (null != user) {
+                bridgeMaintenance.setPersonName(user.getName());
             }
         });
         return ResponseData.success(super.packForBT(page));
@@ -195,6 +195,18 @@
         return ResponseData.success(resultMap);
     }
 
+
+    /**
+     * 桥按照月份统计维护记录
+     */
+    @RequestMapping(value = "/countByMonth")
+    @ResponseBody
+    public Object countByMonth(@RequestParam(value = "year", required = false) String year) {
+
+        return ResponseData.success(bridgeMaintenanceService.countByMonth(year));
+    }
+
+
     /***
      * 根据类型获取养护内容
      * @param type
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
index bb9f349..cd03942 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
@@ -25,4 +25,6 @@
 
     List<StatisticsDTO> maintainCount(@Param("year") String year);
 
+    List<StatisticsDTO> countByMonth(@Param("year") String year);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
index a2845df..22e2eb4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
@@ -63,4 +63,21 @@
           ORDER BY count DESC
     </select>
 
+
+    <select id="countByMonth" resultType="com.casic.missiles.modular.bridges.dto.StatisticsDTO">
+
+        SELECT
+        DATE_FORMAT(maintain_time, '%Y-%m') AS `type`,
+        bridge_id AS id,
+        COUNT(*) AS `count`
+        FROM
+        ${bizDataBaseName}.bridge_maintenance bm
+        WHERE 1=1
+        <if test="year != null and year !=''">
+            and YEAR(bm.`maintain_time`) = #{year}
+        </if>
+        GROUP BY bm.bridge_id, DATE_FORMAT(maintain_time, '%Y-%m')
+        ORDER BY `type`
+    </select>
+
 </mapper>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
index 29836b4..597e662 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
@@ -100,10 +100,10 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(BridgeInformation bridgeInformation) {
-        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
-        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
-            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
-        }
+//        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
+//        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
+//            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
+//        }
         bridgeInformationService.updateById(bridgeInformation);
         return ResponseData.success();
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
index 53f2ec6..be98727 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
@@ -113,9 +113,9 @@
             bridgeMaintenance.setCategory("1".equals(bridgeMaintenance.getCategory()) ? "道路" : "桥梁");
             bridgeMaintenance.setMaintainTimeStr(ToolUtil.isNotEmpty(bridgeMaintenance.getMaintainTime()) ?
                     DateUtil.format(bridgeMaintenance.getMaintainTime(), "yyyy-MM-dd") : null);
-            Person person = bridgeMaintenanceService.getPerson(bridgeMaintenance.getPersonId());
-            if (null != person) {
-                bridgeMaintenance.setPersonName(person.getName());
+            User user=permissionService.getUserById(bridgeMaintenance.getPersonId(),null);
+            if (null != user) {
+                bridgeMaintenance.setPersonName(user.getName());
             }
         });
         return ResponseData.success(super.packForBT(page));
@@ -195,6 +195,18 @@
         return ResponseData.success(resultMap);
     }
 
+
+    /**
+     * 桥按照月份统计维护记录
+     */
+    @RequestMapping(value = "/countByMonth")
+    @ResponseBody
+    public Object countByMonth(@RequestParam(value = "year", required = false) String year) {
+
+        return ResponseData.success(bridgeMaintenanceService.countByMonth(year));
+    }
+
+
     /***
      * 根据类型获取养护内容
      * @param type
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
index bb9f349..cd03942 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
@@ -25,4 +25,6 @@
 
     List<StatisticsDTO> maintainCount(@Param("year") String year);
 
+    List<StatisticsDTO> countByMonth(@Param("year") String year);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
index a2845df..22e2eb4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
@@ -63,4 +63,21 @@
           ORDER BY count DESC
     </select>
 
+
+    <select id="countByMonth" resultType="com.casic.missiles.modular.bridges.dto.StatisticsDTO">
+
+        SELECT
+        DATE_FORMAT(maintain_time, '%Y-%m') AS `type`,
+        bridge_id AS id,
+        COUNT(*) AS `count`
+        FROM
+        ${bizDataBaseName}.bridge_maintenance bm
+        WHERE 1=1
+        <if test="year != null and year !=''">
+            and YEAR(bm.`maintain_time`) = #{year}
+        </if>
+        GROUP BY bm.bridge_id, DATE_FORMAT(maintain_time, '%Y-%m')
+        ORDER BY `type`
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
index 9369894..6366120 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
@@ -6,6 +6,8 @@
     private int count;
     private String percent="0%";
 
+    private Long id;
+
     public String getType() {
         return type;
     }
@@ -38,6 +40,14 @@
         this.percent = percent;
     }
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public StatisticsDTO() {
     }
 
@@ -47,4 +57,11 @@
         this.count = count;
         this.percent = percent;
     }
+
+    public StatisticsDTO(String type, String typeName, int count,Long id) {
+        this.type = type;
+        this.typeName = typeName;
+        this.count = count;
+        this.id=id;
+    }
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
index 29836b4..597e662 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
@@ -100,10 +100,10 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(BridgeInformation bridgeInformation) {
-        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
-        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
-            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
-        }
+//        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
+//        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
+//            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
+//        }
         bridgeInformationService.updateById(bridgeInformation);
         return ResponseData.success();
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
index 53f2ec6..be98727 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
@@ -113,9 +113,9 @@
             bridgeMaintenance.setCategory("1".equals(bridgeMaintenance.getCategory()) ? "道路" : "桥梁");
             bridgeMaintenance.setMaintainTimeStr(ToolUtil.isNotEmpty(bridgeMaintenance.getMaintainTime()) ?
                     DateUtil.format(bridgeMaintenance.getMaintainTime(), "yyyy-MM-dd") : null);
-            Person person = bridgeMaintenanceService.getPerson(bridgeMaintenance.getPersonId());
-            if (null != person) {
-                bridgeMaintenance.setPersonName(person.getName());
+            User user=permissionService.getUserById(bridgeMaintenance.getPersonId(),null);
+            if (null != user) {
+                bridgeMaintenance.setPersonName(user.getName());
             }
         });
         return ResponseData.success(super.packForBT(page));
@@ -195,6 +195,18 @@
         return ResponseData.success(resultMap);
     }
 
+
+    /**
+     * 桥按照月份统计维护记录
+     */
+    @RequestMapping(value = "/countByMonth")
+    @ResponseBody
+    public Object countByMonth(@RequestParam(value = "year", required = false) String year) {
+
+        return ResponseData.success(bridgeMaintenanceService.countByMonth(year));
+    }
+
+
     /***
      * 根据类型获取养护内容
      * @param type
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
index bb9f349..cd03942 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
@@ -25,4 +25,6 @@
 
     List<StatisticsDTO> maintainCount(@Param("year") String year);
 
+    List<StatisticsDTO> countByMonth(@Param("year") String year);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
index a2845df..22e2eb4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
@@ -63,4 +63,21 @@
           ORDER BY count DESC
     </select>
 
+
+    <select id="countByMonth" resultType="com.casic.missiles.modular.bridges.dto.StatisticsDTO">
+
+        SELECT
+        DATE_FORMAT(maintain_time, '%Y-%m') AS `type`,
+        bridge_id AS id,
+        COUNT(*) AS `count`
+        FROM
+        ${bizDataBaseName}.bridge_maintenance bm
+        WHERE 1=1
+        <if test="year != null and year !=''">
+            and YEAR(bm.`maintain_time`) = #{year}
+        </if>
+        GROUP BY bm.bridge_id, DATE_FORMAT(maintain_time, '%Y-%m')
+        ORDER BY `type`
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
index 9369894..6366120 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
@@ -6,6 +6,8 @@
     private int count;
     private String percent="0%";
 
+    private Long id;
+
     public String getType() {
         return type;
     }
@@ -38,6 +40,14 @@
         this.percent = percent;
     }
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public StatisticsDTO() {
     }
 
@@ -47,4 +57,11 @@
         this.count = count;
         this.percent = percent;
     }
+
+    public StatisticsDTO(String type, String typeName, int count,Long id) {
+        this.type = type;
+        this.typeName = typeName;
+        this.count = count;
+        this.id=id;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java
new file mode 100644
index 0000000..a77b70d
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.bridges.dto;
+
+public class ValueDTO {
+    private String name;
+    private int count;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public ValueDTO() {
+    }
+
+    public ValueDTO(String name, int count) {
+        this.name = name;
+        this.count = count;
+    }
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
index 29836b4..597e662 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
@@ -100,10 +100,10 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(BridgeInformation bridgeInformation) {
-        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
-        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
-            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
-        }
+//        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
+//        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
+//            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
+//        }
         bridgeInformationService.updateById(bridgeInformation);
         return ResponseData.success();
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
index 53f2ec6..be98727 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
@@ -113,9 +113,9 @@
             bridgeMaintenance.setCategory("1".equals(bridgeMaintenance.getCategory()) ? "道路" : "桥梁");
             bridgeMaintenance.setMaintainTimeStr(ToolUtil.isNotEmpty(bridgeMaintenance.getMaintainTime()) ?
                     DateUtil.format(bridgeMaintenance.getMaintainTime(), "yyyy-MM-dd") : null);
-            Person person = bridgeMaintenanceService.getPerson(bridgeMaintenance.getPersonId());
-            if (null != person) {
-                bridgeMaintenance.setPersonName(person.getName());
+            User user=permissionService.getUserById(bridgeMaintenance.getPersonId(),null);
+            if (null != user) {
+                bridgeMaintenance.setPersonName(user.getName());
             }
         });
         return ResponseData.success(super.packForBT(page));
@@ -195,6 +195,18 @@
         return ResponseData.success(resultMap);
     }
 
+
+    /**
+     * 桥按照月份统计维护记录
+     */
+    @RequestMapping(value = "/countByMonth")
+    @ResponseBody
+    public Object countByMonth(@RequestParam(value = "year", required = false) String year) {
+
+        return ResponseData.success(bridgeMaintenanceService.countByMonth(year));
+    }
+
+
     /***
      * 根据类型获取养护内容
      * @param type
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
index bb9f349..cd03942 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
@@ -25,4 +25,6 @@
 
     List<StatisticsDTO> maintainCount(@Param("year") String year);
 
+    List<StatisticsDTO> countByMonth(@Param("year") String year);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
index a2845df..22e2eb4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
@@ -63,4 +63,21 @@
           ORDER BY count DESC
     </select>
 
+
+    <select id="countByMonth" resultType="com.casic.missiles.modular.bridges.dto.StatisticsDTO">
+
+        SELECT
+        DATE_FORMAT(maintain_time, '%Y-%m') AS `type`,
+        bridge_id AS id,
+        COUNT(*) AS `count`
+        FROM
+        ${bizDataBaseName}.bridge_maintenance bm
+        WHERE 1=1
+        <if test="year != null and year !=''">
+            and YEAR(bm.`maintain_time`) = #{year}
+        </if>
+        GROUP BY bm.bridge_id, DATE_FORMAT(maintain_time, '%Y-%m')
+        ORDER BY `type`
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
index 9369894..6366120 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
@@ -6,6 +6,8 @@
     private int count;
     private String percent="0%";
 
+    private Long id;
+
     public String getType() {
         return type;
     }
@@ -38,6 +40,14 @@
         this.percent = percent;
     }
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public StatisticsDTO() {
     }
 
@@ -47,4 +57,11 @@
         this.count = count;
         this.percent = percent;
     }
+
+    public StatisticsDTO(String type, String typeName, int count,Long id) {
+        this.type = type;
+        this.typeName = typeName;
+        this.count = count;
+        this.id=id;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java
new file mode 100644
index 0000000..a77b70d
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.bridges.dto;
+
+public class ValueDTO {
+    private String name;
+    private int count;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public ValueDTO() {
+    }
+
+    public ValueDTO(String name, int count) {
+        this.name = name;
+        this.count = count;
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java
index 745f26d..d6c6a2a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.system.model.Person;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,5 +22,7 @@
 
     List<StatisticsDTO> maintainCount(String year);
 
+    List<Map<String, Object>> countByMonth(String year);
+
     Person getPerson(Long personId);
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
index 29836b4..597e662 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
@@ -100,10 +100,10 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(BridgeInformation bridgeInformation) {
-        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
-        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
-            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
-        }
+//        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
+//        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
+//            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
+//        }
         bridgeInformationService.updateById(bridgeInformation);
         return ResponseData.success();
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
index 53f2ec6..be98727 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
@@ -113,9 +113,9 @@
             bridgeMaintenance.setCategory("1".equals(bridgeMaintenance.getCategory()) ? "道路" : "桥梁");
             bridgeMaintenance.setMaintainTimeStr(ToolUtil.isNotEmpty(bridgeMaintenance.getMaintainTime()) ?
                     DateUtil.format(bridgeMaintenance.getMaintainTime(), "yyyy-MM-dd") : null);
-            Person person = bridgeMaintenanceService.getPerson(bridgeMaintenance.getPersonId());
-            if (null != person) {
-                bridgeMaintenance.setPersonName(person.getName());
+            User user=permissionService.getUserById(bridgeMaintenance.getPersonId(),null);
+            if (null != user) {
+                bridgeMaintenance.setPersonName(user.getName());
             }
         });
         return ResponseData.success(super.packForBT(page));
@@ -195,6 +195,18 @@
         return ResponseData.success(resultMap);
     }
 
+
+    /**
+     * 桥按照月份统计维护记录
+     */
+    @RequestMapping(value = "/countByMonth")
+    @ResponseBody
+    public Object countByMonth(@RequestParam(value = "year", required = false) String year) {
+
+        return ResponseData.success(bridgeMaintenanceService.countByMonth(year));
+    }
+
+
     /***
      * 根据类型获取养护内容
      * @param type
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
index bb9f349..cd03942 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
@@ -25,4 +25,6 @@
 
     List<StatisticsDTO> maintainCount(@Param("year") String year);
 
+    List<StatisticsDTO> countByMonth(@Param("year") String year);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
index a2845df..22e2eb4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
@@ -63,4 +63,21 @@
           ORDER BY count DESC
     </select>
 
+
+    <select id="countByMonth" resultType="com.casic.missiles.modular.bridges.dto.StatisticsDTO">
+
+        SELECT
+        DATE_FORMAT(maintain_time, '%Y-%m') AS `type`,
+        bridge_id AS id,
+        COUNT(*) AS `count`
+        FROM
+        ${bizDataBaseName}.bridge_maintenance bm
+        WHERE 1=1
+        <if test="year != null and year !=''">
+            and YEAR(bm.`maintain_time`) = #{year}
+        </if>
+        GROUP BY bm.bridge_id, DATE_FORMAT(maintain_time, '%Y-%m')
+        ORDER BY `type`
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
index 9369894..6366120 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
@@ -6,6 +6,8 @@
     private int count;
     private String percent="0%";
 
+    private Long id;
+
     public String getType() {
         return type;
     }
@@ -38,6 +40,14 @@
         this.percent = percent;
     }
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public StatisticsDTO() {
     }
 
@@ -47,4 +57,11 @@
         this.count = count;
         this.percent = percent;
     }
+
+    public StatisticsDTO(String type, String typeName, int count,Long id) {
+        this.type = type;
+        this.typeName = typeName;
+        this.count = count;
+        this.id=id;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java
new file mode 100644
index 0000000..a77b70d
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.bridges.dto;
+
+public class ValueDTO {
+    private String name;
+    private int count;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public ValueDTO() {
+    }
+
+    public ValueDTO(String name, int count) {
+        this.name = name;
+        this.count = count;
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java
index 745f26d..d6c6a2a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.system.model.Person;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,5 +22,7 @@
 
     List<StatisticsDTO> maintainCount(String year);
 
+    List<Map<String, Object>> countByMonth(String year);
+
     Person getPerson(Long personId);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/impl/BridgeMaintenanceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/impl/BridgeMaintenanceServiceImpl.java
index a910544..13c3ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/impl/BridgeMaintenanceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/impl/BridgeMaintenanceServiceImpl.java
@@ -1,9 +1,14 @@
 package com.casic.missiles.modular.bridges.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.common.service.ICommonUserService;
+import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.bridges.dao.BridgeMaintenanceMapper;
 import com.casic.missiles.modular.bridges.dto.StatisticsDTO;
+import com.casic.missiles.modular.bridges.dto.ValueDTO;
+import com.casic.missiles.modular.bridges.model.BridgeInformation;
+import com.casic.missiles.modular.bridges.service.IBridgeInformationService;
 import com.casic.missiles.modular.bridges.service.IBridgeMaintenanceService;
 import com.casic.missiles.modular.bridges.model.BridgeMaintenance;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -13,8 +18,7 @@
 import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -31,6 +35,9 @@
 
     @Autowired
     private ICommonPermissionService commonPermissionService;
+    @Autowired
+    private IBridgeInformationService bridgeInformationService;
+
 
     @Override
     public List<Person> getPersonListByName(String personName) {
@@ -61,6 +68,35 @@
             });
             statisticsDTOList.add(statisticsDTO);
         });
-        return  statisticsDTOList;
+        return statisticsDTOList;
+    }
+
+    @Override
+    public  List<Map<String, Object>> countByMonth(String year) {
+        if(ToolUtil.isEmpty(year)) String.valueOf(Calendar.getInstance().get(Calendar.YEAR));
+        List<Map<String, Object>> result1Map =new ArrayList<>();
+
+        final String[] ymArr = {year + "-01", year + "-02", year + "-03", year + "-04", year + "-05", year + "-06", year + "-07", year + "-08", year + "-09", year + "-10", year + "-11", year + "-12"};
+        List<StatisticsDTO> recordList = this.baseMapper.countByMonth(year);
+        //查询桥的基本信息
+        EntityWrapper<BridgeInformation> query = new EntityWrapper<>();
+        List<BridgeInformation> bridgeInformationList = bridgeInformationService.selectList(query);
+
+        for (BridgeInformation bridgeInformation : bridgeInformationList) {
+            Map<String, Object> resultMap = new HashMap<>();
+            List<ValueDTO> resultList = new ArrayList<>();
+            for (String ym : ymArr) {
+                ValueDTO valueDTO = new ValueDTO(ym, 0);
+                for (StatisticsDTO statisticsDTO1 : recordList) {
+                    if(statisticsDTO1.getId().equals(bridgeInformation.getId())&&ym.equals(statisticsDTO1.getType())){
+                        valueDTO.setCount(statisticsDTO1.getCount());
+                    }
+                }
+                resultList.add(valueDTO);
+            }
+            resultMap.put(bridgeInformation.getId()+"",resultList);
+            result1Map.add(resultMap);
+        }
+        return result1Map;
     }
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
index 29836b4..597e662 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeInformationController.java
@@ -100,10 +100,10 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(BridgeInformation bridgeInformation) {
-        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
-        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
-            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
-        }
+//        BridgeInformation bridgeInformation1 = bridgeInformationService.selectById(bridgeInformation.getId());
+//        if (ToolUtil.isEmpty(bridgeInformation.getPhoto())) {
+//            bridgeInformation.setPhoto(bridgeInformation1.getPhoto());
+//        }
         bridgeInformationService.updateById(bridgeInformation);
         return ResponseData.success();
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
index 53f2ec6..be98727 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java
@@ -113,9 +113,9 @@
             bridgeMaintenance.setCategory("1".equals(bridgeMaintenance.getCategory()) ? "道路" : "桥梁");
             bridgeMaintenance.setMaintainTimeStr(ToolUtil.isNotEmpty(bridgeMaintenance.getMaintainTime()) ?
                     DateUtil.format(bridgeMaintenance.getMaintainTime(), "yyyy-MM-dd") : null);
-            Person person = bridgeMaintenanceService.getPerson(bridgeMaintenance.getPersonId());
-            if (null != person) {
-                bridgeMaintenance.setPersonName(person.getName());
+            User user=permissionService.getUserById(bridgeMaintenance.getPersonId(),null);
+            if (null != user) {
+                bridgeMaintenance.setPersonName(user.getName());
             }
         });
         return ResponseData.success(super.packForBT(page));
@@ -195,6 +195,18 @@
         return ResponseData.success(resultMap);
     }
 
+
+    /**
+     * 桥按照月份统计维护记录
+     */
+    @RequestMapping(value = "/countByMonth")
+    @ResponseBody
+    public Object countByMonth(@RequestParam(value = "year", required = false) String year) {
+
+        return ResponseData.success(bridgeMaintenanceService.countByMonth(year));
+    }
+
+
     /***
      * 根据类型获取养护内容
      * @param type
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
index bb9f349..cd03942 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/BridgeMaintenanceMapper.java
@@ -25,4 +25,6 @@
 
     List<StatisticsDTO> maintainCount(@Param("year") String year);
 
+    List<StatisticsDTO> countByMonth(@Param("year") String year);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
index a2845df..22e2eb4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dao/mapping/BridgeMaintenanceMapper.xml
@@ -63,4 +63,21 @@
           ORDER BY count DESC
     </select>
 
+
+    <select id="countByMonth" resultType="com.casic.missiles.modular.bridges.dto.StatisticsDTO">
+
+        SELECT
+        DATE_FORMAT(maintain_time, '%Y-%m') AS `type`,
+        bridge_id AS id,
+        COUNT(*) AS `count`
+        FROM
+        ${bizDataBaseName}.bridge_maintenance bm
+        WHERE 1=1
+        <if test="year != null and year !=''">
+            and YEAR(bm.`maintain_time`) = #{year}
+        </if>
+        GROUP BY bm.bridge_id, DATE_FORMAT(maintain_time, '%Y-%m')
+        ORDER BY `type`
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
index 9369894..6366120 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/StatisticsDTO.java
@@ -6,6 +6,8 @@
     private int count;
     private String percent="0%";
 
+    private Long id;
+
     public String getType() {
         return type;
     }
@@ -38,6 +40,14 @@
         this.percent = percent;
     }
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public StatisticsDTO() {
     }
 
@@ -47,4 +57,11 @@
         this.count = count;
         this.percent = percent;
     }
+
+    public StatisticsDTO(String type, String typeName, int count,Long id) {
+        this.type = type;
+        this.typeName = typeName;
+        this.count = count;
+        this.id=id;
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java
new file mode 100644
index 0000000..a77b70d
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/dto/ValueDTO.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.bridges.dto;
+
+public class ValueDTO {
+    private String name;
+    private int count;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public ValueDTO() {
+    }
+
+    public ValueDTO(String name, int count) {
+        this.name = name;
+        this.count = count;
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java
index 745f26d..d6c6a2a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/IBridgeMaintenanceService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.system.model.Person;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,5 +22,7 @@
 
     List<StatisticsDTO> maintainCount(String year);
 
+    List<Map<String, Object>> countByMonth(String year);
+
     Person getPerson(Long personId);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/impl/BridgeMaintenanceServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/impl/BridgeMaintenanceServiceImpl.java
index a910544..13c3ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/impl/BridgeMaintenanceServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/service/impl/BridgeMaintenanceServiceImpl.java
@@ -1,9 +1,14 @@
 package com.casic.missiles.modular.bridges.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.common.service.ICommonUserService;
+import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.bridges.dao.BridgeMaintenanceMapper;
 import com.casic.missiles.modular.bridges.dto.StatisticsDTO;
+import com.casic.missiles.modular.bridges.dto.ValueDTO;
+import com.casic.missiles.modular.bridges.model.BridgeInformation;
+import com.casic.missiles.modular.bridges.service.IBridgeInformationService;
 import com.casic.missiles.modular.bridges.service.IBridgeMaintenanceService;
 import com.casic.missiles.modular.bridges.model.BridgeMaintenance;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -13,8 +18,7 @@
 import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -31,6 +35,9 @@
 
     @Autowired
     private ICommonPermissionService commonPermissionService;
+    @Autowired
+    private IBridgeInformationService bridgeInformationService;
+
 
     @Override
     public List<Person> getPersonListByName(String personName) {
@@ -61,6 +68,35 @@
             });
             statisticsDTOList.add(statisticsDTO);
         });
-        return  statisticsDTOList;
+        return statisticsDTOList;
+    }
+
+    @Override
+    public  List<Map<String, Object>> countByMonth(String year) {
+        if(ToolUtil.isEmpty(year)) String.valueOf(Calendar.getInstance().get(Calendar.YEAR));
+        List<Map<String, Object>> result1Map =new ArrayList<>();
+
+        final String[] ymArr = {year + "-01", year + "-02", year + "-03", year + "-04", year + "-05", year + "-06", year + "-07", year + "-08", year + "-09", year + "-10", year + "-11", year + "-12"};
+        List<StatisticsDTO> recordList = this.baseMapper.countByMonth(year);
+        //查询桥的基本信息
+        EntityWrapper<BridgeInformation> query = new EntityWrapper<>();
+        List<BridgeInformation> bridgeInformationList = bridgeInformationService.selectList(query);
+
+        for (BridgeInformation bridgeInformation : bridgeInformationList) {
+            Map<String, Object> resultMap = new HashMap<>();
+            List<ValueDTO> resultList = new ArrayList<>();
+            for (String ym : ymArr) {
+                ValueDTO valueDTO = new ValueDTO(ym, 0);
+                for (StatisticsDTO statisticsDTO1 : recordList) {
+                    if(statisticsDTO1.getId().equals(bridgeInformation.getId())&&ym.equals(statisticsDTO1.getType())){
+                        valueDTO.setCount(statisticsDTO1.getCount());
+                    }
+                }
+                resultList.add(valueDTO);
+            }
+            resultMap.put(bridgeInformation.getId()+"",resultList);
+            result1Map.add(resultMap);
+        }
+        return result1Map;
     }
 }
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b593c98..7866c42 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <artifactId>casic-web</artifactId>
     <version>${pro.version}</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>casic-web</name>
     <description>casic web启动入口</description>
     <profiles>
@@ -217,7 +217,8 @@
                         <exclude>**/MockController.class</exclude>
                     </excludes>
                     <includes>
-                        <include>/config/application.yml</include>
+                        <include>**/com/**</include>
+                        <include>**/application.yml</include>
                     </includes>
                 </configuration>
             </plugin>
@@ -266,6 +267,10 @@
                         <delimiter>${resource.delimiter}</delimiter>
                     </delimiters>
                     <useDefaultDelimiters>true</useDefaultDelimiters>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
                 </configuration>
                 <executions>
                     <execution>
@@ -290,7 +295,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
         <resources>
             <resource>