综合统计页面数据整理,问题修改

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

@@ -32,10 +32,12 @@ public class ZhtjGljbxxXxctdqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGljbxxXxctdqkPage(Page page, ZhtjGljbxxXxctdqk zhtjGljbxxXxctdqk) {
+    if(zhtjGljbxxXxctdqk.getYear() == null){
+      zhtjGljbxxXxctdqk.setYear("2018");
+    }
     return  new R<>(zhtjGljbxxXxctdqkService.page(page,Wrappers.query(zhtjGljbxxXxctdqk)));
   }
 
-
   /**
    * 通过id查询县乡村通达情况
    * @param id id

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

@@ -15,13 +15,13 @@ import java.time.LocalDateTime;
  * @date 2019-03-11 17:58:58
  */
 @Data
-@TableName("T_ZHTJ_GLJSZKPD")
+@TableName("t_zhtj_gljszkpd")
 @EqualsAndHashCode(callSuper = true)
 public class ZhtjGljszkpd extends Model<ZhtjGljszkpd> {
 private static final long serialVersionUID = 1L;
 
   /**
-   * 
+   *
    */
   @TableId
   private Integer id;

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

@@ -15,13 +15,13 @@ import java.time.LocalDateTime;
  * @date 2019-03-12 11:04:15
  */
 @Data
-@TableName("T_ZHTJ_GLLMQK")
+@TableName("t_zhtj_gllmqk")
 @EqualsAndHashCode(callSuper = true)
 public class ZhtjGllmqk extends Model<ZhtjGllmqk> {
 private static final long serialVersionUID = 1L;
 
   /**
-   * 
+   *
    */
   @TableId
   private Integer id;

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

@@ -15,13 +15,13 @@ import java.time.LocalDateTime;
  * @date 2019-03-12 08:57:24
  */
 @Data
-@TableName("T_ZHTJ_GLQSQK_QLQK")
+@TableName("t_zhtj_glqsqk_qlqk")
 @EqualsAndHashCode(callSuper = true)
 public class ZhtjGlqsqkQlqk extends Model<ZhtjGlqsqkQlqk> {
 private static final long serialVersionUID = 1L;
 
   /**
-   * 
+   *
    */
   @TableId
   private Integer id;

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

@@ -15,13 +15,13 @@ import java.time.LocalDateTime;
  * @date 2019-03-11 20:53:25
  */
 @Data
-@TableName("T_ZHTJ_GLQSQK_SDQK")
+@TableName("t_zhtj_glqsqk_sdqk")
 @EqualsAndHashCode(callSuper = true)
 public class ZhtjGlqsqkSdqk extends Model<ZhtjGlqsqkSdqk> {
 private static final long serialVersionUID = 1L;
 
   /**
-   * 
+   *
    */
   @TableId
   private Integer id;

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

@@ -27,11 +27,11 @@
   </resultMap>
       <select id="electZhtjGllmqks" resultMap="zhtjGllmqkMap">
             SELECT * FROM `t_zhtj_gllmqk` where type = #{type}
-             <if test="year==null or year==''">
-                   and year=(
-                   select max(year) maxyear from `t_zhtj_gllmqk`
-                   )
-             </if>
+            <if test="year==null or year==''">
+                  and year=(
+                  select max(year) maxyear from `t_zhtj_gllmqk`
+                  )
+            </if>
             <if test="year!=null and year!=''">
                   and year=#{year}
             </if>