From 125785eab634f165743cbb22f74ce1881b95fac1 Mon Sep 17 00:00:00 2001 From: hxh Date: Sat, 15 Mar 2025 10:23:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9remark,=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E5=8C=BA=E5=88=92=E7=AD=89=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/web/controller/system/SysXzqhController.java | 12 ++++++------ .../com/shuili/common/core/domain/BaseEntity.java | 2 -- .../shuili/common/core/domain/entity/SysMenu.java | 1 - .../shuili/common/core/domain/entity/SysRole.java | 2 ++ .../src/main/java/com/kms/system/domain/SysXzqh.java | 3 +++ .../kms/yg/df/controller/BsSgcDfAqrwController.java | 4 ++-- .../kms/yg/df/controller/BsSgcDfBzbpController.java | 4 ++-- .../kms/yg/df/controller/BsSgcDfJbxxController.java | 4 ++-- .../yg/df/controller/BsSgcDfSafeJbxxController.java | 8 -------- .../com/kms/yg/df/service/BsSgcDfAqrwService.java | 8 ++++---- .../kms/yg/sz/controller/BsSgcSzAqrwController.java | 4 ++-- .../kms/yg/sz/controller/BsSgcSzBzbpController.java | 4 ++-- .../kms/yg/sz/controller/BsSgcSzGcdaController.java | 4 ++-- .../yg/sz/controller/BsSgcSzSafeJbxxController.java | 7 ------- .../com/kms/yg/sz/service/BsSgcSzAqrwService.java | 8 ++++---- .../yxgh/common/controller/CommonApiController.java | 4 ++-- .../com/kms/yxgh/df/service/DfYhRecordService.java | 2 +- .../com/kms/yxgh/sz/service/SzRecordService.java | 2 +- .../main/resources/mapper/system/SysDeptMapper.xml | 6 +----- .../main/resources/mapper/system/SysRoleMapper.xml | 3 +-- .../main/resources/mapper/system/SysXzqhMapper.xml | 8 ++++---- .../resources/mapper/yg/df/BsSgcDfAqrwMapper.xml | 2 +- .../resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml | 2 +- 23 files changed, 43 insertions(+), 61 deletions(-) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index 3df9f237..17e39362 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -77,15 +77,15 @@ public class SysXzqhController extends BaseController { // if (xzqh.getLayer() == 5) { // String substring = xzqh.getXzqhdm().substring(0, 2); // QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.likeRight("XZQHDM", substring); -// queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'"); +// queryWrapper.likeRight("adcd", substring); +// queryWrapper.apply("RIGHT(adcd, 6) = '000000'"); // List list = sysXzqhService.list(queryWrapper); // return AjaxResult.success(list); // } else if (xzqh.getLayer() == 4) { // String substring = xzqh.getXzqhdm().substring(0, 4); // QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.likeRight("XZQHDM", substring); -// queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'"); +// queryWrapper.likeRight("adcd", substring); +// queryWrapper.apply("RIGHT(adcd, 6) = '000000'"); // List list = sysXzqhService.list(queryWrapper); // return AjaxResult.success(list); // } else { @@ -104,7 +104,7 @@ public class SysXzqhController extends BaseController { SysXzqh xzqh = sysXzqhService.getById(xzqhId); String userName = user.getUserName(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm())) + queryWrapper.likeRight("adcd", getQuery(xzqh.getXzqhdm())) .in("LAYER", xzqh.getLayer()); List list = sysXzqhService.list(queryWrapper); @@ -112,7 +112,7 @@ public class SysXzqhController extends BaseController { } else { SysXzqh xzqh = sysXzqhService.getById(xzqhdm); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm())) + queryWrapper.likeRight("adcd", getQuery(xzqh.getXzqhdm())) .in("LAYER", xzqh.getLayer() - 1); List list = sysXzqhService.list(queryWrapper); return AjaxResult.success(list); diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java index 13647f40..d1bb4541 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java @@ -55,8 +55,6 @@ public class BaseEntity implements Serializable @Excel(name = "备注,可以不填") protected String note; - - /** 开始时间 */ @JsonIgnore @ApiModelProperty("开始时间") diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java index e876bb71..baa2a709 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java @@ -7,7 +7,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java index 4ac50677..026131b9 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java @@ -69,6 +69,8 @@ public class SysRole extends BaseEntity private String category; private String md5; + @TableField(exist = false) + private String note; public SysRole() { diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java b/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java index 531ac032..e88ed656 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java @@ -1,5 +1,6 @@ package com.kms.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; @@ -28,6 +29,7 @@ public class SysXzqh extends BaseEntity /** 行政区划代码 */ @Excel(name = "行政区划代码") @ApiModelProperty("行政区划代码") + @TableField("adcd") private String xzqhdm; /** 父级区划id */ @@ -38,6 +40,7 @@ public class SysXzqh extends BaseEntity /** 区划名称 */ @Excel(name = "区划名称") @ApiModelProperty("区划名称") + @TableField("ad_name") private String name; /** 层级 */ diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java index da4918ae..18310cd9 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java @@ -88,7 +88,7 @@ public class BsSgcDfAqrwController extends BaseController if (projectInfo != null && projectInfo.getAdcd() != null) { String infoAdcd = projectInfo.getAdcd(); QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); + sysXzqhQueryWrapper.eq("adcd", infoAdcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { infoAdcd = xzqh.getXzqhdm().substring(0, 2); @@ -125,7 +125,7 @@ public class BsSgcDfAqrwController extends BaseController }else { QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); + sysXzqhQueryWrapper.eq("adcd", adcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java index f8e5f042..2a3d9006 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java @@ -68,7 +68,7 @@ public class BsSgcDfBzbpController extends BaseController if (projectInfo != null && projectInfo.getAdcd() != null) { String infoAdcd = projectInfo.getAdcd(); QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); + sysXzqhQueryWrapper.eq("adcd", infoAdcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { infoAdcd = xzqh.getXzqhdm().substring(0, 2); @@ -105,7 +105,7 @@ public class BsSgcDfBzbpController extends BaseController }else { QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); + sysXzqhQueryWrapper.eq("adcd", adcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java index 0ba9d32e..6aae85c2 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java @@ -67,7 +67,7 @@ public class BsSgcDfJbxxController extends BaseController if (projectInfo != null && projectInfo.getAdcd() != null) { String infoAdcd = projectInfo.getAdcd(); QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); + sysXzqhQueryWrapper.eq("adcd", infoAdcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { infoAdcd = xzqh.getXzqhdm().substring(0, 2); @@ -104,7 +104,7 @@ public class BsSgcDfJbxxController extends BaseController }else { QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); + sysXzqhQueryWrapper.eq("adcd", adcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java index e4cc2d0f..d3b73722 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java @@ -1,25 +1,18 @@ package com.kms.yg.df.controller; -import java.math.BigDecimal; import java.util.*; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.common.utils.UserUtils; import com.kms.framework.web.service.SysPermissionService; -import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; -import com.kms.yg.sz.domain.BsSgcSzBzbp; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysDept; @@ -42,7 +35,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.AjaxResult; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java index 1accecab..7aff5b9e 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java @@ -151,8 +151,8 @@ public class BsSgcDfAqrwService extends BaseService queryWrapper = new QueryWrapper<>(); - queryWrapper.apply("LEFT(XZQHDM, 6) = LEFT({0}, 6)", adcd) - .apply("RIGHT(XZQHDM, 6) = '000000'"); + queryWrapper.apply("LEFT(adcd, 6) = LEFT({0}, 6)", adcd) + .apply("RIGHT(adcd, 6) = '000000'"); SysXzqh byId= sysXzqhService.getOne(queryWrapper); Integer layer = byId.getLayer(); @@ -214,8 +214,8 @@ public class BsSgcDfAqrwService extends BaseService queryWrapper = new QueryWrapper<>(); - queryWrapper.apply("LEFT(XZQHDM, 6) = LEFT({0}, 6)", adcd) - .apply("RIGHT(XZQHDM, 6) = '000000'"); + queryWrapper.apply("LEFT(adcd, 6) = LEFT({0}, 6)", adcd) + .apply("RIGHT(adcd, 6) = '000000'"); SysXzqh byId= sysXzqhService.getOne(queryWrapper); // 获取层级属性值 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java index 268a949b..eb0075bc 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java @@ -87,7 +87,7 @@ public class BsSgcSzAqrwController extends BaseController if (projectInfo != null && projectInfo.getAdcd() != null) { String infoAdcd = projectInfo.getAdcd(); QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); + sysXzqhQueryWrapper.eq("adcd", infoAdcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==1) { infoAdcd = xzqh.getXzqhdm().substring(0, 2); @@ -124,7 +124,7 @@ public class BsSgcSzAqrwController extends BaseController }else { QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); + sysXzqhQueryWrapper.eq("adcd", adcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==1) { diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java index f2e6766e..efcc1a4b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java @@ -81,7 +81,7 @@ public class BsSgcSzBzbpController extends BaseController if (projectInfo != null && projectInfo.getAdcd() != null) { String infoAdcd = projectInfo.getAdcd(); QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); + sysXzqhQueryWrapper.eq("adcd", infoAdcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { infoAdcd = xzqh.getXzqhdm().substring(0, 2); @@ -116,7 +116,7 @@ public class BsSgcSzBzbpController extends BaseController }else { QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); + sysXzqhQueryWrapper.eq("adcd", adcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { adcd = xzqh.getXzqhdm().substring(0, 2); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java index 91da696a..7e3a8bfd 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java @@ -68,7 +68,7 @@ public class BsSgcSzGcdaController extends BaseController if (projectInfo != null && projectInfo.getAdcd() != null) { String infoAdcd = projectInfo.getAdcd(); QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); + sysXzqhQueryWrapper.eq("adcd", infoAdcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { infoAdcd = xzqh.getXzqhdm().substring(0, 2); @@ -105,7 +105,7 @@ public class BsSgcSzGcdaController extends BaseController }else { QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); + sysXzqhQueryWrapper.eq("adcd", adcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); if (xzqh.getLayer()==5) { diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java index 3dee1e7a..e1576794 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java @@ -1,21 +1,15 @@ package com.kms.yg.sz.controller; -import java.math.BigDecimal; import java.util.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.common.utils.UserUtils; import com.kms.framework.web.service.SysPermissionService; -import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import com.kms.yg.df.domain.BsSgcDfSafeJbxx; -import com.kms.yg.sz.domain.BsSgcSzBzbp; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.controller.BaseController; @@ -40,7 +34,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.AjaxResult; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java index 2830a18a..0b0eb671 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java @@ -149,8 +149,8 @@ public class BsSgcSzAqrwService extends BaseService queryWrapper = new QueryWrapper<>(); - queryWrapper.apply("LEFT(XZQHDM, 6) = LEFT({0}, 6)", adcd) - .apply("RIGHT(XZQHDM, 6) = '000000'"); + queryWrapper.apply("LEFT(adcd, 6) = LEFT({0}, 6)", adcd) + .apply("RIGHT(adcd, 6) = '000000'"); SysXzqh byId = sysXzqhService.getOne(queryWrapper); Integer layer = byId.getLayer(); @@ -207,8 +207,8 @@ public class BsSgcSzAqrwService extends BaseService queryWrapper = new QueryWrapper<>(); - queryWrapper.apply("LEFT(XZQHDM, 6) = LEFT({0}, 6)", adcd) - .apply("RIGHT(XZQHDM, 6) = '000000'"); + queryWrapper.apply("LEFT(adcd, 6) = LEFT({0}, 6)", adcd) + .apply("RIGHT(adcd, 6) = '000000'"); SysXzqh byId= sysXzqhService.getOne(queryWrapper); Integer layer = byId.getLayer(); diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java b/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java index 3f2bbe81..60453b32 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java @@ -42,14 +42,14 @@ public class CommonApiController { public Response> getGuangDong(@RequestParam(value = "xzqhdm", required = false) String xzqhdm) { if (StringUtils.isEmpty(xzqhdm)) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.likeRight("XZQHDM", "44") + queryWrapper.likeRight("adcd", "44") .in("LAYER", 3); List list = sysXzqhService.list(queryWrapper); return Response.ok(list); } else { SysXzqh xzqh = sysXzqhService.getById(xzqhdm); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm())) + queryWrapper.likeRight("adcd", getQuery(xzqh.getXzqhdm())) .eq("LAYER", xzqh.getLayer() - 1); List list = sysXzqhService.list(queryWrapper); return Response.ok(list); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index cad94e88..64662d90 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -69,7 +69,7 @@ public class DfYhRecordService extends DefaultApprovalBusinessService() - .likeRight("XZQHDM", entry.getKey()).last(" limit 1")); + .likeRight("adcd", entry.getKey()).last(" limit 1")); if (null != xzqhdm) { xList.add(xzqhdm.getName()); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index 121e7def..b1124354 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -81,7 +81,7 @@ public class SzRecordService extends BaseService { // 设置 x轴 // 转换名称 SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper() - .likeRight("XZQHDM", entry.getKey()).last(" limit 1")); + .likeRight("adcd", entry.getKey()).last(" limit 1")); if (null != xzqhdm) { xList.add(xzqhdm.getName()); } diff --git a/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml b/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml index e2e89cf6..2c4377c9 100644 --- a/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -21,7 +21,6 @@ - @@ -38,7 +37,7 @@ select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag, - d.del_flag, d.create_uid, d.create_time, d.name, d.pc_logo, d.pc_background, + d.del_flag, d.create_uid, d.create_time, d.pc_logo, d.pc_background, d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id, d.xzqh_name from sys_dept d @@ -120,7 +119,6 @@ status, tag, create_uid, - name, pc_logo, pc_background, admin_name, @@ -146,7 +144,6 @@ #{status}, #{tag}, #{createUid}, - #{name}, #{pcLogo}, #{pcBackground}, #{adminName}, @@ -173,7 +170,6 @@ status = #{status}, tag = #{tag}, update_uid = #{updateUid}, - name = #{name}, pc_logo = #{pcLogo}, pc_background = #{pcBackground}, admin_name = #{adminName}, diff --git a/shuili-system/src/main/resources/mapper/system/SysRoleMapper.xml b/shuili-system/src/main/resources/mapper/system/SysRoleMapper.xml index b08e020d..e47409eb 100644 --- a/shuili-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/shuili-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -16,12 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select distinct r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, - r.status, r.del_flag, r.create_time, r.note + r.status, r.del_flag, r.create_time from sys_role r left join sys_user_role ur on ur.role_id = r.id left join sys_user u on u.id = ur.user_id diff --git a/shuili-system/src/main/resources/mapper/system/SysXzqhMapper.xml b/shuili-system/src/main/resources/mapper/system/SysXzqhMapper.xml index 53d30881..7597e2cc 100644 --- a/shuili-system/src/main/resources/mapper/system/SysXzqhMapper.xml +++ b/shuili-system/src/main/resources/mapper/system/SysXzqhMapper.xml @@ -6,15 +6,15 @@ diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml index 78a56b69..777167a8 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml @@ -9,7 +9,7 @@ COUNT(1) num FROM bs_sgc_df_dfrw ss LEFT JOIN att_dike_base sj ON sj.dike_code = ss.dike_code - LEFT JOIN sys_xzqh sx ON sj.adcd = LEFT(sx.XZQHDM,6) + LEFT JOIN sys_xzqh sx ON sj.adcd = LEFT(sx.adcd,6) diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml index 72df526b..12eec32e 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml @@ -9,7 +9,7 @@ COUNT(1) num FROM bs_sgc_sz_szrw ss LEFT JOIN att_waga_base sj ON sj.waga_code = ss.waga_code - LEFT JOIN sys_xzqh sx ON LEFT(sj.adcd,6) = LEFT(sx.XZQHDM,6) + LEFT JOIN sys_xzqh sx ON LEFT(sj.adcd,6) = LEFT(sx.adcd,6) AND RIGHT(sx.xzqhdm, 6) = '000000'