xml

jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java

@@ -15,6 +15,7 @@ import com.kms.common.utils.BaseEntityUtils;
 
 
 import com.kms.common.utils.UserUtils;
+import com.kms.earlyStage.domain.SpecialProjectInfo;
 import com.kms.earlyStage.domain.SpecialProjectProposal;
 import com.kms.earlyStage.service.SpecialProjectProposalService;
 import com.kms.system.domain.SysXzqh;
@@ -72,62 +73,9 @@ public class SpecialProjectFeasibilityController extends BaseController
     @ApiOperation("可行性研究报告列表")
     public IPage list(@RequestBody SearchParam<SpecialProjectFeasibility> sp)
     {
-        SpecialProjectFeasibility 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<SysXzqh> 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 specialProjectFeasibilityService.selectPage(sp,infoAdcd);
-            }else {
-                return specialProjectFeasibilityService.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 specialProjectFeasibilityService.selectPage(sp,substring);
-        }else {
-            QueryWrapper<SysXzqh> 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 specialProjectFeasibilityService.selectPage(sp, adcd);
-        }
+        IPage<SpecialProjectFeasibility> specialProjectInfoIPage = specialProjectFeasibilityService.selectPage(sp);
+
+        return specialProjectInfoIPage;
 
     }
 

jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java

@@ -1,6 +1,8 @@
 package com.kms.earlyStage.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -114,4 +116,9 @@ public class SpecialProjectProposal extends BaseEntity
 
     private String adcd;
 
+
+    //查询字段 0：列表，1：其它
+    @TableField(exist = false)
+    private String getList;
+
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidResultMapper.java

@@ -22,4 +22,6 @@ public interface ProjectBidResultMapper extends BaseMapper<ProjectBidResult> {
                                    @Param("orderBy") String orderBy,
                                    @Param("pageNum") int pageNum,
                                    @Param("pageSize") int pageSize);
+
+    List<ProjectBidResult> getListByProNo();
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java

@@ -24,4 +24,13 @@ public interface SpecialProjectFeasibilityMapper extends BaseMapper<SpecialProje
                                      @Param("orderBy") String orderBy,
                                      @Param("pageNum") int pageNum,
                                      @Param("pageSize") int pageSize);
+
+    List<SpecialProjectFeasibility> 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/earlyStage/service/ProjectBidResultService.java

@@ -1,9 +1,13 @@
 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.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
+import com.kms.system.domain.SysUserPro;
+import com.kms.system.mapper.SysUserProMapper;
 import lombok.experimental.Accessors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,7 +30,25 @@ public class ProjectBidResultService extends BaseService<ProjectBidResultMapper,
     @Autowired
     private ProjectBidResultMapper projectBidResultMapper;
 
+    @Autowired
+    private SysUserProMapper sysUserProMapper;
+
     public IPage selectPage(SearchParam<ProjectBidResult> sp) {
+
+        if (ObjectUtil.isNull(sp.getData())) {
+
+            List<ProjectBidResult> list = projectBidResultMapper.getListByProNo();
+
+            Page<ProjectBidResult> page = new Page<>();
+
+            page.setRecords(list);
+            page.setTotal(list.size());
+
+
+            return page;
+        }
+
+
         ProjectBidResult data = sp.getData();
 
         Map<String, Object> params = sp.getParams();

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.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.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.SpecialProjectProposal;
+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,19 +32,33 @@ public class SpecialProjectFeasibilityService extends BaseService<SpecialProject
     @Autowired
     private SpecialProjectFeasibilityMapper specialProjectFeasibilityMapper;
 
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+
+    public IPage selectPage(SearchParam<SpecialProjectFeasibility> sp) {
+        SysUser sysUser = UserUtils.getUser();
 
-    public IPage selectPage(SearchParam<SpecialProjectFeasibility> sp, String adcd) {
         SpecialProjectFeasibility data = sp.getData();
 
         Map<String, Object> params = sp.getParams();
-        List<SpecialProjectInfo> list = specialProjectFeasibilityMapper.getXzqh(data.getId(),data.getProjectName(),
-                data.getProjectType(),adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
+        ConditionView cv = sp.getCv();
+
+        assert sysUser != null;
+        List<SpecialProjectFeasibility> list = null;
 
-        Page<SpecialProjectInfo> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
 
+        if (ObjectUtil.isNull(params)) {
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+                    sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());
+        }else {
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+                    sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
+        }
 
+        Page<SpecialProjectFeasibility> page = new Page<>();
+        page.setRecords(list);
+        page.setTotal(list.size());
         return page;
 
     }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java

@@ -55,7 +55,7 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
         assert sysUser != null;
         List<SpecialProjectProposal> list = null;
 
-        if (ObjectUtil.isNull(data.getProjectCode())) {
+        if (ObjectUtil.isNull(data.getGetList())) {
             return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
         }
 

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

@@ -44,4 +44,11 @@
     </select>
 
 
+    <select id="getListByProNo" resultMap="ProjectBidResult">
+        SELECT *
+        FROM bs_slgc_qqjd_pro_bid_result br
+        WHERE br.PRO_NO not in (SELECT PRO_NO FROM sys_user_pro);
+    </select>
+
+
 </mapper>

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

@@ -44,4 +44,35 @@
         </where>
         order by pf.${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>
+    <select id="getByUserPro" resultMap="SpecialProjectFeasibility">
+        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+        <include refid="SpecialProjectInfo"/>
+        <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 ${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 ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+        </if>
+    </select>
 </mapper>