From e2f232a6fc6404513ae53d69405d95d2eb9429ce Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 18:42:03 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index daf19c9..c804e74 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -106,8 +106,7 @@
for (String departmentId : departmentIdsParent) {
OrganizationChartEntity organizationChart = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, departmentId));
OrganizationChartEntity organizationChartParent = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, organizationChart.getParentId()));
- if (organizationChartParent!=null)
- {
+ if (organizationChartParent != null) {
departmentIds.add(organizationChartParent.getId().toString());
}
}
@@ -230,14 +229,14 @@
public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
String matterName, List<String> ids, String status,
String guideUserId, String createTimeStartTime,
- String createTimeTimeEndTime,String classifyId) {
- return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
+ String createTimeTimeEndTime, String classifyId) {
+ return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId, createTimeStartTime, createTimeTimeEndTime, classifyId);
}
@Override
public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids, String status,
- String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId) {
- return baseMapper.selectConfigList(matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
+ String guideUserId, String createTimeStartTime, String createTimeTimeEndTime, String classifyId) {
+ return baseMapper.selectConfigList(matterName, ids, status, guideUserId, createTimeStartTime, createTimeTimeEndTime, classifyId);
}
@Override
@@ -402,6 +401,7 @@
throw new RuntimeException(e);
}
for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
+ transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
if (sysUser != null) {
smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
@@ -438,20 +438,32 @@
}
@Override
- public int deleteComment(Integer id) {
- GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
- guideRepairOrder.setIsHideComments(1);
- baseMapper.updateById(guideRepairOrder);
- //新增删除评论进展
- GuideEvolveEntity entity = new GuideEvolveEntity();
- entity.setCreateTime(LocalDateTime.now());
- entity.setUpdateTime(LocalDateTime.now());
- entity.setState("14");
- entity.setFromUserId(guideRepairOrder.getSubmitUserId() + "");
- entity.setGuideId(guideRepairOrder.getId().toString());
- guideEvolveMapper.insertConfig(entity);
- return baseMapper.updateById(guideRepairOrder);
+ public ResultData deleteComment(Integer id, SysUser sysUser) {
+ if (sysUser.getUserType().equals("1") || sysUser.getIsDivisionHead().equals("1")) {
+ GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
+ if (guideRepairOrder!=null&&guideRepairOrder.getState().equals("3")) {
+ guideRepairOrder.setIsHideComments(1);
+ baseMapper.updateById(guideRepairOrder);
+ //新增删除评论进展
+ GuideEvolveEntity entity = new GuideEvolveEntity();
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("14");
+ entity.setFromUserId(sysUser.getUserId() + "");
+ entity.setGuideId(guideRepairOrder.getId().toString());
+ guideEvolveMapper.insertConfig(entity);
+ baseMapper.updateById(guideRepairOrder);
+ return ResultData.success("删除评论成功");
+ } else {
+ return ResultData.error("已办结的单据才能进行删除评论操作");
+ }
+ } else {
+ return ResultData.error("只能部门领导和超级管理员才能删除评论");
+ }
+
}
+
+
}
--
Gitblit v1.7.1