From d2056ab9ae8ef0ce3eb763eb0e1fa19663f409e1 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 25 Jan 2024 19:25:20 +0800 Subject: [PATCH] xml --- .../src/views/system/user/index.vue | 8 +-- .../views/system/user/profile/resetPwd.vue | 4 +- .../controller/system/SysXzqhController.java | 2 +- .../SpecialProjectInfoController.java | 22 ++++--- .../SpecialProjectPlanInfoController.java | 7 +- .../SpecialProjectPreDesignController.java | 58 +---------------- .../SpecialProjectProposalController.java | 62 +----------------- .../mapper/SpecialProjectInfoMapper.java | 15 ++++- .../mapper/SpecialProjectPlanInfoMapper.java | 14 +++- .../mapper/SpecialProjectPreDesignMapper.java | 19 ++++-- .../mapper/SpecialProjectProposalMapper.java | 10 +++ .../service/SpecialProjectInfoService.java | 38 +++++++++-- .../SpecialProjectPlanInfoService.java | 24 +++++-- .../SpecialProjectPreDesignService.java | 28 +++++++- .../SpecialProjectProposalService.java | 36 ++++++---- .../kms/system/service/SysXzqhService.java | 13 +++- .../earlyStage/SpecialProjectInfoMapper.xml | 65 ++++++++++++++++++- .../SpecialProjectPlanInfoMapper.xml | 49 ++++++++++---- .../SpecialProjectPreDesignMapper.xml | 34 ++++++++++ .../SpecialProjectProposalMapper.xml | 41 +++++++++++- 20 files changed, 364 insertions(+), 185 deletions(-) diff --git a/jwtech-admin-page/src/views/system/user/index.vue b/jwtech-admin-page/src/views/system/user/index.vue index 080898f5..53a66e7b 100644 --- a/jwtech-admin-page/src/views/system/user/index.vue +++ b/jwtech-admin-page/src/views/system/user/index.vue @@ -524,7 +524,7 @@ export default { components: { Treeselect }, data() { const validatePassword = (rule, value, callback) => { - if ( + /*if ( !new RegExp( "^(?![A-Z]+$)(?![a-z]+$)(?![0-9]+$)(?![!@#$%^&*]+$)[a-zA-Z0-9!@#$%^&*]{8,}$" ).test(value) @@ -536,7 +536,7 @@ export default { ); } else { callback(); - } + }*/ }; const validateLoginName = (rule, value, callback) => { if (this.form.isPcUser) { @@ -1040,7 +1040,7 @@ export default { cancelButtonText: "取消", inputValidator: (value) => { // changeValidator: (value) => { - if ( + /*if ( // !new RegExp("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$").test( // value // ) @@ -1051,7 +1051,7 @@ export default { // this.$message.warning("密码必须数字和字母组成,且长度6至16位") return false; } - return true; + return true;*/ }, inputErrorMessage: "密码至少包含大写字母、小写字母、数字和符号（!@#$%^&*）中的两种，且长度至少8位", diff --git a/jwtech-admin-page/src/views/system/user/profile/resetPwd.vue b/jwtech-admin-page/src/views/system/user/profile/resetPwd.vue index dd0ce43e..13c5b272 100644 --- a/jwtech-admin-page/src/views/system/user/profile/resetPwd.vue +++ b/jwtech-admin-page/src/views/system/user/profile/resetPwd.vue @@ -41,7 +41,7 @@ export default { } }; const checkPassword = (rule, value, callback) => { - if ( + /*if ( !new RegExp( "^(?![A-Z]+$)(?![a-z]+$)(?![0-9]+$)(?![!@#$%^&*]+$)[a-zA-Z0-9!@#$%^&*]{8,}$" ).test(value) @@ -53,7 +53,7 @@ export default { ); } else { callback(); - } + }*/ }; return { test: "1test", diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index 553e4dc0..6db2c86e 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -66,7 +66,7 @@ public class SysXzqhController extends BaseController String xzqhId = sysDept.getXzqhId(); SysXzqh xzqh = sysXzqhService.getById(xzqhId); String userName = user.getUserName(); - if (userName.equals("admin")) { + if (userName.equals("admin")||user.getUserType().equals("01")) { List list = sysXzqhService.list(); return AjaxResult.success(list); }else if (xzqh.getLayer()==1) { diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java index 2782f6bc..8cea6f49 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java @@ -99,18 +99,20 @@ public class SpecialProjectInfoController extends BaseController { return page; } + IPage specialProjectInfoIPage = specialProjectInfoService.selectPage(sp); + return specialProjectInfoIPage; + + + /*SysUser sysUser = UserUtils.getUser(); + assert sysUser != null; + if (sysUser.getUserType().equals("01")) { + + sp.getData().setAdcd(sysXzqhService.getSubString(sp.getData().getAdcd())); - SysUser sysUser = UserUtils.getUser(); - //先获取userId----查关联表用 - String userId = sysUser.getId(); - //获取该用户角色 - List sysRoles = sysRoleService.getRoleByUserId(userId); - List roleKey = sysRoles.stream().map(SysRole::getRoleKey).collect(Collectors.toList()); - if (roleKey.contains("legalPerson")) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(SysUserPro.class).eq(SysUserPro::getUserId, userId).eq(SysUserPro::getStatus,"1"); List proNoList = sysUserProService.list(queryWrapper).stream().map(SysUserPro::getProNo).collect(Collectors.toList()); @@ -128,7 +130,7 @@ public class SpecialProjectInfoController extends BaseController { }else { return getXzqhPage(sp,false); - } + }*/ } @@ -252,7 +254,7 @@ public class SpecialProjectInfoController extends BaseController { - public IPage getXzqhPage(SearchParam sp,Boolean b) { + /*public IPage getXzqhPage(SearchParam sp,Boolean b) { SpecialProjectInfo projectInfo = sp.getData(); String adcd = null; @@ -325,7 +327,7 @@ public class SpecialProjectInfoController extends BaseController { return specialProjectInfoService.selectPage(sp, substring); } - } + }*/ diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPlanInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPlanInfoController.java index fc0deeb2..8e7be288 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPlanInfoController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPlanInfoController.java @@ -127,7 +127,7 @@ public class SpecialProjectPlanInfoController extends BaseController @PostMapping("/list") @ApiOperation("计划基本信息列表") public IPage list(@RequestBody SearchParam sp) { - SpecialProjectPlanInfo planInfo = sp.getData(); + /*SpecialProjectPlanInfo planInfo = sp.getData(); String adcd = planInfo.getAdcd(); SysUser sysUser = UserUtils.getUser(); @@ -139,7 +139,10 @@ public class SpecialProjectPlanInfoController extends BaseController adcd = handleAdcd(adcd); } - return specialProjectPlanInfoService.selectPage(sp, adcd); + return specialProjectPlanInfoService.selectPage(sp, adcd);*/ + IPage specialProjectInfoIPage = specialProjectPlanInfoService.selectPage(sp); + + return specialProjectInfoIPage; } private String handleAdminUser(SpecialProjectPlanInfo planInfo, String adcd) { diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java index 8113036b..a69f6953 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java @@ -74,62 +74,8 @@ public class SpecialProjectPreDesignController extends BaseController @ApiOperation("初步设计管理列表") public IPage list(@RequestBody SearchParam sp) { - SpecialProjectPreDesign planInfo = sp.getData(); - String adcd = planInfo.getAdcd(); - SysUser sysUser = UserUtils.getUser(); - if (sysUser.getUserName().equals("admin")) { - if (planInfo != null && planInfo.getAdcd() != null) { - String infoAdcd = planInfo.getAdcd(); - QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); - SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==1) { - infoAdcd = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==2) { - infoAdcd = xzqh.getXzqhdm().substring(0, 4); - - }else { - infoAdcd = xzqh.getXzqhdm(); - } - return specialProjectPreDesignService.selectPage(sp,infoAdcd); - }else { - return specialProjectPreDesignService.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()==1) { - substring = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==2) { - substring = xzqh.getXzqhdm().substring(0, 4); - - }else { - substring = xzqh.getXzqhdm(); - } - - return specialProjectPreDesignService.selectPage(sp,substring); - }else { - QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); - - SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==1) { - adcd = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==2) { - adcd = xzqh.getXzqhdm().substring(0, 4); - - }else { - adcd = xzqh.getXzqhdm(); - } - return specialProjectPreDesignService.selectPage(sp, adcd); - } + IPage iPage = specialProjectPreDesignService.selectPage(sp); + return iPage; } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java index d9e053e4..cf6a811d 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java @@ -14,6 +14,7 @@ import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; +import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.domain.SpecialProjectPlanInfo; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; @@ -88,66 +89,9 @@ public class SpecialProjectProposalController extends BaseController @ApiOperation("项目建议书列表") public IPage list(@RequestBody SearchParam sp) { - SpecialProjectProposal planInfo = sp.getData(); - String adcd = null; - if (planInfo != null) { - adcd = planInfo.getAdcd(); - } - - SysUser sysUser = UserUtils.getUser(); - if (sysUser.getUserName().equals("admin")) { - if (planInfo != null && planInfo.getAdcd() != null) { - String infoAdcd = planInfo.getAdcd(); - QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); - SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==1) { - infoAdcd = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==2) { - infoAdcd = xzqh.getXzqhdm().substring(0, 4); - - }else { - infoAdcd = xzqh.getXzqhdm(); - } - return specialProjectProposalService.selectPage(sp,infoAdcd); - }else { - return specialProjectProposalService.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()==1) { - substring = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==2) { - substring = xzqh.getXzqhdm().substring(0, 4); - - }else { - substring = xzqh.getXzqhdm(); - } + IPage specialProjectInfoIPage = specialProjectProposalService.selectPage(sp); - return specialProjectProposalService.selectPage(sp,substring); - }else { - QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); - - SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==1) { - adcd = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==2) { - adcd = xzqh.getXzqhdm().substring(0, 4); - - }else { - adcd = xzqh.getXzqhdm(); - } - return specialProjectProposalService.selectPage(sp, adcd); - } + return specialProjectInfoIPage; } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java index 3c25e7cd..1f3ec2ec 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java @@ -18,12 +18,23 @@ import java.util.List; public interface SpecialProjectInfoMapper extends BaseMapper { - List getXzqh(@Param("id") String id, +/* List getXzqh(@Param("id") String id, @Param("projectName") String projectName, @Param("proNo") String proNO, @Param("projectType") String projectType, @Param("adcd") String adcd, @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("pageSize") int pageSize);*/ + + List getByUserPro(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("proNo") String proNO, + @Param("projectType") String projectType, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java index 0d326a2a..ce4b12b9 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java @@ -17,11 +17,21 @@ import java.util.List; @Repository public interface SpecialProjectPlanInfoMapper extends BaseMapper { - List getXzqh(@Param("id") String id, +/* List getXzqh(@Param("id") String id, @Param("planName") String planName, @Param("planType") String planType, @Param("adcd") String adcd, @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("pageSize") int pageSize);*/ + + List getByUserPro(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("planName") String planName, + @Param("planType") String planType, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java index 10635017..6ebf23e8 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java @@ -18,9 +18,18 @@ import java.util.List; public interface SpecialProjectPreDesignMapper extends BaseMapper { List getXzqh(@Param("id") String id, - @Param("projectName") String projectName, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("projectName") String projectName, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); + + List getByUserPro(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java index 99cc96fd..6e0656ec 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java @@ -27,4 +27,14 @@ public interface SpecialProjectProposalMapper extends BaseMapper getByUserPro(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("projectCode") String projectCode, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java index 8e45d73e..441a227c 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java @@ -7,8 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.core.domain.entity.SysUser; +import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.mapper.SpecialProjectInfoMapper; +import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; @@ -29,8 +32,11 @@ public class SpecialProjectInfoService extends BaseService sp,String adcd){ + /*public IPage selectPage(SearchParam sp,String adcd){ SpecialProjectInfo data = sp.getData(); Map params = sp.getParams(); @@ -51,10 +57,32 @@ public class SpecialProjectInfoService extends BaseService selectPage1(SearchParam sp) { - specialProjectInfoMapper. - }*/ + public IPage selectPage(SearchParam sp) { + SysUser sysUser = UserUtils.getUser(); + + SpecialProjectInfo data = sp.getData(); + + Map params = sp.getParams(); + + assert sysUser != null; + List list = null; + + + if (ObjectUtil.isNull(params)) { + list = specialProjectInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProNo(), + data.getProjectType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); + }else { + list = specialProjectInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProNo(), + data.getProjectType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + } + + Page page = new Page<>(); + page.setRecords(list); + page.setTotal(list.size()); + return page; + + } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java index df582ebf..768fbb55 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java @@ -1,10 +1,14 @@ package com.kms.earlyStage.service; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.core.domain.entity.SysUser; +import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectInfo; +import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; @@ -26,15 +30,25 @@ public class SpecialProjectPlanInfoService extends BaseService sp, String adcd){ + + @Autowired + private SysXzqhService sysXzqhService; + public IPage selectPage(SearchParam sp){ + SysUser sysUser = UserUtils.getUser(); SpecialProjectPlanInfo data = sp.getData(); Map params = sp.getParams(); - //create_time - String orderBy = (String) params.get("orderBy"); - List list = specialProjectPlanInfoMapper.getXzqh(data.getId(),data.getPlanName(), - data.getPlanType(),adcd,orderBy,sp.getPageNum(),sp.getPageSize()); + assert sysUser != null; + List list = null; + + if (ObjectUtil.isNull(params)) { + list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(), + data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); + }else { + list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(), + data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + } Page infoPage = new Page<>(); infoPage.setRecords(list); diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java index 9530e8f1..aeae4e14 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java @@ -1,11 +1,16 @@ package com.kms.earlyStage.service; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.core.domain.entity.SysUser; +import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectFeasibility; import com.kms.earlyStage.domain.SpecialProjectInfo; +import com.kms.earlyStage.domain.SpecialProjectPlanInfo; +import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; @@ -27,13 +32,30 @@ public class SpecialProjectPreDesignService extends BaseService sp, String adcd) { + @Autowired + private SysXzqhService sysXzqhService; + + public IPage selectPage(SearchParam sp) { + + SysUser sysUser = UserUtils.getUser(); SpecialProjectPreDesign data = sp.getData(); Map params = sp.getParams(); - List list = specialProjectPreDesignMapper.getXzqh(data.getId(),data.getProjectName(), - adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + + + assert sysUser != null; + List list = null; + + if (ObjectUtil.isNull(params)) { + list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(), + sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); + }else { + list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(), + sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + } + + Page page = new Page<>(); page.setRecords(list); diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java index 9eb2580a..b055be35 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java @@ -4,9 +4,13 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.ConditionView; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.core.domain.entity.SysUser; +import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.domain.SpecialProjectPlanInfo; +import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; @@ -28,6 +32,9 @@ public class SpecialProjectProposalService extends BaseService geProCodeList(String proNo) { List list=specialProjectProposalMapper.geProCodeList(proNo); @@ -35,30 +42,37 @@ public class SpecialProjectProposalService extends BaseService sp, String adcd) { + public IPage selectPage(SearchParam sp) { + SysUser sysUser = UserUtils.getUser(); + SpecialProjectProposal data = sp.getData(); + ConditionView cv = sp.getCv(); + Map params = sp.getParams(); + assert sysUser != null; List list = null; - if (ObjectUtil.isNull(params)) { - list = specialProjectProposalMapper.getXzqh(data.getId(),data.getProjectName(),data.getProNo(), - data.getProjectType(),adcd,"create_time",sp.getPageNum(),sp.getPageSize()); - }else { - list = specialProjectProposalMapper.getXzqh(data.getId(),data.getProjectName(),data.getProNo(), - data.getProjectType(),adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); - } + if (ObjectUtil.isNull(data.getProjectCode())) { + return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), new QueryWrapper<>()); + } + if (ObjectUtil.isNull(params)) { + list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),(String) cv.getValue(), + data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); + }else { + list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),(String) cv.getValue(), + data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + } Page page = new Page<>(); page.setRecords(list); page.setTotal(list.size()); - - - return page; } + + } diff --git a/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java b/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java index f426dff5..19230c89 100644 --- a/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java +++ b/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java @@ -28,13 +28,20 @@ public class SysXzqhService extends BaseService{ SysXzqh sysXzqh = sysXzqhMapper.selectOne(Wrappers.lambdaQuery(SysXzqh.class) .eq(SysXzqh::getXzqhdm, adcd)); + if (sysXzqh == null) { + return null; + } + + if (sysXzqh.getLayer() == 1) { - sysXzqh.getXzqhdm().substring(0, 2); + return sysXzqh.getXzqhdm().substring(0, 2); } else if (sysXzqh.getLayer() == 2) { - sysXzqh.getXzqhdm().substring(0, 4); + return sysXzqh.getXzqhdm().substring(0, 4); + }else { + return sysXzqh.getXzqhdm(); } - return sysXzqh.getXzqhdm(); + } diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml index c0970e32..f7aea260 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + + + select id, + project_name, + pro_no, + adcd, + project_type, + compiling_unit, + start_year, + end_year, + amount, + create_time + from bs_slgc_qqjd_spe_pro_info pi + @@ -32,7 +47,7 @@ - + + + + WHERE + pi.PRO_NO IN ( + SELECT + PRO_NO + FROM + sys_user_pro + + + AND user_id=#{userId}) + + + and project_name like concat('%',#{projectName},'%') + + + and pi.project_type=#{projectType} + + + and pi.pro_no=#{proNo} + + + + order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + + + + and project_name like concat('%',#{projectName},'%') + + + and project_type=#{projectType} + + + and pi.pro_no=#{proNo} + + + + order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml index 88dbda5f..f19e8377 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml @@ -15,7 +15,7 @@ is_major, INVESTMENT, create_time - from bs_slgc_qqjd_plan_info + from bs_slgc_qqjd_plan_info pi @@ -31,21 +31,46 @@ - - - - and plan_name like concat('%',#{planName},'%') - - - and plan_type=#{planType} - - - - order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + WHERE + pi.PRO_NO IN ( + SELECT + PRO_NO + FROM + sys_user_pro + + + AND user_id=#{userId}) + + + and plan_name like concat('%',#{planName},'%') + + + and plan_type=#{planType} + + + + order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + + + + and plan_name like concat('%',#{planName},'%') + + + and plan_type=#{planType} + + + + order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml index 3a7617af..199dc657 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml @@ -43,4 +43,38 @@ order by da.${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml index fd579a17..530384f0 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml @@ -15,7 +15,7 @@ COMPILING_UNIT, APPROVAL_OPINION, create_time - from bs_slgc_qqjd_spe_pro_proposal + from bs_slgc_qqjd_spe_pro_proposal pi @@ -61,4 +61,43 @@ order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + +