智慧公路代码提交

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcGljcQsgdsxmqk.java

@@ -30,9 +30,9 @@ private static final long serialVersionUID = 1L;
    */
   private String ds;
   /**
-   * 合计
+   * 年度
    */
-  private Double hj;
+  private String nd;
   /**
    * 本年投资合计(万元)
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgLzglCxysxkController.java

 package com.elephant.framework.galaxy.aroad.module.zhjg.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxkslsptj;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.CxysBeyondFormat;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.CxysDataAnalysis;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ShowCxysTotal;
 import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxk;
@@ -39,15 +42,67 @@ public class ZhjgLzglCxysxkController extends BaseController  {
     return  new R<>(zhjgLzglCxysxkService.page(page,Wrappers.query(zhjgLzglCxysxk)));
   }
 
-    /**
-     * 根据许可单号查询超限许可信息是否已存在(大于0表示已存在)
-     * @param xkdh
-     * @return
-     */
-    @GetMapping("/{xkdh}")
-    public Integer getZhjgLzglCxysxkByXkdh(String xkdh){
-        return zhjgLzglCxysxkService.getZhjgLzglCxysxkByXkdh(xkdh);
-    }
+  /**
+   * 超限许可许可公示分页查询
+   *
+   * @param page 分页对象
+   * @param startDate 开始时间
+   * @param endDate 结束时间
+   * @param xkdh 许可单号
+   * @param cph 车牌号
+   * @return
+   */
+  @GetMapping("/xkgsByPage")
+  public R selectCxysXkgsByCurrentDate(Page page, String startDate, String endDate, String xkdh, String cph) {
+    return new R<>(zhjgLzglCxysxkService.selectCxysXkgsByCurrentDate(page, startDate, endDate, xkdh, cph));
+  }
+
+  /**
+   * 查询跨省发证审批数量
+   * @param startDate 开始时间
+   * @param endDate 结束时间
+   * @return 数量
+   */
+  @GetMapping("/ksfzspNumber")
+  public R selectCountKsFzSpByDate(String startDate, String endDate) {
+    System.out.println("startDate: "+startDate);
+    System.out.println("endDate: "+endDate);
+
+    return new R<>(zhjgLzglCxysxkService.selectCountKsFzSpByDate(startDate,endDate));
+  }
+
+  /**
+   * 根据许可单号查询超限许可信息是否已存在(大于0表示已存在)
+   * @param xkdh
+   * @return
+   */
+  @GetMapping("/{xkdh}")
+  public Integer getZhjgLzglCxysxkByXkdh(String xkdh){
+      return zhjgLzglCxysxkService.getZhjgLzglCxysxkByXkdh(xkdh);
+  }
+
+  /**
+   * 超限运输数据分析页面统计数据
+   */
+  @GetMapping("/cxysSjfx")
+  public CxysDataAnalysis selectCxysSjfx(Double startLong, Double endLong,
+                                        Double startWidth, Double endWidth,
+                                        Double startHeight, Double endHeight,
+                                        Double startWeight, Double endWeight,
+                                        String startDate, String endDate) {
+    System.out.println("startLong :"+startLong);
+    System.out.println("endLong :"+endLong);
+    System.out.println("startWidth :"+startWidth);
+    System.out.println("endWidth :"+endWidth);
+    System.out.println("startHeight :"+startHeight);
+    System.out.println("endHeight :"+endHeight);
+    System.out.println("startWeight :"+startWeight);
+    System.out.println("endWeight :"+endWeight);
+    System.out.println("startDate :"+startDate);
+    System.out.println("endDate :"+endDate);
+
+    return  zhjgLzglCxysxkService.selectCxysSjfx(startLong,endLong,startWidth,endWidth,startHeight,endHeight,startWeight,endWeight,startDate,endDate);
+  }
 
   /**
    * 查询某时间段内数据
@@ -65,6 +120,16 @@ public class ZhjgLzglCxysxkController extends BaseController  {
     return  zhjgLzglCxysxkService.findZhjgLzglCxysxkByDate(startDate,endDate);
   }
 
+  /**
+   * 超限运输综合展示页面
+   * @param startDate
+   * @param endDate
+   * @return
+   */
+  @GetMapping("/cxysZhzs")
+  public ShowCxysTotal seleCxysZhzs(String startDate, String endDate) {
+    return zhjgLzglCxysxkService.seleCxysZhzs(startDate,endDate);
+  }
 
   /**
    * 通过id查询超限运输许可表

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/CxysBeyondFormat.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.entity;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author zhanglongfa
+ * @Date 2019/4/19 上午10:44
+ */
+@Data
+public class CxysBeyondFormat {
+    private Integer data;
+    private Integer otherData;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/CxysDataAnalysis.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.entity;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description
+ * @Author zhanglongfa
+ * @Date 2019/4/19 上午10:44
+ */
+@Data
+public class CxysDataAnalysis {
+    private CxysBeyondFormat longBeyond;
+    private CxysBeyondFormat widthBeyond;
+    private CxysBeyondFormat heightBeyond;
+    private CxysBeyondFormat weightBeyond;
+    private CxysSizeBeyondAnalysis cxysSizeBeyond;
+    private List<Map> cxysSsspspTj;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/CxysSizeBeyondAnalysis.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.entity;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author zhanglongfa
+ * @Date 2019/4/19 上午10:44
+ */
+@Data
+public class CxysSizeBeyondAnalysis {
+    private Integer dcc;
+    private Integer dck;
+    private Integer dcg;
+    private Integer cck;
+    private Integer ccg;
+    private Integer ckg;
+    private Integer cckg;
+    private Integer qt;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ShowCxysTotal.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.entity;
+
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description
+ * @Author zhanglongfa
+ * @Date 2019/4/19 上午10:44
+ */
+@Data
+public class ShowCxysTotal {
+    private Integer pieUnder;
+    private Integer pieRange;
+    private Integer pieOn;
+    private Integer longOn;
+    private Integer longUnder;
+    private Integer widthOn;
+    private Integer widthUnder;
+    private Integer heightOn;
+    private Integer heightUnder;
+    private List<Map> cxysSsspspTj;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/mapper/ZhjgLzglCxysxkMapper.java

 package com.elephant.framework.galaxy.aroad.module.zhjg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRw;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxk;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 超限运输许可表
@@ -10,5 +16,26 @@ import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxk;
  * @date 2019-03-27 17:46:24
  */
 public interface ZhjgLzglCxysxkMapper extends BaseMapper<ZhjgLzglCxysxk> {
+    /**
+     * 超限许可许可公示分页查询
+     *
+     * @param page 分页对象
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @param xkdh 许可单号
+     * @param cph 车牌号
+     * @return
+     */
+    IPage<List<ZhjgLzglCxysxk>> selectCxysXkgsByCurrentDate(Page page, @Param("startDate") String startDate,
+                                                            @Param("endDate") String endDate, @Param("xkdh") String xkdh,
+                                                            @Param("cph") String cph);
 
+    /**
+     * 查询跨省发证审批数量
+     * @param xkdh 许可单号
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 数量
+     */
+    Integer selectCountKsFzSpByDate(String xkdh,String startDate,String endDate);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/mapper/ZhjgLzglCxysxkslsptjMapper.java

-package com.elephant.framework.galaxy.aroad.module.zhjg.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxkslsptj;
-
-/**
- * 受理审批统计表
- *
- * @author wangjian
- * @date 2019-03-26 14:38:10
- */
-public interface ZhjgLzglCxysxkslsptjMapper extends BaseMapper<ZhjgLzglCxysxkslsptj> {
-
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/ZhjgLzglCxysxkService.java

 package com.elephant.framework.galaxy.aroad.module.zhjg.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.CxysBeyondFormat;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.CxysDataAnalysis;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ShowCxysTotal;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxk;
-import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxkslsptj;
 
 import java.util.List;
 
@@ -27,4 +31,41 @@ public interface ZhjgLzglCxysxkService extends IService<ZhjgLzglCxysxk> {
      * @param     * @return
      */
     Integer getZhjgLzglCxysxkByXkdh(String xkdh);
+
+    /**
+     * 超限许可许可公示分页查询
+     *
+     * @param page 分页对象
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @param xkdh 许可单号
+     * @param cph 车牌号
+     * @return
+     */
+    IPage<List<ZhjgLzglCxysxk>> selectCxysXkgsByCurrentDate(Page page, String startDate, String endDate, String xkdh, String cph);
+
+    /**
+     * 查询跨省发证审批数量
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 数量
+     */
+    Integer[] selectCountKsFzSpByDate(String startDate, String endDate);
+
+    /**
+     * 超限运输数据分析页面统计数据
+     */
+    CxysDataAnalysis selectCxysSjfx(Double startLong, Double endLong,
+                                          Double startWidth, Double endWidth,
+                                          Double startHeight, Double endHeight,
+                                          Double startWeight, Double endWeight,
+                                          String startDate, String endDate);
+
+    /**
+     * 超限运输综合展示页面
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ShowCxysTotal seleCxysZhzs(String startDate, String endDate);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/ZhjgLzglCxysxkslsptjService.java

-package com.elephant.framework.galaxy.aroad.module.zhjg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxkslsptj;
-
-import java.util.List;
-
-/**
- * 受理审批统计表
- *
- * @author wangjian
- * @date 2019-03-26 14:38:10
- */
-public interface ZhjgLzglCxysxkslsptjService extends IService<ZhjgLzglCxysxkslsptj> {
-
-    /**
-     * 通过时间查询该时间段内的数据
-     * @param startDate
-     * @param endDate
-     * @return
-     */
-    List<ZhjgLzglCxysxkslsptj> findZhjgLzglCxysxkslsptjByDate(String startDate, String endDate);
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/impl/ZhjgLzglCxysxkslsptjServiceImpl.java

-package com.elephant.framework.galaxy.aroad.module.zhjg.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.elephant.framework.galaxy.aroad.module.system.entity.DeptRelation;
-import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxkslsptj;
-import com.elephant.framework.galaxy.aroad.module.zhjg.mapper.ZhjgLzglCxysxkslsptjMapper;
-import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgLzglCxysxkslsptjService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 受理审批统计表
- *
- * @author wangjian
- * @date 2019-03-26 14:38:10
- */
-@Service
-@AllArgsConstructor
-public class ZhjgLzglCxysxkslsptjServiceImpl extends ServiceImpl<ZhjgLzglCxysxkslsptjMapper, ZhjgLzglCxysxkslsptj> implements ZhjgLzglCxysxkslsptjService {
-    private final ZhjgLzglCxysxkslsptjMapper zhjgLzglCxysxkslsptjMapper;
-
-    @Override
-    public List<ZhjgLzglCxysxkslsptj> findZhjgLzglCxysxkslsptjByDate(String startDate, String endDate){
-        return zhjgLzglCxysxkslsptjMapper.selectList(Wrappers.<ZhjgLzglCxysxkslsptj>query().lambda().
-                ge(ZhjgLzglCxysxkslsptj::getRq,startDate).le(ZhjgLzglCxysxkslsptj::getRq,endDate));
-    }
-}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/entity/ZhjsGchtandgcxmV.java

@@ -63,4 +63,8 @@ private static final long serialVersionUID = 1L;
    */
   private String proname;
 
+  /**
+   * 项目Id
+   */
+  private String gcxmid;
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljsdjqkController.java

@@ -3,6 +3,7 @@ package com.elephant.framework.galaxy.aroad.module.zhtj.controller;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljsdjqk;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhyhZhzsGlData;
 import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGljsdjqkService;
 import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
@@ -41,6 +42,16 @@ public class ZhtjGljsdjqkController extends BaseController  {
     return  new R<>(zhtjGljsdjqkService.page(page,Wrappers.query(zhtjGljsdjqk)));
   }
 
+  /**
+   * 根据年份查询智慧养护综合展示公路数据
+   * @param year 年份
+   * @return
+   */
+  @GetMapping("/getZhyhZhzsGl")
+  public R getZhyhZhzsGlData(String year) {
+    return new R<>(zhtjGljsdjqkService.getZhyhZhzsGlData(year));
+  }
+
   /**
    * 通过id查询综合统计_公路技术等级情况
    * @param id id

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhyhZhzsGlData.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.entity;
+
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsKeyValue;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ZhyhZhzsGlData {
+    private List<ZhyhZhzsKeyValue> zhyhZhzsGlOne;
+    private List<ZhyhZhzsKeyValue> zhyhZhzsGlTwo;
+    private List<ZhyhZhzsKeyValue> zhyhZhzsGlThree;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljsdjqkMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljsdjqk;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsKeyValue;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,4 +18,5 @@ import java.util.Map;
  */
 public interface ZhtjGljsdjqkMapper extends BaseMapper<ZhtjGljsdjqk> {
 
+    List<ZhyhZhzsKeyValue> getZhyhZhzsGlOne(@Param("year") String year);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljsdjqkService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.system.vo.echarts.BarEchartsVo;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljsdjqk;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhyhZhzsGlData;
 
 import java.util.List;
 import java.util.Map;
@@ -31,4 +32,12 @@ public interface ZhtjGljsdjqkService extends IService<ZhtjGljsdjqk> {
     IPage<List<ZhtjGljsdjqk>> getZhtjGljsdjqkNcglListByTypes(Page page,String types);
     // 获取全省公路技术等级、行政等级
     Map<String,Object> getQsgljsxz();
+
+
+    /**
+     * 根据年份查询智慧养护综合展示公路数据
+     * @param year 年份
+     * @return
+     */
+    ZhyhZhzsGlData getZhyhZhzsGlData(String year);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljsdjqkServiceImpl.java

@@ -9,8 +9,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.system.vo.echarts.BarEchartsVo;
 import com.elephant.framework.galaxy.aroad.module.system.vo.echarts.BarSeriesVo;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljsdjqk;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhyhZhzsGlData;
 import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjGljsdjqkMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGljsdjqkService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsKeyValue;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -134,4 +136,69 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
         }});
         return resultMap;
     }
+
+    /**
+     * 根据年份查询智慧养护综合展示公路数据
+     * @param year 年份
+     * @return
+     */
+    public ZhyhZhzsGlData getZhyhZhzsGlData(String year) {
+        ZhyhZhzsGlData zhyhZhzsGlData = new ZhyhZhzsGlData();
+
+        zhyhZhzsGlData.setZhyhZhzsGlOne(getZhyhZhzsGlOne(year));
+        zhyhZhzsGlData.setZhyhZhzsGlTwo(getZhyhZhzsGlTwo(year));
+        zhyhZhzsGlData.setZhyhZhzsGlThree(getZhyhZhzsGlThree(year));
+        return zhyhZhzsGlData;
+    }
+
+    public List<ZhyhZhzsKeyValue> getZhyhZhzsGlOne(String year) {
+        return zgtjgljsdjqkMapper.getZhyhZhzsGlOne(year);
+    }
+
+    public List<ZhyhZhzsKeyValue> getZhyhZhzsGlTwo(String year) {
+        List<ZhyhZhzsKeyValue> zhyhZhzsKeyValues = new ArrayList<>();
+
+        ZhtjGljsdjqk zhtjGljsdjqk = zgtjgljsdjqkMapper.selectOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getType,"国省道合计").
+                eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getYear,year));
+
+        ZhyhZhzsKeyValue zhyhZhzsKeyValue0 = new ZhyhZhzsKeyValue();
+        zhyhZhzsKeyValue0.setKey("高速");
+        zhyhZhzsKeyValue0.setValue(zhtjGljsdjqk.getHighRoad().toString());
+        zhyhZhzsKeyValues.add(zhyhZhzsKeyValue0);
+
+        ZhyhZhzsKeyValue zhyhZhzsKeyValue1 = new ZhyhZhzsKeyValue();
+        zhyhZhzsKeyValue1.setKey("一级");
+        zhyhZhzsKeyValue1.setValue(zhtjGljsdjqk.getFirstRoad().toString());
+        zhyhZhzsKeyValues.add(zhyhZhzsKeyValue1);
+
+        ZhyhZhzsKeyValue zhyhZhzsKeyValue2 = new ZhyhZhzsKeyValue();
+        zhyhZhzsKeyValue2.setKey("二级");
+        zhyhZhzsKeyValue2.setValue(zhtjGljsdjqk.getSecondRoad().toString());
+        zhyhZhzsKeyValues.add(zhyhZhzsKeyValue2);
+
+        ZhyhZhzsKeyValue zhyhZhzsKeyValue3 = new ZhyhZhzsKeyValue();
+        zhyhZhzsKeyValue3.setKey("三级");
+        zhyhZhzsKeyValue3.setValue(zhtjGljsdjqk.getThreeRoad().toString());
+        zhyhZhzsKeyValues.add(zhyhZhzsKeyValue3);
+
+        ZhyhZhzsKeyValue zhyhZhzsKeyValue4 = new ZhyhZhzsKeyValue();
+        zhyhZhzsKeyValue4.setKey("四级");
+        zhyhZhzsKeyValue4.setValue(zhtjGljsdjqk.getFourRoad().toString());
+        zhyhZhzsKeyValues.add(zhyhZhzsKeyValue4);
+
+        return zhyhZhzsKeyValues;
+    }
+
+    public List<ZhyhZhzsKeyValue> getZhyhZhzsGlThree(String year) {
+        List<ZhyhZhzsKeyValue> zhyhZhzsKeyValues = new ArrayList<>();
+        List<ZhtjGljsdjqk> zhtjGljsdjqks = zgtjgljsdjqkMapper.selectList(Wrappers.<ZhtjGljsdjqk>query().lambda()
+                .eq(ZhtjGljsdjqk::getType,"国省道合计").eq(ZhtjGljsdjqk::getYear,year).ne(ZhtjGljsdjqk::getArea,"合计"));
+        for(ZhtjGljsdjqk zhtjGljsdjqk: zhtjGljsdjqks) {
+            ZhyhZhzsKeyValue zhyhZhzsKeyValue = new ZhyhZhzsKeyValue();
+            zhyhZhzsKeyValue.setKey(zhtjGljsdjqk.getArea());
+            zhyhZhzsKeyValue.setValue(zhtjGljsdjqk.getTotal().toString());
+            zhyhZhzsKeyValues.add(zhyhZhzsKeyValue);
+        }
+        return zhyhZhzsKeyValues;
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhDzxgcglGcjdController.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcjd;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhDzxgcglGcjdService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 大中修工程管理_工程进度
+ *
+ * @author wangjian
+ * @date 2019-04-28 14:41:27
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/dzxgcglgcjd")
+public class ZhyhDzxgcglGcjdController extends BaseController  {
+
+  private final  ZhyhDzxgcglGcjdService zhyhDzxgcglGcjdService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhyhDzxgcglGcjd 大中修工程管理_工程进度
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhyhDzxgcglGcjdPage(Page page, ZhyhDzxgcglGcjd zhyhDzxgcglGcjd) {
+    return  new R<>(zhyhDzxgcglGcjdService.page(page,Wrappers.query(zhyhDzxgcglGcjd)));
+  }
+
+
+  /**
+   * 通过id查询大中修工程管理_工程进度
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhyhDzxgcglGcjdService.getById(id));
+  }
+
+  /**
+   * 新增大中修工程管理_工程进度
+   * @param zhyhDzxgcglGcjd 大中修工程管理_工程进度
+   * @return R
+   */
+  @SysLog("新增大中修工程管理_工程进度")
+  @PostMapping
+  public R save(@RequestBody ZhyhDzxgcglGcjd zhyhDzxgcglGcjd){
+    return new R<>(zhyhDzxgcglGcjdService.save(zhyhDzxgcglGcjd));
+  }
+
+  /**
+   * 修改大中修工程管理_工程进度
+   * @param zhyhDzxgcglGcjd 大中修工程管理_工程进度
+   * @return R
+   */
+  @SysLog("修改大中修工程管理_工程进度")
+  @PutMapping
+  public R updateById(@RequestBody ZhyhDzxgcglGcjd zhyhDzxgcglGcjd){
+    return new R<>(zhyhDzxgcglGcjdService.updateById(zhyhDzxgcglGcjd));
+  }
+
+  /**
+   * 通过id删除大中修工程管理_工程进度
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除大中修工程管理_工程进度")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhyhDzxgcglGcjdService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgLzglCxysxkslsptjController.java → src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhDzxgcglGcxxController.java

-package com.elephant.framework.galaxy.aroad.module.zhjg.controller;
+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxxTreeOne;
 import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
-import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxkslsptj;
-import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgLzglCxysxkslsptjService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxx;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhDzxgcglGcxxService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
@@ -14,87 +15,79 @@ import java.util.List;
 
 
 /**
- * 受理审批统计表
+ * 智慧养护_大中修工程管理_工程信息
  *
  * @author wangjian
- * @date 2019-03-26 14:38:10
+ * @date 2019-04-23 17:00:31
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/zhjg/zhjglzglcxysxkslsptj")
-public class ZhjgLzglCxysxkslsptjController extends BaseController  {
+@RequestMapping("/zhyh/dzxgcglgcxx")
+public class ZhyhDzxgcglGcxxController extends BaseController  {
 
-  private final  ZhjgLzglCxysxkslsptjService zhjgLzglCxysxkslsptjService;
+  private final  ZhyhDzxgcglGcxxService zhyhDzxgcglGcxxService;
 
   /**
    * 分页查询
    * @param page 分页对象
-   * @param zhjgLzglCxysxkslsptj 受理审批统计表
+   * @param zhyhDzxgcglGcxx 智慧养护_大中修工程管理_工程信息
    * @return
    */
   @GetMapping("/page")
-  public R getZhjgLzglCxysxkslsptjPage(Page page, ZhjgLzglCxysxkslsptj zhjgLzglCxysxkslsptj) {
-    return  new R<>(zhjgLzglCxysxkslsptjService.page(page,Wrappers.query(zhjgLzglCxysxkslsptj)));
+  public R getZhyhDzxgcglGcxxPage(Page page, ZhyhDzxgcglGcxx zhyhDzxgcglGcxx) {
+    return  new R<>(zhyhDzxgcglGcxxService.page(page,Wrappers.query(zhyhDzxgcglGcxx)));
   }
 
   /**
-   * 查询某时间段内数据
-   * @param startDate
-   * @param endDate
+   * 获取tree树结构
    * @return
    */
-  @GetMapping("/getDataByDate")
-  public List<ZhjgLzglCxysxkslsptj> findZhjgLzglCxysxkslsptjByDate(String startDate, String endDate) {
-    if(startDate==null || endDate==null){
-      return null;
-    }
-    startDate = startDate.trim();
-    endDate = endDate.trim();
-    return  zhjgLzglCxysxkslsptjService.findZhjgLzglCxysxkslsptjByDate(startDate,endDate);
+  @GetMapping("/getTree")
+  public R  getTree() {
+    return new R<>(zhyhDzxgcglGcxxService.getTree());
   }
 
-
   /**
-   * 通过id查询受理审批统计表
+   * 通过id查询智慧养护_大中修工程管理_工程信息
    * @param id id
    * @return R
    */
   @GetMapping("/{id}")
-  public R getById(@PathVariable("id") Integer id){
-    return new R<>(zhjgLzglCxysxkslsptjService.getById(id));
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhyhDzxgcglGcxxService.getById(id));
   }
 
   /**
-   * 新增受理审批统计表
-   * @param zhjgLzglCxysxkslsptj 受理审批统计表
+   * 新增智慧养护_大中修工程管理_工程信息
+   * @param zhyhDzxgcglGcxx 智慧养护_大中修工程管理_工程信息
    * @return R
    */
-  @SysLog("新增受理审批统计表")
+  @SysLog("新增智慧养护_大中修工程管理_工程信息")
   @PostMapping
-  public R save(@RequestBody ZhjgLzglCxysxkslsptj zhjgLzglCxysxkslsptj){
-    return new R<>(zhjgLzglCxysxkslsptjService.save(zhjgLzglCxysxkslsptj));
+  public R save(@RequestBody ZhyhDzxgcglGcxx zhyhDzxgcglGcxx){
+    return new R<>(zhyhDzxgcglGcxxService.save(zhyhDzxgcglGcxx));
   }
 
   /**
-   * 修改受理审批统计表
-   * @param zhjgLzglCxysxkslsptj 受理审批统计表
+   * 修改智慧养护_大中修工程管理_工程信息
+   * @param zhyhDzxgcglGcxx 智慧养护_大中修工程管理_工程信息
    * @return R
    */
-  @SysLog("修改受理审批统计表")
+  @SysLog("修改智慧养护_大中修工程管理_工程信息")
   @PutMapping
-  public R updateById(@RequestBody ZhjgLzglCxysxkslsptj zhjgLzglCxysxkslsptj){
-    return new R<>(zhjgLzglCxysxkslsptjService.updateById(zhjgLzglCxysxkslsptj));
+  public R updateById(@RequestBody ZhyhDzxgcglGcxx zhyhDzxgcglGcxx){
+    return new R<>(zhyhDzxgcglGcxxService.updateById(zhyhDzxgcglGcxx));
   }
 
   /**
-   * 通过id删除受理审批统计表
+   * 通过id删除智慧养护_大中修工程管理_工程信息
    * @param id id
    * @return R
    */
-  @SysLog("删除受理审批统计表")
+  @SysLog("删除智慧养护_大中修工程管理_工程信息")
   @DeleteMapping("/{id}")
-  public R removeById(@PathVariable Integer id){
-    return new R<>(zhjgLzglCxysxkslsptjService.removeById(id));
+  public R removeById(@PathVariable String id){
+    return new R<>(zhyhDzxgcglGcxxService.removeById(id));
   }
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhDzxgcglJlzfController.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglJlzf;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhDzxgcglJlzfService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 大中修工程管理_计量支付
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:44:39
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/dzxgcgljlzf")
+public class ZhyhDzxgcglJlzfController extends BaseController  {
+
+  private final  ZhyhDzxgcglJlzfService zhyhDzxgcglJlzfService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhyhDzxgcglJlzf 大中修工程管理_计量支付
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhyhDzxgcglJlzfPage(Page page, ZhyhDzxgcglJlzf zhyhDzxgcglJlzf) {
+    return  new R<>(zhyhDzxgcglJlzfService.page(page,Wrappers.query(zhyhDzxgcglJlzf)));
+  }
+
+
+  /**
+   * 通过id查询大中修工程管理_计量支付
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhyhDzxgcglJlzfService.getById(id));
+  }
+
+  /**
+   * 新增大中修工程管理_计量支付
+   * @param zhyhDzxgcglJlzf 大中修工程管理_计量支付
+   * @return R
+   */
+  @SysLog("新增大中修工程管理_计量支付")
+  @PostMapping
+  public R save(@RequestBody ZhyhDzxgcglJlzf zhyhDzxgcglJlzf){
+    return new R<>(zhyhDzxgcglJlzfService.save(zhyhDzxgcglJlzf));
+  }
+
+  /**
+   * 修改大中修工程管理_计量支付
+   * @param zhyhDzxgcglJlzf 大中修工程管理_计量支付
+   * @return R
+   */
+  @SysLog("修改大中修工程管理_计量支付")
+  @PutMapping
+  public R updateById(@RequestBody ZhyhDzxgcglJlzf zhyhDzxgcglJlzf){
+    return new R<>(zhyhDzxgcglJlzfService.updateById(zhyhDzxgcglJlzf));
+  }
+
+  /**
+   * 通过id删除大中修工程管理_计量支付
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除大中修工程管理_计量支付")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhyhDzxgcglJlzfService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhDzxgcglYsglController.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglYsgl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhDzxgcglYsglService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 大中修工程管理_验收管理
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:10:02
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/dzxgcglysgl")
+public class ZhyhDzxgcglYsglController extends BaseController  {
+
+  private final  ZhyhDzxgcglYsglService zhyhDzxgcglYsglService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhyhDzxgcglYsgl 大中修工程管理_验收管理
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhyhDzxgcglYsglPage(Page page, ZhyhDzxgcglYsgl zhyhDzxgcglYsgl) {
+    return  new R<>(zhyhDzxgcglYsglService.page(page,Wrappers.query(zhyhDzxgcglYsgl)));
+  }
+
+
+  /**
+   * 通过id查询大中修工程管理_验收管理
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhyhDzxgcglYsglService.getById(id));
+  }
+
+  /**
+   * 新增大中修工程管理_验收管理
+   * @param zhyhDzxgcglYsgl 大中修工程管理_验收管理
+   * @return R
+   */
+  @SysLog("新增大中修工程管理_验收管理")
+  @PostMapping
+  public R save(@RequestBody ZhyhDzxgcglYsgl zhyhDzxgcglYsgl){
+    return new R<>(zhyhDzxgcglYsglService.save(zhyhDzxgcglYsgl));
+  }
+
+  /**
+   * 修改大中修工程管理_验收管理
+   * @param zhyhDzxgcglYsgl 大中修工程管理_验收管理
+   * @return R
+   */
+  @SysLog("修改大中修工程管理_验收管理")
+  @PutMapping
+  public R updateById(@RequestBody ZhyhDzxgcglYsgl zhyhDzxgcglYsgl){
+    return new R<>(zhyhDzxgcglYsglService.updateById(zhyhDzxgcglYsgl));
+  }
+
+  /**
+   * 通过id删除大中修工程管理_验收管理
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除大中修工程管理_验收管理")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhyhDzxgcglYsglService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhLkpdController.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhLkpd;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhLkpdService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 智慧养护_路况评定
+ *
+ * @author wangjian
+ * @date 2019-04-22 17:45:59
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/lkpd")
+public class ZhyhLkpdController extends BaseController  {
+
+  private final  ZhyhLkpdService zhyhLkpdService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhyhLkpd 智慧养护_路况评定
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhyhLkpdPage(Page page, ZhyhLkpd zhyhLkpd) {
+    return  new R<>(zhyhLkpdService.page(page,Wrappers.query(zhyhLkpd)));
+  }
+
+
+  /**
+   * 通过id查询智慧养护_路况评定
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhyhLkpdService.getById(id));
+  }
+
+  /**
+   * 新增智慧养护_路况评定
+   * @param zhyhLkpd 智慧养护_路况评定
+   * @return R
+   */
+  @SysLog("新增智慧养护_路况评定")
+  @PostMapping
+  public R save(@RequestBody ZhyhLkpd zhyhLkpd){
+    return new R<>(zhyhLkpdService.save(zhyhLkpd));
+  }
+
+  /**
+   * 修改智慧养护_路况评定
+   * @param zhyhLkpd 智慧养护_路况评定
+   * @return R
+   */
+  @SysLog("修改智慧养护_路况评定")
+  @PutMapping
+  public R updateById(@RequestBody ZhyhLkpd zhyhLkpd){
+    return new R<>(zhyhLkpdService.updateById(zhyhLkpd));
+  }
+
+  /**
+   * 通过id删除智慧养护_路况评定
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除智慧养护_路况评定")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhyhLkpdService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhQldtjgLrbsjhqlController.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgLrbsjhql;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhQldtjgLrbsjhqlService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 列入部、省计划桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 15:05:42
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/qldtjglrbsjhql")
+public class ZhyhQldtjgLrbsjhqlController extends BaseController  {
+
+  private final  ZhyhQldtjgLrbsjhqlService zhyhQldtjgLrbsjhqlService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhyhQldtjgLrbsjhql 列入部、省计划桥梁
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhyhQldtjgLrbsjhqlPage(Page page, ZhyhQldtjgLrbsjhql zhyhQldtjgLrbsjhql) {
+    return  new R<>(zhyhQldtjgLrbsjhqlService.page(page,Wrappers.query(zhyhQldtjgLrbsjhql)));
+  }
+
+
+  /**
+   * 通过id查询列入部、省计划桥梁
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhyhQldtjgLrbsjhqlService.getById(id));
+  }
+
+  /**
+   * 新增列入部、省计划桥梁
+   * @param zhyhQldtjgLrbsjhql 列入部、省计划桥梁
+   * @return R
+   */
+  @SysLog("新增列入部、省计划桥梁")
+  @PostMapping
+  public R save(@RequestBody ZhyhQldtjgLrbsjhql zhyhQldtjgLrbsjhql){
+    return new R<>(zhyhQldtjgLrbsjhqlService.save(zhyhQldtjgLrbsjhql));
+  }
+
+  /**
+   * 修改列入部、省计划桥梁
+   * @param zhyhQldtjgLrbsjhql 列入部、省计划桥梁
+   * @return R
+   */
+  @SysLog("修改列入部、省计划桥梁")
+  @PutMapping
+  public R updateById(@RequestBody ZhyhQldtjgLrbsjhql zhyhQldtjgLrbsjhql){
+    return new R<>(zhyhQldtjgLrbsjhqlService.updateById(zhyhQldtjgLrbsjhql));
+  }
+
+  /**
+   * 通过id删除列入部、省计划桥梁
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除列入部、省计划桥梁")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhyhQldtjgLrbsjhqlService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhQldtjgSjzdjgqlController.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgSjzdjgql;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhQldtjgSjzdjgqlService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 市局重点监管桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 10:53:58
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/qldtjgsjzdjgql")
+public class ZhyhQldtjgSjzdjgqlController extends BaseController  {
+
+  private final  ZhyhQldtjgSjzdjgqlService zhyhQldtjgSjzdjgqlService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhyhQldtjgSjzdjgql 市局重点监管桥梁
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhyhQldtjgSjzdjgqlPage(Page page, ZhyhQldtjgSjzdjgql zhyhQldtjgSjzdjgql) {
+    return  new R<>(zhyhQldtjgSjzdjgqlService.page(page,Wrappers.query(zhyhQldtjgSjzdjgql)));
+  }
+
+
+  /**
+   * 通过id查询市局重点监管桥梁
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhyhQldtjgSjzdjgqlService.getById(id));
+  }
+
+  /**
+   * 新增市局重点监管桥梁
+   * @param zhyhQldtjgSjzdjgql 市局重点监管桥梁
+   * @return R
+   */
+  @SysLog("新增市局重点监管桥梁")
+  @PostMapping
+  public R save(@RequestBody ZhyhQldtjgSjzdjgql zhyhQldtjgSjzdjgql){
+    return new R<>(zhyhQldtjgSjzdjgqlService.save(zhyhQldtjgSjzdjgql));
+  }
+
+  /**
+   * 修改市局重点监管桥梁
+   * @param zhyhQldtjgSjzdjgql 市局重点监管桥梁
+   * @return R
+   */
+  @SysLog("修改市局重点监管桥梁")
+  @PutMapping
+  public R updateById(@RequestBody ZhyhQldtjgSjzdjgql zhyhQldtjgSjzdjgql){
+    return new R<>(zhyhQldtjgSjzdjgqlService.updateById(zhyhQldtjgSjzdjgql));
+  }
+
+  /**
+   * 通过id删除市局重点监管桥梁
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除市局重点监管桥梁")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhyhQldtjgSjzdjgqlService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhSjbbDzxjdybController.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhSjbbDzxjdyb;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhSjbbDzxjdybService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 智慧养护_数据报表_大中修进度月报
+ *
+ * @author wangjian
+ * @date 2019-04-28 10:34:22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/sjbbdzxjdyb")
+public class ZhyhSjbbDzxjdybController extends BaseController  {
+
+  private final  ZhyhSjbbDzxjdybService zhyhSjbbDzxjdybService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhyhSjbbDzxjdyb 智慧养护_数据报表_大中修进度月报
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhyhSjbbDzxjdybPage(Page page, ZhyhSjbbDzxjdyb zhyhSjbbDzxjdyb) {
+    return  new R<>(zhyhSjbbDzxjdybService.page(page,Wrappers.query(zhyhSjbbDzxjdyb)));
+  }
+
+
+  /**
+   * 通过id查询智慧养护_数据报表_大中修进度月报
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhyhSjbbDzxjdybService.getById(id));
+  }
+
+  /**
+   * 新增智慧养护_数据报表_大中修进度月报
+   * @param zhyhSjbbDzxjdyb 智慧养护_数据报表_大中修进度月报
+   * @return R
+   */
+  @SysLog("新增智慧养护_数据报表_大中修进度月报")
+  @PostMapping
+  public R save(@RequestBody ZhyhSjbbDzxjdyb zhyhSjbbDzxjdyb){
+    return new R<>(zhyhSjbbDzxjdybService.save(zhyhSjbbDzxjdyb));
+  }
+
+  /**
+   * 修改智慧养护_数据报表_大中修进度月报
+   * @param zhyhSjbbDzxjdyb 智慧养护_数据报表_大中修进度月报
+   * @return R
+   */
+  @SysLog("修改智慧养护_数据报表_大中修进度月报")
+  @PutMapping
+  public R updateById(@RequestBody ZhyhSjbbDzxjdyb zhyhSjbbDzxjdyb){
+    return new R<>(zhyhSjbbDzxjdybService.updateById(zhyhSjbbDzxjdyb));
+  }
+
+  /**
+   * 通过id删除智慧养护_数据报表_大中修进度月报
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除智慧养护_数据报表_大中修进度月报")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhyhSjbbDzxjdybService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhZhzsController.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzs;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhZhzsService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 智慧养护_综合展示
+ *
+ * @author wangjian
+ * @date 2019-04-26 11:51:59
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/zhzs")
+public class ZhyhZhzsController extends BaseController  {
+
+  private final  ZhyhZhzsService zhyhZhzsService;
+
+  /**
+   * 智慧养护综合展示根据年份进行数据查询
+   * @param year 年份
+   * @return
+   */
+  @GetMapping("/getZhzsData")
+  public R getZhyhZhzsData(String year) {
+    return new R<>(zhyhZhzsService.getZhyhZhzsData(year));
+  }
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhZhzsQlController.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsQlData;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsQl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhZhzsQlService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 智慧养护_综合展示_桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-26 15:34:59
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/zhzsql")
+public class ZhyhZhzsQlController extends BaseController  {
+
+  private final  ZhyhZhzsQlService zhyhZhzsQlService;
+
+  /**
+   * 获取综合展示桥梁信息
+   * @param year
+   * @return
+   */
+  @GetMapping("/getZhzsQlData")
+  public R getZhyhZhzsQlDataByYear(String year) {
+    return new R<>(zhyhZhzsQlService.getZhyhZhzsQlDataByYear(year));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhDzxgcglGcjd.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 大中修工程管理_工程进度
+ *
+ * @author wangjian
+ * @date 2019-04-28 14:41:27
+ */
+@Data
+@TableName("t_zhyh_dzxgcgl_gcjd")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhDzxgcglGcjd extends Model<ZhyhDzxgcglGcjd> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 年月
+   */
+  private String ny;
+  /**
+   * 形象进度
+   */
+  private String xxjd;
+  /**
+   * 管养单位
+   */
+  private String gydw;
+  /**
+   * 工程名称
+   */
+  private String gcmc;
+  /**
+   * 省及中央总投资(万元)
+   */
+  private Double szyztz;
+  /**
+   * 年投资(万元)
+   */
+  private Double ntz;
+  /**
+   * 工程本半月完成(万元)
+   */
+  private Double gcby;
+  /**
+   * 工程本年累计完成(万元)
+   */
+  private Double gcbn;
+  /**
+   * 工程自开工累计完成(万元)
+   */
+  private Double gckg;
+  /**
+   * 工程本年累计完成占年投资的百分比(%)
+   */
+  private Double gcbfb;
+  /**
+   * 计量本年累计计量支付(万元)
+   */
+  private Double jlbn;
+  /**
+   * 计量自开工累计计量支付(万元)
+   */
+  private Double jlkg;
+  /**
+   * 计量本年累计计量支付占年投资的百分比(%)
+   */
+  private Double jlbfb;
+  /**
+   * 备注
+   */
+  private String bz;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+  /**
+   * 工程类别
+   */
+  private String gclx;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhDzxgcglGcxx.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 智慧养护_大中修工程管理_工程信息
+ *
+ * @author wangjian
+ * @date 2019-04-23 17:00:31
+ */
+@Data
+@TableName("t_zhyh_dzxgcgl_gcxx")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhDzxgcglGcxx extends Model<ZhyhDzxgcglGcxx> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 工程名称
+   */
+  private String gcmc;
+  /**
+   * 工程类型
+   */
+  private String gclx;
+  /**
+   * 合同名称
+   */
+  private String htmc;
+  /**
+   * 管养单位
+   */
+  private String gydw;
+  /**
+   * 工程开始日期
+   */
+  private String gcksrq;
+  /**
+   * 工程结束日期
+   */
+  private String gcjsrq;
+  /**
+   * 质保开始日期
+   */
+  private String zbksrq;
+  /**
+   * 质保结束日期
+   */
+  private String zbjsrq;
+  /**
+   * 中标单位
+   */
+  private String zbdw;
+  /**
+   * 监理单位
+   */
+  private String jldw;
+  /**
+   * 路线编号
+   */
+  private String lxbh;
+  /**
+   * 行驶方向
+   */
+  private String xsfx;
+  /**
+   * 位置描述
+   */
+  private String wzms;
+  /**
+   * 工程起点桩号
+   */
+  private Integer gcqdzh;
+  /**
+   * 工程结束桩号
+   */
+  private Integer gcjszh;
+  /**
+   * 录入人
+   */
+  private String lrr;
+  /**
+   * 录入时间
+   */
+  private String lrsj;
+  /**
+   * 地图坐标
+   */
+  private String dtzb;
+  /**
+   * 备注
+   */
+  private String bz;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhDzxgcglGcxxTreeOne.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ZhyhDzxgcglGcxxTreeOne {
+    private String label;
+    private List<ZhyhDzxgcglGcxxTreeTwo> children;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhDzxgcglGcxxTreeTwo.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import lombok.Data;
+
+@Data
+public class ZhyhDzxgcglGcxxTreeTwo {
+    private String id;
+    private String label;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhDzxgcglJlzf.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 大中修工程管理_计量支付
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:44:39
+ */
+@Data
+@TableName("t_zhyh_dzxgcgl_jlzf")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhDzxgcglJlzf extends Model<ZhyhDzxgcglJlzf> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 记录编号
+   */
+  private String jlbh;
+  /**
+   * 支付说明
+   */
+  private String zfsm;
+  /**
+   * 支付理由
+   */
+  private String zfly;
+  /**
+   * 变更金额
+   */
+  private Double bgje;
+  /**
+   * 暂扣金额
+   */
+  private Double zkje;
+  /**
+   * 实际支付金额
+   */
+  private Double sjzfje;
+  /**
+   * 本次实际支付金额
+   */
+  private Double bcsjzfje;
+  /**
+   * 开户银行
+   */
+  private String khyh;
+  /**
+   * 申请单位名称
+   */
+  private String sqdwmc;
+  /**
+   * 所属工程
+   */
+  private String ssgc;
+  /**
+   * 申请日期
+   */
+  private String sqrq;
+  /**
+   * 货币单位
+   */
+  private String hbdw;
+  /**
+   * 核定支付金额
+   */
+  private Double hdzfje;
+  /**
+   * 其他扣款
+   */
+  private Double qtkk;
+  /**
+   * 本次核定支付金额
+   */
+  private Double bchdzfje;
+  /**
+   * 请款单位开户名称
+   */
+  private String qkdwkhmc;
+  /**
+   * 账号
+   */
+  private String zh;
+  /**
+   * 申请单位负责人
+   */
+  private String sqdwfzr;
+  /**
+   * 处置状态
+   */
+  private String czzt;
+  /**
+   * 备注
+   */
+  private String bz;
+  /**
+   * 附件id
+   */
+  private String fjid;
+  /**
+   * 附件信息
+   */
+  private String fjxx;
+  /**
+   * 审核流程
+   */
+  private String shlc;
+  /**
+   * 历史流程
+   */
+  private String lslc;
+  /**
+   * 上报意见
+   */
+  private String sbyj;
+  /**
+   * 撤回意见
+   */
+  private String chyj;
+  /**
+   * 批复意见
+   */
+  private String pfyj;
+  /**
+   * 所属合同
+   */
+  private String ssht;
+  /**
+   * 工程路线名称
+   */
+  private String gclxmc;
+  /**
+   * 工程路线编号
+   */
+  private String gclxbh;
+  /**
+   * 流程状态
+   */
+  private String lczt;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhDzxgcglYsgl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 大中修工程管理_验收管理
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:10:02
+ */
+@Data
+@TableName("t_zhyh_dzxgcgl_ysgl")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhDzxgcglYsgl extends Model<ZhyhDzxgcglYsgl> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 所属合同
+   */
+  private String ssht;
+  /**
+   * 工程路线编码
+   */
+  private String gclxbm;
+  /**
+   * 工程路线名称
+   */
+  private String gclxmc;
+  /**
+   * 管养单位
+   */
+  private String gydw;
+  /**
+   * 记录编号
+   */
+  private String jldb;
+  /**
+   * 验收情况
+   */
+  private String ysqk;
+  /**
+   * 安全情况
+   */
+  private String aqqk;
+  /**
+   * 验收人
+   */
+  private String ysr;
+  /**
+   * 施工单位评分
+   */
+  private Double sgdwpf;
+  /**
+   * 施工单位评价
+   */
+  private Double sgdwpj;
+  /**
+   * 验收日期
+   */
+  private LocalDateTime ysrq;
+  /**
+   * 备注
+   */
+  private String bz;
+  /**
+   * 附件id
+   */
+  private String fjid;
+  /**
+   * 附件信息
+   */
+  private String fjxx;
+  /**
+   * 所属工程
+   */
+  private String ssgc;
+  /**
+   * 质量情况
+   */
+  private String zlqk;
+  /**
+   * 验收是否合格
+   */
+  private String yssfhg;
+  /**
+   * 验收单位
+   */
+  private String ysdw;
+  /**
+   * 监理单位评分
+   */
+  private Double jldwpf;
+  /**
+   * 监理单位评价
+   */
+  private Double jldwpj;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhLkpd.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 智慧养护_路况评定
+ *
+ * @author wangjian
+ * @date 2019-04-22 17:45:59
+ */
+@Data
+@TableName("t_zhyh_lkpd")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhLkpd extends Model<ZhyhLkpd> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 路线名称
+   */
+  private String lxmc;
+  /**
+   * 行政区划
+   */
+  private String xzqh;
+  /**
+   * 养管单位
+   */
+  private String ygdw;
+  /**
+   * 车道类型
+   */
+  private String cdlx;
+  /**
+   * 行驶方向
+   */
+  private String xsfx;
+  /**
+   * 起点桩号
+   */
+  private Double qdzh;
+  /**
+   * 终点桩号
+   */
+  private Double zdzh;
+  /**
+   * 评定长度
+   */
+  private Double pdcd;
+  /**
+   * 评定MQI
+   */
+  private Double pdmqi;
+  /**
+   * 评定PQI
+   */
+  private Double pdpqi;
+  /**
+   * 评定PCI
+   */
+  private Double pdpci;
+  /**
+   * 评定RDI
+   */
+  private Double pdrdi;
+  /**
+   * 评定SRI
+   */
+  private Double pdsri;
+  /**
+   * 评定PSSI
+   */
+  private Double pdpsst;
+  /**
+   * 路基SCI
+   */
+  private Double ljsci;
+  /**
+   * 桥隧BCI
+   */
+  private Double qsbct;
+  /**
+   * 设施TCI
+   */
+  private Double sstci;
+  /**
+   * 评定RQI
+   */
+  private Double pdrqi;
+  /**
+   * 评定时间
+   */
+  private String pdsj;
+  /**
+   * 路段编码
+   */
+  private String ldbm;
+  /**
+   * 路线编码
+   */
+  private String lxbm;
+  /**
+   * 技术等级
+   */
+  private String jsdj;
+  /**
+   * 路面类型
+   */
+  private String lmlx;
+  /**
+   * MQI评定结果
+   */
+  private String mqipdjg;
+  /**
+   * PQI评定结果
+   */
+  private String pqipdjg;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+
+  /**
+   * 等级
+   */
+  private String dj;
+
+  /**
+   * 路线类型
+   */
+  private String lxlx;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhQldtjgLrbsjhql.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 列入部、省计划桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 15:05:42
+ */
+@Data
+@TableName("t_zhyh_qldtjg_lrbsjhql")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhQldtjgLrbsjhql extends Model<ZhyhQldtjgLrbsjhql> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 养管单位
+   */
+  private String jgdw;
+  /**
+   * 桥梁名称
+   */
+  private String qlmc;
+  /**
+   * 路线名称
+   */
+  private String lxbh;
+  /**
+   * 桥跨
+   */
+  private Double qk;
+  /**
+   * 结构
+   */
+  private String jg;
+  /**
+   * 桥类
+   */
+  private String ql;
+  /**
+   * 技术等级
+   */
+  private String jsdj;
+  /**
+   * 开工时间
+   */
+  private LocalDateTime kgsj;
+  /**
+   * 工程进度
+   */
+  private String gcjd;
+  /**
+   * 竣工时间
+   */
+  private LocalDateTime jgsj;
+  /**
+   * 主要内容
+   */
+  private String zynr;
+  /**
+   * 已完成投资(万元)
+   */
+  private Double ywctz;
+  /**
+   * 是否安排工程改造
+   */
+  private String sfapgcgz;
+  /**
+   * 省局是否审批
+   */
+  private String sjsfsp;
+  /**
+   * 计划年份
+   */
+  private String jhnf;
+  /**
+   * 计划文号
+   */
+  private String jhwh;
+  /**
+   * 道路情况
+   */
+  private String dlqk;
+  /**
+   * 值守情况
+   */
+  private String zsqk;
+  /**
+   * 项目未开工原因
+   */
+  private String xmwkgyy;
+  /**
+   * 备注
+   */
+  private String bz;
+  /**
+   * 图片Id
+   */
+  private String tpid;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhQldtjgSjzdjgql.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 市局重点监管桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 10:53:58
+ */
+@Data
+@TableName("t_zhyh_qldtjg_sjzdjgql")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhQldtjgSjzdjgql extends Model<ZhyhQldtjgSjzdjgql> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 养管单位
+   */
+  private String jgdw;
+  /**
+   * 桥梁名称
+   */
+  private String qlmc;
+  /**
+   * 路线编号
+   */
+  private String lxbh;
+  /**
+   * 桥跨
+   */
+  private Double qk;
+  /**
+   * 结构
+   */
+  private String jg;
+  /**
+   * 桥类
+   */
+  private String ql;
+  /**
+   * 技术等级
+   */
+  private String jsdj;
+  /**
+   * 开工时间
+   */
+  private LocalDateTime kgsj;
+  /**
+   * 工程进度
+   */
+  private String gcjd;
+  /**
+   * 竣工时间
+   */
+  private LocalDateTime jgsj;
+  /**
+   * 主要内容
+   */
+  private String zynr;
+  /**
+   * 已完成投资(万元)
+   */
+  private Double ywctz;
+  /**
+   * 是否安排工程改造
+   */
+  private String sfapgcgz;
+  /**
+   * 省局是否审批
+   */
+  private String sjsfsp;
+  /**
+   * 计划年份
+   */
+  private String jhnf;
+  /**
+   * 计划文号
+   */
+  private String jhwh;
+  /**
+   * 道路情况
+   */
+  private String dlqk;
+  /**
+   * 值守情况
+   */
+  private String zsqk;
+  /**
+   * 项目未开工原因
+   */
+  private String xmwkgyy;
+  /**
+   * 备注
+   */
+  private String bz;
+  /**
+   * 图片Id
+   */
+  private String tpid;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhSjbbDzxjdyb.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 智慧养护_数据报表_大中修进度月报
+ *
+ * @author wangjian
+ * @date 2019-04-28 10:34:22
+ */
+@Data
+@TableName("t_zhyh_sjbb_dzxjdyb")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhSjbbDzxjdyb extends Model<ZhyhSjbbDzxjdyb> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 地市名称
+   */
+  private String dsmc;
+  /**
+   * 时间
+   */
+  private String sj;
+  /**
+   * 省财政省及中央总投资(万元)
+   */
+  private String sczsjzyztz;
+  /**
+   * 省财政年投资(万元)
+   */
+  private String sczntz;
+  /**
+   * 省财政本半月完成(万元)
+   */
+  private String sczbbywc;
+  /**
+   * 省财政本年累计完成(万元)
+   */
+  private String sczbnljwc;
+  /**
+   * 省财政自开工累计完成(万元)
+   */
+  private String sczzkgljwc;
+  /**
+   * 省财政本年累计完成占年投资的百分比(%)
+   */
+  private String sczbnljwczntzdbfb;
+  /**
+   * 省财政本年累计计量支付(万元)
+   */
+  private String sczbnljjlzf;
+  /**
+   * 省财政自开工累计计量支付(万元)
+   */
+  private String sczzkgljjlzf;
+  /**
+   * 省财政本年累计计量支付占年投资的百分比(万元)
+   */
+  private String sczbnljjlzfbfb;
+  /**
+   * 市财政总投资(万元)
+   */
+  private String scazztz;
+  /**
+   * 市财政年投资(万元)
+   */
+  private String scazntz;
+  /**
+   * 市财政本半月完成(万元)
+   */
+  private String scazbbywc;
+  /**
+   * 市财政本年累计完成(万元)
+   */
+  private String scazbnljwc;
+  /**
+   * 市财政自开工累计完成(万元)
+   */
+  private String scazzkgljwc;
+  /**
+   * 市财政本年累计完成占年投资的百分比(%)
+   */
+  private String scazbnljbfb;
+  /**
+   * 市财政本年累计计量支付(万元)
+   */
+  private String scazbnljjlzf;
+  /**
+   * 市财政自开工累计计量支付(万元)
+   */
+  private String scazzkgjlzf;
+  /**
+   * 市财政本年累计计量支付占年投资的百分比(万元)
+   */
+  private String scazbnjlzfbfb;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+  /**
+   * 排序
+   */
+  private Integer sort;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgLzglCxysxkslsptj.java → src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhZhzs.java

-package com.elephant.framework.galaxy.aroad.module.zhjg.entity;
+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,38 +9,38 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * 受理审批统计表
+ * 智慧养护_综合展示
  *
  * @author wangjian
- * @date 2019-03-26 14:38:10
+ * @date 2019-04-26 11:51:59
  */
 @Data
-@TableName("t_zhjg_lzgl_cxysxkslsptj")
+@TableName("t_zhyh_zhzs")
 @EqualsAndHashCode(callSuper = true)
-public class ZhjgLzglCxysxkslsptj extends Model<ZhjgLzglCxysxkslsptj> {
+public class ZhyhZhzs extends Model<ZhyhZhzs> {
 private static final long serialVersionUID = 1L;
 
   /**
    * 主键
    */
   @TableId
-  private Integer id;
+  private String id;
   /**
-   * 日期
+   * 年份
    */
-  private String rq;
+  private String year;
   /**
-   * 省市
+   * 字段名称
    */
-  private String ss;
+  private String name;
   /**
-   * 受理数目
+   * 数值
    */
-  private Integer slsm;
+  private String value;
   /**
-   * 审批数目
+   * 类别
    */
-  private Integer spsm;
+  private String type;
   /**
    * 创建人
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhZhzsData.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsKeyValue;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsQl;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ZhyhZhzsData {
+    private List<ZhyhZhzsKeyValue> zhyhZhzsQlOne;
+    private List<ZhyhZhzsKeyValue> zhyhZhzsQlTwo;
+    private List<ZhyhZhzsKeyValue> zhyhZhzsQlThree;
+
+    private List<ZhyhZhzsKeyValue> zhyhZhzsSdOne;
+    private List<ZhyhZhzsKeyValue> zhyhZhzsSdTwo;
+    private List<ZhyhZhzsKeyValue> zhyhZhzsSdThree;
+
+    private List<ZhyhZhzsKeyValue> zhyhZhzsOne;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhZhzsKeyValue.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import lombok.Data;
+
+@Data
+public class ZhyhZhzsKeyValue {
+    private String key;
+    private String value;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhZhzsQl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 智慧养护_综合展示_桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-26 15:34:59
+ */
+@Data
+@TableName("t_zhyh_zhzs_ql")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhZhzsQl extends Model<ZhyhZhzsQl> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 年份
+   */
+  private String year;
+  /**
+   * 省市
+   */
+  private String ss;
+  /**
+   * 总计
+   */
+  private Integer zj;
+  /**
+   * 一类
+   */
+  private Integer yl;
+  /**
+   * 二类
+   */
+  private Integer el;
+  /**
+   * 三类
+   */
+  private Integer sl;
+  /**
+   * 四类
+   */
+  private Integer sil;
+  /**
+   * 五类
+   */
+  private Integer wl;
+  /**
+   * 未评定
+   */
+  private Integer wpd;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhZhzsQlData.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ZhyhZhzsQlData {
+    private List<ZhyhZhzsQl> zhyhZhzsQls;
+    private ZhyhZhzsQl zhyhZhzsQl;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhDzxgcglGcjdMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcjd;
+
+/**
+ * 大中修工程管理_工程进度
+ *
+ * @author wangjian
+ * @date 2019-04-28 14:41:27
+ */
+public interface ZhyhDzxgcglGcjdMapper extends BaseMapper<ZhyhDzxgcglGcjd> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhDzxgcglGcxxMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxx;
+
+/**
+ * 智慧养护_大中修工程管理_工程信息
+ *
+ * @author wangjian
+ * @date 2019-04-23 17:00:31
+ */
+public interface ZhyhDzxgcglGcxxMapper extends BaseMapper<ZhyhDzxgcglGcxx> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhDzxgcglJlzfMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglJlzf;
+
+/**
+ * 大中修工程管理_计量支付
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:44:39
+ */
+public interface ZhyhDzxgcglJlzfMapper extends BaseMapper<ZhyhDzxgcglJlzf> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhDzxgcglYsglMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglYsgl;
+
+/**
+ * 大中修工程管理_验收管理
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:10:02
+ */
+public interface ZhyhDzxgcglYsglMapper extends BaseMapper<ZhyhDzxgcglYsgl> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhLkpdMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhLkpd;
+
+/**
+ * 智慧养护_路况评定
+ *
+ * @author wangjian
+ * @date 2019-04-22 17:45:59
+ */
+public interface ZhyhLkpdMapper extends BaseMapper<ZhyhLkpd> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhQldtjgLrbsjhqlMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgLrbsjhql;
+
+/**
+ * 列入部、省计划桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 15:05:42
+ */
+public interface ZhyhQldtjgLrbsjhqlMapper extends BaseMapper<ZhyhQldtjgLrbsjhql> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhQldtjgSjzdjgqlMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgSjzdjgql;
+
+/**
+ * 市局重点监管桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 10:53:58
+ */
+public interface ZhyhQldtjgSjzdjgqlMapper extends BaseMapper<ZhyhQldtjgSjzdjgql> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhSjbbDzxjdybMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhSjbbDzxjdyb;
+
+/**
+ * 智慧养护_数据报表_大中修进度月报
+ *
+ * @author wangjian
+ * @date 2019-04-28 10:34:22
+ */
+public interface ZhyhSjbbDzxjdybMapper extends BaseMapper<ZhyhSjbbDzxjdyb> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhZhzsMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzs;
+
+/**
+ * 智慧养护_综合展示
+ *
+ * @author wangjian
+ * @date 2019-04-26 11:51:59
+ */
+public interface ZhyhZhzsMapper extends BaseMapper<ZhyhZhzs> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhZhzsQlMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsQl;
+
+/**
+ * 智慧养护_综合展示_桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-26 15:34:59
+ */
+public interface ZhyhZhzsQlMapper extends BaseMapper<ZhyhZhzsQl> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhDzxgcglGcjdService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcjd;
+
+/**
+ * 大中修工程管理_工程进度
+ *
+ * @author wangjian
+ * @date 2019-04-28 14:41:27
+ */
+public interface ZhyhDzxgcglGcjdService extends IService<ZhyhDzxgcglGcjd> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhDzxgcglGcxxService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxx;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxxTreeOne;
+
+import java.util.List;
+
+/**
+ * 智慧养护_大中修工程管理_工程信息
+ *
+ * @author wangjian
+ * @date 2019-04-23 17:00:31
+ */
+public interface ZhyhDzxgcglGcxxService extends IService<ZhyhDzxgcglGcxx> {
+    /**
+     * 获取tree树结构
+     * @return
+     */
+    List<ZhyhDzxgcglGcxxTreeOne> getTree();
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhDzxgcglJlzfService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglJlzf;
+
+/**
+ * 大中修工程管理_计量支付
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:44:39
+ */
+public interface ZhyhDzxgcglJlzfService extends IService<ZhyhDzxgcglJlzf> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhDzxgcglYsglService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglYsgl;
+
+/**
+ * 大中修工程管理_验收管理
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:10:02
+ */
+public interface ZhyhDzxgcglYsglService extends IService<ZhyhDzxgcglYsgl> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhLkpdService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhLkpd;
+
+/**
+ * 智慧养护_路况评定
+ *
+ * @author wangjian
+ * @date 2019-04-22 17:45:59
+ */
+public interface ZhyhLkpdService extends IService<ZhyhLkpd> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhQldtjgLrbsjhqlService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgLrbsjhql;
+
+/**
+ * 列入部、省计划桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 15:05:42
+ */
+public interface ZhyhQldtjgLrbsjhqlService extends IService<ZhyhQldtjgLrbsjhql> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhQldtjgSjzdjgqlService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgSjzdjgql;
+
+/**
+ * 市局重点监管桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 10:53:58
+ */
+public interface ZhyhQldtjgSjzdjgqlService extends IService<ZhyhQldtjgSjzdjgql> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhSjbbDzxjdybService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhSjbbDzxjdyb;
+
+/**
+ * 智慧养护_数据报表_大中修进度月报
+ *
+ * @author wangjian
+ * @date 2019-04-28 10:34:22
+ */
+public interface ZhyhSjbbDzxjdybService extends IService<ZhyhSjbbDzxjdyb> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhZhzsQlService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsQl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsQlData;
+
+import java.util.List;
+
+/**
+ * 智慧养护_综合展示_桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-26 15:34:59
+ */
+public interface ZhyhZhzsQlService extends IService<ZhyhZhzsQl> {
+
+    /**
+     * 获取综合展示桥梁信息
+     * @param year
+     * @return
+     */
+    ZhyhZhzsQlData getZhyhZhzsQlDataByYear(String year);
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhZhzsService.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzs;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsData;
+
+/**
+ * 智慧养护_综合展示
+ *
+ * @author wangjian
+ * @date 2019-04-26 11:51:59
+ */
+public interface ZhyhZhzsService extends IService<ZhyhZhzs> {
+
+    /**
+     * 智慧养护综合展示根据年份进行数据查询
+     * @param year 年份
+     * @return
+     */
+    public ZhyhZhzsData getZhyhZhzsData(String year);
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhDzxgcglGcjdServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcjd;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhDzxgcglGcjdMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhDzxgcglGcjdService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 大中修工程管理_工程进度
+ *
+ * @author wangjian
+ * @date 2019-04-28 14:41:27
+ */
+@Service
+public class ZhyhDzxgcglGcjdServiceImpl extends ServiceImpl<ZhyhDzxgcglGcjdMapper, ZhyhDzxgcglGcjd> implements ZhyhDzxgcglGcjdService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhDzxgcglGcxxServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxk;
+import com.elephant.framework.galaxy.aroad.module.zhjg.mapper.ZhjgLzglCxysxkMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxx;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxxTreeOne;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxxTreeTwo;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhDzxgcglGcxxMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhDzxgcglGcxxService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.sql.Wrapper;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 智慧养护_大中修工程管理_工程信息
+ *
+ * @author wangjian
+ * @date 2019-04-23 17:00:31
+ */
+@Service
+@AllArgsConstructor
+public class ZhyhDzxgcglGcxxServiceImpl extends ServiceImpl<ZhyhDzxgcglGcxxMapper, ZhyhDzxgcglGcxx> implements ZhyhDzxgcglGcxxService {
+    private final ZhyhDzxgcglGcxxMapper zhyhDzxgcglGcxxMapper;
+
+
+    /**
+     * 获取tree树结构
+     * @return
+     */
+    public List<ZhyhDzxgcglGcxxTreeOne> getTree() {
+        List<ZhyhDzxgcglGcxxTreeOne> zhyhDzxgcglGcxxTreeOnes = getTreeGydwNameGroupBy();
+
+        List<ZhyhDzxgcglGcxx> zhyhDzxgcglGcxxes = zhyhDzxgcglGcxxMapper.selectList(Wrappers.<ZhyhDzxgcglGcxx>query());
+
+        for(ZhyhDzxgcglGcxx zhyhDzxgcglGcxx : zhyhDzxgcglGcxxes) {
+
+            for(ZhyhDzxgcglGcxxTreeOne zhyhDzxgcglGcxxTreeOne: zhyhDzxgcglGcxxTreeOnes) {
+
+                if(zhyhDzxgcglGcxx.getGydw().equals(zhyhDzxgcglGcxxTreeOne.getLabel())) {
+                    ZhyhDzxgcglGcxxTreeTwo zhyhDzxgcglGcxxTreeTwo = new ZhyhDzxgcglGcxxTreeTwo();
+                    zhyhDzxgcglGcxxTreeTwo.setId(zhyhDzxgcglGcxx.getId());
+                    zhyhDzxgcglGcxxTreeTwo.setLabel(zhyhDzxgcglGcxx.getGcmc());
+                    zhyhDzxgcglGcxxTreeOne.getChildren().add(zhyhDzxgcglGcxxTreeTwo);
+                    break;
+                }
+            }
+        }
+        return zhyhDzxgcglGcxxTreeOnes;
+    }
+
+    //获取tree树结构
+    public List<ZhyhDzxgcglGcxxTreeOne> getTreeGydwNameGroupBy() {
+        List<ZhyhDzxgcglGcxx> zhyhDzxgcglGcxxs = zhyhDzxgcglGcxxMapper.selectList(Wrappers.<ZhyhDzxgcglGcxx>query().groupBy("gydw"));
+        List<ZhyhDzxgcglGcxxTreeOne> zhyhDzxgcglGcxxTreeOnes = new ArrayList<ZhyhDzxgcglGcxxTreeOne>();
+        for(ZhyhDzxgcglGcxx zhyhDzxgcglGcxx : zhyhDzxgcglGcxxs) {
+            ZhyhDzxgcglGcxxTreeOne zhyhDzxgcglGcxxTreeOne = new ZhyhDzxgcglGcxxTreeOne();
+            List<ZhyhDzxgcglGcxxTreeTwo> children = new ArrayList<ZhyhDzxgcglGcxxTreeTwo>();
+            zhyhDzxgcglGcxxTreeOne.setLabel(zhyhDzxgcglGcxx.getGydw());
+            zhyhDzxgcglGcxxTreeOne.setChildren(children);
+            zhyhDzxgcglGcxxTreeOnes.add(zhyhDzxgcglGcxxTreeOne);
+        }
+        return zhyhDzxgcglGcxxTreeOnes;
+    }
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhDzxgcglJlzfServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglJlzf;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhDzxgcglJlzfMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhDzxgcglJlzfService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 大中修工程管理_计量支付
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:44:39
+ */
+@Service
+public class ZhyhDzxgcglJlzfServiceImpl extends ServiceImpl<ZhyhDzxgcglJlzfMapper, ZhyhDzxgcglJlzf> implements ZhyhDzxgcglJlzfService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhDzxgcglYsglServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglYsgl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhDzxgcglYsglMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhDzxgcglYsglService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 大中修工程管理_验收管理
+ *
+ * @author wangjian
+ * @date 2019-04-22 16:10:02
+ */
+@Service
+public class ZhyhDzxgcglYsglServiceImpl extends ServiceImpl<ZhyhDzxgcglYsglMapper, ZhyhDzxgcglYsgl> implements ZhyhDzxgcglYsglService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhLkpdServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhLkpd;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhLkpdMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhLkpdService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 智慧养护_路况评定
+ *
+ * @author wangjian
+ * @date 2019-04-22 17:45:59
+ */
+@Service
+public class ZhyhLkpdServiceImpl extends ServiceImpl<ZhyhLkpdMapper, ZhyhLkpd> implements ZhyhLkpdService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhQldtjgLrbsjhqlServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgLrbsjhql;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhQldtjgLrbsjhqlMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhQldtjgLrbsjhqlService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 列入部、省计划桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 15:05:42
+ */
+@Service
+public class ZhyhQldtjgLrbsjhqlServiceImpl extends ServiceImpl<ZhyhQldtjgLrbsjhqlMapper, ZhyhQldtjgLrbsjhql> implements ZhyhQldtjgLrbsjhqlService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhQldtjgSjzdjgqlServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgSjzdjgql;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhQldtjgSjzdjgqlMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhQldtjgSjzdjgqlService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 市局重点监管桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-22 10:53:58
+ */
+@Service
+public class ZhyhQldtjgSjzdjgqlServiceImpl extends ServiceImpl<ZhyhQldtjgSjzdjgqlMapper, ZhyhQldtjgSjzdjgql> implements ZhyhQldtjgSjzdjgqlService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhSjbbDzxjdybServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhSjbbDzxjdyb;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhSjbbDzxjdybMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhSjbbDzxjdybService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 智慧养护_数据报表_大中修进度月报
+ *
+ * @author wangjian
+ * @date 2019-04-28 10:34:22
+ */
+@Service
+public class ZhyhSjbbDzxjdybServiceImpl extends ServiceImpl<ZhyhSjbbDzxjdybMapper, ZhyhSjbbDzxjdyb> implements ZhyhSjbbDzxjdybService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhZhzsQlServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsQl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsQlData;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhZhzsQlMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhZhzsQlService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 智慧养护_综合展示_桥梁
+ *
+ * @author wangjian
+ * @date 2019-04-26 15:34:59
+ */
+@Service
+@AllArgsConstructor
+public class ZhyhZhzsQlServiceImpl extends ServiceImpl<ZhyhZhzsQlMapper, ZhyhZhzsQl> implements ZhyhZhzsQlService {
+
+    private final ZhyhZhzsQlMapper zhyhZhzsQlMapper;
+
+    /**
+     * 获取综合展示桥梁信息
+     * @param year
+     * @return
+     */
+    public ZhyhZhzsQlData getZhyhZhzsQlDataByYear(String year) {
+        ZhyhZhzsQlData zhyhZhzsQlData = new ZhyhZhzsQlData();
+
+        zhyhZhzsQlData.setZhyhZhzsQl(getZhyhZhzsQlByYearTotle(year));
+        zhyhZhzsQlData.setZhyhZhzsQls(getZhyhZhzsQlByYear(year));
+
+        return zhyhZhzsQlData;
+    }
+
+    /**
+     * 获取饼状图
+     * @param year
+     * @return
+     */
+    public List<ZhyhZhzsQl> getZhyhZhzsQlByYear(String year) {
+        List<ZhyhZhzsQl> zhyhZhzsQls = new ArrayList<>();
+        zhyhZhzsQls = zhyhZhzsQlMapper.selectList(Wrappers.<ZhyhZhzsQl>query().lambda().ne(ZhyhZhzsQl::getSs,"总计").eq(ZhyhZhzsQl::getYear,year));
+        return zhyhZhzsQls;
+    }
+
+    /**
+     * 获取柱状图
+     * @param year
+     * @return
+     */
+    public ZhyhZhzsQl getZhyhZhzsQlByYearTotle(String year) {
+        ZhyhZhzsQl zhyhZhzsQl = new ZhyhZhzsQl();
+        zhyhZhzsQl = zhyhZhzsQlMapper.selectOne(Wrappers.<ZhyhZhzsQl>query().lambda().eq(ZhyhZhzsQl::getYear,year).eq(ZhyhZhzsQl::getSs,"总计"));
+        return zhyhZhzsQl;
+    }
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhZhzsServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzs;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsData;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsKeyValue;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhZhzsMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhZhzsService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 智慧养护_综合展示
+ *
+ * @author wangjian
+ * @date 2019-04-26 11:51:59
+ */
+@Service
+@AllArgsConstructor
+public class ZhyhZhzsServiceImpl extends ServiceImpl<ZhyhZhzsMapper, ZhyhZhzs> implements ZhyhZhzsService {
+
+    private final ZhyhZhzsMapper zhyhZhzsMapper;
+
+    /**
+     * 智慧养护综合展示根据年份进行数据查询
+     * @param year 年份
+     * @return
+     */
+    public ZhyhZhzsData getZhyhZhzsData(String year) {
+
+        ZhyhZhzsData zhyhZhzsData = new ZhyhZhzsData();
+        zhyhZhzsData.setZhyhZhzsQlOne(getZhyhZhzsQlListByYear("ql1",year));
+        zhyhZhzsData.setZhyhZhzsQlTwo(getZhyhZhzsQlListByYear("ql2",year));
+        zhyhZhzsData.setZhyhZhzsQlThree(getZhyhZhzsQlListByYear("ql3",year));
+
+        zhyhZhzsData.setZhyhZhzsSdOne(getZhyhZhzsQlListByYear("sd1",year));
+        zhyhZhzsData.setZhyhZhzsSdTwo(getZhyhZhzsQlListByYear("sd2",year));
+        zhyhZhzsData.setZhyhZhzsSdThree(getZhyhZhzsQlListByYear("sd3",year));
+
+
+        zhyhZhzsData.setZhyhZhzsOne(getZhyhZhzsQlListByYear("one",year));
+
+        return zhyhZhzsData;
+    }
+
+    public List<ZhyhZhzsKeyValue> getZhyhZhzsQlListByYear(String type, String year) {
+        List<ZhyhZhzsKeyValue> zhyhZhzsKeyValues = new ArrayList<ZhyhZhzsKeyValue>();
+        List<ZhyhZhzs> zhyhZhzss = zhyhZhzsMapper.selectList(Wrappers.<ZhyhZhzs>query().lambda().eq(ZhyhZhzs::getType,type).eq(ZhyhZhzs::getYear,year));
+        for(ZhyhZhzs zhyhZhzs : zhyhZhzss) {
+            ZhyhZhzsKeyValue zhyhZhzsKeyValue = new ZhyhZhzsKeyValue();
+            zhyhZhzsKeyValue.setKey(zhyhZhzs.getName());
+            zhyhZhzsKeyValue.setValue(zhyhZhzs.getValue());
+            zhyhZhzsKeyValues.add(zhyhZhzsKeyValue);
+        }
+        return zhyhZhzsKeyValues;
+    }
+
+
+
+}

src/main/resources/mapper/zhjc/ZhjcGljcQsgdsxmqkMapper.xml

@@ -7,7 +7,7 @@
   <resultMap id="zhjcGljcQsgdsxmqkMap" type="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGljcQsgdsxmqk">
         <id property="id" column="id"/>
         <result property="ds" column="ds"/>
-        <result property="hj" column="hj"/>
+        <result property="nd" column="nd"/>
         <result property="bntchj" column="bntchj"/>
         <result property="xxbywctz" column="xxbywctz"/>
         <result property="yfbntz" column="yfbntz"/>

src/main/resources/mapper/zhjg/ZhjgLzglCxysxkMapper.xml

@@ -31,4 +31,39 @@
         <result property="status" column="status"/>
         <result property="ifks" column="ifks"/>
   </resultMap>
+      <select id="selectCxysXkgsByCurrentDate" resultMap="zhjgLzglCxysxkMap">
+            select *
+            from t_zhjg_lzgl_cxysxk
+            <where>
+              <if test="startDate!=null">
+                    str_to_date(substring_index(txsj,'-', 1), '%Y年%m月%e日')&gt;=#{startDate}
+              </if>
+              <if test="endDate!=null">
+                    and str_to_date(substring_index(txsj,'-', -1), '%Y年%m月%e日')&lt;=#{endDate}
+              </if>
+              <if test="cph!=null">
+                  and cph like CONCAT('%',#{cph}, '%')
+              </if>
+                <if test="xkdh!=null">
+                    and xkdh like CONCAT('%',#{xkdh}, '%')
+                </if>
+                and ifks=2
+            </where>
+      </select>
+
+    <select id="selectCountKsFzSpByDate" resultType="Integer">
+        select count(*) from t_zhjg_lzgl_cxysxk
+        <where>
+            <if test="xkdh">
+                TRIM(xkdh) like CONCAT('',#{xkdh},'%')
+            </if>
+            <if test="startDate">
+                and rq &gt;= #{startDate}
+            </if>
+            <if test="endDate">
+                and rq &lt;= #{endDate}
+            </if>
+            and ifks=1
+        </where>
+    </select>
 </mapper>

src/main/resources/mapper/zhjs/ZhjsGchtandgcxmVMapper.xml

@@ -15,5 +15,6 @@
         <result property="conamount" column="conamount"/>
         <result property="filelist" column="fileList"/>
         <result property="proname" column="proname"/>
+        <result property="gcxmid" column="gcxmid"/>
   </resultMap>
 </mapper>

src/main/resources/mapper/zhtj/ZhtjGljsdjqkMapper.xml

@@ -27,4 +27,12 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+
+      <select id="getZhyhZhzsGlOne" resultType="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhZhzsKeyValue">
+            select type as `key`,total as `value`
+            from t_zhtj_gllmqk
+            <where>
+                  area='合计' and year=#{year} and (type="国道" or type="省道")
+            </where>
+      </select>
 </mapper>

src/main/resources/mapper/zhjg/ZhjgLzglCxysxkslsptjMapper.xml → src/main/resources/mapper/zhyh/ZhyhDzxgcglGcjdMapper.xml

@@ -2,13 +2,24 @@
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhjg.mapper.ZhjgLzglCxysxkslsptjMapper">
+<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhDzxgcglGcjdMapper">
 
-  <resultMap id="zhjgLzglCxysxkslsptjMap" type="com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgLzglCxysxkslsptj">
+  <resultMap id="zhyhDzxgcglGcjdMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcjd">
         <id property="id" column="id"/>
-        <result property="ss" column="ss"/>
-        <result property="slsm" column="slsm"/>
-        <result property="spsm" column="spsm"/>
+        <result property="ny" column="ny"/>
+        <result property="xxjd" column="xxjd"/>
+        <result property="gydw" column="gydw"/>
+        <result property="gcmc" column="gcmc"/>
+        <result property="szyztz" column="szyztz"/>
+        <result property="ntz" column="ntz"/>
+        <result property="gcby" column="gcby"/>
+        <result property="gcbn" column="gcbn"/>
+        <result property="gckg" column="gckg"/>
+        <result property="gcbfb" column="gcbfb"/>
+        <result property="jlbn" column="jlbn"/>
+        <result property="jlkg" column="jlkg"/>
+        <result property="jlbfb" column="jlbfb"/>
+        <result property="bz" column="bz"/>
         <result property="creator" column="creator"/>
         <result property="createTime" column="create_time"/>
         <result property="updatePerson" column="update_person"/>
@@ -16,5 +27,6 @@
         <result property="status" column="status"/>
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
+        <result property="gclx" column="gclx"/>
   </resultMap>
 </mapper>

src/main/resources/mapper/zhyh/ZhyhDzxgcglGcxxMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhDzxgcglGcxxMapper">
+
+  <resultMap id="zhyhDzxgcglGcxxMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxx">
+        <id property="id" column="id"/>
+        <result property="gcmc" column="gcmc"/>
+        <result property="gclx" column="gclx"/>
+        <result property="htmc" column="htmc"/>
+        <result property="gydw" column="gydw"/>
+        <result property="gcksrq" column="gcksrq"/>
+        <result property="gcjsrq" column="gcjsrq"/>
+        <result property="zbksrq" column="zbksrq"/>
+        <result property="zbjsrq" column="zbjsrq"/>
+        <result property="zbdw" column="zbdw"/>
+        <result property="jldw" column="jldw"/>
+        <result property="lxbh" column="lxbh"/>
+        <result property="xsfx" column="xsfx"/>
+        <result property="wzms" column="wzms"/>
+        <result property="gcqdzh" column="gcqdzh"/>
+        <result property="gcjszh" column="gcjszh"/>
+        <result property="lrr" column="lrr"/>
+        <result property="lrsj" column="lrsj"/>
+        <result property="dtzb" column="dtzb"/>
+        <result property="bz" column="bz"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/zhyh/ZhyhDzxgcglJlzfMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhDzxgcglJlzfMapper">
+
+  <resultMap id="zhyhDzxgcglJlzfMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglJlzf">
+        <id property="id" column="id"/>
+        <result property="jlbh" column="jlbh"/>
+        <result property="zfsm" column="zfsm"/>
+        <result property="zfly" column="zfly"/>
+        <result property="bgje" column="bgje"/>
+        <result property="zkje" column="zkje"/>
+        <result property="sjzfje" column="sjzfje"/>
+        <result property="bcsjzfje" column="bcsjzfje"/>
+        <result property="khyh" column="khyh"/>
+        <result property="sqdwmc" column="sqdwmc"/>
+        <result property="ssgc" column="ssgc"/>
+        <result property="sqrq" column="sqrq"/>
+        <result property="hbdw" column="hbdw"/>
+        <result property="hdzfje" column="hdzfje"/>
+        <result property="qtkk" column="qtkk"/>
+        <result property="bchdzfje" column="bchdzfje"/>
+        <result property="qkdwkhmc" column="qkdwkhmc"/>
+        <result property="zh" column="zh"/>
+        <result property="sqdwfzr" column="sqdwfzr"/>
+        <result property="czzt" column="czzt"/>
+        <result property="bz" column="bz"/>
+        <result property="fjid" column="fjId"/>
+        <result property="fjxx" column="fjxx"/>
+        <result property="shlc" column="shlc"/>
+        <result property="lslc" column="lslc"/>
+        <result property="sbyj" column="sbyj"/>
+        <result property="chyj" column="chyj"/>
+        <result property="pfyj" column="pfyj"/>
+        <result property="ssht" column="ssht"/>
+        <result property="gclxmc" column="gclxmc"/>
+        <result property="gclxbh" column="gclxbh"/>
+        <result property="lczt" column="lczt"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/zhyh/ZhyhDzxgcglYsglMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhDzxgcglYsglMapper">
+
+  <resultMap id="zhyhDzxgcglYsglMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglYsgl">
+        <id property="id" column="id"/>
+        <result property="ssht" column="ssht"/>
+        <result property="gclxbm" column="gclxbm"/>
+        <result property="gclxmc" column="gclxmc"/>
+        <result property="gydw" column="gydw"/>
+        <result property="jldb" column="jldb"/>
+        <result property="ysqk" column="ysqk"/>
+        <result property="aqqk" column="aqqk"/>
+        <result property="ysr" column="ysr"/>
+        <result property="sgdwpf" column="sgdwpf"/>
+        <result property="sgdwpj" column="sgdwpj"/>
+        <result property="ysrq" column="ysrq"/>
+        <result property="bz" column="bz"/>
+        <result property="fjid" column="fjId"/>
+        <result property="fjxx" column="fjxx"/>
+        <result property="ssgc" column="ssgc"/>
+        <result property="zlqk" column="zlqk"/>
+        <result property="yssfhg" column="yssfhg"/>
+        <result property="ysdw" column="ysdw"/>
+        <result property="jldwpf" column="jldwpf"/>
+        <result property="jldwpj" column="jldwpj"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/zhyh/ZhyhLkpdMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhLkpdMapper">
+
+  <resultMap id="zhyhLkpdMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhLkpd">
+        <id property="id" column="id"/>
+        <result property="lxmc" column="lxmc"/>
+        <result property="xzqh" column="xzqh"/>
+        <result property="ygdw" column="ygdw"/>
+        <result property="cdlx" column="cdlx"/>
+        <result property="xsfx" column="xsfx"/>
+        <result property="qdzh" column="qdzh"/>
+        <result property="zdzh" column="zdzh"/>
+        <result property="pdcd" column="pdcd"/>
+        <result property="pdmqi" column="pdmqi"/>
+        <result property="pdpqi" column="pdpqi"/>
+        <result property="pdpci" column="pdpci"/>
+        <result property="pdrdi" column="pdrdi"/>
+        <result property="pdsri" column="pdsri"/>
+        <result property="pdpsst" column="pdpsst"/>
+        <result property="ljsci" column="ljsci"/>
+        <result property="qsbct" column="qsbct"/>
+        <result property="sstci" column="sstci"/>
+        <result property="pdrqi" column="pdrqi"/>
+        <result property="pdsj" column="pdsj"/>
+        <result property="ldbm" column="ldbm"/>
+        <result property="lxbm" column="lxbm"/>
+        <result property="jsdj" column="jsdj"/>
+        <result property="lmlx" column="lmlx"/>
+        <result property="mqipdjg" column="mqipdjg"/>
+        <result property="pqipdjg" column="pqipdjg"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+        <result property="dj" column="dj"/>
+        <result property="lxlx" column="lxlx"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/zhyh/ZhyhQldtjgLrbsjhqlMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhQldtjgLrbsjhqlMapper">
+
+  <resultMap id="zhyhQldtjgLrbsjhqlMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgLrbsjhql">
+        <id property="id" column="id"/>
+        <result property="jgdw" column="jgdw"/>
+        <result property="qlmc" column="qlmc"/>
+        <result property="lxbh" column="lxbh"/>
+        <result property="qk" column="qk"/>
+        <result property="jg" column="jg"/>
+        <result property="ql" column="ql"/>
+        <result property="jsdj" column="jsdj"/>
+        <result property="kgsj" column="kgsj"/>
+        <result property="gcjd" column="gcjd"/>
+        <result property="jgsj" column="jgsj"/>
+        <result property="zynr" column="zynr"/>
+        <result property="ywctz" column="ywctz"/>
+        <result property="sfapgcgz" column="sfapgcgz"/>
+        <result property="sjsfsp" column="sjsfsp"/>
+        <result property="jhnf" column="jhnf"/>
+        <result property="jhwh" column="jhwh"/>
+        <result property="dlqk" column="dlqk"/>
+        <result property="zsqk" column="zsqk"/>
+        <result property="xmwkgyy" column="xmwkgyy"/>
+        <result property="bz" column="bz"/>
+        <result property="tpid" column="tpid"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/zhyh/ZhyhQldtjgSjzdjgqlMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhQldtjgSjzdjgqlMapper">
+
+  <resultMap id="zhyhQldtjgSjzdjgqlMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhQldtjgSjzdjgql">
+        <id property="id" column="id"/>
+        <result property="jgdw" column="jgdw"/>
+        <result property="qlmc" column="qlmc"/>
+        <result property="lxbh" column="lxbh"/>
+        <result property="qk" column="qk"/>
+        <result property="jg" column="jg"/>
+        <result property="ql" column="ql"/>
+        <result property="jsdj" column="jsdj"/>
+        <result property="kgsj" column="kgsj"/>
+        <result property="gcjd" column="gcjd"/>
+        <result property="jgsj" column="jgsj"/>
+        <result property="zynr" column="zynr"/>
+        <result property="ywctz" column="ywctz"/>
+        <result property="sfapgcgz" column="sfapgcgz"/>
+        <result property="sjsfsp" column="sjsfsp"/>
+        <result property="jhnf" column="jhnf"/>
+        <result property="jhwh" column="jhwh"/>
+        <result property="dlqk" column="dlqk"/>
+        <result property="zsqk" column="zsqk"/>
+        <result property="xmwkgyy" column="xmwkgyy"/>
+        <result property="bz" column="bz"/>
+        <result property="tpid" column="tpid"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/zhyh/ZhyhSjbbDzxjdybMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhSjbbDzxjdybMapper">
+
+  <resultMap id="zhyhSjbbDzxjdybMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhSjbbDzxjdyb">
+        <id property="id" column="id"/>
+        <result property="dsmc" column="dsmc"/>
+        <result property="sj" column="sj"/>
+        <result property="sczsjzyztz" column="sczsjzyztz"/>
+        <result property="sczntz" column="sczntz"/>
+        <result property="sczbbywc" column="sczbbywc"/>
+        <result property="sczbnljwc" column="sczbnljwc"/>
+        <result property="sczzkgljwc" column="sczzkgljwc"/>
+        <result property="sczbnljwczntzdbfb" column="sczbnljwczntzdbfb"/>
+        <result property="sczbnljjlzf" column="sczbnljjlzf"/>
+        <result property="sczzkgljjlzf" column="sczzkgljjlzf"/>
+        <result property="sczbnljjlzfbfb" column="sczbnljjlzfbfb"/>
+        <result property="scazztz" column="scazztz"/>
+        <result property="scazntz" column="scazntz"/>
+        <result property="scazbbywc" column="scazbbywc"/>
+        <result property="scazbnljwc" column="scazbnljwc"/>
+        <result property="scazzkgljwc" column="scazzkgljwc"/>
+        <result property="scazbnljbfb" column="scazbnljbfb"/>
+        <result property="scazbnljjlzf" column="scazbnljjlzf"/>
+        <result property="scazzkgjlzf" column="scazzkgjlzf"/>
+        <result property="scazbnjlzfbfb" column="scazbnjlzfbfb"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+        <result property="sort" column="sort"/>
+  </resultMap>
+</mapper>