Merge branch 'dev' of http://39.96.70.20:8080/A7/aroad into dev

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

@@ -7,26 +7,21 @@ import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjh;
 import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhService;
 import lombok.AllArgsConstructor;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
-import sun.net.www.http.HttpClient;
 
 import java.util.List;
-import java.util.UUID;
 
 
 /**
  * 智慧决策_规划计划
  *
  * @author wangjian
- * @date 2019-05-27 14:23:44
+ * @date 2019-05-29 10:45:50
  */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/zhjc/ghjh")
-@ServletComponentScan
 public class ZhjcGhjhController extends BaseController  {
 
   private final  ZhjcGhjhService zhjcGhjhService;
@@ -42,29 +37,54 @@ public class ZhjcGhjhController extends BaseController  {
     return  new R<>(zhjcGhjhService.page(page,Wrappers.query(zhjcGhjh)));
   }
 
+  /**
+   * 根据项目编码查询项目数据
+   */
+  @GetMapping("/getDataByXmbm")
+  public R getZhjcGhjhByXmbm(String xmbm) {
+    return new R<>(zhjcGhjhService.getZhjcGhjhByXmbm(xmbm));
+  }
 
   /**
-   * 通过id查询智慧决策_规划计划
-   * @param id id
-   * @return R
+   * 获取项目跟踪列表数据
+   */
+  @GetMapping("/getXmgzTableData")
+  public R getGhjhXmgz(Page page, String tbdwdm, String xmlxdm, String jsxzdm, String xmjd) {
+    return new R<>(zhjcGhjhService.getGhjhXmgz(page, tbdwdm, xmlxdm, jsxzdm, xmjd));
+  }
+
+  /**
+   * 获取项目跟踪坐标数据
+   * @return
+   */
+  @GetMapping("/getXmgzShapeData")
+  public R getGhjhXmgzShape(String tbdwdm, String xmlxdm, String jsxzdm, String xmjd) {
+    return new R<>(zhjcGhjhService.getGhjhXmgzShape(tbdwdm, xmlxdm, jsxzdm, xmjd));
+  }
+
+  /**
+   * 获取数据分析页面数据
    */
-  @GetMapping("/{id}")
-  public R getById(@PathVariable("id") String id){
-    return new R<>(zhjcGhjhService.getById(id));
+  @GetMapping("/getTjfxData")
+  public R getZhjcGhjhTjfxDataByYear(String year) {
+    return  new R<>(zhjcGhjhService.getZhjcGhjhTjfxDataByYear(year));
   }
 
+
   /**
    * 新增智慧决策_规划计划
+   * @param zhjcGhjh 智慧决策_规划计划
    * @return R
    */
   @SysLog("新增智慧决策_规划计划")
   @PostMapping("/add")
   public R save(@RequestBody ZhjcGhjh zhjcGhjh){
-    return zhjcGhjhService.addZhjcGhjh(zhjcGhjh);
+    return new R<>(zhjcGhjhService.addZhjcGhjh(zhjcGhjh));
   }
 
   /**
    * 修改智慧决策_规划计划
+   * @param zhjcGhjh 智慧决策_规划计划
    * @return R
    */
   @SysLog("修改智慧决策_规划计划")
@@ -78,9 +98,9 @@ public class ZhjcGhjhController extends BaseController  {
    * @return R
    */
   @SysLog("删除智慧决策_规划计划")
-  @GetMapping("/delete")
-  public R removeById(String xmid,String xmjd){
-    return new R<>(zhjcGhjhService.remove(Wrappers.<ZhjcGhjh>query().lambda().eq(ZhjcGhjh::getXmid,xmid).eq(ZhjcGhjh::getXmjd,xmjd)));
+  @PostMapping("/delete")
+  public R removeById(@RequestBody ZhjcGhjh zhjcGhjh){
+    return new R<>(zhjcGhjhService.deleteZhjcGhjh(zhjcGhjh));
   }
   /**
    *

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

@@ -71,13 +71,12 @@ public class ZhjcGhjhFghjdzbController extends BaseController  {
 
   /**
    * 通过id删除智慧决策_规划计划_非规划阶段坐标表
-   * @param xmid xmid
    * @return R
    */
   @SysLog("删除智慧决策_规划计划_非规划阶段坐标表")
-  @GetMapping("/delete")
-  public R removeById(String xmid){
-    return new R<>(zhjcGhjhFghjdzbService.remove(Wrappers.<ZhjcGhjhFghjdzb>query().lambda().eq(ZhjcGhjhFghjdzb::getXmid,xmid)));
+  @PostMapping("/delete")
+  public R removeById(@RequestBody ZhjcGhjhFghjdzb zhjcGhjhFghjdzb){
+    return new R<>(zhjcGhjhFghjdzbService.remove(Wrappers.<ZhjcGhjhFghjdzb>query().lambda().eq(ZhjcGhjhFghjdzb::getXmid,zhjcGhjhFghjdzb.getXmid())));
   }
 
 }

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

@@ -53,7 +53,7 @@ public class ZhjcGhjhGhjdzbController extends BaseController  {
    * @return R
    */
   @SysLog("新增智慧决策_规划计划_规划阶段坐标表")
-  @GetMapping("/add")
+  @PostMapping("/add")
   public R save(@RequestBody ZhjcGhjhGhjdzb zhjcGhjhGhjdzb){
     zhjcGhjhGhjdzb.setId(UUID.randomUUID().toString().replaceAll("-",""));
     return new R<>(zhjcGhjhGhjdzbService.save(zhjcGhjhGhjdzb));
@@ -64,19 +64,18 @@ public class ZhjcGhjhGhjdzbController extends BaseController  {
    * @return R
    */
   @SysLog("修改智慧决策_规划计划_规划阶段坐标表")
-  @GetMapping("/update")
+  @PostMapping("/update")
   public R updateById(@RequestBody ZhjcGhjhGhjdzb zhjcGhjhGhjdzb){
     return new R<>(zhjcGhjhGhjdzbService.update(zhjcGhjhGhjdzb,Wrappers.<ZhjcGhjhGhjdzb>query().lambda().eq(ZhjcGhjhGhjdzb::getXmid,zhjcGhjhGhjdzb.getXmid())));
   }
 
   /**
    * 通过id删除智慧决策_规划计划_规划阶段坐标表
-   * @param xmid xmid
    * @return R
    */
   @SysLog("删除智慧决策_规划计划_规划阶段坐标表")
-  @GetMapping("/delete")
-  public R removeById(String xmid){
-    return new R<>(zhjcGhjhGhjdzbService.remove(Wrappers.<ZhjcGhjhGhjdzb>query().lambda().eq(ZhjcGhjhGhjdzb::getXmid,xmid)));
+  @PostMapping("/delete")
+  public R removeById(@RequestBody ZhjcGhjhGhjdzb zhjcGhjhGhjdzb){
+    return new R<>(zhjcGhjhGhjdzbService.remove(Wrappers.<ZhjcGhjhGhjdzb>query().lambda().eq(ZhjcGhjhGhjdzb::getXmid,zhjcGhjhGhjdzb.getXmid())));
   }
 }

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

@@ -2,6 +2,7 @@ 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.module.zhjc.entity.ZhjcGhjhTjfx;
 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;
@@ -44,5 +45,4 @@ public class ZhjcGhjhGhxmController extends BaseController  {
   public R getZhjcGhjhTjfxDataByYear(String year) {
     return new R<>(ZhjcGhjhGhxmService.getZhjcGhjhTjfxDataByYear(year));
   }
-
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcGhjhTzzhController.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.ZhjcGhjhTzzh;
+import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhTzzhService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 智慧决策_规划计划_投资资金
+ *
+ * @author wangjian
+ * @date 2019-05-29 10:45:56
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhjc/ghjhtzzh")
+public class ZhjcGhjhTzzhController extends BaseController  {
+
+  private final  ZhjcGhjhTzzhService zhjcGhjhTzzhService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhjcGhjhTzzh 智慧决策_规划计划_投资资金
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhjcGhjhTzzhPage(Page page, ZhjcGhjhTzzh zhjcGhjhTzzh) {
+    return  new R<>(zhjcGhjhTzzhService.page(page,Wrappers.query(zhjcGhjhTzzh)));
+  }
+
+
+  /**
+   * 通过id查询智慧决策_规划计划_投资资金
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhjcGhjhTzzhService.getById(id));
+  }
+
+  /**
+   * 新增智慧决策_规划计划_投资资金
+   * @param zhjcGhjhTzzh 智慧决策_规划计划_投资资金
+   * @return R
+   */
+  @SysLog("新增智慧决策_规划计划_投资资金")
+  @PostMapping("/add")
+  public R save(@RequestBody ZhjcGhjhTzzh zhjcGhjhTzzh){
+    return new R<>(zhjcGhjhTzzhService.addZhjcGhjhTzzh(zhjcGhjhTzzh));
+  }
+
+  /**
+   * 修改智慧决策_规划计划_投资资金
+   * @param zhjcGhjhTzzh 智慧决策_规划计划_投资资金
+   * @return R
+   */
+  @SysLog("修改智慧决策_规划计划_投资资金")
+  @PostMapping("/update")
+  public R updateById(@RequestBody ZhjcGhjhTzzh zhjcGhjhTzzh){
+    return new R<>(zhjcGhjhTzzhService.updateZhjcGhjhTzzh(zhjcGhjhTzzh));
+  }
+
+  /**
+   * 删除智慧决策_规划计划_投资资金
+   * @return R
+   */
+  @SysLog("删除智慧决策_规划计划_投资资金")
+  @PostMapping("/delete")
+  public R removeById(@RequestBody ZhjcGhjhTzzh zhjcGhjhTzzh){
+    return new R<>(zhjcGhjhTzzhService.deleteZhjcGhjhTzzh(zhjcGhjhTzzh));
+  }
+
+}

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

 package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 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.math.BigDecimal;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 智慧决策_规划计划
  *
  * @author wangjian
- * @date 2019-05-27 14:23:44
+ * @date 2019-05-29 10:45:50
  */
 @Data
 @TableName("t_zhjc_ghjh")
@@ -26,13 +29,13 @@ private static final long serialVersionUID = 1L;
   @TableId
   private String id;
   /**
-   * 项目id
+   * CROWID
    */
-  private String xmid;
+  private String crowid;
   /**
-   * 项目主键
+   * 项目id
    */
-  private String crowid;
+  private String xmid;
   /**
    * 项目编码
    */
@@ -42,92 +45,97 @@ private static final long serialVersionUID = 1L;
    */
   private String xmmc;
   /**
-   * 地市编码
+   * 填报单位代码
    */
   private String tbdwdm;
   /**
-   * 地市名称
+   * 填报单位名称
    */
   private String tbdwmc;
   /**
-   * 项目类型（新改建、大中修、其他）
+   * 项目类型代码
    */
-  private String xmlx;
+  private String xmlxdm;
   /**
-   * 建设性质_细分（新建、改建、新改建、大修、中修、大中修，其他）
+   * 项目类型
    */
-  private String jsxz;
+  private String xmlx;
   /**
-   * 项目阶段id
+   * 项目阶段
    */
   private String xmjd;
   /**
-   * 项目阶段（规划阶段、前期阶段、年度计划阶段、计划执行阶段）
+   * 项目阶段含义
    */
   private String xmjdhy;
   /**
-   * 前期工作项目阶段（工可、施工图批复等）
+   * 建设性质代码
    */
-  private String qqxmjz;
+  private String jsxzdm;
   /**
-   * 里程
+   * 建设性质
    */
-  private Double jsgm;
+  private String jsxz;
   /**
-   * 项目阶段进入时间
+   * 里程
    */
-  private String createTime;
+  private BigDecimal jsgm;
   /**
    * 建设年限
    */
-  private String jsxn;
+  private String jsnx;
   /**
    * 总投资
    */
-  private Double ztz;
+  private BigDecimal ztz;
   /**
-   * 总投资_中央投资
+   * 中央投资
    */
-  private Double zytz;
+  private BigDecimal zytz;
   /**
-   * 总投资_中央及省投资
+   * 省投资
    */
-  private Double zySTz;
+  private BigDecimal stz;
   /**
-   * 年度_总投资
+   * 是否最新阶段
    */
-  private Double ndZtz;
+  private String sfzxzt;
   /**
-   * 年度_中央投资
+   * 项目阶段进入时间
    */
-  private Double ndZytz;
+  private String createtime;
   /**
-   * 年度_省投资
+   * 建设年限
    */
-  private Double ndStz;
+  private String jhnf;
   /**
-   * 至上年_省下达投资
+   * 备注
    */
-  private Double yxdstzYearLast;
+  private String bz;
   /**
-   * 至上年_中央下达投资
+   * 至上年省投资
    */
-  private Double yxdzytzYearLast;
+  @TableField(exist = false)
+  private Double zsnstz;
   /**
-   * 本年_省下达投资
+   * 至上年中央投资
    */
-  private Double yxdstzYearThis;
+  @TableField(exist = false)
+  private Double zsnzytz;
   /**
-   * 本年_中央下达投资
+   * 本年省投资
    */
-  private Double yxdzytzYearThis;
+  @TableField(exist = false)
+  private Double bnstz;
   /**
-   * 统计时间
+   * 本年中央投资
    */
-  private String dateTime;
+  @TableField(exist = false)
+  private Double bnzytz;
+
   /**
-   * 备注
+   * 坐标
    */
-  private Double bz;
-
+  @TableField(exist = false)
+  private List<List<String>> shape;
 }

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

@@ -7,6 +7,7 @@ import java.util.List;
 @Data
 public class ZhjcGhjhTjfx {
     private List<ZhjcGhjhTjfxOne> zhjcGhjhTjfxOnes;
+    private ZhjcGhjhTjfxTwo[] zhjcGhjhTjfxTwos;
     private List<ZhjcGhjhTjfxFour> zhjcGhjhTjfxFours;
     private List<ZhjcGhjhTjfxThree> zhjcGhjhTjfxThrees;
 }

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

@@ -9,4 +9,5 @@ public class ZhjcGhjhTjfxDzxAndXgj {
     private Double numbertwo;
     private Double numberthree;
     private Double numberfour;
+    private Double numberfive;
 }

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
+
+import lombok.Data;
+
+@Data
+public class ZhjcGhjhTjfxTwo {
+    private Integer qq;
+    private Integer gk;
+    private Integer cs;
+    private Integer sgt;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcGhjhTzzh.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.math.BigDecimal;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 智慧决策_规划计划_投资资金
+ *
+ * @author wangjian
+ * @date 2019-05-29 11:23:25
+ */
+@Data
+@TableName("t_zhjc_ghjh_tzzh")
+@EqualsAndHashCode(callSuper = true)
+public class ZhjcGhjhTzzh extends Model<ZhjcGhjhTzzh> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * CROWID
+   */
+  private String crowid;
+  /**
+   * 项目id
+   */
+  private String xmid;
+  /**
+   * 项目阶段
+   */
+  private String xmjd;
+  /**
+   * 项目阶段含义
+   */
+  private String xmjdhy;
+  /**
+   * 省投资S --中央投资Z
+   */
+  private String tzly;
+  /**
+   * 投资年份
+   */
+  private String tznf;
+  /**
+   * 批次
+   */
+  private String pc;
+  /**
+   * 批次含义
+   */
+  private String pchy;
+  /**
+   * 至目前已安排中央投资
+   */
+  private BigDecimal zytzyap;
+  /**
+   * 至目前已安排省投资
+   */
+  private BigDecimal stzyap;
+  /**
+   * 下达投资
+   */
+  private BigDecimal yxdtz;
+  /**
+   * 备注
+   */
+  private String bz;
+  /**
+   * 填报时间
+   */
+  private String tbsj;
+  /**
+   * 月完成投资 (第四阶段)
+   */
+  private BigDecimal wctzmonth;
+
+}

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

@@ -6,13 +6,60 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
+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-27 14:23:44
+ * @date 2019-05-29 10:45:50
  */
 public interface ZhjcGhjhMapper extends BaseMapper<ZhjcGhjh> {
+
+    /**
+     * 获取项目跟踪列表本年数据资金
+     * @return
+     */
+    Double getTableBnZJData(@Param("xmid") String xmid, @Param("tzly") String tzly, @Param("tznf") String tznf);
+
+    /**
+     * 获取项目跟踪列表至上年年数据资金
+     * @return
+     */
+    Double getTableZsnZJData(@Param("xmid") String xmid, @Param("tzly") String tzly, @Param("tznf") String tznf);
+
+    /**
+     * 获取数据分析图一数据
+     * @param xmlxdm
+     * @param jhnf
+     * @return
+     */
+    List<ZhjcGhjhTjfxDzxAndXgj> getGhjhOneData(@Param("xmlxdm") String xmlxdm, @Param("jhnf") String jhnf);
+
+    /**
+     * 获取数据分析图二数据
+     * @return
+     */
+    Integer getGhjhTwoData(@Param("xmlxdm") String xmlxdm, @Param("xmjd") String xmjd, @Param("year") String year);
+
+    /**
+     * 获取数据分析图二大中修其他数据
+     */
+    Integer getGhjhTwoDatatwo(@Param("year") String year);
+
+    /**
+     * 获取数据分析图三数据
+     * @return
+     */
+    List<ZhjcGhjhTjfxDzxAndXgj> getGhjhThreeData(@Param("year") String year);
+
+    /**
+     * 获取数据分析图si数据
+     * @return
+     */
+    List<ZhjcGhjhTjfxDzxAndXgj> getGhjhFourData(@Param("code") int code, @Param("xmlxdm") String xmlxdm, @Param("year") String year);
     List<Map<String,Object>> queryLxGhjh(@Param("gcxmId") String gcxmId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/mapper/ZhjcGhjhTzzhMapper.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.ZhjcGhjhTzzh;
+
+/**
+ * 智慧决策_规划计划_投资资金
+ *
+ * @author wangjian
+ * @date 2019-05-29 10:45:56
+ */
+public interface ZhjcGhjhTzzhMapper extends BaseMapper<ZhjcGhjhTzzh> {
+
+}

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

@@ -24,9 +24,10 @@ public interface ZhjcGhjhGhxmService extends IService<ZhjcGhjhGhxm> {
 
     /**
      * 分页查询规划项目
-     * @param Page
      * @param zhjcGhjhGhxm
      * @return
      */
     IPage<ZhjcGhjhGhxm> getZhjcGhjhXmgzDataByPage(Page page, ZhjcGhjhGhxm zhjcGhjhGhxm);
+
+
 }

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

 package com.elephant.framework.galaxy.aroad.module.zhjc.service;
 
+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.IService;
-import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjh;
-import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhGhjdzb;
-import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.*;
+
+import java.util.List;
 
 import java.util.List;
 import java.util.Map;
@@ -12,23 +15,46 @@ import java.util.Map;
  * 智慧决策_规划计划
  *
  * @author wangjian
- * @date 2019-05-27 14:23:44
+ * @date 2019-05-29 10:45:50
  */
 public interface ZhjcGhjhService extends IService<ZhjcGhjh> {
 
+    /**
+     * 根据项目编码查询项目数据
+     */
+    List<ZhjcGhjh> getZhjcGhjhByXmbm(String xmbm);
+
+    /**
+     * 获取项目跟踪页面数据
+     */
+    IPage<ZhjcGhjh> getGhjhXmgz(Page page, String tbdwdm, String xmlxdm, String jsxzdm, String xmjd);
+
+    /**
+     * 获取项目跟踪页面坐标数据
+     */
+    List<ZhjcGhjh> getGhjhXmgzShape(String tbdwdm, String xmlxdm, String jsxzdm, String xmjd);
+
+    /**
+     * 根据统计年份查询规划计划统计分析页面数据
+     * @param year
+     * @return
+     */
+    ZhjcGhjhTjfx getZhjcGhjhTjfxDataByYear(String year);
+
     /**
      * 修改规划计划
-     * @param zhjcGhjh
      * @return
      */
     Boolean updateZhjcGhjh(ZhjcGhjh zhjcGhjh);
 
-
     /**
      * 新增规划计划
-     * @param zhjcGhjh
-     * @return
      */
-    R addZhjcGhjh(ZhjcGhjh zhjcGhjh);
+    Boolean addZhjcGhjh(ZhjcGhjh zhjcGhjh);
+
+    /**
+     * 删除规划计划
+     */
+    Boolean deleteZhjcGhjh(ZhjcGhjh zhjcGhjh);
     List<Map<String,Object>> queryLxGhjh(String gcxmId);
-}
+}
\ No newline at end of file

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTzzh;
+
+/**
+ * 智慧决策_规划计划_投资资金
+ *
+ * @author wangjian
+ * @date 2019-05-29 10:45:56
+ */
+public interface ZhjcGhjhTzzhService extends IService<ZhjcGhjhTzzh> {
+    /**
+     * 修改规划计划投资资金
+     */
+    Boolean updateZhjcGhjhTzzh(ZhjcGhjhTzzh zhjcGhjhTzzh);
+
+    /**
+     * 新增 规划计划投资资金
+     */
+    Boolean addZhjcGhjhTzzh(ZhjcGhjhTzzh zhjcGhjhTzzh);
+
+    /**
+     * 删除规划计划投资资金
+     */
+    Boolean deleteZhjcGhjhTzzh(ZhjcGhjhTzzh zhjcGhjhTzzh);
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjc.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjh;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTzzh;
+import com.elephant.framework.galaxy.aroad.module.zhjc.mapper.ZhjcGhjhTzzhMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhTzzhService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.UUID;
+
+/**
+ * 智慧决策_规划计划_投资资金
+ *
+ * @author wangjian
+ * @date 2019-05-29 10:45:56
+ */
+@Service
+@AllArgsConstructor
+public class ZhjcGhjhTzzhServiceImpl extends ServiceImpl<ZhjcGhjhTzzhMapper, ZhjcGhjhTzzh> implements ZhjcGhjhTzzhService {
+
+    final ZhjcGhjhTzzhMapper zhjcGhjhTzzhMapper;
+
+    /**
+     * 修改规划计划投资资金
+     */
+    public Boolean updateZhjcGhjhTzzh(ZhjcGhjhTzzh zhjcGhjhTzzh) {
+        return zhjcGhjhTzzhMapper.update(zhjcGhjhTzzh, Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getXmid,zhjcGhjhTzzh.getXmid()).eq(ZhjcGhjhTzzh::getXmjd,zhjcGhjhTzzh.getXmjd()))>0;
+    }
+
+    /**
+     * 新增 规划计划投资资金
+     */
+    public Boolean addZhjcGhjhTzzh(ZhjcGhjhTzzh zhjcGhjhTzzh) {
+        ZhjcGhjhTzzh zhjcGhjhTzzh1 = null;
+        if(zhjcGhjhTzzh.getXmjd().startsWith("1") || zhjcGhjhTzzh.getXmjd().startsWith("2")) {
+            zhjcGhjhTzzh1 = zhjcGhjhTzzhMapper.selectOne(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getXmid,zhjcGhjhTzzh.getXmid()).eq(ZhjcGhjhTzzh::getXmjd,zhjcGhjhTzzh.getXmjd()));
+        }else{
+            zhjcGhjhTzzh1 = zhjcGhjhTzzhMapper.selectOne(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getCrowid,zhjcGhjhTzzh.getCrowid()));
+        }
+
+        zhjcGhjhTzzh.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+        int code = zhjcGhjhTzzhMapper.insert(zhjcGhjhTzzh);
+
+        if(code>0) {
+            if(zhjcGhjhTzzh1!=null &&  zhjcGhjhTzzh1.getId()!=null && !"".equals(zhjcGhjhTzzh1.getId().trim())) {
+                zhjcGhjhTzzhMapper.delete(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getId,zhjcGhjhTzzh1.getId()));
+            }
+        }
+        return code>0;
+    }
+
+    /**
+     * 删除规划计划投资资金
+     */
+    public Boolean deleteZhjcGhjhTzzh(ZhjcGhjhTzzh zhjcGhjhTzzh) {
+        if(zhjcGhjhTzzh.getXmjd().startsWith("4")) {
+            return zhjcGhjhTzzhMapper.delete(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getCrowid,zhjcGhjhTzzh.getCrowid()).eq(ZhjcGhjhTzzh::getXmjd,zhjcGhjhTzzh.getXmjd()))>0;
+        }else{
+            return zhjcGhjhTzzhMapper.delete(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getXmid,zhjcGhjhTzzh.getXmid()).eq(ZhjcGhjhTzzh::getXmjd,zhjcGhjhTzzh.getXmjd()))>0;
+        }
+    }
+}

src/main/java/com/elephant/framework/galaxy/aroad/security/config/ResourceServerConfiguration.java

@@ -21,7 +21,9 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
     http.formLogin()
         .and()
         .authorizeRequests()
-        .antMatchers("/roadconditionevent/**","/zhyh/lkpd/save","/zhyh/dzxgcglgcxx/**","/zhyh/dzxgcglgcjd/**","/zhyh/dzxgcgljlzf/**","/zhyh/dzxgcglysgl/**","/zhjc/ghjhghjdzb/**","/zhjc/ghjh/**","/zhjc/ghjhfghjdzb/**","/zhyh/qldtjglrbsjhql/**","/zhyh/qldtjgsjzdjgql/**")
+        .antMatchers("/roadconditionevent/**","/zhyh/lkpd/save","/zhyh/dzxgcglgcxx/**","/zhyh/dzxgcglgcjd/**","/zhyh/dzxgcgljlzf/**","/zhyh/dzxgcglysgl/**",
+                "/zhjc/ghjhghjdzb/**","/zhjc/ghjhtzzh/**","/zhjc/ghjh/**","/zhjc/ghjhfghjdzb/**",
+                "/zhyh/qldtjglrbsjhql/**","/zhyh/qldtjgsjzdjgql/**")
         .permitAll()
         .anyRequest()
         .authenticated()

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

@@ -7,29 +7,24 @@
   <resultMap id="zhjcGhjhMap" type="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjh">
         <id property="id" column="id"/>
         <result property="crowid" column="crowid"/>
-        <result property="xmbh" column="xmbh"/>
+        <result property="xmid" column="xmid"/>
+        <result property="xmbm" column="xmbm"/>
         <result property="xmmc" column="xmmc"/>
         <result property="tbdwdm" column="tbdwdm"/>
         <result property="tbdwmc" column="tbdwmc"/>
+        <result property="xmlxdm" column="xmlxdm"/>
         <result property="xmlx" column="xmlx"/>
-        <result property="jsxz" column="jsxz"/>
         <result property="xmjd" column="xmjd"/>
-        <result property="qqxmjz" column="qqxmjz"/>
+        <result property="xmjdhy" column="xmjdhy"/>
+        <result property="jsxzdm" column="jsxzdm"/>
+        <result property="jsxz" column="jsxz"/>
         <result property="jsgm" column="jsgm"/>
-        <result property="createTime" column="create_time"/>
-        <result property="jsxn" column="jsxn"/>
+        <result property="jsnx" column="jsnx"/>
         <result property="ztz" column="ztz"/>
         <result property="zytz" column="zytz"/>
-        <result property="zySTz" column="zy_s_tz"/>
-        <result property="ndZtz" column="nd_ztz"/>
-        <result property="ndZytz" column="nd_zytz"/>
-        <result property="ndStz" column="nd_stz"/>
-        <result property="yxdstzYearLast" column="yxdstz_year_last"/>
-        <result property="yxdzytzYearLast" column="yxdzytz_year_last"/>
-        <result property="yxdstzYearThis" column="yxdstz_year_this"/>
-        <result property="yxdzytzYearThis" column="yxdzytz_year_this"/>
-        <result property="dateTime" column="date_time"/>
-        <result property="bz" column="bz"/>
+        <result property="stz" column="stz"/>
+        <result property="sfzxzt" column="sfzxzt"/>
+        <result property="createtime" column="createtime"/>
   </resultMap>
 <!--      <resultMap id="lxghjhMap" type="HashMap">-->
 <!--            <result property="xmmc" column="xmmc"/>-->
@@ -44,4 +39,87 @@
       <select id="queryLxGhjh" resultType="HashMap">
         select * from t_zhjc_ghjh where xmbm in (SELECT xmbm FROM `t_szgl_ghjh_gcxm` where gcxm_id = #{gcxmId})
       </select>
+      <select id="getTableBnZJData">
+            select sum(YXDTZ) from t_zhjc_ghjh_tzzh where xmid in (select xmid from t_zhjc_ghjh where xmbm in (select xmbm from t_zhjc_ghjh
+            where xmid=#{xmid}))
+            and tzly=#{tzly}
+            and tznf=#{tznf}
+      </select>
+
+      <select id="getTableZsnZJData" resultType="java.lang.Double">
+            select sum(YXDTZ) from t_zhjc_ghjh_tzzh where xmid in (select xmid from t_zhjc_ghjh where xmbm in (select xmbm from t_zhjc_ghjh
+            where xmid=#{xmid}))
+            and tzly=#{tzly}
+            and tznf &lt; #{tznf}
+      </select>
+
+      <select id="getGhjhOneData" resultType="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTjfxDzxAndXgj">
+            select tbdwmc as city,count(*) as number  from t_zhjc_ghjh
+            <where>
+                  xmjd='10'
+                  <if test="xmlxdm!=null and xmlxdm!=''">
+                        and  xmlxdm=#{xmlxdm}
+                  </if>
+                  <if test="jhnf!=null and jhnf!=''">
+                        and jhnf=#{jhnf}
+                  </if>
+            </where>
+            GROUP BY tbdwdm
+      </select>
+
+      <select id="getGhjhTwoData" resultType="java.lang.Integer">
+            select count(*) as number from t_zhjc_ghjh
+            <where>
+                  sfzxzt='1'
+                  <if test="xmlxdm!=null and xmlxdm!=''">
+                        and xmlxdm=#{xmlxdm}
+                  </if>
+                  <if test="xmjd!=null and xmjd!=''">
+                        and xmjd=#{xmjd}
+                  </if>
+                  <if test="year!=null and year!=''">
+                        and left(CreateTime,4)=#{year}
+                  </if>
+            </where>
+      </select>
+
+      <select id="getGhjhTwoDatatwo" resultType="java.lang.Integer">
+            select count(*) as number from t_zhjc_ghjh
+            <where>
+                  sfzxzt='1' and xmlxdm='02' and xmjd not in('22','24')
+                  <if test="year!=null and year!=''">
+                        and left(CreateTime,4)=#{year}
+                  </if>
+            </where>
+      </select>
+
+      <select id="getGhjhThreeData" resultType="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTjfxDzxAndXgj">
+            select h.tbdwmc as city,sum(h.zytz) as number,sum(h.stz) as numbertwo,(sum(h.ztz)-sum(h.zytz)-sum(h.stz)) as numberthree,sum(t.ZYTZYAP) as numberfour,sum(t.STZYAP) as numberfive from t_zhjc_ghjh h left join t_zhjc_ghjh_tzzh t on h.xmid=t.xmid and h.xmjd=t.xmjd
+            <where>
+                  h.xmjd='30'
+                  <if test="year!=null and year!=''">
+                        and tznf=#{year}
+                  </if>
+            </where>
+            GROUP BY h.tbdwmc
+      </select>
+
+      <select id="getGhjhFourData" resultType="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTjfxDzxAndXgj">
+            select h.tbdwmc as city,sum(t.wctzmonth) as number from t_zhjc_ghjh h left join t_zhjc_ghjh_tzzh t on h.xmid=t.xmid and h.xmjd=t.xmjd
+            <where>
+                  h.xmjd='40'
+                  <if test="code==1">
+                        <if test="xmlxdm!=null and xmlxdm!=''">
+                              and h.xmlxdm=#{xmlxdm}
+                        </if>
+                  </if>
+                  <if test="code==2">
+                        and h.xmlxdm!='01' and h.xmlxdm!='02'
+                  </if>
+                  <if test="year!=null and year!=''">
+                        and left(t.tbsj,4)=#{year}
+                  </if>
+            </where>
+            GROUP BY h.tbdwmc
+      </select>
 </mapper>

src/main/resources/mapper/zhjc/ZhjcGhjhTzzhMapper.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.ZhjcGhjhTzzhMapper">
+
+  <resultMap id="zhjcGhjhTzzhMap" type="com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTzzh">
+        <id property="id" column="id"/>
+        <result property="crowid" column="crowid"/>
+        <result property="xmid" column="xmid"/>
+        <result property="xmjd" column="xmjd"/>
+        <result property="xmjdhy" column="xmjdhy"/>
+        <result property="tzly" column="tzly"/>
+        <result property="tznf" column="tznf"/>
+        <result property="pc" column="pc"/>
+        <result property="pchy" column="pchy"/>
+        <result property="zytzyap" column="zytzyap"/>
+        <result property="stzyap" column="stzyap"/>
+        <result property="yxdtz" column="yxdtz"/>
+        <result property="bz" column="bz"/>
+        <result property="tbsj" column="tbsj"/>
+        <result property="wctzmonth" column="wctzmonth"/>
+  </resultMap>
+</mapper>