From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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 a474dfa..f230b52 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
@@ -90,7 +90,7 @@
for (OrganizationChartEntity organizationChart : organizationChartEntities) {
departmentIds.add(organizationChart.getId().toString());
}
- List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
+ List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
if (sysUsers.size() == 0) {//如果此所属地区部门没有导半人员则看其下级地区有没有相关分类导办人员
for (OrganizationChartEntity organizationChart : organizationChartEntities) {
//获取下级部门
@@ -99,16 +99,18 @@
if (organizationChartEntitiesUser != null)
departmentIds = this.getDepartmentIds(organizationChartEntitiesUser, departmentIds);
}
- sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
if (sysUsers.size() == 0) {//如果该所属地区没有导办人员则为获取其上級地区有没有相关分类导办人员
List<String> departmentIdsParent = new ArrayList<>();
departmentIdsParent.addAll(departmentIds);
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()));
- departmentIds.add(organizationChartParent.getId().toString());
+ if (organizationChartParent != null) {
+ departmentIds.add(organizationChartParent.getId().toString());
+ }
}
- sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
if (sysUsers.size() == 0) {
sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, null, null);//获取导半人员
if (sysUsers.size() == 0) {
@@ -226,14 +228,15 @@
@Override
public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
String matterName, List<String> ids, String status,
- String guideUserId) {
- return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId);
+ String guideUserId, String createTimeStartTime,
+ 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) {
- return baseMapper.selectConfigList(matterName, ids, status, guideUserId);
+ String guideUserId, String createTimeStartTime, String createTimeTimeEndTime, String classifyId) {
+ return baseMapper.selectConfigList(matterName, ids, status, guideUserId, createTimeStartTime, createTimeTimeEndTime, classifyId);
}
@Override
@@ -361,7 +364,7 @@
WxUtil wxUtil = new WxUtil();
String accessToken = "0";
try {
- accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
+ accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -393,7 +396,7 @@
WxUtil wxUtil = new WxUtil();
String accessToken = "0";
try {
- accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
+ accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -433,5 +436,33 @@
return 0;
}
+ @Override
+ 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 {
+ ResultData.error("已办结的单据才能进行删除评论操作");
+ }
+ } else {
+ ResultData.error("只能部门领导和超级管理员才能删除评论");
+ }
+ return ResultData.error();
+ }
+
+
+
}
--
Gitblit v1.7.1