fix: 修复sql

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java

@@ -27,7 +27,7 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
             "from bs_sgc_df_gcda df ",
             "left join bs_sgc_df_gcgl pj on pj.dike_code = df.dike_code and pj.expr_date is null ",
             "where 1=1 ",
-            "and df.expr_date is null",
+            "and df.expr_date is null ",
             "<if test='dikeName != null  and dikeName != \"\"'>",
             "and dike_name like concat('%', #{dikeName}, '%') ",
             "</if>",
@@ -49,9 +49,9 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
             "<script>",
             "select df.dike_code dike_code, df.dike_name dike_name, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department ",
             "from bs_sgc_df_gcda df ",
-            "left join bs_sgc_df_gcgl pj on pj.dike_code = df.dike_code and pj.expr_date is null",
+            "left join bs_sgc_df_gcgl pj on pj.dike_code = df.dike_code and pj.expr_date is null ",
             "where 1=1 ",
-            "and df.expr_date is null",
+            "and df.expr_date is null ",
             "<if test='dikeName != null  and dikeName != \"\"'>",
             "and dike_name like concat('%', #{dikeName}, '%') ",
             "</if>",
@@ -80,9 +80,9 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
             "<script>",
             "select df.dike_code dike_code, df.dike_name dike_name, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department ",
             "from bs_sgc_df_gcda df ",
-            "left join bs_sgc_df_gcgl pj on pj.dike_code = df.dike_code and pj.expr_date is null",
+            "left join bs_sgc_df_gcgl pj on pj.dike_code = df.dike_code and pj.expr_date is null ",
             "where 1=1 ",
-            "and df.expr_date is null",
+            "and df.expr_date is null ",
             "<if test='sp.dikeName != null  and sp.dikeName != \"\"'>",
             "and dike_name like concat('%', #{sp.dikeName}, '%') ",
             "</if>",
@@ -106,7 +106,7 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
     @Select("<script>" +
             "SELECT df.dike_code as dikeCode, df.dike_name as dikeName, df.dike_grad as dikeGrad, df.dike_type as dikeType, df.dike_len as dikeLen, gcgl.engineering_management_unit as engineeringManagementUnit, df.adcd_start as adcdStart, df.adcd_end as adcdEnd " +
             "FROM bs_sgc_df_gcda df " +
-            "LEFT JOIN bs_sgc_df_gcgl gcgl ON gcgl.dike_code = df.dike_code  and gcgl.expr_date is null" +
+            "LEFT JOIN bs_sgc_df_gcgl gcgl ON gcgl.dike_code = df.dike_code  and gcgl.expr_date is null " +
             "WHERE 1=1 " +
             "AND df.expr_date is null " +
             "<if test='dfProject.dikeGrad != null and dfProject.dikeGrad != \"\"'>" +

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java

@@ -28,7 +28,7 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
             "from bs_sgc_sz_jbxx df ",
             "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code and pj.expr_date is null ",
             "where 1=1 ",
-            "and df.expr_date is null",
+            "and df.expr_date is null ",
             "<if test='wagaName != null and wagaName != \"\"'>",
             "and waga_name like concat('%', #{wagaName}, '%') ",
             "</if>",
@@ -48,8 +48,8 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
 
     @Select(value = "select count(1) " +
             "from bs_sgc_sz_jbxx df " +
-            "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code and pj.expr_date is null" +
-            "where waga_name = #{wagaName} and waga_type = #{wagaType}, and df.expr_date is null")
+            "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code and pj.expr_date is null " +
+            "where waga_name = #{wagaName} and waga_type = #{wagaType}, and df.expr_date is null ")
     int getSzProjectListCount(@Param("wagaName") String wagaName, @Param("wagaType") String wagaType);
 
 
@@ -57,9 +57,9 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
             "<script>",
             "select df.waga_code waga_code, df.waga_name waga_name, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department ",
             "from bs_sgc_sz_jbxx df ",
-            "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code and df.expr_date is null and pj.expr_date is null",
+            "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code and df.expr_date is null and pj.expr_date is null ",
             "where 1=1 ",
-            "and df.expr_date is null",
+            "and df.expr_date is null ",
             "<if test='sp.wagaName != null  and sp.wagaName != \"\"'>",
             "and waga_name like concat('%', #{sp.wagaName}, '%') ",
             "</if>",
@@ -83,7 +83,7 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
     @Select("<script>" +
             "SELECT df.waga_code as wagaCode, df.waga_name as wagaName, df.waga_type as wagaType, df.adcd as adcd, pj.engineering_management_unit as engineeringManagementUnit " +
             "FROM bs_sgc_sz_jbxx df " +
-            "LEFT JOIN bs_sgc_sz_gcgl pj ON pj.waga_code = df.waga_code and pj.expr_date is null" +
+            "LEFT JOIN bs_sgc_sz_gcgl pj ON pj.waga_code = df.waga_code and pj.expr_date is null " +
             "WHERE 1=1 " +
             "and df.expr_date is null  " +
             "<if test='szProject.wagaName != null and szProject.wagaName != \"\"'>" +