Merge remote-tracking branch 'origin/master'

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<BsSgcjsjdBuiProInfo> sp)
     {
 
-        BsSgcjsjdBuiProInfo planInfo = sp.getData();
-        String adcd = planInfo.getAdcd();
-        SysUser sysUser = UserUtils.getUser();
+        IPage<BsSgcjsjdBuiProInfo> 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;
 
     }
 

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@@ -23,4 +23,13 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                       @Param("orderBy") String orderBy,
                                       @Param("pageNum") int pageNum,
                                       @Param("pageSize") int pageSize);
+
+    List<BsSgcjsjdBuiProInfo> 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);
 }

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<BsSgcjsjdBuiProInfoM
     @Autowired
     private BsSgcJsjdBuiContInfoService bsSgcJsjdBuiContInfoService;
 
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
 
     public IPage selectPage(SearchParam<BsSgcjsjdBuiProInfo> sp, String adcd) {
 
@@ -74,4 +82,53 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         return page;
     }
 
+    public IPage<BsSgcjsjdBuiProInfo> selectPage1(SearchParam<BsSgcjsjdBuiProInfo> sp) {
+        SysUser sysUser = UserUtils.getUser();
+
+        BsSgcjsjdBuiProInfo data = sp.getData();
+
+        Map<String, Object> params = sp.getParams();
+
+        assert sysUser != null;
+        List<BsSgcjsjdBuiProInfo> 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<BsSgcjsjdBuiProInfo> page = new Page<>();
+        page.setRecords(list);
+        page.setTotal(list.size());
+        List<BsSgcjsjdBuiProInfo> records = page.getRecords();
+
+        for (BsSgcjsjdBuiProInfo record : records) {
+            String proNo = record.getProNo();
+            String proCode = record.getProCode();
+            QueryWrapper<BsSgcJsjdBuiContInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("pro_no", proNo);
+            queryWrapper.eq("pro_code", proCode);
+            List<BsSgcJsjdBuiContInfo> 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;
+
+    }
 }

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<ProjectBidWinner> detailsQueryWrapper = new QueryWrapper<>();

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<ProjectBidDetails> detailsQueryWrapper = new QueryWrapper<>();

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
     </sql>
@@ -23,6 +24,7 @@
         <result property="projectType" column="project_type"/>
         <result property="proCode" column="pro_code"/>
         <result property="constructionNature" column="CONSTRUCTION_NATURE"/>
+        <result property="total" column="total"/>
     </resultMap>
 
 
@@ -37,4 +39,36 @@
         </where>
         order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>
+
+    <select id="getByUserPro" resultMap="BsSgcjsjdBuiProInfo">
+        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+        <include refid="info"/>
+        <if test="userType==01">
+            WHERE
+            pi.PRO_NO IN (
+            SELECT
+            PRO_NO
+            FROM
+            sys_user_pro
+            <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
+                <if test="projectName!=null and projectName!=''">
+                    and project_name like concat('%',#{projectName},'%')
+                </if>
+                <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
+            </where>
+            order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+        </if>
+        <if test="userType==00">
+            <where>
+                <if test="projectName!=null and projectName!=''">
+                    and project_name like concat('%',#{projectName},'%')
+                </if>
+                <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
+            </where>
+            order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+        </if>
+    </select>
 </mapper>

jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidWiningMapper.xml

@@ -6,7 +6,7 @@
 
     <sql id="info">
         select
-            project_name,
+            pp.project_name,
             bw.*
 
         from bs_slgc_qqjd_pro_bid_winning bw