From 547ddde5c5647f143d2bedac97af02400d95bf39 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Wed, 8 May 2024 23:29:47 +0800
Subject: [PATCH] update code

---
 .../ProjectMaterialSealController.java        | 16 ++++++++++++++
 .../mapper/SurProjectMaterialSealMapper.java  |  2 ++
 .../ISurProjectMaterialSealService.java       |  2 ++
 .../SurProjectMaterialSealServiceImpl.java    |  5 +++++
 .../project/SurProjectMaterialSealMapper.xml  | 22 +++++++++++++++++++
 5 files changed, 47 insertions(+)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java
index a3a13933..202b7f97 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java
@@ -101,4 +101,20 @@ public class ProjectMaterialSealController extends BaseController {
         return getDataTable(list);
     }
 
+    @PostMapping("/selectByApprove")
+    public TableDataInfo selectByApprove(@RequestBody SurProjectMaterialSeal where){
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        Long deptId=where.getDeptId();
+        if(deptId==null || deptId<=0){
+            if (SecurityUtils.isUserB()) {
+                where.setPrjIds(getProjectIds());
+            }
+        }
+        startPage();
+        List<SurProjectMaterialSeal> list=materialSealService.selectByApprove(where);
+        return getDataTable(list);
+    }
+
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java
index 38012724..15ec6933 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java
@@ -80,4 +80,6 @@ public interface SurProjectMaterialSealMapper
      * @return
      */
     public List<SurProjectMaterialSeal>  groupByApprove(SurProjectMaterialSeal where);
+
+    public List<SurProjectMaterialSeal> selectByApprove(SurProjectMaterialSeal where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java
index 63a1c820..441cd71b 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java
@@ -88,4 +88,6 @@ public interface ISurProjectMaterialSealService
      * @return
      */
     public List<SurProjectMaterialSeal> groupByApprove(SurProjectMaterialSeal where);
+
+    public List<SurProjectMaterialSeal> selectByApprove(SurProjectMaterialSeal where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java
index 8713b61e..6bf94d0b 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java
@@ -222,4 +222,9 @@ public class SurProjectMaterialSealServiceImpl extends WeChatMessageServiceImpl
     public List<SurProjectMaterialSeal> groupByApprove(SurProjectMaterialSeal where) {
         return surProjectMaterialSealMapper.groupByApprove(where);
     }
+
+    @Override
+    public List<SurProjectMaterialSeal> selectByApprove(SurProjectMaterialSeal where) {
+        return surProjectMaterialSealMapper.selectByApprove(where);
+    }
 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
index 4e40f6cb..4aa9bc73 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
@@ -259,4 +259,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by spme.seal_date desc
         ) spme
     </select>
+
+    <select id="selectByApprove"   parameterType="SurProjectMaterialSeal" resultMap="SurProjectMaterialSealResult">
+        select *
+        from (
+        select spme.*,sp.projectName, sd.dept_name from sur_project_material_seal spme
+        left join sur_project sp on spme.project_id = sp.id
+        left join sys_dept sd on sd.dept_id = spme.dept_id
+        where spme.is_del=0  and sp.isDel=0 and sp.progressVisible=0
+        <if test="approveStatus==4">and spme.approve_status = 4</if>
+        <if test="approveStatus==0">and spme.approve_status &lt;&gt; 4</if>
+        <if test="deptId != null and deptId > 0"> and sp.deptId = #{deptId} </if>
+        <if test='proType != null  and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if>
+        <if test="projectId != null and projectId > 0">and sp.id = #{projectId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and sp.id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        order by spme.seal_date desc
+        ) spme
+    </select>
 </mapper>
\ No newline at end of file