From 2e5ffea1fc7263fff8e3b6a87707233597c07c8f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 09:23:04 +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 | 134 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 116 insertions(+), 18 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 e7b4263..4f908e2 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
@@ -1,20 +1,17 @@
package com.dg.core.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dg.core.db.gen.entity.GuideRepairOrder;
-import com.dg.core.db.gen.entity.GuideRepairOrderImage;
-import com.dg.core.db.gen.entity.Slideshow;
-import com.dg.core.db.gen.entity.TransactionEvent;
-import com.dg.core.db.gen.mapper.GuideRepairOrderImageMapper;
-import com.dg.core.db.gen.mapper.GuideRepairOrderMapper;
-import com.dg.core.db.gen.mapper.TransactionEventMapper;
+import com.dg.core.db.gen.entity.*;
+import com.dg.core.db.gen.mapper.*;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.util.Snowflake;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -26,6 +23,15 @@
@Resource
private GuideRepairOrderImageMapper guideRepairOrderImageMapper;
+ @Resource
+ private SysUserMapper sysUserMapper;
+
+ @Resource
+ private OrganizationChartMapper organizationChartMapper;
+
+ @Resource
+ private GuideEvolveMapper guideEvolveMapper;
+
@Override
public int addOrder(GuideRepairOrder guideRepairOrder){
@@ -35,10 +41,58 @@
guideRepairOrder.setMatterName(transactionEvent.getMatterName());
guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
- guideRepairOrder.setState("1");
+ List<String> departmentIds=new ArrayList<>();
+ //自动分配业务代码开始
+ List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(guideRepairOrder.getAreaCode());
+ if (organizationChartEntities!=null){
+ for (OrganizationChartEntity organizationChart:organizationChartEntities) {
+ departmentIds.add(organizationChart.getId().toString());
+ }
+ List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
+ if (sysUsers==null) {//如果此所属地区部门没有导半人员则看其下级地区有没有相关分类导办人员
+ for (OrganizationChartEntity organizationChart:organizationChartEntities) {
+ //获取下级部门
+ List<OrganizationChartEntity> organizationChartEntitiesUser = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
+ .eq(OrganizationChartEntity::getParentId, organizationChart.getId().toString()));
+ if (organizationChartEntitiesUser!=null)
+ departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
+ }
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
+ if (sysUsers==null){//如果其下级部门仍没有该分类的导半人员则查询所以该所属地区的导办人员
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds,null,null);//获取导半人员
+ if(sysUsers==null)//如果该所属地区没有导办人员则为特殊单据需要手动分配
+ guideRepairOrder.setState("1");
+ }
+ }
+ if (sysUsers!=null){//系统分配导办人员
+ SysUser sysUser = sysUsers.get(0);//因为sql用了升序排序所以第一条就是待办结最少的人员之一
+ guideRepairOrder.setState("2");
+ guideRepairOrder.setGuideUserId(sysUser.getUserId().toString());
+ guideRepairOrder.setGuideDepartmentId(sysUser.getDepartmentId());
+ //新增分配记录
+ GuideEvolveEntity entity=new GuideEvolveEntity();
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("10");
+ entity.setDepartmentalId(sysUser.getDepartmentId());
+ entity.setToUserId(guideRepairOrder.getGuideUserId()+"");
+ entity.setFromUserId(guideRepairOrder.getSubmitUserId());
+ entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
+ entity.setGuidOrderNum(guideRepairOrder.getOrderNum());
+ guideEvolveMapper.insertConfig(entity);
+ }
+ }
+ else{//如果该办事指南用户所选所属地区无导半部门则为特殊单据需要手动分配
+ guideRepairOrder.setState("1");
+ }
+ //自动分配业务代码结束
+ guideRepairOrder.setCreateTime(LocalDateTime.now());
+ guideRepairOrder.setUpdateTime(LocalDateTime.now());
transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()+1);
- String[] images = guideRepairOrder.getImages().split(",");
- for (String image: images) {
+ //保存图片地址
+ if (guideRepairOrder.getImages()!=null){
+ String[] images = guideRepairOrder.getImages().split(",");
+ for (String image: images) {
GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
guideRepairOrderImage.setId(Snowflake.getId());
guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
@@ -46,15 +100,19 @@
guideRepairOrderImage.setCreateTime(LocalDateTime.now());
guideRepairOrderImage.setType(1);
guideRepairOrderImageMapper.insert(guideRepairOrderImage);
+ }
}
- if (guideRepairOrder.getOrderNum()!=null){
- GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
- guideRepairOrderImage.setId(Snowflake.getId());
- guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
- guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
- guideRepairOrderImage.setCreateTime(LocalDateTime.now());
- guideRepairOrderImage.setType(2);
- guideRepairOrderImageMapper.insert(guideRepairOrderImage);
+ //保存视频地址
+ if (guideRepairOrder.getVideo()!=null){
+ if (guideRepairOrder.getOrderNum()!=null){
+ GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
+ guideRepairOrderImage.setId(Snowflake.getId());
+ guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
+ guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
+ guideRepairOrderImage.setCreateTime(LocalDateTime.now());
+ guideRepairOrderImage.setType(2);
+ guideRepairOrderImageMapper.insert(guideRepairOrderImage);
+ }
}
int ans= baseMapper.insert(guideRepairOrder);
int i = transactionEventMapper.updateById(transactionEvent);
@@ -65,6 +123,18 @@
}
+ public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
+ for (OrganizationChartEntity organizationChart:organizationChartEntities) {
+ departmentIds.add(organizationChart.getId().toString());
+ List<OrganizationChartEntity> organizationChartEntitiesUser = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
+ .eq(OrganizationChartEntity::getParentId, organizationChart.getId().toString()));
+ if (organizationChartEntitiesUser!=null)
+ departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
+
+ }
+ return departmentIds;
+ }
+
@Override
public GuideRepairOrder selectConfigData(String Id, String orderNum) {
return baseMapper.selectConfigData(Id,orderNum);
@@ -72,6 +142,8 @@
@Override
public int updateConfig(GuideRepairOrder order) {
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
+ order.setGuideUserPhone(sysUser.getPhonenumber());
return baseMapper.updateConfig(order);
}
@@ -80,5 +152,31 @@
return baseMapper.selectBySubmitId(submitUserId);
}
+ @Override
+ public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName,List<String> ids) {
+ return baseMapper.selectConfigList(page,state,matterName, ids);
+ }
+
+ @Override
+ public int countConfigList(String matterName,List<String> ids) {
+ return baseMapper.countConfigList(matterName,ids);
+ }
+
+ /**
+ * 1 今天 2昨天 3本月 4本年度 String time
+ * @param state
+ * @param ids
+ * @return
+ */
+ @Override
+ public int countStatisticsNum(String state,List<String> ids,String time) {
+ return baseMapper.countStatisticsNum(state,ids,time);
+ }
+
+ @Override
+ public List<CountListNum> countListNum(String state, List<String> ids, Integer time) {
+ return baseMapper.countListNum(state, ids,time);
+ }
+
}
--
Gitblit v1.7.1