From bd059632ce3548a3c0192fd5df6bb328a0bb3378 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 13 Feb 2025 10:34:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=91=E5=81=87=E6=8A=A5=E5=A4=87=E3=80=81?= =?UTF-8?q?=E5=87=BA=E5=B7=AE=E6=8A=A5=E5=A4=87=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/evection/controller/EvectionController.java | 8 ++++---- .../java/com/bonus/system/evection/dao/EvectionDao.java | 2 +- .../bonus/system/evection/service/EvectionService.java | 3 ++- .../system/evection/service/EvectionServiceImpl.java | 4 ++-- .../main/resources/mapper/evection/EvectionMapper.xml | 9 ++++++++- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/controller/EvectionController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/controller/EvectionController.java index 01c136a..7a0925f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/controller/EvectionController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/controller/EvectionController.java @@ -124,7 +124,7 @@ public class EvectionController extends BaseController { @Log(title = "流程管理->出差报备->修改出差报备", businessType = BusinessType.UPDATE) public AjaxResult edit(@Validated @RequestBody EvectionBean o) { try{ - AjaxResult result = isCheck(o.getId() + ""); + AjaxResult result = isCheck(o.getId() + "",1); if(result!=null){ return result; } @@ -145,7 +145,7 @@ public class EvectionController extends BaseController { @Log(title = "流程管理->出差报备->删除出差报备", businessType = BusinessType.DELETE) public AjaxResult remove(@PathVariable("id") String id) { try{ - AjaxResult result = isCheck(id); + AjaxResult result = isCheck(id,2); if(result!=null){ return result; } @@ -163,9 +163,9 @@ public class EvectionController extends BaseController { * @author cwchen * @date 2025/2/12 14:32 */ - public AjaxResult isCheck(String id) { + public AjaxResult isCheck(String id,int type) { // 判断休假报备数据是否被核对 - Integer checkStatus = evectionService.isCheck(id); + Integer checkStatus = evectionService.isCheck(id,type); if(!Objects.equals(checkStatus,0)){ return AjaxResult.error("出差报备数据已被核对，无法操作"); }else { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/dao/EvectionDao.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/dao/EvectionDao.java index b107b4c..70e8c6e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/dao/EvectionDao.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/dao/EvectionDao.java @@ -44,5 +44,5 @@ public interface EvectionDao { * @author cwchen * @date 2025/2/12 15:53 */ - EvectionBean getEvectionById(String id); + EvectionBean getEvectionById(@Param("id") String id,@Param("type") int type); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/service/EvectionService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/service/EvectionService.java index b547367..5b862cc 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/service/EvectionService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/service/EvectionService.java @@ -8,6 +8,7 @@ import com.bonus.system.dept.entity.ProDeptRoleBean; import com.bonus.system.dept.entity.ProDeptRoleDo; import com.bonus.system.evection.entity.EvectionBean; import com.bonus.system.leaveReporting.entity.LeaveReportingBean; +import org.apache.ibatis.annotations.Param; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -71,5 +72,5 @@ public interface EvectionService { * @author cwchen * @date 2025/2/12 15:12 */ - Integer isCheck(String id); + Integer isCheck(@Param("id") String id,@Param("type") int type); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/service/EvectionServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/service/EvectionServiceImpl.java index 3b7e11c..d19dd9d 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/service/EvectionServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/service/EvectionServiceImpl.java @@ -136,9 +136,9 @@ public class EvectionServiceImpl implements EvectionService { } @Override - public Integer isCheck(String id) { + public Integer isCheck(String id,int type) { try { - EvectionBean evectionBean = evectionDao.getEvectionById(id); + EvectionBean evectionBean = evectionDao.getEvectionById(id,type); List list = evectionDao.isCheck(evectionBean); if(CollectionUtils.isNotEmpty(list)){ for (Integer status : list) { diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml index 3254142..2ed5808 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml @@ -254,6 +254,13 @@ la.leave_end_date AS leaveEndDate, la.org_id AS orgId FROM leave_apply la - WHERE la.id = #{id} + + + AND la.id = #{id} + + + AND la.leave_form_id = #{id} AND submit_id = user_id + + \ No newline at end of file