From 9e37f43e6b57538961551389a00662133b8006f6 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Fri, 29 Mar 2024 18:09:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BsSgcjsjdBuiProInfoService.java | 34 ++++++++++++++----- .../SpecialProjectFeasibilityService.java | 15 ++++++-- .../service/SpecialProjectInfoService.java | 18 ++++++++-- .../SpecialProjectPlanInfoService.java | 15 ++++++-- .../SpecialProjectPreDesignService.java | 16 +++++++-- .../SpecialProjectProposalService.java | 18 +++++++--- .../BsSgcJsjdBuiRegulatoryInspections.java | 3 ++ ...SgcJsjdBuiRegulatoryInspectionsMapper.java | 1 + ...gcJsjdBuiRegulatoryInspectionsService.java | 15 ++++++-- .../build/BsSgcjsjdBuiProInfoMapper.xml | 5 +-- .../SpecialProjectFeasibilityMapper.xml | 4 ++- .../SpecialProjectPreDesignMapper.xml | 5 +-- .../BsSgcYxjdEnterpriseInfoMapper.xml | 32 ++++++++++++++++- ...sSgcJsjdBuiRegulatoryInspectionsMapper.xml | 2 ++ 14 files changed, 151 insertions(+), 32 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index 5bf3cd33..d39f9ce1 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -106,7 +106,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService params = sp.getParams(); assert sysUser != null; @@ -115,11 +120,11 @@ public class BsSgcjsjdBuiProInfoService extends BaseService page = new Page<>(); @@ -156,7 +161,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService params = sp.getParams(); String isMajor = null; @@ -174,12 +184,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService list = null; list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType, - sysXzqhService.getSubString(sp.getData().getAdcd()), + sysXzqhService.getSubString(data.getAdcd()), "create_time", new Page<>(sp.getPageNum(), sp.getPageSize())); @@ -242,7 +252,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService params = sp.getParams(); String isMajor = null; @@ -264,8 +279,9 @@ public class BsSgcjsjdBuiProInfoService extends BaseService list = null; - list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType, - sysXzqhService.getSubString(sp.getData().getAdcd()), + list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(), + sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType, + sysXzqhService.getSubString(data.getAdcd()), "create_time", new Page<>(sp.getPageNum(), sp.getPageSize())); diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java index 9b4d0b7f..db0a1823 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java @@ -6,10 +6,12 @@ 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.SysDept; 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.SpecialProjectProposal; +import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,12 +37,19 @@ public class SpecialProjectFeasibilityService extends BaseService sp) { SysUser sysUser = UserUtils.getUser(); SpecialProjectFeasibility data = sp.getData(); - + if (sysUser.getUserType().equals("00") && data.getAdcd() == null) { + String deptId = sysUser.getDeptId(); + SysDept sysDept = sysDeptService.get(deptId); + String xzqhId = sysDept.getXzqhId(); + data.setAdcd(xzqhId); + } Map params = sp.getParams(); ConditionView cv = sp.getCv(); @@ -50,10 +59,10 @@ public class SpecialProjectFeasibilityService extends BaseService(sp.getPageNum(),sp.getPageSize())); + sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize())); }else { list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(), - sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); + sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } return list; 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 1dc9dd3b..5ebe60af 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 @@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.core.domain.entity.SysDept; 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.SysDeptService; import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +38,9 @@ public class SpecialProjectInfoService extends BaseService sp,String adcd){ SpecialProjectInfo data = sp.getData(); @@ -66,23 +71,30 @@ public class SpecialProjectInfoService extends BaseService params = sp.getParams(); assert sysUser != null; - List list = null; IPage list1 = null; if (ObjectUtil.isNull(params)) { list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(), - data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), "create_time"); + data.getProjectType(), sysXzqhService.getSubString(data.getAdcd()), "create_time"); } else { list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()), sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(), - data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy")); + data.getProjectType(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy")); } 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 f07a2762..dc9392c3 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 @@ -5,9 +5,11 @@ 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.SysDept; 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.SysDeptService; import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,10 +35,19 @@ public class SpecialProjectPlanInfoService extends BaseService sp){ SysUser sysUser = UserUtils.getUser(); SpecialProjectPlanInfo data = sp.getData(); + if (sysUser.getUserType().equals("00") && data.getAdcd() == null) { + String deptId = sysUser.getDeptId(); + SysDept sysDept = sysDeptService.get(deptId); + String xzqhId = sysDept.getXzqhId(); + data.setAdcd(xzqhId); + } Map params = sp.getParams(); assert sysUser != null; @@ -44,10 +55,10 @@ public class SpecialProjectPlanInfoService extends BaseService(sp.getPageNum(),sp.getPageSize())); + data.getPlanType(),sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(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"),new Page<>(sp.getPageNum(),sp.getPageSize())); + data.getPlanType(),sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } 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 48b5c2ca..a467704d 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 @@ -5,12 +5,14 @@ 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.SysDept; import com.jianwei.common.core.domain.entity.SysUser; import com.jianwei.common.mybaitsplus.BeanToWrapper; 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.SysDeptService; import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,12 +38,20 @@ public class SpecialProjectPreDesignService extends BaseService sp) { SysUser sysUser = UserUtils.getUser(); SpecialProjectPreDesign data = sp.getData(); - + if (sysUser.getUserType().equals("00") && data.getAdcd() == null) { + String deptId = sysUser.getDeptId(); + SysDept sysDept = sysDeptService.get(deptId); + String xzqhId = sysDept.getXzqhId(); + data.setAdcd(xzqhId); + } Map params = sp.getParams(); @@ -54,10 +64,10 @@ public class SpecialProjectPreDesignService extends BaseService(sp.getPageNum(),sp.getPageSize())); + sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(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"),new Page<>(sp.getPageNum(),sp.getPageSize())); + sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } 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 8085a21b..2e471de0 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 @@ -8,11 +8,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.SysDept; import com.jianwei.common.core.domain.entity.SysUser; import com.jianwei.common.mybaitsplus.BeanToWrapper; import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.domain.SpecialProjectPlanInfo; +import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,6 +40,9 @@ public class SpecialProjectProposalService extends BaseService geProCodeList(String proNo) { List list=specialProjectProposalMapper.geProCodeList(proNo); @@ -49,7 +54,12 @@ public class SpecialProjectProposalService extends BaseService params = sp.getParams(); @@ -60,7 +70,7 @@ public class SpecialProjectProposalService extends BaseService wrapper = Wrappers.lambdaQuery(SpecialProjectProposal.class).like(data.getProjectName() != null, SpecialProjectProposal::getProjectName, data.getProjectName()) .like(data.getProjectCode() != null, SpecialProjectProposal::getProjectCode, data.getProjectCode()) - .likeRight(data.getAdcd() != null, SpecialProjectProposal::getAdcd, sysXzqhService.getSubString(sp.getData().getAdcd())); + .likeRight(data.getAdcd() != null, SpecialProjectProposal::getAdcd, sysXzqhService.getSubString(data.getAdcd())); return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper); } @@ -68,10 +78,10 @@ public class SpecialProjectProposalService extends BaseService(sp.getPageNum(),sp.getPageSize())); + data.getProjectCode(),sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize())); }else { list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(), - data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); + data.getProjectCode(),sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java index ff1c001a..4771b1a0 100644 --- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java +++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java @@ -88,4 +88,7 @@ public class BsSgcJsjdBuiRegulatoryInspections extends BaseEntity @TableField(exist = false) private String projectName; + @TableField(exist = false) + private String adcd; + } diff --git a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java index 3b2921c5..f9340d15 100644 --- a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java +++ b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java @@ -18,6 +18,7 @@ public interface BsSgcJsjdBuiRegulatoryInspectionsMapper extends BaseMapper getByUserPro(@Param("userId") String userId, @Param("userType") String userType, + @Param("adcd") String adcd, @Param("id") String id1, @Param("projectName") String projectName, @Param("inspectionTypes") String inspectionTypes, diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java index 36aa3508..f06046aa 100644 --- a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java +++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java @@ -4,9 +4,11 @@ import cn.hutool.core.util.ObjectUtil; 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.SysDept; import com.jianwei.common.core.domain.entity.SysUser; import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectPlanInfo; +import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,6 +31,9 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService params = sp.getParams(); assert sysUser != null; @@ -43,11 +54,11 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService - WHERE @@ -200,7 +199,9 @@ and pi.project_type=#{projectType} - + + and pp.adcd like concat(#{adcd},'%') + order by pi.${orderBy} desc diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml index b2f7a38d..e1c0cc29 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml @@ -76,7 +76,9 @@ and pp.project_code like concat('%',#{projectCode},'%') - + + and pp.adcd like concat(#{adcd},'%') + order by ${orderBy} desc diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml index 815f4b0d..059fd79a 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml @@ -73,8 +73,9 @@ and pp.project_name like concat('%',#{projectName},'%') - - + + and pp.adcd like concat(#{adcd},'%') + order by da.${orderBy} desc diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml index dc62d8a9..9e92e881 100644 --- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml @@ -65,6 +65,36 @@