From 2e5036d2e6fbbcf22bf98bfde83811335ccf8159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 20 Nov 2020 16:19:48 +0800 Subject: [PATCH 1/3] fix --- .../service/impl/AssessManagerServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 970369fb..3ffdb11a 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -271,6 +271,14 @@ public class AssessManagerServiceImpl implements AssessManagerService { //删除本次考核任务 resultRecordMapper.batchDeleteByStartIdAndStaffId(req.getStartId(),change); evaluationStartStaffMapper.deleteEvaluationStartStaffChangeAssess(req.getStartId(),change); + //删除钉钉任务 + try { + List recordIds = resultRecordMapper.selectIdsByStartId(req.getStartId()); + String s = dingtalkBusiness.delWorkMSGWithStart(recordIds); + log.info("清除钉钉任务响应，res: " +s); + } catch (Exception e) { + log.error("调用钉钉清除任务异常,e:" ,e); + } return R.ok(); } return R.ok(); From e32c867e10cb7f265eb4fa5fca84f4622e28435b Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 20 Nov 2020 17:13:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/flow/service/impl/StaffRoleServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index 8ac106f1..63cadd28 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -424,16 +424,17 @@ public class StaffRoleServiceImpl extends ServiceImpl Date: Fri, 20 Nov 2020 17:22:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/TestController.java | 19 +++++++++++++++---- .../lz/modules/flow/dao/StaffRoleMapper.java | 2 ++ .../service/impl/StaffRoleServiceImpl.java | 4 ++-- .../resources/mapper/flow/StaffRoleMapper.xml | 8 ++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index c366c26a..08db18ad 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -13,10 +13,12 @@ import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.enums.ResultRecordStatusEnum; +import com.lz.modules.app.enums.RoleEnums; import com.lz.modules.app.resp.Step; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.app.service.StaffService; +import com.lz.modules.flow.dao.StaffRoleMapper; import com.lz.modules.flow.entity.RecordAuth; import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.flow.model.FlowModel; @@ -39,10 +41,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.swing.*; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -274,6 +273,18 @@ public class TestController { return R.ok().put("data",map); } + @Autowired + private StaffRoleMapper staffRoleMapper; + + // http://localhost:8080/lz_management/test/testmaster + @RequestMapping("/test/testmaster") + public R testmaster(Long userId) throws Exception{ + List masterPMs = staffRoleMapper.selectStaffRolesByDepartmentLevelList(Arrays.asList(new String[]{RoleEnums.MASTER_PM.getName()})); + + + return R.ok(); + } + public static void main(String[] args) { String a = "{\"313\":[17,20,13]}"; diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java index 1d9447df..1cf70aa6 100644 --- a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java @@ -68,4 +68,6 @@ public interface StaffRoleMapper extends BaseMapper { List selectMenusByParentId(@Param("parentId") long parentId); + + List selectStaffRolesByDepartmentLevelList(@Param("departmentLevels") List departmentLevels); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index 63cadd28..d8b76b8c 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -425,8 +425,8 @@ public class StaffRoleServiceImpl extends ServiceImpl masterPMs = staffRoleMapper.selectStaffRolesByDepartmentLevelList(Arrays.asList(new String[]{RoleEnums.MASTER_PM.getName()})); + if(CollectionUtils.isNotEmpty(masterPMs)){ return R.error("主管理员只能设置一个,如果想添加，只能更改管理员。"); } staffRoleMapper.insertStaffRole(staffRole); diff --git a/src/main/resources/mapper/flow/StaffRoleMapper.xml b/src/main/resources/mapper/flow/StaffRoleMapper.xml index 1689bd4a..6d941cab 100644 --- a/src/main/resources/mapper/flow/StaffRoleMapper.xml +++ b/src/main/resources/mapper/flow/StaffRoleMapper.xml @@ -197,5 +197,13 @@ + + +