fix:优化

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java

@@ -66,8 +66,8 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper<DfCheckingProblemV
 
     @Select("<script> " +
             "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_df_xcqx  where 1=1 " +
-            "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
-            "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
+            "<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " +
+            "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
             "<if test='data.code != null and data.code != \"\"'>" +
             "and dike_code = #{data.code} " +
             "</if>" +

shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwProblemV2Dto.java

@@ -14,6 +14,11 @@ import java.util.Date;
 @ApiModel("工程巡查问题v2")
 public class DwProblemV2Dto {
 
+    @ApiModelProperty("工程编码")
+    private String dikeCode;
+    @ApiModelProperty("工程名称")
+    private String dikeName;
+
     /**
      * 是否可以领单  1是 0否
      */

shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhDetailV2Dto.java

@@ -75,14 +75,14 @@ public class DwYhDetailV2Dto {
      * 工程代码
      */
     @ApiModelProperty("工程代码")
-    private String projectCode;
+    private String dikeCode;
 
 
     /**
      * 工程代码名称
      */
     @ApiModelProperty("工程代码名称")
-    private String projectName;
+    private String dikeName;
 
 
 }

shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhListV2Dto.java

@@ -23,6 +23,13 @@ public class DwYhListV2Dto {
     @ApiModelProperty("巡查项目ID")
     private String checkingId;
 
+    @ApiModelProperty("堤防code")
+    private String dikeCode;
+
+    @ApiModelProperty("堤防名称")
+    private String dikeName;
+
+
     @ApiModelProperty("记录id")
     private String recordId;
 

shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java

@@ -68,8 +68,8 @@ public interface DwCheckingProblemV2Mapper extends BaseMapper<DwCheckingProblemV
 
     @Select("<script> " +
             "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_dw_xcqx  where 1=1 " +
-            "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
-            "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
+            "<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " +
+            "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
             "<if test='data.code != null and data.code != \"\"'>" +
             "and dike_code = #{data.code} " +
             "</if>" +

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java

@@ -68,8 +68,8 @@ public interface SzCheckingProblemV2Mapper extends BaseMapper<SzCheckingProblemV
 
     @Select("<script> " +
             "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_sz_xcqx  where 1=1 " +
-            "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
-            "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
+            "<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " +
+            "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
             "<if test='data.code != null and data.code != \"\"'>" +
             "and waga_code = #{data.code} " +
             "</if>" +