fix: 修复字段名称

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

@@ -52,12 +52,12 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
 
     @Select({
             "<script>",
-            "select df.wage_code wage_code, df.wage_name wage_name, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department ",
+            "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.wage_code = df.wage_code ",
+            "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code ",
             "where 1=1 ",
-            "<if test='sp.wageName != null  and sp.wageName != \"\"'>",
-            "and wage_name like concat('%', #{sp.wageName}, '%') ",
+            "<if test='sp.wagaName != null  and sp.wagaName != \"\"'>",
+            "and waga_name like concat('%', #{sp.wagaName}, '%') ",
             "</if>",
             "<if test='sp.engineeringManagementUnit!= null and sp.engineeringManagementUnit != \"\"'>",
             "and pj.engineering_management_unit like concat('%', #{sp.engineeringManagementUnit}, '%') ",
@@ -68,11 +68,11 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
             "</script>"
     })
     @Results({
-            @Result(property = "wageCode", column = "wage_code"),
-            @Result(property = "wageName", column = "wage_name"),
+            @Result(property = "wagaCode", column = "waga_code"),
+            @Result(property = "wagaName", column = "waga_name"),
             @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"),
             @Result(property = "waterAdministrativeDepartment", column = "water_administrative_department"),
-            @Result(property = "lastTime", column = "wage_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.df.mapper.SzYhRecordMapper.getLastInsertTimeByWagaCode"))
+            @Result(property = "lastTime", column = "waga_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.df.mapper.SzYhRecordMapper.getLastInsertTimeByWagaCode"))
     })
     IPage<SzProjectListDto> getDfYhProjectListWithPage(Page<SzProjectListDto> page, @Param("sp") SzYhProjectQueDto sp);
 }

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhProjectQueDto.java

@@ -18,7 +18,7 @@ import lombok.Data;
 public class SzYhProjectQueDto {
 
     @ApiModelProperty(value = "水闸名称")
-    private String wageName;
+    private String wagaName;
     @ApiModelProperty(value = "工程管理单位")
     private String engineeringManagementUnit;
     @ApiModelProperty(value = "水务行政部门")

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.base.SzException;
-import com.kms.yxgh.df.dto.DfYhPlanDto;
 import com.kms.yxgh.sz.domain.SzYhPlan;
 import com.kms.yxgh.sz.dto.SzYhPlanDetailDto;
 import com.kms.yxgh.sz.dto.SzYhPlanSearchDto;
@@ -27,67 +26,67 @@ import org.springframework.transaction.annotation.Transactional;
 public class SzYhPlanService extends BaseService<SzYhPlanMapper, SzYhPlan> {
 
 
-  public SzYhPlanDetailDto getDetailById(String id) {
-    SzYhPlan szPlan = this.getById(id);
-    return BeanCopyUtils.copy(szPlan, SzYhPlanDetailDto.class);
-  }
+    public SzYhPlanDetailDto getDetailById(String id) {
+        SzYhPlan szPlan = this.getById(id);
+        return BeanCopyUtils.copy(szPlan, SzYhPlanDetailDto.class);
+    }
 
 
-  @Transactional(rollbackFor = Exception.class)
-  public SzYhPlanDetailDto add(SzYhPlanDetailDto dto) {
-    SzYhPlan szPlan = BeanCopyUtils.copy(dto, SzYhPlan.class);
-    if (szPlan != null) {
-      szPlan.setId(null);
-      if (checkNameDistinct(szPlan.getId(), szPlan.getName())) {
-        getBaseMapper().insert(szPlan);
-        dto.setId(szPlan.getId());
-        return dto;
-      } else {
-        throw new SzException("该名称已存在");
-      }
+    @Transactional(rollbackFor = Exception.class)
+    public SzYhPlanDetailDto add(SzYhPlanDetailDto dto) {
+        SzYhPlan szPlan = BeanCopyUtils.copy(dto, SzYhPlan.class);
+        if (szPlan != null) {
+            szPlan.setId(null);
+            if (checkNameDistinct(szPlan.getId(), szPlan.getName())) {
+                getBaseMapper().insert(szPlan);
+                dto.setId(szPlan.getId());
+                return dto;
+            } else {
+                throw new SzException("该名称已存在");
+            }
 
+        }
+        return null;
     }
-    return null;
-  }
 
-  @Transactional(rollbackFor = Exception.class)
-  public SzYhPlanDetailDto update(SzYhPlanDetailDto dto) {
-    if (exist(dto.getId())) {
-      SzYhPlan szPlan = BeanCopyUtils.copy(dto, SzYhPlan.class);
-      if (szPlan != null) {
-        if (checkNameDistinct(szPlan.getId(), szPlan.getName())) {
-          getBaseMapper().updateById(szPlan);
-          return dto;
-        } else {
-          throw new SzException("该名称已存在");
+    @Transactional(rollbackFor = Exception.class)
+    public SzYhPlanDetailDto update(SzYhPlanDetailDto dto) {
+        if (exist(dto.getId())) {
+            SzYhPlan szPlan = BeanCopyUtils.copy(dto, SzYhPlan.class);
+            if (szPlan != null) {
+                if (checkNameDistinct(szPlan.getId(), szPlan.getName())) {
+                    getBaseMapper().updateById(szPlan);
+                    return dto;
+                } else {
+                    throw new SzException("该名称已存在");
+                }
+            }
         }
-      }
-    }
-    throw new SzException("源数据不存在，请确认id值是否正确");
+        throw new SzException("源数据不存在，请确认id值是否正确");
 
-  }
+    }
 
 
-  @Transactional(rollbackFor = Exception.class)
-  public Boolean deleteById(String id) {
-    return removeById(id);
-  }
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteById(String id) {
+        return removeById(id);
+    }
 
-  private boolean checkNameDistinct(String id, String name) {
-    Wrapper<SzYhPlan> wp = Wrappers.<SzYhPlan>lambdaQuery()
-        .eq(SzYhPlan::getName, name)
-        .ne(StringUtils.isNotEmpty(id), SzYhPlan::getId, id);
-    return this.getBaseMapper().selectCount(wp) <= 0;
-  }
+    private boolean checkNameDistinct(String id, String name) {
+        Wrapper<SzYhPlan> wp = Wrappers.<SzYhPlan>lambdaQuery()
+                .eq(SzYhPlan::getName, name)
+                .ne(StringUtils.isNotEmpty(id), SzYhPlan::getId, id);
+        return this.getBaseMapper().selectCount(wp) <= 0;
+    }
 
-  private boolean exist(String id) {
-    Wrapper<SzYhPlan> wp = Wrappers.<SzYhPlan>lambdaQuery()
-        .eq(SzYhPlan::getId, id);
-    return this.getBaseMapper().selectCount(wp) > 0;
-  }
+    private boolean exist(String id) {
+        Wrapper<SzYhPlan> wp = Wrappers.<SzYhPlan>lambdaQuery()
+                .eq(SzYhPlan::getId, id);
+        return this.getBaseMapper().selectCount(wp) > 0;
+    }
 
     public IPage<SzYhPlanSearchDto> search(SearchParam<SzYhPlanSearchDto> sp) {
-      Page<SzYhPlanSearchDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-      return this.getBaseMapper().selectPage(page, sp.getData());
+        Page<SzYhPlanSearchDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
+        return this.getBaseMapper().selectPage(page, sp.getData());
     }
 }