From 8700aa64e3c6415d2c55f3e9928b1259222f3bad Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 31 Mar 2025 10:28:08 +0800
Subject: [PATCH] Initial commit

---
 .../modules/projectinfo/controller/ProjectCaseController.java | 1 +
 .../projectinfo/service/impl/ProjectCaseServiceImpl.java      | 2 --
 src/main/resources/mapper/projectinfo/ProjectCaseDao.xml      | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/projectinfo/controller/ProjectCaseController.java b/src/main/java/com/gaotao/modules/projectinfo/controller/ProjectCaseController.java
index fa46b9d..87fafe3 100644
--- a/src/main/java/com/gaotao/modules/projectinfo/controller/ProjectCaseController.java
+++ b/src/main/java/com/gaotao/modules/projectinfo/controller/ProjectCaseController.java
@@ -144,6 +144,7 @@ public class ProjectCaseController extends AbstractController {
 	public R manageAudit(@RequestBody ProjectCase projectCase){
 		ProjectCase pCase = projectCaseService.getById(projectCase.getId());
 		pCase.setXjshow(projectCase.getXjshow());
+		pCase.setStatus(20);
 		projectCaseService.update(pCase);
 		return R.ok();
 	}
diff --git a/src/main/java/com/gaotao/modules/projectinfo/service/impl/ProjectCaseServiceImpl.java b/src/main/java/com/gaotao/modules/projectinfo/service/impl/ProjectCaseServiceImpl.java
index dc81659..171fab4 100644
--- a/src/main/java/com/gaotao/modules/projectinfo/service/impl/ProjectCaseServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/projectinfo/service/impl/ProjectCaseServiceImpl.java
@@ -52,7 +52,6 @@ public class ProjectCaseServiceImpl extends ServiceImpl<ProjectCaseDao, ProjectC
 	public void saveCase(MultipartFile[] file,ProjectCase projectCase) {
 		projectCase.setEnteredDate(new Date());
 		projectCase.setInnerStatus(projectCase.getStatus());
-		projectCase.setXjshow(projectCase.getStatus()==10?"N":"Y");
 		this.save(projectCase);
 
 		for (MultipartFile f : file) {
@@ -98,7 +97,6 @@ public class ProjectCaseServiceImpl extends ServiceImpl<ProjectCaseDao, ProjectC
 	@Transactional
 	public void update(ProjectCase projectCase) {
 		projectCase.setLatestUpdatedDate(new Date());
-		projectCase.setXjshow(projectCase.getStatus()>10?"Y":"N");
 		this.updateById(projectCase);
 	}
 
diff --git a/src/main/resources/mapper/projectinfo/ProjectCaseDao.xml b/src/main/resources/mapper/projectinfo/ProjectCaseDao.xml
index bb68943..c6eac2c 100644
--- a/src/main/resources/mapper/projectinfo/ProjectCaseDao.xml
+++ b/src/main/resources/mapper/projectinfo/ProjectCaseDao.xml
@@ -68,10 +68,10 @@
                 AND  #{param2.endDate} >=pc.entered_date
             </if>
             <if test="param2.manageAudit == '待审核'">
-                and pc.xjshow = 'N'
+                and (pc.xjshow = 'N' or pc.xjshow = '')
             </if>
             <if test="param2.xjshow != null and param2.xjshow != ''">
-                and pc.xjshow = #{param2.xjshow}
+                and pc.xjshow = #{param2.xjshow} and pc.status>10
             </if>
         </where>
     </select>