From 808e2a6becbcdda239c34dd5724db302cb3fcf26 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Wed, 26 Jun 2024 15:08:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E6=B0=91=E4=BF=A1=E6=81=AF=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=9F=A5=E7=9C=8B=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 2 +- .../BsSgcJsjdBuiRealNameProController.java | 2 +- .../domain/BsSgcJsjdBuiSectionExcel.java | 11 +- .../mapper/BsSgcJsjdBuiRealNameProMapper.java | 22 ++++ .../mapper/BsSgcjsjdBuiProInfoMapper.java | 22 ++++ .../BsSgcJsjdBuiRealNameProService.java | 50 +++++++ .../mapper/build/BsSgcJsjdBuiRealNamePro.xml | 122 ++++++++++++++++++ .../build/BsSgcjsjdBuiProInfoMapper.xml | 117 +++++++++++++++++ 8 files changed, 341 insertions(+), 7 deletions(-) create mode 100644 jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiRealNamePro.xml diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java index f43a1953..6cee57bc 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java @@ -245,7 +245,7 @@ public class SysLoginController extends BaseController { // } // } // } - RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue+"&page="+page); + RedirectView redirectView = new RedirectView("http://210.76.82.26/jgThinking/#/singleLogin"+"?token="+tokenValue+"&page="+page); ModelAndView modelAndView = new ModelAndView(redirectView); return modelAndView; } diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameProController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameProController.java index 31cb31a7..a6f16731 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameProController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameProController.java @@ -52,7 +52,7 @@ public class BsSgcJsjdBuiRealNameProController extends BaseController @ApiOperation("农民工实行信息关联项目列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcJsjdBuiRealNameProService.selectPage(sp); + return bsSgcJsjdBuiRealNameProService.selectPage1(sp); } /** diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSectionExcel.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSectionExcel.java index 7eff6f0c..f3f36e27 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSectionExcel.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSectionExcel.java @@ -16,23 +16,24 @@ public class BsSgcJsjdBuiSectionExcel { private String sectionName; - /** 项目法人 */ @Excel(name = "项目法人单位") + /** 项目法人 */ + @Excel(name = "项目法人单位") @ApiModelProperty("项目法人") - private String projectlegalPerson; + private String projectLegalPerson; /** 单位法定代表人电话 */ @Excel(name = "单位法定代表人") @ApiModelProperty("单位法定代表人") - private String projectunitLegal ; + private String projectUnitLegal ; @Excel(name = "单位法定代表人电话") private String projectUnitLegalPhone; @Excel(name = "项目负责人") - private String projectsuperintendent; + private String projectSuperintendent; @Excel(name = "项目负责人电话") - private String projectsuperinteidentPhone; + private String projectSuperintendentPhone; /** 项目建设地址 */ @Excel(name = "建设地址") diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiRealNameProMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiRealNameProMapper.java index dcef5cc7..0ae25a3f 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiRealNameProMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiRealNameProMapper.java @@ -1,9 +1,13 @@ package com.kms.build.mapper; +import com.kms.build.domain.BsSgcjsjdBuiProInfo; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.build.domain.BsSgcJsjdBuiRealNamePro; +import java.util.List; + /** * 农民工实行信息关联项目Mapper接口 * @@ -13,4 +17,22 @@ import com.kms.build.domain.BsSgcJsjdBuiRealNamePro; @Repository public interface BsSgcJsjdBuiRealNameProMapper extends BaseMapper { + List getByUser(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("adcd") String adcd, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("proNo") String proNo, + @Param("proCode")String proCode); + + List getCount(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("adcd") String adcd, + @Param("proNo") String proNo, + @Param("proCode")String proCode); + } diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java index 562ab992..fd0225dd 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java @@ -2,6 +2,7 @@ package com.kms.build.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.build.domain.BsSgcJsjdBuiRealNamePro; import com.kms.build.domain.BsSgcjsjdBuiProInfo; import com.kms.build.domain.Num; import com.kms.build.domain.dto.AssertStatisticsDto; @@ -96,4 +97,25 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper getByUser(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("adcd") String adcd, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("proNo") String proNo, + @Param("proCode")String proCode); + + Integer getRealNameCount(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("adcd") String adcd, + @Param("proNo") String proNo, + @Param("proCode")String proCode); + + } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiRealNameProService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiRealNameProService.java index 51c6b327..c2b78b8b 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiRealNameProService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiRealNameProService.java @@ -1,10 +1,26 @@ package com.kms.build.service; +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.build.domain.BsSgcjsjdBuiProInfo; +import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper; +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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.build.mapper.BsSgcJsjdBuiRealNameProMapper; import com.kms.build.domain.BsSgcJsjdBuiRealNamePro; +import javax.annotation.Resource; +import java.util.List; + /** * 农民工实行信息关联项目Service接口 * @@ -13,5 +29,39 @@ import com.kms.build.domain.BsSgcJsjdBuiRealNamePro; */ @Service public class BsSgcJsjdBuiRealNameProService extends BaseService{ + @Autowired + SysDeptService sysDeptService; + + @Autowired + private BsSgcJsjdBuiRealNameProMapper bsSgcJsjdBuiRealNameProMapper; + + @Autowired + private BsSgcjsjdBuiProInfoMapper bsSgcjsjdBuiProInfoMapper; + + @Autowired + SysXzqhService sysXzqhService; + + public IPage selectPage1(SearchParam sp){ + SysUser sysUser = UserUtils.getUser(); + BsSgcJsjdBuiRealNamePro 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); + } + String subString=null; + subString = sysXzqhService.getSubString(data.getAdcd()); + List list = bsSgcjsjdBuiProInfoMapper.getByUser(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), + subString, + sp.getPageNum(), sp.getPageSize(), sp.getData().getProNo(), sp.getData().getProCode()); + Integer count = bsSgcjsjdBuiProInfoMapper.getRealNameCount(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), + subString, + sp.getData().getProNo(), sp.getData().getProCode()); + Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + page.setRecords(list); + page.setTotal(count); + return page; + } } diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiRealNamePro.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiRealNamePro.xml new file mode 100644 index 00000000..3c78d6e1 --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiRealNamePro.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index 7bb99649..b79b16c1 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -620,4 +620,121 @@ + + + + + + + + + + + + + +