更新智慧公路sql，

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/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/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/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/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/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>