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 caa1ffa1..16ed7b96 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 @@ -1,12 +1,19 @@ package com.kms.yg.sz.controller; +import java.math.BigDecimal; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.kms.common.utils.UserUtils; +import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysDept; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; @@ -60,7 +67,68 @@ public class BsSgcSzAqrwController extends BaseController @ApiOperation("水闸安全鉴定任务信息列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzAqrwService.selectPage(sp); + BsSgcSzAqrw projectInfo = sp.getData(); + String adcd = null; + if (projectInfo != null) { + adcd = projectInfo.getAdcd(); + } + + SysUser sysUser = UserUtils.getUser(); + if (sysUser.getUserName().equals("admin")) { + if (projectInfo != null && projectInfo.getAdcd() != null) { + String infoAdcd = projectInfo.getAdcd(); + QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); + sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); + SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); + if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) { + infoAdcd = xzqh.getXzqhdm().substring(0, 2); + + } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) { + infoAdcd = xzqh.getXzqhdm().substring(0, 4); + + }else { + infoAdcd = xzqh.getXzqhdm(); + } + return bsSgcSzAqrwService.selectPage(sp,infoAdcd); + }else { + return bsSgcSzAqrwService.selectPage(sp,null); + } + + }else if (adcd == null) { + SysUser user = UserUtils.getUser(); + String deptId = user.getDeptId(); + SysDept sysDept = sysDeptService.get(deptId); + String xzqhId = sysDept.getXzqhId(); + SysXzqh xzqh = sysXzqhService.getById(xzqhId); + String substring = ""; + if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) { + substring = xzqh.getXzqhdm().substring(0, 2); + + } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) { + substring = xzqh.getXzqhdm().substring(0, 4); + + }else { + substring = xzqh.getXzqhdm(); + } + + return bsSgcSzAqrwService.selectPage(sp,substring); + }else { + + QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); + sysXzqhQueryWrapper.eq("XZQHDM", adcd); + + SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); + if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) { + adcd = xzqh.getXzqhdm().substring(0, 2); + + } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) { + adcd = xzqh.getXzqhdm().substring(0, 4); + + }else { + adcd = xzqh.getXzqhdm(); + } + return bsSgcSzAqrwService.selectPage(sp, adcd); + } } /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java index 90a95d51..c0f52a93 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java @@ -93,12 +93,19 @@ public class BsSgcSzAqrw extends BaseEntity @ApiModelProperty("完成时间") private String relation; + + private String taskName; + public void setWagaIds(String[] idArray) { this.wagaIds = String.join(",", idArray); } public String[] getWagaIds() { - return this.wagaIds.split(","); + if (this.wagaIds == null) { + return null; + }else{ + return this.wagaIds.split(","); + } } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjdxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjdxxService.java index fc49ff5d..5d69cec3 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjdxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjdxxService.java @@ -1,8 +1,11 @@ package com.kms.yg.sz.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.sz.mapper.BsSgcSzAqjdxxMapper; import com.kms.yg.sz.domain.BsSgcSzAqjdxx; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * 水闸安全鉴定信息Service接口 @@ -13,4 +16,5 @@ import org.springframework.stereotype.Service; @Service public class BsSgcSzAqjdxxService extends BaseService{ + } 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 6208a0cd..30a6424c 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 @@ -1,7 +1,9 @@ package com.kms.yg.sz.service; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzSzrw; @@ -18,6 +20,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -41,14 +44,35 @@ public class BsSgcSzAqrwService extends BaseService sp) { - Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); + public IPage selectPage(SearchParam sp,String adcd) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + BsSgcSzAqrw projectInfo = sp.getData(); + if (projectInfo != null) { + String projectName = projectInfo.getTaskName(); + String projectType = projectInfo.getTaskStatus(); + queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId()); + queryWrapper.like(projectName != null, "task_name", projectName); + queryWrapper.like(projectType != null && projectType!="", "task_type", projectType); + queryWrapper.likeRight(adcd != null, "ADCD", adcd); + } + + + Map params = sp.getParams(); + if (params!=null) { + //create_time + if (params.get("orderBy") != null) { + String orderBy = (String) params.get("orderBy"); + queryWrapper.orderByDesc(orderBy != null, orderBy); + } + } - return page; + Page page = new Page<>(sp.getPageNum(),sp.getPageSize()); + Page infoPage = bsSgcSzAqrwMapper.selectPage(page, queryWrapper); + return infoPage; }