From d498f693733a107e5f6e8fa2e8df7591b4924af1 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 10:46:18 +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 | 132 +++++++++++++++++++++++++++++++++++--------
1 files changed, 106 insertions(+), 26 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 534597c..c3bde4d 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
@@ -7,6 +7,7 @@
import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.*;
import com.dg.core.db.gen.mapper.*;
+import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.service.ISysSettingsService;
import com.dg.core.util.SmsUtil;
@@ -14,8 +15,10 @@
import com.dg.core.util.TestDate;
import com.dg.core.util.WxUtil;
import com.iceyyy.workday.WorkUtils;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -46,8 +49,15 @@
@Resource
private AutomessageSysSettingsMapper iSysSettingsMapper;
+
@Resource
SmsUtil smsUtil;
+
+ @Resource(name = "stringRedisTemplate")
+ private StringRedisTemplate stringRedisTemplate;
+
+ private static WxUtil wxUtil;
+
@Override
public int addOrder(GuideRepairOrder guideRepairOrder) {
@@ -75,12 +85,12 @@
}
if (isAdd) {
//自动分配业务代码开始
- List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(transactionEvent.getDepartmentId(),guideRepairOrder.getAreaCode());
+ List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(transactionEvent.getDepartmentId(), guideRepairOrder.getAreaCode());
if (organizationChartEntities.size() > 0) {
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) {
//获取下级部门
@@ -89,12 +99,27 @@
if (organizationChartEntitiesUser != null)
departmentIds = this.getDepartmentIds(organizationChartEntitiesUser, departmentIds);
}
- sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
- if (sysUsers.size() == 0) {//如果其下级部门仍没有该分类的导半人员则查询所以该所属地区的导办人员
- sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, null, null);//获取导半人员
- if (sysUsers.size() == 0)//如果该所属地区没有导办人员则为特殊单据需要手动分配
- guideRepairOrder.setState("1");
+ 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()));
+ if (organizationChartParent != null) {
+ departmentIds.add(organizationChartParent.getId().toString());
+ }
+ }
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
+ if (sysUsers.size() == 0) {
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, null, null);//获取导半人员
+ if (sysUsers.size() == 0) {
+ //如果该所属地区没有导办人员则为特殊单据需要手动分配
+ guideRepairOrder.setState("1");
+ }
+ }
}
+
}
if (sysUsers.size() > 0) {//系统分配导办人员
SysUser sysUser = sysUsers.get(0);//因为sql用了升序排序所以第一条就是待办结最少的人员之一
@@ -202,13 +227,21 @@
@Override
public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
- String matterName, List<String> ids,String status) {
- return baseMapper.selectConfigList(page, state, matterName, ids,status);
+ 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);
}
@Override
- public int countConfigList(String matterName, List<String> ids,String status) {
- return baseMapper.countConfigList(matterName, ids,status);
+ 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);
+ }
+
+ @Override
+ public int countConfigList(String matterName, List<String> ids, String status, String guideUserId) {
+ return baseMapper.countConfigList(matterName, ids, status, guideUserId);
}
@Override
@@ -234,8 +267,10 @@
SysUser sysUserTo = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
SysUser sysUserFrom = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
sysUserTo.setTransactionNum(sysUserTo.getTransactionNum() + 1);
- sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
- sysUserMapper.updateById(sysUserFrom);
+ if (sysUserFrom.getUserType().equals(2)) {
+ sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
+ sysUserMapper.updateById(sysUserFrom);
+ }
GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
.eq(GuideRepairOrder::getId, order.getGuideId()));
//短信发送
@@ -249,7 +284,7 @@
sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
return sysUserMapper.updateById(sysUserFrom);
}
- }
+ }
return 0;
}
@@ -263,8 +298,9 @@
@Override
public int countStatisticsNum(String state, List<String> ids, String time,
String isTimeout, String evaluateState,
- List<String> classifyIds,String serviceState) {
- return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds,serviceState);
+ List<String> classifyIds, String serviceState,
+ String guideUserId) {
+ return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds, serviceState, guideUserId);
}
@Override
@@ -307,7 +343,7 @@
DateTime dateTime = td.nextWeekDay(dateTimeUser);
Calendar calendar = dateTime.toCalendar();
LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE),
+ calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DATE),
9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
guideRepairOrder.setTimeoutTime(localDateTime);
}
@@ -316,7 +352,7 @@
DateTime dateTime = td.nextWeekDay(dateTimeUser);
Calendar calendar = dateTime.toCalendar();
LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE),
+ calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DATE),
9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
guideRepairOrder.setTimeoutTime(localDateTime);
}
@@ -328,7 +364,7 @@
WxUtil wxUtil = new WxUtil();
String accessToken = "0";
try {
- accessToken = wxUtil.getBatteryCarAccessToken();
+ accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -338,6 +374,22 @@
@Override
public int deleteConfigById(String Id) {
+ GuideRepairOrder guideRepairOrderDelete = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, Id));
+ //删除进展记录
+ guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id));
+ TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId()));
+ if (transactionEvent.getTransactionNum()>0)
+ {
+ transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1);
+ }
+ //对应办事指南减一
+ transactionEventMapper.updateById(transactionEvent);
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrderDelete.getGuideUserId()));
+ if (sysUser != null) {
+ //对应导半人员待导半数量建议
+ sysUser.setTransactionNum(sysUser.getTransactionNum() - 1);
+ sysUserMapper.updateById(sysUser);
+ }
return baseMapper.deleteConfigById(Id);
}
@@ -347,16 +399,16 @@
WxUtil wxUtil = new WxUtil();
String accessToken = "0";
try {
- accessToken = wxUtil.getBatteryCarAccessToken();
+ accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
} catch (Exception e) {
throw new RuntimeException(e);
}
- for (GuideRepairOrder guideRepairOrder:guideRepairOrders) {
+ 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)
- {
+ if (sysUser != null) {
smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
- wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(),accessToken,"86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8",sysUser);
+ wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser);
guideRepairOrder.setIsPush(1);
guideRepairOrder.setIsTimeout("2");
baseMapper.updateById(guideRepairOrder);
@@ -369,7 +421,7 @@
public int updateEvaluate() {
//查找一天没有评价的单据
List<GuideRepairOrder> guideRepairOrders = baseMapper.selectEvaluate();
- for (GuideRepairOrder guideRepairOrder:guideRepairOrders) {
+ for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
guideRepairOrder.setEvaluateState("1");
guideRepairOrder.setEvaluateContent("好评");
guideRepairOrder.setServiceState(1);
@@ -380,7 +432,7 @@
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
entity.setState("12");
- entity.setFromUserId(guideRepairOrder.getSubmitUserId()+"");
+ entity.setFromUserId(guideRepairOrder.getSubmitUserId() + "");
entity.setGuideId(guideRepairOrder.getId().toString());
guideEvolveMapper.insertConfig(entity);
@@ -388,5 +440,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 {
+ return ResultData.error("已办结的单据才能进行删除评论操作");
+ }
+ } else {
+ return ResultData.error("只能部门领导和超级管理员才能删除评论");
+ }
+
+ }
+
+
+
}
--
Gitblit v1.7.1