验收成果接口

src/main/java/com/ruoyi/project/ys/controller/YscgZllxController.java

@@ -101,4 +101,15 @@ public class YscgZllxController extends BaseController
     {
         return toAjax(yscgZllxService.deleteYscgZllxByIds(ids));
     }
+
+
+    /**
+     * 查询资料类型列表
+     */
+    @GetMapping("/selectZllx")
+    public TableDataInfo selectZllx(YscgZllx yscgZllx)
+    {
+        List<YscgZllx> list = yscgZllxService.selectYscgZllxList(yscgZllx);
+        return getDataTable(list);
+    }
 }

src/main/java/com/ruoyi/project/ys/controller/YsqqXmxxController.java

@@ -189,4 +189,16 @@ public class YsqqXmxxController extends BaseController
         return success(ysqqXmxxService.selectYsqqXmxxById_XQ(id));
     }
 
+    /**
+     * 验收成果
+     */
+    @GetMapping("/yscgList")
+    public TableDataInfo yscgList(YsqqXmxx ysqqXmxx)
+    {
+        startPage();
+        ysqqXmxx.setExt1("待验收、已验收(待归档)、已归档'");
+        List<YsqqXmxx> list = ysqqXmxxService.yscgList(ysqqXmxx);
+        return getDataTable(list);
+    }
+
 }

src/main/java/com/ruoyi/project/ys/domain/YsqqXmxx.java

@@ -307,4 +307,42 @@ public class YsqqXmxx extends BaseEntity
     public void setYsqqXmxxSegy(List<YsqqXmxxSegy> ysqqXmxxSegy) {
         this.ysqqXmxxSegy = ysqqXmxxSegy;
     }
+
+    // 用于资料类型
+    private Integer pxh;
+    private String zllxmc;
+    private Long zllxid;
+    private Integer zlsl;
+
+    public Integer getPxh() {
+        return pxh;
+    }
+
+    public void setPxh(Integer pxh) {
+        this.pxh = pxh;
+    }
+
+    public String getZllxmc() {
+        return zllxmc;
+    }
+
+    public void setZllxmc(String zllxmc) {
+        this.zllxmc = zllxmc;
+    }
+
+    public Long getZllxid() {
+        return zllxid;
+    }
+
+    public void setZllxid(Long zllxid) {
+        this.zllxid = zllxid;
+    }
+
+    public Integer getZlsl() {
+        return zlsl;
+    }
+
+    public void setZlsl(Integer zlsl) {
+        this.zlsl = zlsl;
+    }
 }

src/main/java/com/ruoyi/project/ys/service/IYsqqXmxxService.java

@@ -60,4 +60,6 @@ public interface IYsqqXmxxService
      * @return 结果
      */
     public int deleteYsqqXmxxById(Long id);
+
+    public List<YsqqXmxx> yscgList(YsqqXmxx ysqqXmxx);
 }

src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxServiceImpl.java

 package com.ruoyi.project.ys.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.project.ys.domain.YsqqXmxxJxx;
-import com.ruoyi.project.ys.domain.YsqqXmxxSegy;
-import com.ruoyi.project.ys.mapper.YsqqXmxxJxxMapper;
-import com.ruoyi.project.ys.mapper.YsqqXmxxSegyMapper;
+import com.ruoyi.framework.web.page.PageDomain;
+import com.ruoyi.framework.web.page.TableSupport;
+import com.ruoyi.project.ys.domain.*;
+import com.ruoyi.project.ys.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.ys.mapper.YsqqXmxxMapper;
-import com.ruoyi.project.ys.domain.YsqqXmxx;
 import com.ruoyi.project.ys.service.IYsqqXmxxService;
 
 import static com.ruoyi.common.utils.SecurityUtils.getUserId;
@@ -131,4 +130,55 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
         ysqqXmxx.setYsqqXmxxSegy(segyList);
         return ysqqXmxx;
     }
+
+    @Autowired
+    private YscgZllxMapper yscgZllxMapper;
+    @Autowired
+    private YscgWjscqkMapper yscgWjscqkMapper;
+
+    @Override
+    public List<YsqqXmxx> yscgList(YsqqXmxx ysqqXmxx)
+    {
+        //项目信息
+        List<YsqqXmxx>   xmxxList  = ysqqXmxxMapper.selectYsqqXmxxList(ysqqXmxx);
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        Integer PXH = (pageNum-1)*pageSize;
+        // 资料类型
+        YscgZllx yscgZllx = new YscgZllx();
+        List<YscgZllx>  zllxList = yscgZllxMapper.selectYscgZllxList(yscgZllx);
+
+        // 资料上传情况 上传数量
+        YscgWjscqk yscgWjscqk = new YscgWjscqk();
+        List<YscgWjscqk>    zlscList = yscgWjscqkMapper.selectYscgWjscqkList(yscgWjscqk);
+
+        List<YsqqXmxx> jctzList =   new ArrayList<>();
+        for (YsqqXmxx item1 : xmxxList) {
+            PXH++;
+            for (YscgZllx item2 : zllxList) {
+                YsqqXmxx xmxx = new YsqqXmxx();
+                xmxx.setId(item1.getId());
+                xmxx.setXmmc(item1.getXmmc());
+                xmxx.setXmzt(item1.getXmzt());
+                xmxx.setQk(item1.getQk());
+
+                xmxx.setPxh(PXH);
+                xmxx.setZllxid(item2.getId());
+                xmxx.setZllxmc(item2.getLxmc());
+                jctzList.add(xmxx);
+            }
+        }
+        for (YsqqXmxx item3 : jctzList) {
+            String  zllxmc =item3.getZllxmc();
+            Long  xmid = item3.getId();
+            long count = zlscList.stream()
+                    // 过滤出xmid和zllx都匹配的记录
+                    .filter(zlsc -> xmid.equals(zlsc.getXmid()) && zllxmc.equals(zlsc.getZllx()))
+                    // 统计数量
+                    .count();
+            item3.setZlsl((int) count);
+        }
+        return  jctzList;
+    }
 }

src/main/resources/mybatis/ysqqXmxx/YsqqXmxxMapper.xml

@@ -45,9 +45,9 @@
             <if test="ymax != null "> and ymax = #{ymax}</if>
             <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
             <if test="createdTime != null "> and created_time = #{createdTime}</if>
-            <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
+            <if test="ext1 != null  and ext1 != ''"> and xmzt in ('待验收','已验收(待归档)','已归档')</if>
             <if test="ext2 != null  and ext2 != ''"> and xmzt in ('已验收(待归档)','已归档')</if>
-            <if test="ext3 != null  and ext3 != ''">and xmzt in ('已验收(待归档)','已归档')</if>
+            <if test="ext3 != null  and ext3 != ''">and xmzt in ('待验收','已验收(待归档)')</if>
             <if test="xmzt != null  and xmzt != ''"> and xmzt = #{xmzt}</if>
             <if test="xmrq != null "> and xmrq = #{xmrq}</if>
         </where>