diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java index 2f1c7990..8fd8c5fc 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java @@ -18,6 +18,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.earlyStage.domain.SpecialProjectProposal; import com.kms.earlyStage.service.SpecialProjectProposalService; @@ -85,19 +86,9 @@ public class BsSgcjsjdBuiProInfoController extends BaseController public IPage list(@RequestBody SearchParam sp) { - BsSgcjsjdBuiProInfo planInfo = sp.getData(); - String adcd = planInfo.getAdcd(); - SysUser sysUser = UserUtils.getUser(); + IPage specialProjectInfoIPage = bsSgcjsjdBuiProInfoService.selectPage1(sp); - if (sysUser.getUserName().equals("admin")) { - adcd = handleAdminUser(planInfo, adcd); - } else if (adcd == null) { - adcd = handleNullAdcd(); - } else { - adcd = handleAdcd(adcd); - } - - return bsSgcjsjdBuiProInfoService.selectPage(sp, adcd); + return specialProjectInfoIPage; } 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 a926d2e1..06113335 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 @@ -23,4 +23,13 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper 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/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index bbeeab0d..e6dbb112 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 @@ -1,14 +1,19 @@ package com.kms.build.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.jianwei.common.core.service.BaseService; import com.jianwei.common.mybaitsplus.BeanToWrapper; import com.kms.build.domain.BsSgcJsjdBuiContInfo; import com.kms.build.domain.BsSgcjsjdBuiProInfo; import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper; +import com.kms.common.utils.UserUtils; +import com.kms.earlyStage.domain.SpecialProjectInfo; +import com.kms.system.service.SysXzqhService; import org.apache.ibatis.reflection.wrapper.BaseWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,6 +39,9 @@ public class BsSgcjsjdBuiProInfoService extends BaseService sp, String adcd) { @@ -74,4 +82,53 @@ public class BsSgcjsjdBuiProInfoService extends BaseService selectPage1(SearchParam sp) { + SysUser sysUser = UserUtils.getUser(); + + BsSgcjsjdBuiProInfo data = sp.getData(); + + Map params = sp.getParams(); + + assert sysUser != null; + List list = null; + + + if (ObjectUtil.isNull(params)) { + list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(), + sysXzqhService.getSubString(sp.getData().getAdcd()), + "create_time",sp.getPageNum(),sp.getPageSize()); + }else { + list = bsSgcjsjdBuiProInfoMapper.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); + page.setTotal(list.size()); + List records = page.getRecords(); + + for (BsSgcjsjdBuiProInfo record : records) { + String proNo = record.getProNo(); + String proCode = record.getProCode(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pro_no", proNo); + queryWrapper.eq("pro_code", proCode); + List bsSgcJsjdBuiContInfos = + bsSgcJsjdBuiContInfoService.list(queryWrapper); + BigDecimal contractPayment = BigDecimal.ZERO; + for (BsSgcJsjdBuiContInfo bsSgcJsjdBuiContInfo : bsSgcJsjdBuiContInfos) { + BigDecimal actualPayment = bsSgcJsjdBuiContInfo.getActualPayment(); + if (actualPayment == null) { + actualPayment = BigDecimal.ZERO; + } + contractPayment = contractPayment.add(actualPayment); + } + record.setContractPayment(contractPayment); + + } + page.setRecords(records); + + return page; + + } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidWiningController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidWiningController.java index c6f7414d..5dd4a066 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidWiningController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidWiningController.java @@ -160,7 +160,9 @@ public class ProjectBidWiningController extends BaseController @GetMapping("/listVO/{id}") public AjaxResult getVO(@PathVariable String id) { ProjectBidWining byId = projectBidWiningService.getById(id); - + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProNo, byId.getProNo()).eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode())); + byId.setBidProjectName(one.getProjectName()); String noticeId = byId.getNoticeId(); QueryWrapper detailsQueryWrapper = new QueryWrapper<>(); diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java index 0ea3e418..f2b0f33d 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java @@ -161,7 +161,9 @@ public class SpecialProjectBidInfoController extends BaseController @GetMapping("/listVO/{id}") public AjaxResult getVO(@PathVariable String id) { SpecialProjectBidInfo bidInfo = specialProjectBidInfoService.getById(id); - + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProNo, bidInfo.getProNo()).eq(SpecialProjectProposal::getProjectCode, bidInfo.getProjectCode())); + bidInfo.setBidProjectName(one.getProjectName()); String bidId = bidInfo.getBidId(); QueryWrapper detailsQueryWrapper = new QueryWrapper<>(); diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index 24e8f464..9610fc12 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -11,7 +11,8 @@ pp.adcd, pp.project_type, pi.CONSTRUCTION_NATURE, - pi.is_major + pi.is_major, + pi.total from bs_sgc_jsjd_bui_pro_info pi left join bs_slgc_qqjd_spe_pro_proposal pp on pi.pro_code = pp.project_code and pi.pro_no = pp.pro_no @@ -23,6 +24,7 @@ + @@ -37,4 +39,36 @@ order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize}; + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidWiningMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidWiningMapper.xml index 45eb1721..2448b7c5 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidWiningMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidWiningMapper.xml @@ -6,7 +6,7 @@ select - project_name, + pp.project_name, bw.* from bs_slgc_qqjd_pro_bid_winning bw