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 ServiceImpl10?"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 - and pc.xjshow = 'N' + and (pc.xjshow = 'N' or pc.xjshow = '') - and pc.xjshow = #{param2.xjshow} + and pc.xjshow = #{param2.xjshow} and pc.status>10