Browse Source

fix: 修改remark,行政区划等字段名称变更

release-sy-tdsql
hxh 1 month ago
parent
commit
125785eab6
  1. 12
      shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
  2. 2
      shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java
  3. 1
      shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java
  4. 2
      shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java
  5. 3
      shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java
  6. 4
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java
  7. 4
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java
  8. 4
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java
  9. 8
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
  10. 8
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
  11. 4
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
  12. 4
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
  13. 4
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java
  14. 7
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
  15. 8
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
  16. 4
      shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java
  17. 2
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
  18. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java
  19. 6
      shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml
  20. 3
      shuili-system/src/main/resources/mapper/system/SysRoleMapper.xml
  21. 8
      shuili-system/src/main/resources/mapper/system/SysXzqhMapper.xml
  22. 2
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
  23. 2
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml

12
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<SysXzqh> queryWrapper = new QueryWrapper<>();
// queryWrapper.likeRight("XZQHDM", substring);
// queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'");
// queryWrapper.likeRight("adcd", substring);
// queryWrapper.apply("RIGHT(adcd, 6) = '000000'");
// List<SysXzqh> list = sysXzqhService.list(queryWrapper);
// return AjaxResult.success(list);
// } else if (xzqh.getLayer() == 4) {
// String substring = xzqh.getXzqhdm().substring(0, 4);
// QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
// queryWrapper.likeRight("XZQHDM", substring);
// queryWrapper.apply("RIGHT(XZQHDM, 6) = '000000'");
// queryWrapper.likeRight("adcd", substring);
// queryWrapper.apply("RIGHT(adcd, 6) = '000000'");
// List<SysXzqh> 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<SysXzqh> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
queryWrapper.likeRight("adcd", getQuery(xzqh.getXzqhdm()))
.in("LAYER", xzqh.getLayer());
List<SysXzqh> list = sysXzqhService.list(queryWrapper);
@ -112,7 +112,7 @@ public class SysXzqhController extends BaseController {
} else {
SysXzqh xzqh = sysXzqhService.getById(xzqhdm);
QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
queryWrapper.likeRight("adcd", getQuery(xzqh.getXzqhdm()))
.in("LAYER", xzqh.getLayer() - 1);
List<SysXzqh> list = sysXzqhService.list(queryWrapper);
return AjaxResult.success(list);

2
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("开始时间")

1
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;

2
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()
{

3
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;
/** 层级 */

4
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<SysXzqh> 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<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
sysXzqhQueryWrapper.eq("adcd", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==5) {

4
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<SysXzqh> 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<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
sysXzqhQueryWrapper.eq("adcd", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==5) {

4
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<SysXzqh> 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<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
sysXzqhQueryWrapper.eq("adcd", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==5) {

8
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;

8
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java

@ -151,8 +151,8 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
String adcd = DfAqrw.getAdcd();
QueryWrapper<SysXzqh> 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<BsSgcDfAqrwMapper, BsSgcDfAq
// 获取adcd属性值
String adcd = DfAqrw.getAdcd();
QueryWrapper<SysXzqh> 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);
// 获取层级属性值

4
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<SysXzqh> 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<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
sysXzqhQueryWrapper.eq("adcd", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==1) {

4
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<SysXzqh> 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<SysXzqh> 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);

4
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<SysXzqh> 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<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
sysXzqhQueryWrapper.eq("XZQHDM", adcd);
sysXzqhQueryWrapper.eq("adcd", adcd);
SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
if (xzqh.getLayer()==5) {

7
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;

8
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java

@ -149,8 +149,8 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
String adcd = szAqrw.getAdcd();
QueryWrapper<SysXzqh> 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<BsSgcSzAqrwMapper, BsSgcSzAq
String adcd = szAqrw.getAdcd();
QueryWrapper<SysXzqh> 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();

4
shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java

@ -42,14 +42,14 @@ public class CommonApiController {
public Response<List<SysXzqh>> getGuangDong(@RequestParam(value = "xzqhdm", required = false) String xzqhdm) {
if (StringUtils.isEmpty(xzqhdm)) {
QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("XZQHDM", "44")
queryWrapper.likeRight("adcd", "44")
.in("LAYER", 3);
List<SysXzqh> list = sysXzqhService.list(queryWrapper);
return Response.ok(list);
} else {
SysXzqh xzqh = sysXzqhService.getById(xzqhdm);
QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
queryWrapper.likeRight("adcd", getQuery(xzqh.getXzqhdm()))
.eq("LAYER", xzqh.getLayer() - 1);
List<SysXzqh> list = sysXzqhService.list(queryWrapper);
return Response.ok(list);

2
shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java

@ -69,7 +69,7 @@ public class DfYhRecordService extends DefaultApprovalBusinessService<DfYhRecord
// 设置 x轴
// 转换名称
SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper<SysXzqh>()
.likeRight("XZQHDM", entry.getKey()).last(" limit 1"));
.likeRight("adcd", entry.getKey()).last(" limit 1"));
if (null != xzqhdm) {
xList.add(xzqhdm.getName());
}

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

@ -81,7 +81,7 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
// 设置 x轴
// 转换名称
SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper<SysXzqh>()
.likeRight("XZQHDM", entry.getKey()).last(" limit 1"));
.likeRight("adcd", entry.getKey()).last(" limit 1"));
if (null != xzqhdm) {
xList.add(xzqhdm.getName());
}

6
shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml

@ -21,7 +21,6 @@
<result property="createTime" column="create_time"/>
<result property="updateUid" column="update_uid"/>
<result property="updateTime" column="update_time"/>
<result property="name" column="name"/>
<result property="pcLogo" column="pc_logo"/>
<result property="pcBackground" column="pc_background"/>
<result property="adminName" column="admin_name"/>
@ -38,7 +37,7 @@
<sql id="selectDeptVo">
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
</sql>
@ -120,7 +119,6 @@
<if test="status != null">status,</if>
<if test="tag != null">tag,</if>
<if test="createUid != null and createUid != ''">create_uid,</if>
<if test="name != null and name != ''">name,</if>
<if test="pcLogo != null and pcLogo != ''">pc_logo,</if>
<if test="pcBackground != null and pcBackground != ''">pc_background,</if>
<if test="adminName != null and adminName != ''">admin_name,</if>
@ -146,7 +144,6 @@
<if test="status != null">#{status},</if>
<if test="tag != null">#{tag},</if>
<if test="createUid != null and createUid != ''">#{createUid},</if>
<if test="name != null and name != ''">#{name},</if>
<if test="pcLogo != null and pcLogo != ''">#{pcLogo},</if>
<if test="pcBackground != null and pcBackground != ''">#{pcBackground},</if>
<if test="adminName != null and adminName != ''">#{adminName},</if>
@ -173,7 +170,6 @@
<if test="status != null and status != ''">status = #{status},</if>
<if test="tag != null and tag != ''">tag = #{tag},</if>
<if test="updateUid != null and updateUid != ''">update_uid = #{updateUid},</if>
<if test="name != null and name != ''">name = #{name},</if>
<if test="pcLogo != null and pcLogo != ''">pc_logo = #{pcLogo},</if>
<if test="pcBackground != null and pcBackground != ''">pc_background = #{pcBackground},</if>
<if test="adminName != null and adminName != ''">admin_name = #{adminName},</if>

3
shuili-system/src/main/resources/mapper/system/SysRoleMapper.xml

@ -16,12 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateUid" column="update_uid" />
<result property="updateTime" column="update_time" />
<result property="note" column="note" />
</resultMap>
<sql id="selectRoleVo">
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

8
shuili-system/src/main/resources/mapper/system/SysXzqhMapper.xml

@ -6,15 +6,15 @@
<!--<resultMap type="SysXzqh" id="SysXzqh">
<result property="name" column="name" />
<result property="xzqhdm" column="XZQHDM" />
<result property="xzqhdm" column="adcd" />
<result property="num" column="num"/>
</resultMap>
<select id="getArea" resultMap="SysXzqh">
SELECT name,SUBSTRING(XZQHDM, 1, 4) as XZQHDM
SELECT name,SUBSTRING(adcd, 1, 4) as adcd
FROM sys_xzqh
WHERE XZQHDM LIKE '44%'
GROUP BY SUBSTRING(XZQHDM, 1, 4);
WHERE adcd LIKE '44%'
GROUP BY SUBSTRING(adcd, 1, 4);
</select>-->
<sql id="xzqhCondition">

2
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)
</sql>

2
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'
</sql>

Loading…
Cancel
Save