项目预警开发

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

@@ -38,17 +38,17 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                            @Param("pageNum") int pageNum,
                                            @Param("pageSize") int pageSize);
 
-    List<BsSgcjsjdBuiProInfo> selectManagePage(@Param("id") String id,
+    IPage<BsSgcjsjdBuiProInfo> selectManagePage(@Param("id") String id,
                                                @Param("projectName") String projectName,
                                                @Param("isMajor") String isMajor,
                                                @Param("projectType") String projectType,
                                                @Param("adcd") String adcd,
                                                @Param("orderBy") String orderBy,
-                                               @Param("pageNum") int pageNum,
-                                               @Param("pageSize") int pageSize);
+                                               Page page);
 
     IPage<AssertStatisticsDto> selectPageByCode(@Param("id") String id,
                                                @Param("projectName") String projectName,
+                                               @Param("isMajor") String isMajor,
                                                @Param("projectType") String projectType,
                                                @Param("adcd") String adcd,
                                                @Param("orderBy") String orderBy,

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -172,17 +172,17 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
 
 
         assert sysUser != null;
-        List<BsSgcjsjdBuiProInfo> list = null;
+        IPage<BsSgcjsjdBuiProInfo> list = null;
 
 
         list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor,projectType,
                 sysXzqhService.getSubString(sp.getData().getAdcd()),
-                "create_time", sp.getPageNum(), sp.getPageSize());
+                "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
 
 
-        for (BsSgcjsjdBuiProInfo buiProInfo : list) {
-            String proNo = buiProInfo.getProNo();
-            String proCode = buiProInfo.getProCode();
+        for (int i = 0; i < list.getRecords().size(); i++) {
+            String proNo = list.getRecords().get(i).getProNo();
+            String proCode = list.getRecords().get(i).getProCode();
 
             BsSgcJsjdBuiConAcc conAcc = bsSgcJsjdBuiConAccService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiConAcc.class)
                     .eq(BsSgcJsjdBuiConAcc::getProCode, proCode)
@@ -193,17 +193,17 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                     .eq(BsSgcJsjdBuiComAcc::getProNo, proNo));
 
             if (conAcc != null && comAcc != null) {
-                buiProInfo.setProjectPhase("3");
+                list.getRecords().get(i).setProjectPhase("3");
             } else {
-                buiProInfo.setProjectPhase("2");
+                list.getRecords().get(i).setProjectPhase("2");
             }
         }
 
-        Page<BsSgcjsjdBuiProInfo> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
 
-        return page;
+
+
+
+        return list;
 
     }
 
@@ -211,6 +211,17 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         SysUser sysUser = UserUtils.getUser();
 
         BsSgcjsjdBuiProInfo data = sp.getData();
+        String isMajor = null;
+        String projectType = data.getProjectType();
+        if (!ObjectUtil.isNull(projectType)) {
+            String[] split = projectType.split(",");
+            isMajor=split[0];
+            if (" ".equals(split[1])) {
+                projectType=null;
+            }else {
+                projectType=split[1];
+            }
+        }
 
         Map<String, Object> params = sp.getParams();
 
@@ -220,11 +231,65 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         SysDept sysDept = sysDeptService.get(deptId);
         String xzqhId = sysDept.getXzqhId();
 
-        list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(data.getId(), data.getProjectName(), data.getProjectType(),
+        list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(data.getId(), data.getProjectName(),isMajor, data.getProjectType(),
                 sysXzqhService.getSubString(xzqhId),
                 "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
 
 
         return list;
     }
+
+    public IPage listBy(SearchParam<BsSgcjsjdBuiProInfo> sp) {
+        SysUser sysUser = UserUtils.getUser();
+
+        BsSgcjsjdBuiProInfo data = sp.getData();
+
+        Map<String, Object> params = sp.getParams();
+
+        String isMajor = null;
+
+
+
+        String projectType = data.getProjectType();
+        if (!ObjectUtil.isNull(projectType)) {
+            String[] split = projectType.split(",");
+            isMajor=split[0];
+            if (" ".equals(split[1])) {
+                projectType=null;
+            }else {
+                projectType=split[1];
+            }
+        }
+
+
+
+        assert sysUser != null;
+        IPage<BsSgcjsjdBuiProInfo> list = null;
+
+
+        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor,projectType,
+                sysXzqhService.getSubString(sp.getData().getAdcd()),
+                "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
+
+
+        for (int i = 0; i < list.getRecords().size(); i++) {
+            String proNo = list.getRecords().get(i).getProNo();
+            String proCode = list.getRecords().get(i).getProCode();
+
+            BsSgcJsjdBuiConAcc conAcc = bsSgcJsjdBuiConAccService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiConAcc.class)
+                    .eq(BsSgcJsjdBuiConAcc::getProCode, proCode)
+                    .eq(BsSgcJsjdBuiConAcc::getProNo, proNo));
+
+            BsSgcJsjdBuiComAcc comAcc = bsSgcJsjdBuiComAccService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiComAcc.class)
+                    .eq(BsSgcJsjdBuiComAcc::getProCode, proCode)
+                    .eq(BsSgcJsjdBuiComAcc::getProNo, proNo));
+
+            if (conAcc != null && comAcc != null) {
+                list.getRecords().remove(i);
+            }
+        }
+
+        return list;
+
+    }
 }

jwtech-system/src/main/java/com/kms/statistics/controller/ProgressStatisticsController.java

@@ -3,7 +3,9 @@ package com.kms.statistics.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jianwei.common.core.domain.SearchParam;
 import com.kms.build.domain.BsSgcJsjdBuiProgress;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.service.BsSgcJsjdBuiProgressService;
+import com.kms.build.service.BsSgcjsjdBuiProInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,6 +20,9 @@ public class ProgressStatisticsController {
     @Autowired
     private BsSgcJsjdBuiProgressService bsSgcJsjdBuiProgressService;
 
+    @Autowired
+    private BsSgcjsjdBuiProInfoService bsSgcjsjdBuiProInfoService;
+
 
     @PostMapping("/list")
     @ApiOperation("进度管理列表")
@@ -26,4 +31,12 @@ public class ProgressStatisticsController {
         return bsSgcJsjdBuiProgressService.getProgress(sp);
     }
 
+
+    @PostMapping("/listBy")
+    @ApiOperation("进度管理列表")
+    public IPage listBy(@RequestBody SearchParam<BsSgcjsjdBuiProInfo> sp)
+    {
+        return bsSgcjsjdBuiProInfoService.listBy(sp);
+    }
+
 }

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -182,6 +182,9 @@
             <if test="projectName!=null and projectName!=''">
                 and pp.project_name like concat('%',#{projectName},'%')
             </if>
+            <if test="isMajor!=null and isMajor!=''">
+                and pi.is_major=#{isMajor}
+            </if>
             <if test="projectType!=null and projectType!=''">
                 and pp.project_type=#{projectType}
             </if>