From 333f92eb2cf249024eff2cce53f61f53dca396ac Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 25 Aug 2020 18:39:54 +0800 Subject: [PATCH] =?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 --- .../controller/ResultRecordController.java | 132 +++++++++--------- .../lz/modules/app/req/ResultRecordReq.java | 2 + .../lz/modules/app/resp/ResultRecordResp.java | 2 +- .../lz/modules/flow/dao/RecordFileMapper.java | 2 + .../java/com/lz/modules/flow/model/Auth.java | 3 +- .../flow/service/RecordFileService.java | 3 +- .../service/impl/RecordAuthServiceImpl.java | 3 +- .../service/impl/RecordFileServiceImpl.java | 5 + .../modules/sys/entity/app/ResultRecord.java | 2 +- .../app/impl/ResultRecordServiceImpl.java | 16 ++- .../mapper/app/ResultRecordMapper.xml | 68 +++++---- .../mapper/flow/RecordFileMapper.xml | 8 +- 12 files changed, 136 insertions(+), 110 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index b1ec5681..a168c5a8 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -14,11 +14,13 @@ import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.entity.FlowRecord; import com.lz.modules.flow.entity.RecordAuth; import com.lz.modules.flow.entity.RecordFile; +import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.flow.model.Auth; import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.flow.service.RecordAuthService; import com.lz.modules.flow.service.RecordFileService; +import com.lz.modules.flow.service.StaffRoleService; import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.SysUserEntity; @@ -78,8 +80,8 @@ public class ResultRecordController extends AbstractController { @Autowired private RecordFileService recordFileService; - - DingtalkBusiness dingtalkBusiness; + @Autowired + private DingtalkBusiness dingtalkBusiness; @Value("${dingtalk.appid}") private String appid; @@ -87,6 +89,9 @@ public class ResultRecordController extends AbstractController { @Value("${domain.main}") private String domain; + @Autowired + private StaffRoleService staffRoleService; + /** * 列表 */ @@ -102,31 +107,33 @@ public class ResultRecordController extends AbstractController { SysUserEntity user = getUser(); if (req.getIsSelf() == 1) { req.setStaffId(user.getUserId()); - }else{ - DepartmentsStaffRelateEntity relateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(getUserId()); - Map map = departmentsService.selectUserAllDepartmentInFo(relateEntity.getDepartmentId()); - int i = 0; - for (Map.Entry entry : map.entrySet()) { - i++; + } else { + StaffRole staffRole = staffRoleService.selectByStaffId(getUserId()); + if (staffRole == null) { + DepartmentsStaffRelateEntity relateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(getUserId()); + Map map = departmentsService.selectUserAllDepartmentInFo(relateEntity.getDepartmentId()); + int i = 0; + for (Map.Entry entry : map.entrySet()) { + i++; + } + i = i / 2; + if (i == 3) { // 表示有三级部门 + departmentList2 = departmentsService.selectByParentDepartmentId(map.get("dd3")); + departmentList3 = departmentsService.selectByParentDepartmentId(map.get("dd2")); + department1 = map.get("dd3"); + department2 = map.get("dd2"); + department3 = map.get("dd1"); + req.setDepartment3(map.get("dd1")); + } else if (i == 2) { + departmentList2 = departmentsService.selectByParentDepartmentId(map.get("dd2")); + department2 = map.get("dd1"); + department1 = map.get("dd2"); + req.setDepartment2(map.get("dd1")); + } else if (i == 1) { + department1 = map.get("dd1"); + req.setDepartment1(map.get("dd1")); + } } - i = i / 2; - if (i == 3) { // 表示有三级部门 - departmentList2 = departmentsService.selectByParentDepartmentId(map.get("dd3")); - departmentList3 = departmentsService.selectByParentDepartmentId(map.get("dd2")); - department1 = map.get("dd3"); - department2 = map.get("dd2"); - department3 = map.get("dd1"); - req.setDepartment3(map.get("dd1")); - } else if (i == 2) { - departmentList2 = departmentsService.selectByParentDepartmentId(map.get("dd2")); - department2 = map.get("dd1"); - department1 = map.get("dd2"); - req.setDepartment2(map.get("dd1")); - } else if (i == 1) { - department1 = map.get("dd1"); - req.setDepartment1(map.get("dd1")); - } - } PageUtils page = lzResultRecordService.queryPage(req, user); return R.ok().put("page", page) @@ -146,10 +153,6 @@ public class ResultRecordController extends AbstractController { .put("departmentList", departmentList1); } - - - - @RequestMapping("/getStaffResultDetail") public R getStaffResultDetail(ResultRecordReq req) { int yeJiCheckNum = 0; @@ -184,7 +187,6 @@ public class ResultRecordController extends AbstractController { listAuth = recordAuthService.selectAuthInfo(staffRoleMap.get(getUserId())); auth = recordAuthService.getAuth(listAuth); } - List resultDetails = resultDetailService.selectByRecordId(resultRecord.getId()); BigDecimal sumWenHuaJiaZhiGuan = BigDecimal.ZERO; BigDecimal sumYeJi = BigDecimal.ZERO; @@ -264,7 +266,9 @@ public class ResultRecordController extends AbstractController { list.add(comment); } } + String superStaff = recordAuthService.selectByStaffId(resultRecord.getStaffId()); + int fileCount = recordFileService.selectRecordFileCountByRecordId(resultRecord.getId()); return R.ok() .put("staffName", staffEntity.getName()) .put("department1", departmentDto.getDepartment1()) @@ -279,7 +283,9 @@ public class ResultRecordController extends AbstractController { .put("wenHuaJiaZhiGuanNum", wenHuaJiaZhiGuanNum) .put("lastResultNum", lastResultNum) .put("commentNum", commentNum) - .put("superStaff", superStaff); + .put("superStaff", superStaff) + .put("fileCount",fileCount) + ; } @RequestMapping("/commitApproval") @@ -316,20 +322,19 @@ public class ResultRecordController extends AbstractController { } } resultCommentService.addOrUpdateComment(req, getUserId(), status); - if(r != null && (int)r.get("code") == 0){//下面推送消息 - StaffEntity mySelf = (StaffEntity)r.get("from"); - StaffEntity toSelf = (StaffEntity)r.get("to"); - WorkMsgTypeEnum workMsgTypeEnum = (WorkMsgTypeEnum)r.get("type"); - String url = domain + "/management/dingtalklogin?url=";//免登接口 - String jump = domain + "/management/recorddetail?id=" + req.getRecordResultId() - + "&recordType=3" ;//跳转接口 - jump = URLEncoder.encode(jump); - String msg = dingtalkBusiness.sendWorkMSGByEntity(appid, mySelf, toSelf, workMsgTypeEnum, url + jump); - if(msg.equals("OK")){ - return r; - }else{ - return R.error(msg); + try { + if(r != null && (int)r.get("code") == 0){//下面推送消息 + StaffEntity mySelf = (StaffEntity)r.get("from"); + StaffEntity toSelf = (StaffEntity)r.get("to"); + WorkMsgTypeEnum workMsgTypeEnum = (WorkMsgTypeEnum)r.get("type"); + String url = domain + "/management/dingtalklogin?url=";//免登接口 + String jump = domain + "/management/recorddetail?id=" + req.getRecordResultId() + + "&recordType=3" ;//跳转接口 + jump = URLEncoder.encode(jump); + String msg = dingtalkBusiness.sendWorkMSGByEntity(appid, mySelf, toSelf, workMsgTypeEnum, url + jump); } + } catch (Exception e) { + } return R.ok("成功"); //return r != null ? r : R.ok("成功"); @@ -520,14 +525,23 @@ public class ResultRecordController extends AbstractController { /** * 删除 */ - @RequestMapping("/delete") + @RequestMapping("/deleteRecord") @RequiresPermissions("user:lzresultrecord:delete") - public R delete(@RequestBody Long[] ids) { - lzResultRecordService.deleteBatchIds(Arrays.asList(ids)); + public R deleteRecord(String ids) { + if(StringUtil.isBlank(ids)){ + return R.error("请选择 ids"); + } + String is[] = ids.split(","); + for(String i : is ){ + ResultRecord resultRecord = resultRecordService.selectResultRecordById(NumberUtil.objToLongDefault(i,0l)); + if(resultRecord !=null){ + resultRecord.setIsDelete(1); + resultRecordService.updateResultRecordById(resultRecord); + } + } return R.ok(); } - /** * 删除 */ @@ -549,25 +563,5 @@ public class ResultRecordController extends AbstractController { return R.ok(); } - public static void main(String[] args) { - List departmentList1 = new ArrayList<>(); - DepartmentsDto departmentsDto1 = new DepartmentsDto(); - departmentsDto1.setDepartmentId("1"); - DepartmentsDto departmentsDto2 = new DepartmentsDto(); - departmentsDto2.setDepartmentId("2"); - - - DepartmentsDto departmentsDto3 = new DepartmentsDto(); - departmentsDto3.setDepartmentId("3"); - departmentList1.add(departmentsDto1); - departmentList1.add(departmentsDto2); - departmentList1.add(departmentsDto3); - String compare = "3"; - departmentList1 = departmentList1.stream().sorted((p1, p2) -> p1.getDepartmentId().equals(compare) ? 1 : p2.getDepartmentId().equals(compare) ? 1 : 0).collect(Collectors.toList()); - - for (DepartmentsDto departmentsDto : departmentList1) { - System.out.println(departmentsDto.getDepartmentId()); - } - } } diff --git a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java index 5954fa5c..e0107ffa 100644 --- a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java +++ b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java @@ -35,4 +35,6 @@ public class ResultRecordReq { private String resultComment; private Long resultCommitId; private Long rollbackFlowId; + private List statusList ; + private String statusStr; } diff --git a/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java b/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java index 3346ff4a..f7e50f5f 100644 --- a/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java +++ b/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java @@ -17,7 +17,7 @@ public class ResultRecordResp { private Date gmtModified; //月份 private Date monthTime; - //0.新建，1 提交审批中，2 拒绝,3 审批完成 + //0.新建，1 提交审批中，2 拒绝, 3 侍提交 ，4 审批通过,5 驳回 private Integer status; //最后得分 private BigDecimal lastScore; diff --git a/src/main/java/com/lz/modules/flow/dao/RecordFileMapper.java b/src/main/java/com/lz/modules/flow/dao/RecordFileMapper.java index f7b84a76..56bd83ee 100644 --- a/src/main/java/com/lz/modules/flow/dao/RecordFileMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/RecordFileMapper.java @@ -36,4 +36,6 @@ public interface RecordFileMapper extends BaseMapper { List selectByCondition(@Param("page") IPage page , @Param("req") ResultDetailReq req); + + int selectRecordFileCountByRecordId(@Param("recordId") Long recordId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/Auth.java b/src/main/java/com/lz/modules/flow/model/Auth.java index 31c3fd5d..341dacd7 100644 --- a/src/main/java/com/lz/modules/flow/model/Auth.java +++ b/src/main/java/com/lz/modules/flow/model/Auth.java @@ -22,5 +22,6 @@ public class Auth { private int wenHuaEdit; private int waitCommit; private int approvelCommit; - + private int uploadFile; + private int downFile; } diff --git a/src/main/java/com/lz/modules/flow/service/RecordFileService.java b/src/main/java/com/lz/modules/flow/service/RecordFileService.java index 274f0bb6..bc742a39 100644 --- a/src/main/java/com/lz/modules/flow/service/RecordFileService.java +++ b/src/main/java/com/lz/modules/flow/service/RecordFileService.java @@ -17,7 +17,6 @@ import com.lz.modules.sys.entity.SysUserEntity; public interface RecordFileService extends IService { - RecordFile selectRecordFileById(Long id); @@ -34,4 +33,6 @@ public interface RecordFileService extends IService { PageUtils queryPage(ResultDetailReq req, SysUserEntity user); + + int selectRecordFileCountByRecordId(Long recordId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java index 8bb1ba2b..f5413cd0 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java @@ -122,7 +122,8 @@ public class RecordAuthServiceImpl extends ServiceImpl listx = new ArrayList<>(); + if(status !=null){ + for(String l : status){ + listx.add(NumberUtil.objToLongDefault(l,-1)); + } + params.setStatusList(listx); + } + } + + params.setDepartmentIds(departmentIds); String departmentLevel = Constant.ME; if (params.getIsSelf() != 1) { // 表示点击我们审批 FlowDepartment flowDepartment = flowDepartmentService.selectByStaffId(user.getUserId()); @@ -178,7 +189,6 @@ public class ResultRecordServiceImpl extends ServiceImpl resultRecords = pageUtils.getList(); - if (CollectionUtils.isNotEmpty(resultRecords)) { List list = new ArrayList<>(); for (ResultRecord resultRecord : resultRecords) { @@ -187,6 +197,8 @@ public class ResultRecordServiceImpl extends ServiceImpl staffRoleMap = recordAuthService.selectRoleIdByStaffRoleInfo(resultRecord.getFlowStaffIdRole()); if (resp.getStatus().equals(1) && staffRoleMap.get(user.getUserId()) == null) { resp.setStatus(2); // 如果不是自己审批，说明自己己经审批完成 + } else if (resp.getStatus().equals(5) && staffRoleMap.get(user.getUserId()) == null) { + resp.setStatus(1); // 如果不是自己审批，说明自己己经审批完成 } list.add(resp); } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index abd58515..16aeb846 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -171,36 +171,46 @@ diff --git a/src/main/resources/mapper/flow/RecordFileMapper.xml b/src/main/resources/mapper/flow/RecordFileMapper.xml index a8e3abeb..02798b01 100644 --- a/src/main/resources/mapper/flow/RecordFileMapper.xml +++ b/src/main/resources/mapper/flow/RecordFileMapper.xml @@ -90,14 +90,12 @@ update lz_record_file set is_delete = 1 where id=#{id} limit 1 - - - - - +