From ef358a8d86e3f29f6924ebc572d97525f6f023d2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 18:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 18 ++
server/src/main/java/com/doumee/dao/web/dto/DCANoProblemDTO.java | 35 +++++
server/src/main/java/com/doumee/dao/web/dto/CloseDTO.java | 34 ++++
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 214 +++++++++++++++++++++++++-----
server/src/main/java/com/doumee/service/business/WorkorderService.java | 5
server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java | 2
server/src/main/java/com/doumee/api/web/WebCategoryController.java | 2
server/src/main/java/com/doumee/core/constants/Constants.java | 16 ++
server/src/main/java/com/doumee/job/WorkorderJob.java | 35 +++++
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 17 +-
server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 4
server/src/main/java/com/doumee/service/business/CategoryService.java | 2
server/src/main/java/com/doumee/dao/business/model/Multifile.java | 4
server/src/main/java/com/doumee/job/UpdateQywxTokenJob.java | 1
14 files changed, 340 insertions(+), 49 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/web/WebCategoryController.java b/server/src/main/java/com/doumee/api/web/WebCategoryController.java
index cd9a67e..7d7ef0d 100644
--- a/server/src/main/java/com/doumee/api/web/WebCategoryController.java
+++ b/server/src/main/java/com/doumee/api/web/WebCategoryController.java
@@ -38,7 +38,7 @@
@LoginRequired
@GetMapping("/categoryTree")
@ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鏍�")
- public ApiResponse<List<CategoryVO>> categoryVOTree(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
+ public ApiResponse<List<CategoryVO>> categoryVOTree(@RequestParam String categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
try {
ServerHttpRequest request = serverWebExchange.getRequest();
jwtTokenUtil.getUserInfoByToken(token);
diff --git a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
index f77fa7c..e1a58ff 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -5,6 +5,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
+import com.doumee.dao.business.model.Managers;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Workorder;
import com.doumee.dao.web.dto.UpdEmailDTO;
@@ -19,6 +20,7 @@
import org.springframework.web.server.ServerWebExchange;
import javax.annotation.Resource;
+import java.util.List;
/**
* Created by IntelliJ IDEA.
@@ -62,6 +64,22 @@
}
+ @LoginRequired
+ @ApiOperation("閫氱煡浜烘煡璇�")
+ @PostMapping("/managersList")
+ public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ Member user = jwtTokenUtil.getUserInfoByToken(token);
+ return ApiResponse.success(managersService.findList(model));
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
+
@LoginRequired
@ApiOperation("椋庨櫓涓婃姤璇︽儏")
diff --git a/server/src/main/java/com/doumee/core/constants/Constants.java b/server/src/main/java/com/doumee/core/constants/Constants.java
index 6bd764f..b7d21d9 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -182,4 +182,20 @@
*/
class IgnoreDate extends Date {}
}
+
+
+ /**
+ * 鏂囦欢闄勪欢绫诲瀷
+ */
+ public interface multiFileType{
+ //0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖
+ int sheUpload = 0;
+ int dbhUpload = 1;
+ int dbhDeal = 2;
+ int dbhAllocation = 3;
+ int dbhDealUser = 4;
+ int dcaUpload = 5;
+ int dcaDeal = 6;
+ int dcaWorkOrder= 7;
+ }
}
diff --git a/server/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/src/main/java/com/doumee/dao/business/model/Multifile.java
index 97f86eb..dc861ea 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -63,8 +63,8 @@
@ExcelExportColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
private Integer type;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊", example = "1")
- @ExcelExportColumn(name="鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖", example = "1")
+ @ExcelExportColumn(name="鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖")
private Integer objType;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
diff --git a/server/src/main/java/com/doumee/dao/business/model/Workorder.java b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
index 88fa837..7afb179 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Workorder.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
@@ -2,13 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelExportColumn;
+import com.doumee.dao.web.dto.DCANoProblemDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -79,7 +80,7 @@
@ApiModelProperty(value = "涓婃姤鏃堕棿", example = "1")
@ExcelExportColumn(name="涓婃姤鏃堕棿")
- private Date submitDate;
+ private Integer submitDate;
@ApiModelProperty(value = "SHE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�", example = "1")
@ExcelExportColumn(name="SHE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�")
@@ -129,13 +130,13 @@
@ExcelExportColumn(name="鍙戠幇鏃堕棿")
private String happenTime;
- @ApiModelProperty(value = "椋庨櫓绫诲瀷(鍏宠仈category锛�")
- @ExcelExportColumn(name="椋庨櫓绫诲瀷(鍏宠仈category锛�")
+ @ApiModelProperty(value = "椋庨櫓銆佷激瀹炽�佽瀵熶富棰樼被鍨�(鍏宠仈category锛�")
+ @ExcelExportColumn(name="椋庨櫓銆佷激瀹炽�佽瀵熶富棰樼被鍨�(鍏宠仈category锛�")
private Integer typeId;
@ApiModelProperty(value = "椋庨櫓鎻忚堪", example = "1")
@ExcelExportColumn(name="椋庨櫓鎻忚堪")
- private Integer riskInfo;
+ private String riskInfo;
@ApiModelProperty(value = "褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜", example = "1")
@ExcelExportColumn(name="褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜")
@@ -227,9 +228,11 @@
@TableField(exist = false)
private String memberPhone;
- @ApiModelProperty("鍚屼簨鍚嶇О 澶氫釜,鍒嗗壊")
+
+
+ @ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�")
@TableField(exist = false)
- private String colleague;
+ private List<DCANoProblemDTO> dcaNoProblemDTOList;
diff --git a/server/src/main/java/com/doumee/dao/web/dto/CloseDTO.java b/server/src/main/java/com/doumee/dao/web/dto/CloseDTO.java
new file mode 100644
index 0000000..9de8e67
--- /dev/null
+++ b/server/src/main/java/com/doumee/dao/web/dto/CloseDTO.java
@@ -0,0 +1,34 @@
+package com.doumee.dao.web.dto;
+
+import com.doumee.dao.business.model.Multifile;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2025/4/8 17:41
+ */
+@Data
+public class CloseDTO {
+
+ @ApiModelProperty(value = "宸ュ崟涓婚敭")
+ private Integer workorderId;
+
+ @ApiModelProperty(value = "璇存槑")
+ private String info;
+
+ @ApiModelProperty(value = "宸ュ崟鍏抽棴闄勪欢鍥剧墖")
+ private List<Multifile> multifileList;
+
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭",hidden = true)
+ private Integer memberId;
+
+
+
+
+
+}
diff --git a/server/src/main/java/com/doumee/dao/web/dto/DCANoProblemDTO.java b/server/src/main/java/com/doumee/dao/web/dto/DCANoProblemDTO.java
new file mode 100644
index 0000000..1bc1f9e
--- /dev/null
+++ b/server/src/main/java/com/doumee/dao/web/dto/DCANoProblemDTO.java
@@ -0,0 +1,35 @@
+package com.doumee.dao.web.dto;
+
+import com.doumee.dao.business.model.Multifile;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2025/4/8 14:25
+ */
+@Data
+public class DCANoProblemDTO {
+
+ @ApiModelProperty(value = "闂涓婚敭锛坈ategory:id锛�")
+ private Integer problemId;
+
+ @ApiModelProperty(value = "鎻忚堪 - 涓嶇鍚堝師鍥�")
+ private String eventInfo;
+
+ @ApiModelProperty(value = "闂涓婚敭锛坈ategory:id锛�")
+ private List<Multifile> multifileList;
+
+
+
+
+
+
+
+
+
+}
diff --git a/server/src/main/java/com/doumee/job/UpdateQywxTokenJob.java b/server/src/main/java/com/doumee/job/UpdateQywxTokenJob.java
index 55042bc..074f296 100644
--- a/server/src/main/java/com/doumee/job/UpdateQywxTokenJob.java
+++ b/server/src/main/java/com/doumee/job/UpdateQywxTokenJob.java
@@ -19,6 +19,7 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
@Override
public JobContext execute(JobParam param) {
JobContext jobContext = new JobContext();
diff --git a/server/src/main/java/com/doumee/job/WorkorderJob.java b/server/src/main/java/com/doumee/job/WorkorderJob.java
new file mode 100644
index 0000000..3744161
--- /dev/null
+++ b/server/src/main/java/com/doumee/job/WorkorderJob.java
@@ -0,0 +1,35 @@
+package com.doumee.job;
+
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.job.BaseJob;
+import com.doumee.core.job.JobContext;
+import com.doumee.core.job.JobParam;
+import com.doumee.service.business.WorkorderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 鏇存柊浼佷笟寰俊鑷缓搴旂敤token
+ * @author dm
+ * @since 2025/03/31 16:44
+ */
+@Slf4j
+@Component("workorderJob")
+public class WorkorderJob extends BaseJob {
+
+ @Autowired
+ private WorkorderService workorderService;
+
+ @Override
+ public JobContext execute(JobParam param) {
+ JobContext jobContext = new JobContext();
+ try {
+ workorderService.initializationCode();
+ jobContext.setContext("鍒濆鍖栧悇绫诲瀷璁㈠崟缂栧彿");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return jobContext;
+ }
+}
diff --git a/server/src/main/java/com/doumee/service/business/CategoryService.java b/server/src/main/java/com/doumee/service/business/CategoryService.java
index 6a87833..7618c8b 100644
--- a/server/src/main/java/com/doumee/service/business/CategoryService.java
+++ b/server/src/main/java/com/doumee/service/business/CategoryService.java
@@ -102,7 +102,7 @@
* @param categoryType
* @return
*/
- List<CategoryVO> getCategoryVOTree(Integer categoryType);
+ List<CategoryVO> getCategoryVOTree(String categoryType);
List<CategoryVO> getCategoryVOList(Integer categoryType);
diff --git a/server/src/main/java/com/doumee/service/business/WorkorderService.java b/server/src/main/java/com/doumee/service/business/WorkorderService.java
index 205b273..e44b2e4 100644
--- a/server/src/main/java/com/doumee/service/business/WorkorderService.java
+++ b/server/src/main/java/com/doumee/service/business/WorkorderService.java
@@ -102,4 +102,9 @@
* @return
*/
Workorder getDetail(Integer id);
+
+ /**
+ * 鍒濆鍖朿ode
+ */
+ void initializationCode();
}
diff --git a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index f9b7163..e32f0ef 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -267,10 +267,10 @@
@Override
- public List<CategoryVO> getCategoryVOTree(Integer categoryType){
+ public List<CategoryVO> getCategoryVOTree(String categoryType){
List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
.eq(Category::getIsdeleted, Constants.ZERO)
- .eq(Objects.nonNull(categoryType),Category::getType,categoryType)
+ .in(Objects.nonNull(categoryType),Category::getType,categoryType.split(","))
.orderByAsc(Category::getSortnum,Category::getId)
);
List<CategoryVO> categoryVOList = new ArrayList<>();
diff --git a/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
index f821ba7..99c7642 100644
--- a/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
@@ -124,7 +124,7 @@
@Override
public List<Managers> findList(Managers pageWrap) {
MPJLambdaWrapper<Managers> queryWrapper = new MPJLambdaWrapper<>();
- pageWrap.setIsdeleted(Constants.ZERO);
+ pageWrap.setIsdeleted(Constants.ZERO);
queryWrapper.selectAll(Managers.class )
.selectAs(Member::getPhone,Managers::getMemberPhone)
.selectAs(Member::getName,Managers::getMemberName)
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index 692355d..a1eea89 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -7,9 +7,12 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.web.dto.CloseDTO;
+import com.doumee.dao.web.dto.DCANoProblemDTO;
import com.doumee.service.business.WorkorderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -18,14 +21,15 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.catalina.Manager;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -54,6 +58,13 @@
@Autowired
private ManagersMapper managersMapper;
+ @Autowired
+ private CategoryMapper categoryMapper;
+
+ @Resource(name="sessionRedisTemplate")
+ private RedisTemplate<Object, Serializable> redisTemplate;
+
+
@Override
public Integer create(Workorder workorder) {
this.isValidBaseParam(workorder);
@@ -62,34 +73,113 @@
workorder.setMemberId(workorder.getMemberId());
workorder.setIsdeleted(Constants.ZERO);
workorder.setStatus(Constants.ZERO);
- //璺岀粖婊戜簨浠朵笂鎶� 鏌ヨSHE璐熻矗浜�
- if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
- List<Managers> managersList = managersMapper.selectList(new QueryWrapper<Managers>().lambda().eq(Managers::getIsdeleted,Constants.ZERO)
- .eq(Managers::getType,Constants.ZERO).orderByAsc(Managers::getSortnum)
- );
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(managersList)){
- workorder.setQwnoticeMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
- }
- }
+ workorder.setCode(this.getNextCode(workorder.getType()));
+ //澶勭悊浜哄憳绫讳俊鎭�
+ this.dealNoticeData(workorder);
workorderMapper.insert(workorder);
+ //瀛樺偍DCA 闂璁板綍琛�
+ this.saveProblemData(workorder);
//瀛樺偍闄勪欢淇℃伅
+ this.saveMutiFile(workorder);
+ //澶勭悊涓婃姤鏃ュ織
+ this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId());
+ //TODO 鍙戦�侀�氱煡
+
+ return workorder.getId();
+ }
+
+
+ /**
+ * 瀛樺偍闄勪欢淇℃伅
+ * @param workorder
+ */
+ public void saveMutiFile(Workorder workorder){
List<Multifile> multifileList = workorder.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
multifile.setObjId(workorder.getId());
multifile.setCreateDate(new Date());
- //TODO 鍚庣画鏁寸悊澶勭悊
if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){//SHE浜嬩欢涓婃姤鍥剧墖
- multifile.setObjType(Constants.ZERO);
+ multifile.setObjType(Constants.multiFileType.sheUpload);
}else if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){//璺岀粖婊戜簨浠朵笂鎶ュ浘鐗�
- multifile.setObjType(Constants.ONE);
+ multifile.setObjType(Constants.multiFileType.dbhUpload);
+ }else if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){//DCA浜嬩欢涓婃姤
+ multifile.setObjType(Constants.multiFileType.dcaUpload);
}
}
multifileMapper.insert(multifileList);
}
- //澶勭悊涓婃姤鏃ュ織
- this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId());
- return workorder.getId();
+ }
+
+
+ /**
+ * 澶勭悊 DCA 鎻愭姤 闂鏁版嵁
+ * @param workorder
+ */
+ public void saveProblemData(Workorder workorder){
+ if(Constants.equalsInteger(workorder.getType(),Constants.TWO)){
+ List<DCANoProblemDTO> dcaNoProblemDTOList = workorder.getDcaNoProblemDTOList();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dcaNoProblemDTOList)){
+ for (DCANoProblemDTO dcaNoProblemDTO:dcaNoProblemDTOList) {
+ Category problem = categoryMapper.selectById(dcaNoProblemDTO.getProblemId());
+ Workorder dcaWorkOrder = new Workorder();
+ dcaWorkOrder.setCreateDate(new Date());
+ dcaWorkOrder.setEditDate(new Date());
+ dcaWorkOrder.setMemberId(workorder.getMemberId());
+ dcaWorkOrder.setTypeId(dcaNoProblemDTO.getProblemId());
+ dcaWorkOrder.setType(Constants.TWO);
+ dcaWorkOrder.setStatus(Constants.ZERO);
+ dcaWorkOrder.setIsdeleted(Constants.ZERO);
+ dcaWorkOrder.setProblemTitle(problem.getName());
+ dcaWorkOrder.setProblemId(problem.getId());
+ dcaWorkOrder.setProblemInfo(problem.getRemark());
+ dcaWorkOrder.setDcaRecordId(workorder.getId());
+ workorderMapper.insert(dcaWorkOrder);
+ List<Multifile> multifileList = dcaNoProblemDTO.getMultifileList();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setObjId(dcaWorkOrder.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setObjType(Constants.multiFileType.dcaWorkOrder);
+ }
+ multifileMapper.insert(multifileList);
+ }
+ }
+ }
+ }
+ }
+
+
+
+ /**
+ * 澶勭悊閫氱煡绫讳汉鍛樹俊鎭�
+ * @param workorder
+ */
+ public void dealNoticeData(Workorder workorder){
+ //SHE涓婃姤 鎻愪氦绫诲瀷涓哄悓浜� 澶勭悊鍚屼簨淇℃伅
+ if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)&&Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)){
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getQwId,workorder.getMemberQwids().split(",")));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
+ workorder.setMemberNames(memberList.stream().map(i->i.getName()).collect(Collectors.joining(",")));
+ }
+ }
+ //璺岀粖婊戜簨浠朵笂鎶� 鏌ヨSHE璐熻矗浜�
+ if(Constants.equalsInteger(workorder.getType(),Constants.THREE) || Constants.equalsInteger(workorder.getType(),Constants.ONE)){
+ List<Managers> managersList = managersMapper.selectJoinList(Managers.class,new MPJLambdaWrapper<Managers>().selectAll(Managers.class)
+ .selectAs(Member::getName,Managers::getMemberName)
+ .leftJoin(Member.class,Member::getId,Managers::getMemberId)
+ .eq(Managers::getIsdeleted,Constants.ZERO)
+ .eq(Managers::getType,Constants.ZERO).orderByAsc(Managers::getSortnum)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(managersList)){
+ workorder.setQwnoticeMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
+ if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+ workorder.setEmialMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
+ }
+ }
+ }
+
+
}
@@ -123,22 +213,21 @@
|| Objects.isNull(workorder.getSubmitDate())
|| Objects.isNull(workorder.getHappenTime())
|| Objects.isNull(workorder.getType())
- || !( Constants.equalsInteger(workorder.getType(),Constants.ZERO) || Constants.equalsInteger(workorder.getType(),Constants.ONE)
- || Constants.equalsInteger(workorder.getType(),Constants.TWO) || Constants.equalsInteger(workorder.getType(),Constants.THREE)
+ || Objects.isNull(workorder.getTypeId())
+ || Objects.isNull(workorder.getLocaltionId())
+ || !( Constants.equalsInteger(workorder.getType(),Constants.ZERO) || Constants.equalsInteger(workorder.getType(),Constants.ONE) ||Constants.equalsInteger(workorder.getType(),Constants.THREE)
)){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
//SHE 浜嬩欢涓婃姤
if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
if(Objects.isNull(workorder.getMemberType())
- || Objects.isNull(workorder.getLocaltionId())
|| Objects.isNull(workorder.getOutJiuyi())
|| (Constants.equalsInteger(workorder.getOutJiuyi(),Constants.ZERO) && Objects.isNull(workorder.getIsYiwushi()))
|| (Constants.equalsInteger(workorder.getIsYiwushi(),Constants.ZERO) && Objects.isNull(workorder.getIsHurted()))
- || Objects.isNull(workorder.getCategoryId())
|| Objects.isNull(workorder.getWorkRelated())
|| (Constants.equalsInteger(workorder.getMemberType(),Constants.TWO) && StringUtils.isEmpty(workorder.getMemberNames()))
- || (Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO) && StringUtils.isEmpty(workorder.getMemberQwids()))
+ || (Constants.equalsInteger(workorder.getMemberType(),Constants.ONE) && StringUtils.isEmpty(workorder.getMemberQwids()))
|| org.apache.commons.lang3.StringUtils.isBlank(workorder.getEventInfo())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -146,15 +235,30 @@
}
//璺岀粖婊� 浜嬩欢涓婃姤
if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
- if(Objects.isNull(workorder.getTypeId())
- || Objects.isNull(workorder.getLocaltionId())
- || org.apache.commons.lang3.StringUtils.isBlank(workorder.getEventInfo())
+ if(org.apache.commons.lang3.StringUtils.isBlank(workorder.getRiskInfo())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ }
+ //DCA 浜嬩欢涓婃姤
+ if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){
+ if(Objects.isNull(workorder.getDcaYesNum())
+ || Objects.isNull(workorder.getDcaNoNum())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
}
-
+ //鏁版嵁搴撴暟鎹牎楠�
+ Category typeCategory = categoryMapper.selectById(workorder.getTypeId());
+ if(Objects.isNull(typeCategory)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Category locationCategory = categoryMapper.selectById(workorder.getLocaltionId());
+ if(Objects.isNull(locationCategory)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ workorder.setLocationName(locationCategory.getNamePath());
}
@Override
@@ -174,13 +278,6 @@
.last(" limit 1 ")
);
if(Objects.nonNull(workorder)){
- //濡傛灉鏄疭HE浜嬩欢涓婃姤 SHE娑夊強浜哄憳绫诲瀷涓哄悓浜嬩俊鎭� 闇�瑕佹煡璇㈠悓浜嬪悕绉�
- if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)&&Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)){
- List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getQwId, Arrays.asList(workorder.getMemberQwids().split(","))));
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
- workorder.setColleague(memberList.stream().map(i->i.getName()).collect(Collectors.joining(",")));
- }
- }
//鏌ヨ闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjId,workorder).orderByAsc(Multifile::getId));
@@ -195,6 +292,7 @@
}
return workorder;
}
+
@Override
public void deleteById(Integer id) {
@@ -320,6 +418,49 @@
return workorderMapper.selectCount(wrapper);
}
+ public String getNextCode(Integer type){
+ String date = DateUtil.getFomartDate(new Date(),"yyyyMMddHHmmss");
+ String key = "S";
+ if(Constants.equalsInteger(type,Constants.ONE)){
+ key = "D";
+ }else if(Constants.equalsInteger(type,Constants.THREE)){
+ key = "A";
+ }
+ String code = redisTemplate.opsForValue().get(key+"_CODE").toString();
+ if(StringUtils.isEmpty(code)){
+ code = "01";
+ }
+ redisTemplate.opsForValue().set(key+"_CODE",Integer.valueOf(code)+1);
+ return key + date + org.apache.commons.lang3.StringUtils.leftPad(code,2,"0");
+ }
+
+
+
+ @Override
+ public void initializationCode(){
+ redisTemplate.opsForValue().set("A_CODE",1);
+ redisTemplate.opsForValue().set("S_CODE",1);
+ redisTemplate.opsForValue().set("D_CODE",1);
+ }
+
+
+
+ public void closeWorkOrder(CloseDTO closeDTO){
+ if(Objects.isNull(closeDTO)
+ || Objects.isNull(closeDTO.getWorkorderId())
+ || org.apache.commons.lang3.StringUtils.isBlank(closeDTO.getInfo())
+ || com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(closeDTO.getMultifileList())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Workorder workorder = workorderMapper.selectById(closeDTO.getWorkorderId());
+ if(Objects.isNull(workorder)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸ュ崟鏁版嵁");
+ }
+ if(!(Constants.equalsInteger(workorder.getStatus(),Constants.ZERO)
+ || Constants.equalsInteger(workorder.getStatus(),Constants.ONE)
+ || Constants.equalsInteger(workorder.getStatus(),Constants.TWO))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆鏃犳硶杩涜鎿嶄綔");
+ }
@@ -327,6 +468,9 @@
+ }
+
+
--
Gitblit v1.9.3