From 0a7159370767b04ef9243f18270d155d527691d4 Mon Sep 17 00:00:00 2001 From: ZQN <364596817@qq.com> Date: 星期二, 25 六月 2024 11:42:15 +0800 Subject: [PATCH] 审批修改,时间倒叙 --- project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 1 + project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 18 ++++++++---------- project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/OrderCheckedQueryBo.java | 8 ++++++++ project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java | 2 +- project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml | 6 +++--- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java index fbf7890..b8559d2 100644 --- a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java +++ b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java @@ -48,7 +48,7 @@ @GetMapping public AjaxResult profile() { - SysUser user = SecurityUtils.getLoginUser().getUser(); + SysUser user = userService.selectUserById(SecurityUtils.getLoginUser().getUserId()); if ("02".equals(user.getUserType())){ SysCompany company = companyService.getById(userService.getById(user.getUserId()).getDeptId()); SysDept sysDept = new SysDept(); diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/OrderCheckedQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/OrderCheckedQueryBo.java index 20c4e17..6968fb0 100644 --- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/OrderCheckedQueryBo.java +++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/OrderCheckedQueryBo.java @@ -1,5 +1,6 @@ package com.project.enforce.domain.bo.queryBo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -16,4 +17,11 @@ private Integer checkStatus ; //1閫氳繃锛�-1鎷掔粷 private Long userId;//瀹℃壒浜篿d + + /** 鎺掑簭鍒� */ + @ApiModelProperty("鎺掑簭鍒�") + private String orderByColumn; + /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */ + @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc") + private String isAsc; } diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java index f7048ff..69e37b3 100644 --- a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java +++ b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java @@ -91,6 +91,7 @@ } else { List<String> phones = orderService.getCheckPhones(order.getCheckLevel()+1, order.getApplyDeptId()); if (StringUtils.isNotEmpty(phones)){ + phones.remove(0); order.setCheckStatus(1); //缁欎笅涓�绾у鎵逛汉鍙戦�佺煭淇� smsService.sendApplyMsg(phones, order.getApplyUser()); diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java index 76e9893..5e9cf93 100644 --- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java +++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java @@ -204,6 +204,9 @@ validEntityBeforeSave(add); List<String> phones = getCheckPhones(add.getCheckLevel(), add.getApplyDeptId()); if (StringUtils.isNotEmpty(phones)){ + int checkLevel = Integer.parseInt(phones.get(0)); + add.setCheckLevel(checkLevel); + phones.remove(0); String checkPhones = StringUtils.join(phones, ","); add.setCheckIds(checkPhones); } @@ -260,7 +263,7 @@ @Override public List<String> getCheckPhones(Integer checkLevel, Long applyDeptId) { - return getCheckPhones(checkLevel, applyDeptId, 0); + return getCheckPhonesSimple(checkLevel, applyDeptId); } @Override @@ -479,24 +482,19 @@ * @param checkLevel 瀹℃壒绾у埆锛氶粯璁�0 * @param deptId 鐢宠閮ㄩ棬id */ - private List<String> getCheckPhones(Integer checkLevel, Long deptId, int current) + private List<String> getCheckPhonesSimple(Integer checkLevel, Long deptId) { if (checkLevel==3){ - if (current==1){ - return null; - } - checkLevel = 0; - deptId = deptService.selectDeptById(deptId).getParentId(); - current++; - getCheckPhones(checkLevel, deptId, current); + return null; } checkLevel++; String checkKey = "check_enforce_"; List<String> phones = userService.getPhonesByRoleKey(checkKey + checkLevel, deptId); if (StringUtils.isNotEmpty(phones)){ + phones.add(0,checkLevel.toString()); return phones; } - return getCheckPhones(checkLevel, deptId, current); + return getCheckPhonesSimple(checkLevel, deptId); } diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml index 1eb759b..80bc40f 100644 --- a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml +++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml @@ -84,7 +84,7 @@ #{applyDeptId} </foreach> </if> - + order by apply_time desc </select> <select id="selectCheckedList" @@ -100,7 +100,7 @@ <if test="enforceReason != null and enforceReason != '' "> AND t2.enforce_reason like concat('%', #{enforceReason}, '%') </if> - + order by t2.apply_time desc </select> @@ -113,6 +113,6 @@ and t2.order_status=2 AND t1.peer_id = #{userId} AND t2.company_code = #{companyCode} - + order by t2.apply_time asc </select> </mapper> -- Gitblit v1.9.1