智慧公路智慧决策规划项目代码提交

src/main/java/com/elephant/framework/galaxy/aroad/module/info/controller/InfoInformationsController.java

@@ -2,11 +2,13 @@ package com.elephant.framework.galaxy.aroad.module.info.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.info.dto.InfoInformationsDto;
 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.info.entity.InfoInformations;
 import com.elephant.framework.galaxy.aroad.module.info.service.InfoInformationsService;
 import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
@@ -46,27 +48,19 @@ public class InfoInformationsController extends BaseController  {
     return new R<>(infoInformationsService.getById(infoId));
   }
 
+
   /** 
-   * 新增信息表
-   * @param infoInformations 信息表
-   * @return R
+  * @Description: 新增上报信息 
+  * @Param: [info] 
+  * @return: com.elephant.framework.galaxy.aroad.response.R 
+  * @Author: songwenjie 
+  * @Date: 2019/5/5 
   */ 
-  @SysLog("新增信息表")
   @PostMapping
-  public R save(@RequestBody InfoInformations infoInformations){
-    return new R<>(infoInformationsService.save(infoInformations));
+  public R saveInformations(@RequestBody InfoInformationsDto info){
+    return new R<>(infoInformationsService.saveInformations(info));
   }
 
-  /**
-   * 修改信息表
-   * @param infoInformations 信息表
-   * @return R
-   */
-  @SysLog("修改信息表")
-  @PutMapping
-  public R updateById(@RequestBody InfoInformations infoInformations){
-    return new R<>(infoInformationsService.updateById(infoInformations));
-  }
 
   /**
    * 通过id删除信息表

src/main/java/com/elephant/framework/galaxy/aroad/module/info/controller/InfoReceiversController.java

+package com.elephant.framework.galaxy.aroad.module.info.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.info.entity.InfoReceivers;
+import com.elephant.framework.galaxy.aroad.module.info.service.InfoReceiversService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 信息接收人表
+ *
+ * @author songwenjie
+ * @date 2019-05-05 09:46:46
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/inforeceivers")
+public class InfoReceiversController extends BaseController  {
+
+  private final  InfoReceiversService infoReceiversService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param infoReceivers 信息接收人表
+   * @return
+   */
+  @GetMapping("/page")
+  public R getInfoReceiversPage(Page page, InfoReceivers infoReceivers) {
+    return  new R<>(infoReceiversService.page(page,Wrappers.query(infoReceivers)));
+  }
+
+
+  /**
+   * 通过id查询信息接收人表
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") Integer id){
+    return new R<>(infoReceiversService.getById(id));
+  }
+
+  /**
+   * 新增信息接收人表
+   * @param infoReceivers 信息接收人表
+   * @return R
+   */
+  @SysLog("新增信息接收人表")
+  @PostMapping
+  public R save(@RequestBody InfoReceivers infoReceivers){
+    return new R<>(infoReceiversService.save(infoReceivers));
+  }
+
+  /**
+   * 修改信息接收人表
+   * @param infoReceivers 信息接收人表
+   * @return R
+   */
+  @SysLog("修改信息接收人表")
+  @PutMapping
+  public R updateById(@RequestBody InfoReceivers infoReceivers){
+    return new R<>(infoReceiversService.updateById(infoReceivers));
+  }
+
+  /**
+   * 通过id删除信息接收人表
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除信息接收人表")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable Integer id){
+    return new R<>(infoReceiversService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/info/dto/InfoInformationsDto.java

+package com.elephant.framework.galaxy.aroad.module.info.dto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program:
+ * @description:
+ * @author: songwenjie
+ * @create: 2019-05-05 09:16
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfoInformationsDto implements Serializable {
+    /**
+     * 模板id
+     */
+    private Integer templateId;
+    /**
+     * 信息标题
+     */
+    private String infoTitle;
+    /**
+     * 信息内容
+     */
+    private String infoContent;
+    /**
+     * 信息备注
+     */
+    private String infoRemark;
+    /**
+     * 发布人id
+     */
+    private Integer reporterId;
+    /**
+     * 上报时间
+     */
+    private Date reportingTime;
+    /**
+     * 接收部门id
+     */
+    private Integer deptId;
+    /**
+     * 接收人ids
+     */
+    private List<Integer> receiverIds;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/info/entity/InfoInformations.java

 package com.elephant.framework.galaxy.aroad.module.info.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 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 lombok.*;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 信息表
@@ -15,15 +17,18 @@ import java.time.LocalDateTime;
  * @date 2019-04-28 10:34:46
  */
 @Data
+@Builder
 @TableName("info_informations")
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
 public class InfoInformations extends Model<InfoInformations> {
 private static final long serialVersionUID = 1L;
 
   /**
    * 信息id
    */
-  @TableId
+  @TableId(type = IdType.AUTO)
   private Integer infoId;
   /**
    * 模板id
@@ -48,6 +53,6 @@ private static final long serialVersionUID = 1L;
   /**
    * 上报时间
    */
-  private LocalDateTime reportingTime;
+  private Date reportingTime;
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/info/entity/InfoReceivers.java

+package com.elephant.framework.galaxy.aroad.module.info.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 信息接收人表
+ *
+ * @author songwenjie
+ * @date 2019-05-05 09:46:46
+ */
+@Data
+@Builder
+@TableName("info_receivers")
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class InfoReceivers extends Model<InfoReceivers> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId(type = IdType.AUTO)
+  private Integer id;
+  /**
+   * 信息id
+   */
+  private Integer infoId;
+  /**
+   * 接收部门id
+   */
+  private Integer deptId;
+  /**
+   * 接收人id
+   */
+  private Integer receiverId;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/info/mapper/InfoInformationsMapper.java

@@ -10,5 +10,12 @@ import com.elephant.framework.galaxy.aroad.module.info.entity.InfoInformations;
  * @date 2019-04-28 10:34:46
  */
 public interface InfoInformationsMapper extends BaseMapper<InfoInformations> {
-
+    /** 
+    * @Description: 新增上报信息 
+    * @Param: [informations] 
+    * @return: java.lang.Boolean 
+    * @Author: songwenjie 
+    * @Date: 2019/5/5 
+    */ 
+    Boolean saveInformations(InfoInformations informations);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/info/mapper/InfoReceiversMapper.java

+package com.elephant.framework.galaxy.aroad.module.info.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.info.entity.InfoReceivers;
+
+/**
+ * 信息接收人表
+ *
+ * @author songwenjie
+ * @date 2019-05-05 09:46:46
+ */
+public interface InfoReceiversMapper extends BaseMapper<InfoReceivers> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/InfoInformationsService.java

 package com.elephant.framework.galaxy.aroad.module.info.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.info.dto.InfoInformationsDto;
 import com.elephant.framework.galaxy.aroad.module.info.entity.InfoInformations;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 信息表
@@ -11,4 +13,12 @@ import com.elephant.framework.galaxy.aroad.module.info.entity.InfoInformations;
  */
 public interface InfoInformationsService extends IService<InfoInformations> {
 
+    /** 
+    * @Description: 新增上报信息 
+    * @Param: [info] 
+    * @return: java.lang.Boolean 
+    * @Author: songwenjie 
+    * @Date: 2019/5/5 
+    */ 
+    Boolean saveInformations(InfoInformationsDto info);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/InfoReceiversService.java

+package com.elephant.framework.galaxy.aroad.module.info.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.info.entity.InfoReceivers;
+
+/**
+ * 信息接收人表
+ *
+ * @author songwenjie
+ * @date 2019-05-05 09:46:46
+ */
+public interface InfoReceiversService extends IService<InfoReceivers> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/impl/InfoInformationsServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.info.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.info.dto.InfoInformationsDto;
 import com.elephant.framework.galaxy.aroad.module.info.entity.InfoInformations;
+import com.elephant.framework.galaxy.aroad.module.info.entity.InfoReceivers;
 import com.elephant.framework.galaxy.aroad.module.info.mapper.InfoInformationsMapper;
 import com.elephant.framework.galaxy.aroad.module.info.service.InfoInformationsService;
+import com.elephant.framework.galaxy.aroad.module.info.service.InfoReceiversService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 信息表
@@ -15,4 +23,36 @@ import org.springframework.stereotype.Service;
 @Service
 public class InfoInformationsServiceImpl extends ServiceImpl<InfoInformationsMapper, InfoInformations> implements InfoInformationsService {
 
+    @Autowired
+    private InfoReceiversService infoReceiversService;
+
+    /** 
+    * @Description: 新增上报信息
+    * @Param: [info] 
+    * @return: java.lang.Boolean 
+    * @Author: songwenjie 
+    * @Date: 2019/5/5 
+    */ 
+    @Transactional
+    public Boolean saveInformations(InfoInformationsDto info){
+        InfoInformations information = InfoInformations.builder()
+                .templateId(info.getTemplateId())
+                .infoTitle(info.getInfoTitle())
+                .infoContent(info.getInfoContent())
+                .infoRemark(info.getInfoRemark())
+                .reporterId(info.getReporterId())
+                .reportingTime(info.getReportingTime())
+                .build();
+        baseMapper.saveInformations(information);
+
+        List<InfoReceivers> receivers = new ArrayList<>();
+        info.getReceiverIds().forEach(r->{
+            receivers.add(InfoReceivers.builder()
+                    .infoId(information.getInfoId())
+                    .deptId(info.getDeptId())
+                    .receiverId(r)
+                    .build());
+        });
+        return infoReceiversService.saveBatch(receivers);
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/impl/InfoReceiversServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.info.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.info.entity.InfoReceivers;
+import com.elephant.framework.galaxy.aroad.module.info.mapper.InfoReceiversMapper;
+import com.elephant.framework.galaxy.aroad.module.info.service.InfoReceiversService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 信息接收人表
+ *
+ * @author songwenjie
+ * @date 2019-05-05 09:46:46
+ */
+@Service
+public class InfoReceiversServiceImpl extends ServiceImpl<InfoReceiversMapper, InfoReceivers> implements InfoReceiversService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcGhjhGhxmController.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.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.zhjc.entity.ZhjcGhjhGhxm;
+import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhGhxmService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 智慧决策—项目决策-规划项目
+ *
+ * @author wangjian
+ * @date 2019-05-05 16:10:42
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhjc/GhjhGhxm")
+public class ZhjcGhjhGhxmController extends BaseController  {
+
+  private final  ZhjcGhjhGhxmService ZhjcGhjhGhxmService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param ZhjcGhjhGhxm 智慧决策—项目决策-规划项目
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhjcGhjhGhxmPage(Page page, ZhjcGhjhGhxm ZhjcGhjhGhxm) {
+    return  new R<>(ZhjcGhjhGhxmService.getZhjcGhjhXmgzDataByPage(page,ZhjcGhjhGhxm));
+  }
+
+  /**
+   * 根据统计时间查询规划计划统计分析页面数据
+   * @param year
+   * @return
+   */
+  @GetMapping("/getTjfxData")
+  public R getZhjcGhjhTjfxDataByYear(String year) {
+    return new R<>(ZhjcGhjhGhxmService.getZhjcGhjhTjfxDataByYear(year));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcXmjcGhxmController.java

@@ -37,7 +37,6 @@ public class ZhjcXmjcGhxmController extends BaseController  {
    */
   @GetMapping("/list")
   public R getList(ZhjcXmjcGhxm zhjcXmjcGhxm) {
-
     return  new R<>(zhjcXmjcGhxmService.getList(zhjcXmjcGhxm));
   }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcXmjcZbfxController.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcXmjcZbfx;
+import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcXmjcZbfxService;
+import com.elephant.framework.galaxy.aroad.response.R;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 项目决策指标分析
+ *
+ * @author zyw
+ * @date 2019-04-29 16:53:48
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhjc/zhjcxmjczbfx")
+public class ZhjcXmjcZbfxController extends BaseController {
+
+    private final ZhjcXmjcZbfxService zhjcXmjcZbfxService;
+
+    /**
+     * 查询查询
+     *
+     * @param zhjcXmjcZbfx 项目决策指标分析
+     * @return
+     */
+    @GetMapping("/list")
+    public R getZhjcXmjcZbfxPage(ZhjcXmjcZbfx zhjcXmjcZbfx) {
+        System.out.println(zhjcXmjcZbfx);
+        return new R<>(zhjcXmjcZbfxService.list(Wrappers.query(zhjcXmjcZbfx)));
+    }
+
+
+    /**
+     * 通过id查询项目决策指标分析
+     *
+     * @param id id
+     * @return R
+     */
+    @GetMapping("/{id}")
+    public R getById(@PathVariable("id") Integer id) {
+        return new R<>(zhjcXmjcZbfxService.getById(id));
+    }
+
+    /**
+     * 新增项目决策指标分析
+     *
+     * @param zhjcXmjcZbfx 项目决策指标分析
+     * @return R
+     */
+    @SysLog("新增项目决策指标分析")
+    @PostMapping
+    public R save(@RequestBody ZhjcXmjcZbfx zhjcXmjcZbfx) {
+        return new R<>(zhjcXmjcZbfxService.save(zhjcXmjcZbfx));
+    }
+
+    /**
+     * 修改项目决策指标分析
+     *
+     * @param zhjcXmjcZbfx 项目决策指标分析
+     * @return R
+     */
+    @SysLog("修改项目决策指标分析")
+    @PutMapping
+    public R updateById(@RequestBody ZhjcXmjcZbfx zhjcXmjcZbfx) {
+        return new R<>(zhjcXmjcZbfxService.updateById(zhjcXmjcZbfx));
+    }
+
+    /**
+     * 通过id删除项目决策指标分析
+     *
+     * @param id id
+     * @return R
+     */
+    @SysLog("删除项目决策指标分析")
+    @DeleteMapping("/{id}")
+    public R removeById(@PathVariable Integer id) {
+        return new R<>(zhjcXmjcZbfxService.removeById(id));
+    }
+
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.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-05-05 16:10:42
+ */
+@Data
+@TableName("t_zhjc_xmjc_ghxm")
+@EqualsAndHashCode(callSuper = true)
+public class ZhjcGhjhGhxm extends Model<ZhjcGhjhGhxm> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private Integer id;
+  /**
+   * 项目类型
+   */
+  private String xmlx;
+  /**
+   * 路线编号
+   */
+  private String lxbh;
+  /**
+   * 项目名称
+   */
+  private String xmmc;
+  /**
+   * 所在地市
+   */
+  private String city;
+  /**
+   * 调整前编号
+   */
+  private String tzqbh;
+  /**
+   * 建设性质
+   */
+  private String jsxz;
+  /**
+   * 里程(公里)
+   */
+  private Double lc;
+  /**
+   * 总投资
+   */
+  private Double ztz;
+  /**
+   * 总投资（其中：中央和省投资）
+   */
+  private Double ztzZyhstz;
+  /**
+   * 五年计划投资
+   */
+  private Double wnjhtz;
+  /**
+   * 五年计划投资(其中：中央和省投资)
+   */
+  private Double wnjhtzZyhstz;
+  /**
+   * 起终点桩号
+   */
+  private String qzdzh;
+  /**
+   * 技术等级
+   */
+  private String jsdj;
+  /**
+   * 路基宽度（米）
+   */
+  private String ljkd;
+  /**
+   * 路面宽度（米）
+   */
+  private String lmkd;
+  /**
+   * 改建及大中修时间
+   */
+  private String gjjdzxsj;
+  /**
+   * 交通量（辆/日）
+   */
+  private Integer jtl;
+  /**
+   * 路面状况PCI（公里）
+   */
+  private String pci;
+  /**
+   * 拟采用技术标准_技术等级
+   */
+  private String ncyJsdj;
+  /**
+   * 拟采用技术标准_路基宽度(米)
+   */
+  private Double ncyLjkd;
+  /**
+   * 建设年限_起始年
+   */
+  private String jsnxQsn;
+  /**
+   * 建设年限_建成年
+   */
+  private String jsnxJcn;
+  /**
+   * 进展情况
+   */
+  private String jzqk;
+  /**
+   * 备注
+   */
+  private String bz;
+  /**
+   * 至上年已下达部省投资
+   */
+  private Double snBstz;
+  /**
+   * 其中：中央投资
+   */
+  private Double snZytz;
+  /**
+   * 本年部省下达投资
+   */
+  private Double bnBstz;
+  /**
+   * 其中：中央投资
+   */
+  private Double bnZytz;
+  /**
+   * 自年初累计完成投资
+   */
+  private Double ncljwctz;
+  /**
+   * 统计时间
+   */
+  private String tjsj;
+  /**
+   * 规划名称
+   */
+  private String ghmc;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ZhjcGhjhTjfx {
+    private List<ZhjcGhjhTjfxOne> zhjcGhjhTjfxOnes;
+    private List<ZhjcGhjhTjfxFour> zhjcGhjhTjfxFours;
+    private List<ZhjcGhjhTjfxThree> zhjcGhjhTjfxThrees;
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
+
+import lombok.Data;
+
+@Data
+public class ZhjcGhjhTjfxDzxAndXgj {
+    private String city;
+    private Double number;
+    private Double numbertwo;
+    private Double numberthree;
+    private Double numberfour;
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
+
+import lombok.Data;
+
+@Data
+public class ZhjcGhjhTjfxFour {
+    String city;
+    Double xgj;
+    Double dzx;
+    Double qt;
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
+
+import lombok.Data;
+
+@Data
+public class ZhjcGhjhTjfxOne {
+    String city;
+    Integer xgj;
+    Integer dzx;
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
+
+import lombok.Data;
+
+@Data
+public class ZhjcGhjhTjfxThree {
+    private String city;
+    private Integer ndzytz;
+    private Integer ndstz;
+    private Integer zytz;
+    private Integer stz;
+    private Integer sxztz;
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.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 zyw
+ * @date 2019-04-29 16:53:48
+ */
+@Data
+@TableName("t_zhjc_xmjc_zbfx")
+@EqualsAndHashCode(callSuper = true)
+public class ZhjcXmjcZbfx extends Model<ZhjcXmjcZbfx> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private Integer id;
+  /**
+   * 指标名称
+   */
+  private String zbmc;
+  /**
+   * 规划值
+   */
+  private Double ghz;
+  /**
+   * 年底实际值
+   */
+  private Double sjz;
+  /**
+   * 预计在建项目完工值
+   */
+  private Double yjz;
+  /**
+   * 规划名称
+   */
+  private String ghmc;
+  /**
+   * 统计年度
+   */
+  private String year;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/mapper/ZhjcGhjhGhxmMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhGhxm;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTjfxDzxAndXgj;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 智慧决策—项目决策-规划项目
+ *
+ * @author wangjian
+ * @date 2019-05-05 16:10:42
+ */
+public interface ZhjcGhjhGhxmMapper extends BaseMapper<ZhjcGhjhGhxm> {
+
+    List<ZhjcGhjhTjfxDzxAndXgj> getZhjcGhjhTjfxOneDzxAndXgjByYear(@Param("lx")String lx, @Param("year") String year);
+
+    List<ZhjcGhjhTjfxDzxAndXgj> getZhjcGhjhTjfxFourByYear(@Param("lx")String lx, @Param("year") String year);
+
+    List<ZhjcGhjhTjfxDzxAndXgj> getZhjcGhjhTjfxFourQtByYear(@Param("year") String year);
+
+    List<ZhjcGhjhTjfxDzxAndXgj> getZhjcGhjhTjfxThreeDataByYear(@Param("year") String year);
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/mapper/ZhjcXmjcZbfxMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcXmjcZbfx;
+
+/**
+ * 项目决策指标分析
+ *
+ * @author zyw
+ * @date 2019-04-29 16:53:48
+ */
+public interface ZhjcXmjcZbfxMapper extends BaseMapper<ZhjcXmjcZbfx> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/ZhjcGhjhGhxmService.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.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.zhjc.entity.ZhjcGhjhGhxm;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTjfx;
+
+/**
+ * 智慧决策—项目决策-规划项目
+ *
+ * @author wangjian
+ * @date 2019-05-05 16:10:42
+ */
+public interface ZhjcGhjhGhxmService extends IService<ZhjcGhjhGhxm> {
+
+    /**
+     * 根据统计年份查询规划计划统计分析页面数据
+     * @param year
+     * @return
+     */
+    ZhjcGhjhTjfx getZhjcGhjhTjfxDataByYear(String year);
+
+
+    /**
+     * 分页查询规划项目
+     * @param Page
+     * @param zhjcGhjhGhxm
+     * @return
+     */
+    IPage<ZhjcGhjhGhxm> getZhjcGhjhXmgzDataByPage(Page page, ZhjcGhjhGhxm zhjcGhjhGhxm);
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/ZhjcXmjcZbfxService.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcXmjcZbfx;
+
+/**
+ * 项目决策指标分析
+ *
+ * @author zyw
+ * @date 2019-04-29 16:53:48
+ */
+public interface ZhjcXmjcZbfxService extends IService<ZhjcXmjcZbfx> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcGhjhGhxmServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.*;
+import com.elephant.framework.galaxy.aroad.module.zhjc.mapper.ZhjcGhjhGhxmMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhGhxmService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.sql.Wrapper;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 智慧决策—项目决策-规划项目
+ *
+ * @author wangjian
+ * @date 2019-05-05 16:10:42
+ */
+@Service
+@AllArgsConstructor
+public class ZhjcGhjhGhxmServiceImpl extends ServiceImpl<ZhjcGhjhGhxmMapper, ZhjcGhjhGhxm> implements ZhjcGhjhGhxmService {
+
+    private final ZhjcGhjhGhxmMapper zhjcGhjhGhxmMapper;
+    private static String[] citys = new String[]{"济南","青岛","淄博","枣庄","东营","烟台","潍坊","济宁","泰安","威海","日照","滨州","德州","聊城"
+            ,"临沂","菏泽","莱芜"};
+
+    /**
+     * 根据统计年份查询规划计划统计分析页面数据
+     * @param year
+     * @return
+     */
+    public ZhjcGhjhTjfx getZhjcGhjhTjfxDataByYear(String year) {
+        ZhjcGhjhTjfx zhjcGhjhTjfx = new ZhjcGhjhTjfx();
+        zhjcGhjhTjfx.setZhjcGhjhTjfxOnes( getZhjcGhjhTjfxOneDataByYear(year));
+        zhjcGhjhTjfx.setZhjcGhjhTjfxThrees(getZhjcGhjhTjfxThreeDataByYear(year));
+        zhjcGhjhTjfx.setZhjcGhjhTjfxFours(getZhjcGhjhTjfxFourDataByYear(year));
+        return zhjcGhjhTjfx;
+    }
+
+    /**
+     * 分页查询规划项目
+     * @param zhjcGhjhGhxm
+     * @return
+     */
+     public IPage<ZhjcGhjhGhxm> getZhjcGhjhXmgzDataByPage(Page page, ZhjcGhjhGhxm zhjcGhjhGhxm) {
+
+         LambdaQueryWrapper<ZhjcGhjhGhxm> lambdaQueryWrapper = Wrappers.<ZhjcGhjhGhxm>query().lambda();
+
+         if(zhjcGhjhGhxm.getCity()!=null && !"".equals(zhjcGhjhGhxm.getCity())) {
+             lambdaQueryWrapper = lambdaQueryWrapper.like(ZhjcGhjhGhxm::getCity, zhjcGhjhGhxm.getCity());
+         }
+         if(zhjcGhjhGhxm.getJsdj()!=null && !"".equals(zhjcGhjhGhxm.getJsdj())) {
+             lambdaQueryWrapper = lambdaQueryWrapper.like(ZhjcGhjhGhxm::getJsdj, zhjcGhjhGhxm.getJsdj());
+         }
+         if(zhjcGhjhGhxm.getJzqk()!=null && !"".equals(zhjcGhjhGhxm.getJzqk())) {
+             lambdaQueryWrapper = lambdaQueryWrapper.eq(ZhjcGhjhGhxm::getJzqk, zhjcGhjhGhxm.getJzqk());
+         }
+         if(zhjcGhjhGhxm.getJsxz()!=null && !"".equals(zhjcGhjhGhxm.getJsxz())) {
+             lambdaQueryWrapper = lambdaQueryWrapper.eq(ZhjcGhjhGhxm::getJsxz, zhjcGhjhGhxm.getJsxz());
+         }
+
+         return zhjcGhjhGhxmMapper.selectPage(page, lambdaQueryWrapper);
+     }
+
+
+    //获取统计分页一图数据
+    public List<ZhjcGhjhTjfxOne> getZhjcGhjhTjfxOneDataByYear(String year) {
+        List<ZhjcGhjhTjfxOne> zhjcGhjhTjfxOnes = new ArrayList<>();
+        List<ZhjcGhjhTjfxDzxAndXgj> dzx = zhjcGhjhGhxmMapper.getZhjcGhjhTjfxOneDzxAndXgjByYear("大中修",year);
+        List<ZhjcGhjhTjfxDzxAndXgj> xgj = zhjcGhjhGhxmMapper.getZhjcGhjhTjfxOneDzxAndXgjByYear("新改建",year);
+
+        for(String city : citys) {
+            ZhjcGhjhTjfxOne zhjcGhjhTjfxOne = new ZhjcGhjhTjfxOne();
+            zhjcGhjhTjfxOne.setCity(city);
+
+            for(ZhjcGhjhTjfxDzxAndXgj zhjcGhjhTjfxDzxAndXgj : dzx) {
+                if(zhjcGhjhTjfxDzxAndXgj.getCity().indexOf(city) > -1) {
+                    zhjcGhjhTjfxOne.setDzx((new Double(zhjcGhjhTjfxDzxAndXgj.getNumber())).intValue());
+                    break;
+                }
+            }
+            for(ZhjcGhjhTjfxDzxAndXgj zhjcGhjhTjfxDzxAndXgj : xgj) {
+                if(zhjcGhjhTjfxDzxAndXgj.getCity().indexOf(city)>-1) {
+                    zhjcGhjhTjfxOne.setXgj((new Double(zhjcGhjhTjfxDzxAndXgj.getNumber())).intValue());
+                    break;
+                }
+            }
+
+            zhjcGhjhTjfxOnes.add(zhjcGhjhTjfxOne);
+        }
+
+        return zhjcGhjhTjfxOnes;
+    }
+
+    //获取统计分页三图数据
+    public List<ZhjcGhjhTjfxThree> getZhjcGhjhTjfxThreeDataByYear(String year) {
+        List<ZhjcGhjhTjfxThree> zhjcGhjhTjfxThrees = new ArrayList<>();
+
+        List<ZhjcGhjhTjfxDzxAndXgj> zhjcGhjhTjfxDzxAndXgjs = zhjcGhjhGhxmMapper.getZhjcGhjhTjfxThreeDataByYear(year);
+
+        for(String city : citys) {
+            ZhjcGhjhTjfxThree zhjcGhjhTjfxThree = new ZhjcGhjhTjfxThree();
+            zhjcGhjhTjfxThree.setCity(city);
+            for(ZhjcGhjhTjfxDzxAndXgj zhjcGhjhTjfxDzxAndXgj : zhjcGhjhTjfxDzxAndXgjs) {
+                if(zhjcGhjhTjfxDzxAndXgj.getCity()!=null && zhjcGhjhTjfxDzxAndXgj.getCity().indexOf(city)!=-1) {
+                    zhjcGhjhTjfxThree.setNdzytz((new Double(zhjcGhjhTjfxDzxAndXgj.getNumber())).intValue());
+                    zhjcGhjhTjfxThree.setNdstz((new Double(zhjcGhjhTjfxDzxAndXgj.getNumbertwo())).intValue());
+                    zhjcGhjhTjfxThree.setZytz(0);
+                    zhjcGhjhTjfxThree.setStz(new Double(zhjcGhjhTjfxDzxAndXgj.getNumberthree()).intValue());
+                    zhjcGhjhTjfxThree.setSxztz(new Double(zhjcGhjhTjfxDzxAndXgj.getNumberfour()).intValue());
+                    break;
+                }
+            }
+            zhjcGhjhTjfxThrees.add(zhjcGhjhTjfxThree);
+        }
+
+
+        return zhjcGhjhTjfxThrees;
+    }
+
+    //获取统计分页四图数据
+    public List<ZhjcGhjhTjfxFour> getZhjcGhjhTjfxFourDataByYear(String year) {
+
+        List<ZhjcGhjhTjfxFour> zhjcGhjhTjfxFours = new ArrayList<>();
+
+        List<ZhjcGhjhTjfxDzxAndXgj> dzx = zhjcGhjhGhxmMapper.getZhjcGhjhTjfxFourByYear("大中修",year);
+        List<ZhjcGhjhTjfxDzxAndXgj> xgj = zhjcGhjhGhxmMapper.getZhjcGhjhTjfxFourByYear("新改建",year);
+        List<ZhjcGhjhTjfxDzxAndXgj> qt = zhjcGhjhGhxmMapper.getZhjcGhjhTjfxFourQtByYear(year);
+
+        for(String city: citys) {
+            ZhjcGhjhTjfxFour zhjcGhjhTjfxFour = new ZhjcGhjhTjfxFour();
+            zhjcGhjhTjfxFour.setCity(city);
+            for(ZhjcGhjhTjfxDzxAndXgj zhjcGhjhTjfxDzxAndXgj : dzx) {
+                if(zhjcGhjhTjfxDzxAndXgj.getCity().indexOf(city)>-1) {
+                    zhjcGhjhTjfxFour.setDzx(zhjcGhjhTjfxDzxAndXgj.getNumber());
+                    break;
+                }
+            }
+            for(ZhjcGhjhTjfxDzxAndXgj zhjcGhjhTjfxDzxAndXgj : xgj) {
+                if(zhjcGhjhTjfxDzxAndXgj.getCity().indexOf(city)>-1) {
+                    zhjcGhjhTjfxFour.setXgj(zhjcGhjhTjfxDzxAndXgj.getNumber());
+                    break;
+                }
+            }
+            for(ZhjcGhjhTjfxDzxAndXgj zhjcGhjhTjfxDzxAndXgj : qt) {
+                if(zhjcGhjhTjfxDzxAndXgj.getCity().indexOf(city)>-1) {
+                    zhjcGhjhTjfxFour.setQt(zhjcGhjhTjfxDzxAndXgj.getNumber());
+                    break;
+                }
+            }
+
+            zhjcGhjhTjfxFours.add(zhjcGhjhTjfxFour);
+        }
+
+        return zhjcGhjhTjfxFours;
+    }
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcXmjcZbfxServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhjc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcXmjcZbfx;
+import com.elephant.framework.galaxy.aroad.module.zhjc.mapper.ZhjcXmjcZbfxMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcXmjcZbfxService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目决策指标分析
+ *
+ * @author zyw
+ * @date 2019-04-29 16:53:48
+ */
+@Service
+public class ZhjcXmjcZbfxServiceImpl extends ServiceImpl<ZhjcXmjcZbfxMapper, ZhjcXmjcZbfx> implements ZhjcXmjcZbfxService {
+
+}

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

@@ -21,7 +21,6 @@ import com.elephant.framework.galaxy.aroad.module.common.controller.BaseControll
 @AllArgsConstructor
 @RequestMapping("/zhtj/zhtjgljszkpd")
 public class ZhtjGljszkpdController extends BaseController  {
-
   private final ZhtjGljszkpdService zhtjGljszkpdService;
 
   /**
@@ -41,46 +40,13 @@ public class ZhtjGljszkpdController extends BaseController  {
 
 
   /**
-   * 通过id查询综合统计_公路技术状况评定
-   * @param id id
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R getById(@PathVariable("id") Integer id){
-    return new R<>(zhtjGljszkpdService.getById(id));
-  }
-
-  /**
-   * 新增综合统计_公路技术状况评定
+   * 按年度和道路类型查询评定数据
    * @param zhtjGljszkpd 综合统计_公路技术状况评定
    * @return R
    */
-  @SysLog("新增综合统计_公路技术状况评定")
-  @PostMapping
-  public R save(@RequestBody ZhtjGljszkpd zhtjGljszkpd){
-    return new R<>(zhtjGljszkpdService.save(zhtjGljszkpd));
-  }
-
-  /**
-   * 修改综合统计_公路技术状况评定
-   * @param zhtjGljszkpd 综合统计_公路技术状况评定
-   * @return R
-   */
-  @SysLog("修改综合统计_公路技术状况评定")
-  @PutMapping
-  public R updateById(@RequestBody ZhtjGljszkpd zhtjGljszkpd){
-    return new R<>(zhtjGljszkpdService.updateById(zhtjGljszkpd));
-  }
-
-  /**
-   * 通过id删除综合统计_公路技术状况评定
-   * @param id id
-   * @return R
-   */
-  @SysLog("删除综合统计_公路技术状况评定")
-  @DeleteMapping("/{id}")
-  public R removeById(@PathVariable Integer id){
-    return new R<>(zhtjGljszkpdService.removeById(id));
+  @GetMapping("/getList")
+  public R getList(ZhtjGljszkpd zhtjGljszkpd) {
+    return new R<>(zhtjGljszkpdService.list(Wrappers.query(zhtjGljszkpd)));
   }
 
 }

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

@@ -99,6 +99,7 @@ public class ZhtjGllmqkController extends BaseController  {
    */
   @GetMapping("/glfgqktj")
   public R getGlfgqktj(){
+    System.out.println("pppppppp");
     return new R<>(zhtjGllmqkService.getGlfgqktj());
   }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhSjbbGsdyhybController.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.ZhyhSjbbGsdyhyb;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhSjbbGsdyhybService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 智慧养护_数据报表_国省道养护月报
+ *
+ * @author wangjian
+ * @date 2019-05-05 20:41:03
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/sjbbgsdyhyb")
+public class ZhyhSjbbGsdyhybController extends BaseController  {
+
+  private final  ZhyhSjbbGsdyhybService zhyhSjbbGsdyhybService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhyhSjbbGsdyhyb 智慧养护_数据报表_国省道养护月报
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhyhSjbbGsdyhybPage(Page page, ZhyhSjbbGsdyhyb zhyhSjbbGsdyhyb) {
+    return  new R<>(zhyhSjbbGsdyhybService.page(page,Wrappers.query(zhyhSjbbGsdyhyb)));
+  }
+
+
+  /**
+   * 通过id查询智慧养护_数据报表_国省道养护月报
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhyhSjbbGsdyhybService.getById(id));
+  }
+
+  /**
+   * 新增智慧养护_数据报表_国省道养护月报
+   * @param zhyhSjbbGsdyhyb 智慧养护_数据报表_国省道养护月报
+   * @return R
+   */
+  @SysLog("新增智慧养护_数据报表_国省道养护月报")
+  @PostMapping
+  public R save(@RequestBody ZhyhSjbbGsdyhyb zhyhSjbbGsdyhyb){
+    return new R<>(zhyhSjbbGsdyhybService.save(zhyhSjbbGsdyhyb));
+  }
+
+  /**
+   * 修改智慧养护_数据报表_国省道养护月报
+   * @param zhyhSjbbGsdyhyb 智慧养护_数据报表_国省道养护月报
+   * @return R
+   */
+  @SysLog("修改智慧养护_数据报表_国省道养护月报")
+  @PutMapping
+  public R updateById(@RequestBody ZhyhSjbbGsdyhyb zhyhSjbbGsdyhyb){
+    return new R<>(zhyhSjbbGsdyhybService.updateById(zhyhSjbbGsdyhyb));
+  }
+
+  /**
+   * 通过id删除智慧养护_数据报表_国省道养护月报
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除智慧养护_数据报表_国省道养护月报")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhyhSjbbGsdyhybService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhSjbbGsdyhyb.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-05-05 20:41:03
+ */
+@Data
+@TableName("t_zhyh_sjbb_gsdyhyb")
+@EqualsAndHashCode(callSuper = true)
+public class ZhyhSjbbGsdyhyb extends Model<ZhyhSjbbGsdyhyb> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 省市
+   */
+  private String ss;
+  /**
+   * 统计时间
+   */
+  private String tjsj;
+  /**
+   * 填报单位
+   */
+  private String tbdw;
+  /**
+   * 管养公路里程
+   */
+  private Double gygllc;
+  /**
+   * 管养路面面积
+   */
+  private Double gylmmj;
+  /**
+   * 管养桥梁数量
+   */
+  private Double gyqlsl;
+  /**
+   * 管养桥梁长度
+   */
+  private Double gyqlcd;
+  /**
+   * 管养公路站数量
+   */
+  private Double gyglz;
+  /**
+   * 管养养护管理人员数量
+   */
+  private Double gyyhry;
+  /**
+   * 本年内累计完成养护工程总投资
+   */
+  private Double bnyhtz;
+  /**
+   * 大中修本年计划投资
+   */
+  private Double dzxbn;
+  /**
+   * 大中修本月完成工作量
+   */
+  private Double dzxby;
+  /**
+   * 大中修本年内累计完成工作量
+   */
+  private Double dzxgzl;
+  /**
+   * 危窄桥本年计划投资
+   */
+  private Double wzqbn;
+  /**
+   * 危窄桥本月完成工作量
+   */
+  private Double wzqby;
+  /**
+   * 危窄桥本年内累计完成工作量
+   */
+  private Double wzqgzl;
+  /**
+   * 其他本年计划投资
+   */
+  private Double qtbn;
+  /**
+   * 其他本月完成工作量
+   */
+  private Double qtby;
+  /**
+   * 其他本年内累计完成工作量
+   */
+  private Double qtgzl;
+  /**
+   * 小修日常养护管理本年投资
+   */
+  private Double xxbn;
+  /**
+   * 小修本月完成工作量
+   */
+  private Double xxby;
+  /**
+   * 小修本年内累计完成工作量
+   */
+  private Double xxgzl;
+  /**
+   * 桥涵隧道本月完成工作量
+   */
+  private Double qsby;
+  /**
+   * 桥涵隧道本年内累计完成工作量
+   */
+  private Double qsbn;
+  /**
+   * 日常本月完成工作量
+   */
+  private Double rcby;
+  /**
+   * 日常本年内累计完成工作量
+   */
+  private Double rcbn;
+  /**
+   * 交调战备本月完成工作量
+   */
+  private Double jdby;
+  /**
+   * 交调战备本年内累计完成工作量
+   */
+  private Double jdbn;
+  /**
+   * 养护工区本月完成工作量
+   */
+  private Double yhgby;
+  /**
+   * 养护工区本年内累计完成工作量
+   */
+  private Double yhgbn;
+  /**
+   * 养护机本月完成工作量
+   */
+  private Double yhjby;
+  /**
+   * 养护机本年累计完成工作量
+   */
+  private Double yhjbn;
+  /**
+   * 本月小修路面挖补
+   */
+  private Double xxwb;
+  /**
+   * 本月小修路面刷油等表层处理
+   */
+  private Double xxsy;
+  /**
+   * 本月小修路面裂缝
+   */
+  private Double xxlf;
+  /**
+   * 本月小修桥涵隧道
+   */
+  private Double xxqs;
+  /**
+   * 本月小修标线施滑
+   */
+  private Double xxbx;
+  /**
+   * 本月小修标志维护
+   */
+  private Double xxbz;
+  /**
+   * 本月小修护栏等维护
+   */
+  private Double xxwl;
+  /**
+   * 本年小修路面挖补
+   */
+  private Double nxwb;
+  /**
+   * 本年小修路面刷油
+   */
+  private Double nxsy;
+  /**
+   * 本年小修路面裂缝处理
+   */
+  private Double nxlf;
+  /**
+   * 本年小修桥涵隧道小修
+   */
+  private Double nxqs;
+  /**
+   * 本年小修标线施滑
+   */
+  private Double nxbx;
+  /**
+   * 本年小修标志维修
+   */
+  private Double nxbz;
+  /**
+   * 本年小修护栏等维修
+   */
+  private Double nxhl;
+  /**
+   * 截至当月低公路通行情况封闭路段
+   */
+  private Double ydfb;
+  /**
+   * 截至当月低公路通行情况半幅路段
+   */
+  private Double ydbf;
+  /**
+   * 截至当月低公路通行情况危桥封闭
+   */
+  private Double ydwq;
+  /**
+   * 截至当月低公路通行情况危桥半幅
+   */
+  private Double ydwqbf;
+  /**
+   * 水毁本月完成工作量
+   */
+  private Double shby;
+  /**
+   * 水毁本年内累计完成工作量
+   */
+  private Double shbn;
+  /**
+   * 除雪本月完成工作量
+   */
+  private Double cxby;
+  /**
+   * 除雪本年内累计完成工作量
+   */
+  private Double cxbn;
+  /**
+   * 本年公路示范
+   */
+  private Double bnsf;
+  /**
+   * 本年公路绿化
+   */
+  private Double bnlh;
+  /**
+   * 本年公路安全保障
+   */
+  private Double bnbz;
+  /**
+   * 本年公路穿村路段
+   */
+  private Double bnld;
+  /**
+   * 本年公路排水设施
+   */
+  private Double bnss;
+  /**
+   * 本年公路路基整修
+   */
+  private Double bnzx;
+  /**
+   * 有关数据本季度
+   */
+  private Double ygjd;
+  /**
+   * 有关数据一二类
+   */
+  private Double ygye;
+  /**
+   * 有关数据保洁机械
+   */
+  private Double ygbj;
+  /**
+   * 有关数据养护机械
+   */
+  private Double ygyh;
+  /**
+   * 新材料结构橡胶沥青
+   */
+  private Double xclq;
+  /**
+   * 新材料结构SBS
+   */
+  private Double xcsbs;
+  /**
+   * 新材料结构其他
+   */
+  private Double xcqt;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhyhSjbbGsdyhybMapper.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.ZhyhSjbbGsdyhyb;
+
+/**
+ * 智慧养护_数据报表_国省道养护月报
+ *
+ * @author wangjian
+ * @date 2019-05-05 20:41:03
+ */
+public interface ZhyhSjbbGsdyhybMapper extends BaseMapper<ZhyhSjbbGsdyhyb> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/ZhyhSjbbGsdyhybService.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.ZhyhSjbbGsdyhyb;
+
+/**
+ * 智慧养护_数据报表_国省道养护月报
+ *
+ * @author wangjian
+ * @date 2019-05-05 20:41:03
+ */
+public interface ZhyhSjbbGsdyhybService extends IService<ZhyhSjbbGsdyhyb> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/service/impl/ZhyhSjbbGsdyhybServiceImpl.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.ZhyhSjbbGsdyhyb;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhyhSjbbGsdyhybMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhyhSjbbGsdyhybService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 智慧养护_数据报表_国省道养护月报
+ *
+ * @author wangjian
+ * @date 2019-05-05 20:41:03
+ */
+@Service
+public class ZhyhSjbbGsdyhybServiceImpl extends ServiceImpl<ZhyhSjbbGsdyhybMapper, ZhyhSjbbGsdyhyb> implements ZhyhSjbbGsdyhybService {
+
+}

src/main/resources/mapper/InfoReceiversMapper.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.info.mapper.InfoReceiversMapper">
+
+  <resultMap id="infoReceiversMap" type="com.elephant.framework.galaxy.aroad.module.info.entity.InfoReceivers">
+        <id property="id" column="id"/>
+        <result property="infoId" column="info_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="receiverId" column="receiver_id"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/info/InfoInformationsMapper.xml

@@ -13,4 +13,11 @@
         <result property="reporterId" column="reporter_id"/>
         <result property="reportingTime" column="reporting_time"/>
   </resultMap>
+
+  <insert id="saveInformations" useGeneratedKeys="true" keyProperty="infoId">
+    insert into
+      info_informations(template_id, info_title,info_content,info_remark,reporter_id,reporting_time)
+    values
+      (#{templateId}, #{infoTitle},#{infoContent},#{infoRemark},#{reporterId},#{reportingTime})
+  </insert>
 </mapper>

src/main/resources/mapper/info/InfoTemplatesMapper.xml

@@ -18,4 +18,6 @@
     select * from info_templates
     where create_dept_id = #{createDeptId}
   </select>
+
+
 </mapper>

src/main/resources/mapper/zhjc/ZhjcGhjhGhxmMapper.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.zhjc.mapper.ZhjcGhjhGhxmMapper">
+
+  <resultMap id="ZhjcGhjhGhxmMap" type="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhGhxm">
+        <id property="id" column="id"/>
+        <result property="xmlx" column="xmlx"/>
+        <result property="lxbh" column="lxbh"/>
+        <result property="xmmc" column="xmmc"/>
+        <result property="city" column="city"/>
+        <result property="tzqbh" column="tzqbh"/>
+        <result property="jsxz" column="jsxz"/>
+        <result property="lc" column="lc"/>
+        <result property="ztz" column="ztz"/>
+        <result property="ztzZyhstz" column="ztz_zyhstz"/>
+        <result property="wnjhtz" column="wnjhtz"/>
+        <result property="wnjhtzZyhstz" column="wnjhtz_zyhstz"/>
+        <result property="qzdzh" column="qzdzh"/>
+        <result property="jsdj" column="jsdj"/>
+        <result property="ljkd" column="ljkd"/>
+        <result property="lmkd" column="lmkd"/>
+        <result property="gjjdzxsj" column="gjjdzxsj"/>
+        <result property="jtl" column="jtl"/>
+        <result property="pci" column="pci"/>
+        <result property="ncyJsdj" column="ncy_jsdj"/>
+        <result property="ncyLjkd" column="ncy_ljkd"/>
+        <result property="jsnxQsn" column="jsnx_qsn"/>
+        <result property="jsnxJcn" column="jsnx_jcn"/>
+        <result property="jzqk" column="jzqk"/>
+        <result property="bz" column="bz"/>
+        <result property="snBstz" column="sn_bstz"/>
+        <result property="snZytz" column="sn_zytz"/>
+        <result property="bnBstz" column="bn_bstz"/>
+        <result property="bnZytz" column="bn_zytz"/>
+        <result property="ncljwctz" column="ncljwctz"/>
+        <result property="tjsj" column="tjsj"/>
+        <result property="ghmc" column="ghmc"/>
+        <result property="createTime" column="create_time"/>
+  </resultMap>
+      
+      <select id="getZhjcGhjhTjfxOneDzxAndXgjByYear" resultType="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTjfxDzxAndXgj">
+            select city,count(*) as number from t_zhjc_xmjc_ghxm
+            <where>
+                  <if test="lx!=null and lx!=''">
+                      xmlx like concat('%',#{lx},'%')
+                  </if>
+                  <if test="year!=null and year!=''">
+                      and tjsj=#{year}
+                  </if>
+            </where>
+            GROUP BY city
+      </select>
+
+      <select id="getZhjcGhjhTjfxFourByYear" resultType="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTjfxDzxAndXgj">
+            select city,sum(ncljwctz) as number from t_zhjc_xmjc_ghxm
+            <where>
+                  <if test="lx!=null and lx!=''">
+                        xmlx like concat('%',#{lx},'%')
+                  </if>
+                  <if test="year!=null and year!=''">
+                        and tjsj=#{year}
+                  </if>
+            </where>
+            GROUP BY city
+      </select>
+
+      <select id="getZhjcGhjhTjfxFourQtByYear" resultType="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTjfxDzxAndXgj">
+            select city,sum(ncljwctz) as number from t_zhjc_xmjc_ghxm
+            <where>
+                  xmlx not like '%大中修%' and xmlx not like '%新改建%'
+                  <if test="year!=null and year!=''">
+                        and tjsj=#{year}
+                  </if>
+            </where>
+            GROUP BY city
+      </select>
+
+      <select id="getZhjcGhjhTjfxThreeDataByYear" resultType="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTjfxDzxAndXgj">
+            select
+              city,
+              (case when sum(bn_zytz) is null then 0 else sum(bn_zytz) end) as number,
+              ((case when sum(bn_bstz) is null then 0 else sum(bn_bstz) end)-(case when sum(bn_zytz) is null then 0 else sum(bn_zytz) end)) as numbertwo,
+              (case when sum(ztz_zyhstz) is null then 0 else sum(ztz_zyhstz) end) as numberthree,
+              ((case when sum(ztz) is null then 0 else sum(ztz) end)-(case when sum(ztz_zyhstz) is null then 0 else sum(ztz_zyhstz) end)) as numberfour
+            from t_zhjc_xmjc_ghxm
+            <where>
+                  <if test="year!=null and year!=''">
+                        tjsj=#{year}
+                  </if>
+            </where>
+            GROUP BY city
+      </select>
+</mapper>

src/main/resources/mapper/zhjc/ZhjcXmjcZbfxMapper.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.zhjc.mapper.ZhjcXmjcZbfxMapper">
+
+  <resultMap id="zhjcXmjcZbfxMap" type="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcXmjcZbfx">
+        <id property="id" column="id"/>
+        <result property="zbmc" column="zbmc"/>
+        <result property="ghz" column="ghz"/>
+        <result property="sjz" column="sjz"/>
+        <result property="yjz" column="yjz"/>
+        <result property="ghmc" column="ghmc"/>
+        <result property="year" column="year"/>
+  </resultMap>
+</mapper>

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

@@ -59,6 +59,6 @@
                       and  rw.rwzt=#{khrw.status}
                 </if>
           </where>
-          order by create_time desc
+          order by rw.create_time desc
     </select>
 </mapper>

src/main/resources/mapper/zhyh/ZhyhSjbbGsdyhybMapper.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.ZhyhSjbbGsdyhybMapper">
+
+  <resultMap id="zhyhSjbbGsdyhybMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhSjbbGsdyhyb">
+        <id property="id" column="id"/>
+        <result property="ss" column="ss"/>
+        <result property="tjsj" column="tjsj"/>
+        <result property="tbdw" column="tbdw"/>
+        <result property="gygllc" column="gygllc"/>
+        <result property="gylmmj" column="gylmmj"/>
+        <result property="gyqlsl" column="gyqlsl"/>
+        <result property="gyqlcd" column="gyqlcd"/>
+        <result property="gyglz" column="gyglz"/>
+        <result property="gyyhry" column="gyyhry"/>
+        <result property="bnyhtz" column="bnyhtz"/>
+        <result property="dzxbn" column="dzxbn"/>
+        <result property="dzxby" column="dzxby"/>
+        <result property="dzxgzl" column="dzxgzl"/>
+        <result property="wzqbn" column="wzqbn"/>
+        <result property="wzqby" column="wzqby"/>
+        <result property="wzqgzl" column="wzqgzl"/>
+        <result property="qtbn" column="qtbn"/>
+        <result property="qtby" column="qtby"/>
+        <result property="qtgzl" column="qtgzl"/>
+        <result property="xxbn" column="xxbn"/>
+        <result property="xxby" column="xxby"/>
+        <result property="xxgzl" column="xxgzl"/>
+        <result property="qsby" column="qsby"/>
+        <result property="qsbn" column="qsbn"/>
+        <result property="rcby" column="rcby"/>
+        <result property="rcbn" column="rcbn"/>
+        <result property="jdby" column="jdby"/>
+        <result property="jdbn" column="jdbn"/>
+        <result property="yhgby" column="yhgby"/>
+        <result property="yhgbn" column="yhgbn"/>
+        <result property="yhjby" column="yhjby"/>
+        <result property="yhjbn" column="yhjbn"/>
+        <result property="xxwb" column="xxwb"/>
+        <result property="xxsy" column="xxsy"/>
+        <result property="xxlf" column="xxlf"/>
+        <result property="xxqs" column="xxqs"/>
+        <result property="xxbx" column="xxbx"/>
+        <result property="xxbz" column="xxbz"/>
+        <result property="xxwl" column="xxwl"/>
+        <result property="nxwb" column="nxwb"/>
+        <result property="nxsy" column="nxsy"/>
+        <result property="nxlf" column="nxlf"/>
+        <result property="nxqs" column="nxqs"/>
+        <result property="nxbx" column="nxbx"/>
+        <result property="nxbz" column="nxbz"/>
+        <result property="nxhl" column="nxhl"/>
+        <result property="ydfb" column="ydfb"/>
+        <result property="ydbf" column="ydbf"/>
+        <result property="ydwq" column="ydwq"/>
+        <result property="ydwqbf" column="ydwqbf"/>
+        <result property="shby" column="shby"/>
+        <result property="shbn" column="shbn"/>
+        <result property="cxby" column="cxby"/>
+        <result property="cxbn" column="cxbn"/>
+        <result property="bnsf" column="bnsf"/>
+        <result property="bnlh" column="bnlh"/>
+        <result property="bnbz" column="bnbz"/>
+        <result property="bnld" column="bnld"/>
+        <result property="bnss" column="bnss"/>
+        <result property="bnzx" column="bnzx"/>
+        <result property="ygjd" column="ygjd"/>
+        <result property="ygye" column="ygye"/>
+        <result property="ygbj" column="ygbj"/>
+        <result property="ygyh" column="ygyh"/>
+        <result property="xclq" column="xclq"/>
+        <result property="xcsbs" column="xcsbs"/>
+        <result property="xcqt" column="xcqt"/>
+  </resultMap>
+</mapper>