智慧公路智慧建设及智慧养护代码近期修改提交

src/main/java/com/elephant/framework/galaxy/aroad/module/common/controller/FileUploadController.java

@@ -109,6 +109,7 @@ public class FileUploadController {
             }
             return new R<>(resultMap);
         }
+        System.out.println("没有上传文件");
         return new R(CommonConstants.FAIL, "没有上传文件");
     }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/common/entity/KeyValues.java

+package com.elephant.framework.galaxy.aroad.module.common.entity;
+
+import lombok.Data;
+
+@Data
+public class KeyValues {
+    private String name;
+    private Integer number;
+
+    public KeyValues(String name,int number) {
+        this.name = name;
+        this.number = number;
+    }
+
+    public KeyValues() {
+    }
+}

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

@@ -10,6 +10,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
+import java.util.Date;
 import java.util.UUID;
 
 
@@ -58,6 +59,7 @@ public class ZhjgLzglFglbzxktzController extends BaseController  {
   public R save(@RequestBody ZhjgLzglFglbzxktz zhjgLzglFglbzxktz){
     String uuid = UUID.randomUUID().toString().replaceAll("-","");
     zhjgLzglFglbzxktz.setId(uuid);
+    zhjgLzglFglbzxktz.setCreateTime((new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date()));
     return new R<>(zhjgLzglFglbzxktzService.save(zhjgLzglFglbzxktz));
   }
 

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

@@ -6,6 +6,8 @@ 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.ZhjgLzglZdslgcxkxztz;
 import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgLzglZdslgcxkxztzService;
+import com.elephant.framework.galaxy.aroad.security.entity.GalaxyUser;
+import com.elephant.framework.galaxy.aroad.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
@@ -57,7 +59,9 @@ public class ZhjgLzglZdslgcxkxztzController extends BaseController  {
   @PostMapping
   public R save(@RequestBody ZhjgLzglZdslgcxkxztz zhjgLzglZdslgcxkxztz){
     String uuid = UUID.randomUUID().toString().replaceAll("-","");
+    GalaxyUser galaxyUser = SecurityUtils.getUser();
     zhjgLzglZdslgcxkxztz.setId(uuid.toString());
+    zhjgLzglZdslgcxkxztz.setCreator(galaxyUser.getUsername());
     return new R<>(zhjgLzglZdslgcxkxztzService.save(zhjgLzglZdslgcxkxztz));
   }
 
@@ -69,6 +73,8 @@ public class ZhjgLzglZdslgcxkxztzController extends BaseController  {
   @SysLog("修改重大涉路工程许可行政台账表")
   @PutMapping
   public R updateById(@RequestBody ZhjgLzglZdslgcxkxztz zhjgLzglZdslgcxkxztz){
+    GalaxyUser galaxyUser = SecurityUtils.getUser();
+    zhjgLzglZdslgcxkxztz.setUpdatePerson(galaxyUser.getUsername());
     return new R<>(zhjgLzglZdslgcxkxztzService.updateById(zhjgLzglZdslgcxkxztz));
   }
 

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

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
 /**
  * 督查情况任务表
  *
- * @author zyw
+ * @author zywcydw
  * @date 2019-03-15 16:58:24
  */
 @Data
@@ -85,6 +85,10 @@ public class ZhjgDckhRw extends Model<ZhjgDckhRw> {
      * 督办附件
      */
     private String dbfj;
+    /**
+     * 附件名称
+     */
+    private String fjname;
     /**
      * 督办人
      */

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

@@ -109,5 +109,9 @@ private static final long serialVersionUID = 1L;
    * 申请书附件ID
    */
   private String sqsfjid;
+  /**
+   * 创建时间
+   */
+  private String createTime;
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/controller/ZhjsGcxmController.java

@@ -37,54 +37,40 @@ public class ZhjsGcxmController extends BaseController  {
     return  new R<>(zhjsGcxmService.page(page,Wrappers.query(zhjsGcxm)));
   }
 
-
   /**
-   * 通过id查询工程项目信息表
-
-   * @param id id
-   * @return R
+   * 根据项目ID查询项目情况
+   * @param xmid
+   * @return
    */
-  @GetMapping("/{id}")
-  public R getById(@PathVariable("id") String id){
-    return new R<>(zhjsGcxmService.getById(id));
+  @GetMapping("/getXmqk")
+  public R getZhjsXmqkByXmid(String xmid) {
+    return new R<>(zhjsGcxmService.getZhjsXmqkByXmid(xmid));
   }
 
   /**
-   * 新增工程项目信息表
-
-   * @param zhjsGcxm 工程项目信息表
-
-   * @return R
+   * 查询综合展示页面图一数据
+   * @return
    */
-  @SysLog("新增工程项目信息表")
-  @PostMapping
-  public R save(@RequestBody ZhjsGcxm zhjsGcxm){
-    return new R<>(zhjsGcxmService.save(zhjsGcxm));
+  @GetMapping("/getZhzsOne")
+  public R getZhjsZhzsOneData() {
+    return new R<>(zhjsGcxmService.getZhjsZhzsOneDatas());
   }
 
   /**
-   * 修改工程项目信息表
-
-   * @param zhjsGcxm 工程项目信息表
-
-   * @return R
+   * 查询综合展示页面图二数据
+   * @return
    */
-  @SysLog("修改工程项目信息表")
-  @PutMapping
-  public R updateById(@RequestBody ZhjsGcxm zhjsGcxm){
-    return new R<>(zhjsGcxmService.updateById(zhjsGcxm));
+  @GetMapping("/getZhzsTwo")
+  public R getZhjsZhzsTwoData(String city) {
+    return new R<>(zhjsGcxmService.getZhjsZhzsTwoDatas(city));
   }
 
   /**
-   * 通过id删除工程项目信息表
-
-   * @param id id
-   * @return R
+   * 查询综合展示页面图三数据
+   * @return
    */
-  @SysLog("删除工程项目信息表")
-  @DeleteMapping("/{id}")
-  public R removeById(@PathVariable String id){
-    return new R<>(zhjsGcxmService.removeById(id));
+  @GetMapping("/getZhzsThree")
+  public R getZhjsZhzsThreeData() {
+    return new R<>(zhjsGcxmService.getZhjsZhzsThreeDatas());
   }
-
 }

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

+package com.elephant.framework.galaxy.aroad.module.zhjs.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class ZhjsXmqk {
+
+    /**
+     *  项目ID
+     */
+    private String id;
+
+    /**
+     * 概算总投资（万元）
+     */
+    private BigDecimal estimate;
+
+    /**
+     * 省投资（万元）
+     */
+    private BigDecimal provinceinvest;
+
+    /**
+     * 中央投资（万元）
+     */
+    private BigDecimal centreinvest;
+
+    /**
+     * 计划开工日期
+     */
+    private LocalDateTime planstartdate;
+
+    /**
+     * 计划完工日期
+     */
+    private LocalDateTime planenddate;
+
+    /**
+     * 项目介绍
+     */
+    private String introduce;
+
+    /**
+     * 项目形象进度
+     */
+    private String plancontent;
+
+    /**
+     * 中央投资-已下达
+     */
+    private String ccinIssuedAmount;
+
+    /**
+     * 省投资-已下达
+     */
+    private BigDecimal provinceIssuedAmount;
+
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjs.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ZhjsZhzs {
+    private List<ZhjsZhzsThree> zhjsZhzsThrees;
+    private List<ZhjsZhzsOne> zhjsZhzsOnes;
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjs.entity;
+
+import lombok.Data;
+
+@Data
+public class ZhjsZhzsOne {
+    private String city;
+    private Integer xujxm;
+    private Integer xijxm;
+    private Integer wgxm;
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhjs.entity;
+
+import lombok.Data;
+
+@Data
+public class ZhjsZhzsThree {
+    private String city;
+    private Integer ccxij;
+    private Integer ccxuj;
+    private Integer pjxij;
+    private Integer pjxuj;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/mapper/ZhjsGcxmMapper.java

 package com.elephant.framework.galaxy.aroad.module.zhjs.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.common.entity.KeyValues;
 import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsXmqk;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 工程项目信息表
@@ -12,4 +17,21 @@ import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm;
  */
 public interface ZhjsGcxmMapper extends BaseMapper<ZhjsGcxm> {
 
+    /**
+     * 根据项目ID查询项目情况
+     * @param xmid
+     * @return
+     */
+    ZhjsXmqk getZhjsXmqkByXmid(@Param("xmid") String xmid);
+
+    /**
+     * 综合展示页面图三和图一数据查询
+     * @return
+     */
+    List<KeyValues> getZhjsZhzsThreeAndOne(@Param("type")String type, @Param("sx")Integer sx);
+
+    /**
+     * 综合展示页面图二数据展示
+     */
+    Integer getZhjsZhzsTwo(@Param("city") String city, @Param("type") String type, @Param("sx") Integer sx);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/ZhjsGcxmService.java

 package com.elephant.framework.galaxy.aroad.module.zhjs.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm;
+import com.elephant.framework.galaxy.aroad.module.common.entity.KeyValues;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.*;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 工程项目信息表
@@ -11,5 +15,25 @@ import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm;
  * @date 2019-04-08 18:14:32
  */
 public interface ZhjsGcxmService extends IService<ZhjsGcxm> {
+    /**
+     * 根据项目ID查询项目情况
+     * @param xmid
+     * @return
+     */
+    ZhjsXmqk getZhjsXmqkByXmid(String xmid);
+
+    /**
+     * 查询综合展示图一数据
+     */
+    List<ZhjsZhzsOne> getZhjsZhzsOneDatas();
+
+    /**
+     * 查询综合展示图三数据
+     */
+    List<ZhjsZhzsThree> getZhjsZhzsThreeDatas();
 
+    /**
+     * 查询综合展示图二数据
+     */
+    List<KeyValues> getZhjsZhzsTwoDatas(String city);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/impl/ZhjsGcxmServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.zhjs.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm;
+import com.elephant.framework.galaxy.aroad.module.common.entity.KeyValues;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.*;
 import com.elephant.framework.galaxy.aroad.module.zhjs.mapper.ZhjsGcxmMapper;
 import com.elephant.framework.galaxy.aroad.module.zhjs.service.ZhjsGcxmService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 工程项目信息表
 
@@ -14,6 +19,116 @@ import org.springframework.stereotype.Service;
  * @date 2019-04-08 18:14:32
  */
 @Service
+@AllArgsConstructor
 public class ZhjsGcxmServiceImpl extends ServiceImpl<ZhjsGcxmMapper, ZhjsGcxm> implements ZhjsGcxmService {
 
+    final ZhjsGcxmMapper zhjsGcxmMapper;
+
+    private static String[] citys = new String[]{"济南","青岛","淄博","枣庄","东营","烟台","潍坊","济宁","泰安","威海","日照","滨州","德州","聊城"
+            ,"临沂","菏泽","莱芜"};
+
+    /**
+     * 根据项目ID查询项目情况
+     * @param xmid
+     * @return
+     */
+    public ZhjsXmqk getZhjsXmqkByXmid(String xmid) {
+        return zhjsGcxmMapper.getZhjsXmqkByXmid(xmid);
+    }
+
+
+
+    /**
+     * 查询综合展示图一数据
+     */
+    public List<ZhjsZhzsOne> getZhjsZhzsOneDatas() {
+        List<ZhjsZhzsOne> zhjsZhzsOnes = new ArrayList<>();
+
+        List<KeyValues> xujxm = zhjsGcxmMapper.getZhjsZhzsThreeAndOne(null, 1);
+        List<KeyValues> xijxm = zhjsGcxmMapper.getZhjsZhzsThreeAndOne(null, 2);
+        List<KeyValues> wgxm = zhjsGcxmMapper.getZhjsZhzsThreeAndOne(null, 3);
+
+        for(String city : citys) {
+            ZhjsZhzsOne zhjsZhzsOne = new ZhjsZhzsOne();
+            zhjsZhzsOne.setCity(city);
+
+            for(KeyValues keyValues : xujxm) {
+                if(keyValues.getName().indexOf(city)>-1) {
+                    zhjsZhzsOne.setXujxm(keyValues.getNumber());
+                }
+            }
+            for(KeyValues keyValues : xijxm) {
+                if(keyValues.getName().indexOf(city)>-1) {
+                    zhjsZhzsOne.setXijxm(keyValues.getNumber());
+                }
+            }
+            for(KeyValues keyValues : wgxm) {
+                if(keyValues.getName().indexOf(city)>-1) {
+                    zhjsZhzsOne.setWgxm(keyValues.getNumber());
+                }
+            }
+            zhjsZhzsOnes.add(zhjsZhzsOne);
+        }
+
+        return zhjsZhzsOnes;
+    }
+
+    /**
+     * 查询综合展示图二数据
+     */
+    public List<KeyValues> getZhjsZhzsTwoDatas(String city) {
+        List<KeyValues> keyValues = new ArrayList<>();
+
+        keyValues.add(new KeyValues("瓶颈续建", zhjsGcxmMapper.getZhjsZhzsTwo(city,"瓶颈",1)));
+        keyValues.add(new KeyValues("瓶颈新建", zhjsGcxmMapper.getZhjsZhzsTwo(city,"瓶颈",2)));
+        keyValues.add(new KeyValues("瓶颈项目", zhjsGcxmMapper.getZhjsZhzsTwo(city,"瓶颈",null)));
+        keyValues.add(new KeyValues("穿城续建", zhjsGcxmMapper.getZhjsZhzsTwo(city,"穿城",1)));
+        keyValues.add(new KeyValues("穿城新建", zhjsGcxmMapper.getZhjsZhzsTwo(city,"穿城",2)));
+        keyValues.add(new KeyValues("穿城项目", zhjsGcxmMapper.getZhjsZhzsTwo(city,"穿城",null)));
+
+        return keyValues;
+    }
+
+    /**
+     * 查询综合展示图三数据
+     */
+    public List<ZhjsZhzsThree> getZhjsZhzsThreeDatas() {
+        List<ZhjsZhzsThree> zhjsZhzsThrees = new ArrayList<>();
+
+        List<KeyValues> ccxuj = zhjsGcxmMapper.getZhjsZhzsThreeAndOne("穿城项目",1);
+        List<KeyValues> ccxij = zhjsGcxmMapper.getZhjsZhzsThreeAndOne("穿城项目",2);
+        List<KeyValues> pjxuj = zhjsGcxmMapper.getZhjsZhzsThreeAndOne("瓶颈项目",1);
+        List<KeyValues> pjxij = zhjsGcxmMapper.getZhjsZhzsThreeAndOne("瓶颈项目",2);
+
+        for(String city : citys) {
+            ZhjsZhzsThree zhjsZhzsThree = new ZhjsZhzsThree();
+            zhjsZhzsThree.setCity(city);
+            for(KeyValues keyValues : ccxuj) {
+                if(keyValues.getName().indexOf(city)>-1) {
+                    zhjsZhzsThree.setCcxuj(keyValues.getNumber());
+                    break;
+                }
+            }
+            for(KeyValues keyValues : ccxij) {
+                if(keyValues.getName().indexOf(city)>-1) {
+                    zhjsZhzsThree.setCcxij(keyValues.getNumber());
+                    break;
+                }
+            }
+            for(KeyValues keyValues : pjxuj) {
+                if(keyValues.getName().indexOf(city)>-1) {
+                    zhjsZhzsThree.setPjxuj(keyValues.getNumber());
+                    break;
+                }
+            }
+            for(KeyValues keyValues : pjxij) {
+                if(keyValues.getName().indexOf(city)>-1) {
+                    zhjsZhzsThree.setPjxij(keyValues.getNumber());
+                    break;
+                }
+            }
+            zhjsZhzsThrees.add(zhjsZhzsThree);
+        }
+        return zhjsZhzsThrees;
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhglScfjController.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.ZhglScfj;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhglScfjService;
+import com.elephant.framework.galaxy.aroad.security.entity.GalaxyUser;
+import com.elephant.framework.galaxy.aroad.util.SecurityUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.UUID;
+
+
+/**
+ * 智慧公路_上传附件表
+ *
+ * @author wangjian
+ * @date 2019-05-06 20:16:42
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhyh/scfj")
+public class ZhglScfjController extends BaseController  {
+
+  private final  ZhglScfjService zhglScfjService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhglScfj 智慧公路_上传附件表
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhglScfjPage(Page page, ZhglScfj zhglScfj) {
+    return  new R<>(zhglScfjService.getZhglScfjPage(page,zhglScfj));
+  }
+
+
+  /**
+   * 通过id查询智慧公路_上传附件表
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhglScfjService.getById(id));
+  }
+
+  /**
+   * 新增智慧公路_上传附件表
+   * @param zhglScfj 智慧公路_上传附件表
+   * @return R
+   */
+  @SysLog("新增智慧公路_上传附件表")
+  @PostMapping
+  public R save(@RequestBody ZhglScfj zhglScfj){
+    String uuid = UUID.randomUUID().toString().replaceAll("-","");
+    GalaxyUser galaxyUser = SecurityUtils.getUser();
+
+    zhglScfj.setId(uuid);
+    zhglScfj.setScr(galaxyUser.getUsername());
+    zhglScfj.setWjzt("已上传");
+    zhglScfj.setScsj((new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date()));
+    return new R<>(zhglScfjService.save(zhglScfj));
+  }
+
+  /**
+   * 修改智慧公路_上传附件表
+   * @param zhglScfj 智慧公路_上传附件表
+   * @return R
+   */
+  @SysLog("修改智慧公路_上传附件表")
+  @PutMapping
+  public R updateById(@RequestBody ZhglScfj zhglScfj){
+    return new R<>(zhglScfjService.updateById(zhglScfj));
+  }
+
+  /**
+   * 通过id删除智慧公路_上传附件表
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除智慧公路_上传附件表")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhglScfjService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhglScfj.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-06 20:16:42
+ */
+@Data
+@TableName("t_zhgl_scfj")
+@EqualsAndHashCode(callSuper = true)
+public class ZhglScfj extends Model<ZhglScfj> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId
+  private String id;
+  /**
+   * 标题
+   */
+  private String bt;
+  /**
+   * 日期
+   */
+  private String rq;
+  /**
+   * 上传人
+   */
+  private String scr;
+  /**
+   * 上传时间
+   */
+  private String scsj;
+  /**
+   * 文件状态
+   */
+  private String wjzt;
+  /**
+   * 文件地址
+   */
+  private String fileurl;
+
+  /**
+   * 类型
+   */
+  private String type;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/mapper/ZhglScfjMapper.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.ZhglScfj;
+
+/**
+ * 智慧公路_上传附件表
+ *
+ * @author wangjian
+ * @date 2019-05-06 20:16:42
+ */
+public interface ZhglScfjMapper extends BaseMapper<ZhglScfj> {
+
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhyh.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhglScfj;
+
+/**
+ * 智慧公路_上传附件表
+ *
+ * @author wangjian
+ * @date 2019-05-06 20:16:42
+ */
+public interface ZhglScfjService extends IService<ZhglScfj> {
+
+    /**
+     * 分页查询附件表
+     * @param page
+     * @return
+     */
+    IPage<ZhglScfj> getZhglScfjPage(IPage<ZhglScfj> page,ZhglScfj zhglScfj);
+}

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

+package com.elephant.framework.galaxy.aroad.module.zhyh.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhglScfj;
+import com.elephant.framework.galaxy.aroad.module.zhyh.mapper.ZhglScfjMapper;
+import com.elephant.framework.galaxy.aroad.module.zhyh.service.ZhglScfjService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * 智慧公路_上传附件表
+ *
+ * @author wangjian
+ * @date 2019-05-06 20:16:42
+ */
+@Service
+@AllArgsConstructor
+public class ZhglScfjServiceImpl extends ServiceImpl<ZhglScfjMapper, ZhglScfj> implements ZhglScfjService {
+
+    final ZhglScfjMapper zhglScfjMapper;
+
+    /**
+     * 分页查询附件表
+     * @param page
+     * @return
+     */
+    public IPage<ZhglScfj> getZhglScfjPage(IPage<ZhglScfj> page,ZhglScfj zhglScfj) {
+        return zhglScfjMapper.selectPage(page, Wrappers.<ZhglScfj>query().lambda().eq(ZhglScfj::getType,zhglScfj.getType()).like(ZhglScfj::getRq,zhglScfj.getRq()));
+    }
+}

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

@@ -20,6 +20,7 @@
         <result property="xfsj" column="xfsj"/>
         <result property="dbnr" column="dbnr"/>
         <result property="dbfj" column="dbfj"/>
+        <result property="fjname" column="fjname"/>
         <result property="dbr" column="dbr"/>
         <result property="dbrlxfs" column="dbrlxfs"/>
         <result property="creator" column="creator"/>
@@ -30,6 +31,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+
     <select id="selectRwForPage" resultMap="zhjgDckhRwMap">
           SELECT distinct
           rw.*

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

@@ -27,5 +27,6 @@
         <result property="bzsj" column="bzsj"/>
         <result property="bcqx" column="bcqx"/>
         <result property="sqsfjid" column="sqsfjid"/>
+        <result property="createTime" column="createTime"/>
   </resultMap>
 </mapper>

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

@@ -44,4 +44,46 @@
         <result property="legalperson" column="legalperson"/>
         <result property="spanlength" column="spanlength"/>
   </resultMap>
+
+      <select id="getZhjsXmqkByXmid" resultType="com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsXmqk">
+            select
+                m.id,m.estimate,m.provinceinvest,
+                m.centreinvest,m.planstartdate,
+                m.planenddate,m.introduce,
+                b.plancontent,
+                h.provinceIssuedAmount,h.ccinIssuedAmount
+            from t_zhjs_gcxm m left join t_zhjs_xmtzjh h on m.id=h.proid left join t_zhjs_hzsb b on m.id=b.proid
+            <where>
+                <if test="xmid!='' and xmid!=null">
+                      m.id=#{xmid}
+                </if>
+            </where>
+      </select>
+    <select id="getZhjsZhzsThreeAndOne" resultType="com.elephant.framework.galaxy.aroad.module.common.entity.KeyValues">
+        select city as name,count(*) as number from t_zhjs_gcxm
+        <where>
+            <if test="type!='' and type!=null">
+                type like concat('%',#{type},'%')
+            </if>
+            <if test="sx!=null">
+                and attribute=#{sx}
+            </if>
+        </where>
+        GROUP BY city
+    </select>
+
+    <select id="getZhjsZhzsTwo" resultType="java.lang.Integer">
+        select count(*) from t_zhjs_gcxm
+        <where>
+            <if test="type!='' and type!=null">
+                type like concat('%',#{type},'%')
+            </if>
+            <if test="sx!=null">
+                and attribute=#{sx}
+            </if>
+            <if test="city!='' and city!=null">
+                and city like concat('%',#{city},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/mapper/zhyh/ZhglScfjMapper.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.ZhglScfjMapper">
+
+  <resultMap id="zhglScfjMap" type="com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhglScfj">
+        <id property="id" column="id"/>
+        <result property="bt" column="bt"/>
+        <result property="rq" column="rq"/>
+        <result property="scr" column="scr"/>
+        <result property="scsj" column="scsj"/>
+        <result property="wjzt" column="wjzt"/>
+        <result property="fileurl" column="fileUrl"/>
+        <result property="type" column="type"/>
+  </resultMap>
+</mapper>