From f7d045b0a8355b0ababd480c8aa195ff6d42bdfd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 四月 2025 11:19:01 +0800
Subject: [PATCH] 工单业务
---
server/src/main/java/com/doumee/api/common/PublicCloudController.java | 1
server/src/main/java/com/doumee/dao/business/model/WorkorderLog.java | 6 +
server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 24 +++---
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 5 -
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 173 ++++++++++++++++++++++++++++++++++++-------
server/src/main/resources/application-dev.yml | 2
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 12 ++
server/src/main/java/com/doumee/dao/web/dto/OrderDataDTO.java | 2
server/src/main/java/com/doumee/dao/business/model/Managers.java | 2
9 files changed, 178 insertions(+), 49 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/common/PublicCloudController.java b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
index e2a317a..e787119 100644
--- a/server/src/main/java/com/doumee/api/common/PublicCloudController.java
+++ b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
@@ -192,6 +192,7 @@
Iterator<String> it = multipartRequest.getFileNames();
while (it.hasNext()) {
MultipartFile file = multipartRequest.getFile(it.next());
+ System.out.println(file.getSize());
String originname = file.getOriginalFilename();
is = file.getInputStream();
String endType = ".jpg";
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 4d19e88..8933128 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -87,7 +87,6 @@
@GetMapping("/detail")
public ApiResponse<Workorder> detail (@RequestParam Integer id, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
-
return ApiResponse.success(workorderService.getDetail(id,jwtTokenUtil.getUserInfoByToken(token)));
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
@@ -123,7 +122,6 @@
@PostMapping("/passOn")
public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
-
passOnDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
workorderService.passOn(passOnDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -157,9 +155,8 @@
@LoginRequired
@ApiOperation("宸ュ崟鎶勯��")
@PostMapping("/sendCopy")
- public ApiResponse sendCopy(@RequestParam SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
+ public ApiResponse sendCopy(@RequestBody SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
-
sendCopyDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
workorderService.sendCopy(sendCopyDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
diff --git a/server/src/main/java/com/doumee/dao/business/model/Managers.java b/server/src/main/java/com/doumee/dao/business/model/Managers.java
index d5cc541..f257b97 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Managers.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Managers.java
@@ -53,7 +53,7 @@
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
private Integer sortnum;
- @ApiModelProperty(value = "绫诲瀷 0SHE璐熻矗浜� 1DCA鎵嬪姩鎶勯�佷汉鍛� 2DCA鏉冮檺浜哄憳", example = "1")
+ @ApiModelProperty(value = "绫诲瀷 0SHE璐熻矗浜� 1DCA鎵嬪姩鎶勯�佷汉鍛� 2DCA鏉冮檺浜哄憳 3SHE閭欢浼佸井閫氱煡浜�", example = "1")
private Integer type;
@ApiModelProperty(value = "鏄惁浼佸井娑堟伅閫氱煡 0鍚� 1鏄�", example = "1")
private Integer isQw;
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 5f4e096..d308374 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
@@ -100,10 +100,10 @@
@ApiModelProperty(value = "浜嬩欢璇存槑", example = "1")
private String eventInfo;
- @ApiModelProperty(value = "閭欢閫氱煡浜哄憳缂栫爜闆嗗悎")
+ @ApiModelProperty(value = "閭欢閫氱煡浜哄憳缂栫爜闆嗗悎 memberId")
private String emialMemberIds;
- @ApiModelProperty(value = "浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎")
+ @ApiModelProperty(value = "浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎 qwId")
private String qwnoticeMemberIds;
@ApiModelProperty(value = "鍙戠敓鏃堕棿")
@@ -212,6 +212,14 @@
@TableField(exist = false)
private String qwId;
+ @ApiModelProperty(value = "瑙ｅ喅鎯呭喌锛堟煡璇娇鐢級锛�0=鍚︼紱1=鏄紱",hidden = true)
+ @TableField(exist = false)
+ private Integer dealStatus;
+
+
+ @ApiModelProperty("鏂囦欢璺緞鍓嶇紑")
+ @TableField(exist = false)
+ private String path;
@ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�")
@TableField(exist = false)
private List<DCANoProblemDTO> dcaNoProblemDTOList;
diff --git a/server/src/main/java/com/doumee/dao/business/model/WorkorderLog.java b/server/src/main/java/com/doumee/dao/business/model/WorkorderLog.java
index d3b4657..8b8e8aa 100644
--- a/server/src/main/java/com/doumee/dao/business/model/WorkorderLog.java
+++ b/server/src/main/java/com/doumee/dao/business/model/WorkorderLog.java
@@ -90,5 +90,11 @@
@TableField(exist = false)
private List<Multifile> multifileList;
+ @ApiModelProperty(value = "鍌績鎸夐挳锛�0=鍚︼紱1=鏄�")
+ @TableField(exist = false)
+ private Integer urgeButton;
+
+
+
}
diff --git a/server/src/main/java/com/doumee/dao/web/dto/OrderDataDTO.java b/server/src/main/java/com/doumee/dao/web/dto/OrderDataDTO.java
index e99f6e4..0cea8fc 100644
--- a/server/src/main/java/com/doumee/dao/web/dto/OrderDataDTO.java
+++ b/server/src/main/java/com/doumee/dao/web/dto/OrderDataDTO.java
@@ -15,7 +15,7 @@
@Data
public class OrderDataDTO {
- @ApiModelProperty(value = "鏌ヨ鏃ユ湡绫诲瀷")
+ @ApiModelProperty(value = "鏌ヨ鏃ユ湡绫诲瀷:0鏈堬紱1瀛ｅ害锛�")
private Integer queryType;
@ApiModelProperty(value = "鏁版嵁绫诲瀷锛�0SHE浜嬩欢 2DCA宸ュ崟璁板綍 3璺岀粖婊戜簨浠�")
diff --git a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 33954ea..dc9d09b 100644
--- a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -418,18 +418,18 @@
}
String token = systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode();
//鏍规嵁code鎹㈠尯浼佷笟寰俊ID
- QywxBaseResponse<String> qwIdBaseResponse= null;// QywxUtil.getUserInfoByCode(token,dto.getCode());
-// if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍鐮佽В鏋愬け璐ワ紝璇疯仈绯荤鐞嗗憳");
-// }
-// if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍澶辫触锛�"+qwIdBaseResponse.getErrmsg());
-// }
-// if(Objects.isNull(qwIdBaseResponse.getData())){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐢ㄦ埛淇℃伅瑙ｆ瀽澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
-// String qwId = qwIdBaseResponse.getData();
- String qwId = dto.getCode();
+ QywxBaseResponse<String> qwIdBaseResponse= QywxUtil.getUserInfoByCode(token,dto.getCode());
+ if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍鐮佽В鏋愬け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍澶辫触锛�"+qwIdBaseResponse.getErrmsg());
+ }
+ if(Objects.isNull(qwIdBaseResponse.getData())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐢ㄦ埛淇℃伅瑙ｆ瀽澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ String qwId = qwIdBaseResponse.getData();
+// String qwId = dto.getCode();
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getQwId,qwId).eq(Member::getIsdeleted,Constants.ZERO).last(" limit 1 "));
if(Objects.isNull(member)){
//鏍规嵁浼佷笟寰俊ID 鏌ヨ鐢ㄦ埛淇℃伅
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 4c7c1bf..915964c 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
@@ -86,6 +86,7 @@
workorder.setMemberId(workorder.getMemberId());
workorder.setIsdeleted(Constants.ZERO);
workorder.setCode(this.getNextCode(workorder.getType()));
+ workorder.setEmailStatus(Constants.ZERO);
//澶勭悊浜哄憳绫讳俊鎭�
this.dealNoticeData(workorder);
//澶勭悊SHE浜嬩欢鐘舵��
@@ -169,7 +170,7 @@
message = message + "-" + workorder.getMemberNames() + " " + DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") + workorder.getLocationName() + categoryName;
textCard.setDescription(" <div class=\"normal\">"+message+"</div>");
}else{
- textCard.setTitle(Constants.equalsInteger(workorder.getType(),Constants.ONE)?"銆怐CA涓婃姤銆�":"璺岀粖婊戦闄╀笂鎶�");
+ textCard.setTitle(Constants.equalsInteger(workorder.getType(),Constants.ONE)?"銆怐CA涓婃姤銆�":"銆愯穼缁婃粦椋庨櫓涓婃姤銆�");
if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":"浠诲姟宸插鐞�")) +"</div>";
message = message + " <div class=\"normal\">"+ DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") +"/"+ workorder.getLocationName() +"/"+ categoryName+"</div>";
@@ -192,7 +193,7 @@
if (Constants.equalsInteger(workorder.getType(), Constants.THREE) || Constants.equalsInteger(workorder.getType(), Constants.TWO) ) {
//澶勭悊涓婃姤鏃ュ織 DCA宸ュ崟 鏃ュ織瀛樺偍鑷冲瓙涓氬姟 涓嶅瓨鍦ㄤ簬鐖剁骇 涓庤穼缁婃粦
String logTitle = Constants.equalsInteger(workorder.getType(), Constants.THREE) ? "璺岀粖婊戦闄�" : "DCA";
- this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId(),workOrderStatus.getLogTitle().replace("{title}",logTitle),null);
+ this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId(),workOrderStatus.getLogTitle().replace("{title}",logTitle),null,null);
}
}
@@ -225,7 +226,9 @@
if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){
List<DCANoProblemDTO> dcaNoProblemDTOList = workorder.getDcaNoProblemDTOList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dcaNoProblemDTOList)){
+ Integer indexCode = 0 ;
for (DCANoProblemDTO dcaNoProblemDTO:dcaNoProblemDTOList) {
+ indexCode = indexCode + 1;
Category problem = categoryMapper.selectById(dcaNoProblemDTO.getProblemId());
if(!Constants.equalsInteger(problem.getType(),6)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"棰樼洰鍒嗙被閿欒");
@@ -244,7 +247,14 @@
dcaWorkOrder.setProblemId(problem.getId());
dcaWorkOrder.setProblemInfo(problem.getRemark());
dcaWorkOrder.setDcaRecordId(workorder.getId());
+ dcaWorkOrder.setHappenTime(workorder.getHappenTime());
+ dcaWorkOrder.setLocaltionId(workorder.getLocaltionId());
+ dcaWorkOrder.setLocationName(workorder.getLocationName());
+ dcaWorkOrder.setSubmitDate(workorder.getSubmitDate());
+ dcaWorkOrder.setCode(workorder.getCode()+"_"+ org.apache.commons.lang3.StringUtils.leftPad(indexCode.toString(),2,"0"));
dcaWorkOrder.setEventInfo(dcaNoProblemDTO.getEventInfo());
+ dcaWorkOrder.setQwnoticeMemberIds(workorder.getQwnoticeMemberIds());
+ dcaWorkOrder.setMemberNames(workorder.getMemberNames());
workorderMapper.insert(dcaWorkOrder);
//瀛樺偍鏃ュ織
this.dealLogData(dcaWorkOrder,workOrderStatus);
@@ -259,6 +269,46 @@
multifileMapper.insert(multifileList);
}
}
+ }
+
+ //鏌ヨ涓婚涓嬬殑鎵�鏈夎瀵熼」
+ Category type = categoryMapper.selectById(workorder.getTypeId());
+ if(Objects.nonNull(type)){
+ //瀛樺偍DCA宸ュ崟璇︽儏
+ Map<String,Object> detail = new HashMap<>();
+ detail.put("title","瑙傚療涓婚锛�"+type.getName());
+ List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getType,4).eq(Category::getParentId,workorder.getTypeId()));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categoryList)){
+ List<Map<String,Object>> childMapList = new ArrayList<>();
+ for (Category category:categoryList) {
+ Map<String,Object> childMap = new HashMap<>();
+ childMap.put("childTitle",category.getName());
+ List<Category> problemList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
+ .eq(Category::getType,6).eq(Category::getParentId,category.getId()));
+ List<Map<String,Object>> problemMapList = new ArrayList<>();
+ Integer index = Constants.ONE;
+ for (Category problem:problemList) {
+ Map<String,Object> problemMap = new HashMap<>();
+ problemMap.put("title",index + "銆�" + problem.getName());
+ List<DCANoProblemDTO> pList = dcaNoProblemDTOList.stream().filter(i->Constants.equalsInteger(i.getProblemId(),problem.getId())).collect(Collectors.toList());
+ if(pList.size()>Constants.ZERO){
+ DCANoProblemDTO dcaNoProblemDTO = pList.get(Constants.ZERO);
+ problemMap.put("status",Constants.TWO);
+ problemMap.put("eventInfo","涓嶇鍚堝師鍥狅細"+dcaNoProblemDTO.getEventInfo());
+ problemMap.put("imgList",dcaNoProblemDTO.getMultifileList().stream().map(i->i.getFileurl()).collect(Collectors.joining(",")));
+ }else{
+ problemMap.put("status",Constants.ONE);
+ }
+ index = index + Constants.ONE;
+ problemMapList.add(problemMap);
+ }
+ childMap.put("problemMapList",problemMapList);
+ childMapList.add(childMap);
+ }
+ detail.put("childMapList",childMapList);
+ }
+ workorder.setRemark(JSONObject.toJSONString(detail));
+ workorderMapper.updateById(workorder);
}
}
}
@@ -277,8 +327,28 @@
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)|| Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+
+ if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+ List<Managers> managersList = managersMapper.selectJoinList(Managers.class,new MPJLambdaWrapper<Managers>().selectAll(Managers.class)
+ .selectAs(Member::getName,Managers::getMemberName)
+ .selectAs(Member::getQwId,Managers::getQwId)
+ .leftJoin(Member.class,Member::getId,Managers::getMemberId)
+ .eq(Managers::getIsdeleted,Constants.ZERO)
+ .eq(Managers::getType,Constants.THREE).orderByAsc(Managers::getSortnum)
+ );
+ if(Objects.isNull(managersList)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌SHE澶勭悊鎶勯�佷汉鍛�");
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(managersList)){
+ workorder.setQwnoticeMemberIds(managersList.stream().filter(i->Constants.equalsInteger(i.getIsQw(),Constants.ONE)).map(i->i.getQwId()).collect(Collectors.joining(",")));
+ if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+ workorder.setEmialMemberIds(managersList.stream().filter(i->Constants.equalsInteger(i.getIsEmail(),Constants.ONE)).map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
+ }
+ }
+ }
+
+ //璺岀粖婊戜簨浠朵笂鎶� \ DCA 鏌ヨ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)
.selectAs(Member::getQwId,Managers::getQwId)
@@ -290,10 +360,13 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌SHE澶勭悊鎶勯�佷汉鍛�");
}
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(managersList)){
- workorder.setQwnoticeMemberIds(managersList.stream().filter(i->Constants.equalsInteger(i.getIsQw(),Constants.ONE)).map(i->i.getQwId()).collect(Collectors.joining(",")));
- if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
- workorder.setEmialMemberIds(managersList.stream().filter(i->Constants.equalsInteger(i.getIsEmail(),Constants.ONE)).map(i->i.getQwId()).collect(Collectors.joining(",")));
+ workorder.setQwnoticeMemberIds(managersList.stream().map(i->i.getQwId()).collect(Collectors.joining(",")));
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO)
+ .in(Member::getQwId,workorder.getQwnoticeMemberIds().split(",")));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
+ workorder.setMemberNames(memberList.stream().map(i->i.getName()).collect(Collectors.joining(",")));
}
+
}
}
}
@@ -305,8 +378,9 @@
* @param afterWorkorder
* @param objType 鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟鍒嗛厤鐗╀笟涓荤 2浠诲姟鍒嗛厤澶勭悊浜� 3浠诲姟澶勭悊鍏抽棴 4浠诲姟鍌績
* @param memberId
+ * @param paramr2 澶勭悊浜�
*/
- public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content){
+ public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content,String paramr2){
WorkorderLog workorderLog = new WorkorderLog();
workorderLog.setCreateDate(new Date());
workorderLog.setEditDate(new Date());
@@ -314,6 +388,7 @@
workorderLog.setBeforeContent(beforeJson);
workorderLog.setAfterContent(JSONObject.toJSONString(afterWorkorder));
workorderLog.setParam1(memberId.toString());
+ workorderLog.setParam2(paramr2);
workorderLog.setObjId(afterWorkorder.getId().toString());
workorderLog.setObjType(objType);
workorderLog.setTitle(title);
@@ -405,9 +480,11 @@
//鏌ヨ闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjId,workorder.getId()).orderByAsc(Multifile::getId));
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_FILE_PATH).getCode();
+
+ workorder.setPath(path);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
- String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_FILE_PATH).getCode();
for (Multifile multifile:multifileList) {
multifile.setFileurlFull(path+multifile.getFileurl());
}
@@ -415,7 +492,7 @@
}
//鏌ヨ鏃ュ織淇℃伅
- workorder.setLogList(this.getLogList(workorder.getId()));
+ workorder.setLogList(this.getLogList(workorder));
if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){
//濡傛灉鏄疍CA鎻愪氦璁板綍锛屾煡璇㈠瓙宸ュ崟闆嗗悎
Workorder param = new Workorder();
@@ -431,20 +508,29 @@
workorder.setCloseButton(Constants.ZERO);
if(member!=null && org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){
List<String> closeUserList = new ArrayList<>();
- closeUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
- if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())){
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getQwnoticeMemberIds())&&
+ (Constants.equalsInteger(workorder.getStatus(),Constants.ZERO)||
+ Constants.equalsInteger(workorder.getStatus(),Constants.ONE)||Constants.equalsInteger(workorder.getStatus(),Constants.TWO))){
+ closeUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
+ }
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())&&
+ (Constants.equalsInteger(workorder.getStatus(),Constants.ONE)||Constants.equalsInteger(workorder.getStatus(),Constants.TWO))){
closeUserList.add(workorder.getManagerId());
}
- if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getDealerId())){
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getDealerId())&&
+ (Constants.equalsInteger(workorder.getStatus(),Constants.TWO))){
closeUserList.add(workorder.getDealerId());
}
- workorder.setCloseButton(closeUserList.stream().filter(i->i.equals(member.getQwId())).collect(Collectors.toList()).size()>Constants.ZERO?Constants.ONE:Constants.ZERO);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(closeUserList)){
+ workorder.setCloseButton(closeUserList.stream().filter(i->i.equals(member.getQwId())).collect(Collectors.toList()).size()>Constants.ZERO?Constants.ONE:Constants.ZERO);
+ }
List<String> passOnUserList = new ArrayList<>();
//寰呭垎閰嶇姸鎬� 澶勭悊杞氦鎸夐挳
- if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitConfirm.getKey())){
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitConfirm.getKey())&&Constants.equalsInteger(workorder.getStatus(),Constants.ZERO)){
passOnUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
- }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())){
- closeUserList.add(workorder.getManagerId());
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())&&(Constants.equalsInteger(workorder.getStatus(),Constants.ONE)
+ || Constants.equalsInteger(workorder.getStatus(),Constants.TWO))){
+ passOnUserList.add(workorder.getManagerId());
}
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(passOnUserList)){
workorder.setPassOnButton(passOnUserList.stream().filter(i->i.equals(member.getQwId())).collect(Collectors.toList()).size()>Constants.ZERO?Constants.ONE:Constants.ZERO);
@@ -454,20 +540,41 @@
}
- public List<WorkorderLog> getLogList(Integer orderId){
+ public List<WorkorderLog> getLogList(Workorder workorder){
List<WorkorderLog> logList = workorderLogMapper.selectJoinList(WorkorderLog.class,
new MPJLambdaWrapper<WorkorderLog>()
.selectAll(WorkorderLog.class)
.selectAs(Member::getName,WorkorderLog::getUserName)
.selectAs(Member::getCompanyName,WorkorderLog::getCompanyName)
.leftJoin(Member.class,Member::getId,WorkorderLog::getParam1)
- .eq(WorkorderLog::getObjId,orderId)
- .orderByAsc(WorkorderLog::getId)
+ .eq(WorkorderLog::getObjId,workorder.getId())
+ .orderByDesc(WorkorderLog::getId)
);
+
+
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(logList)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_LOG_FILE_PATH).getCode();
+ Boolean canOpenUrgeButton = true;
for (WorkorderLog workorderLog:logList) {
+ workorderLog.setUrgeButton(Constants.ZERO);
+ //鐗╀笟涓荤澶勭悊涓�
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.ONE)){
+ Member member = memberMapper.selectById(workorderLog.getParam1());
+ if(Objects.nonNull(member) && org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())
+ && member.getQwId().equals(workorder.getManagerId()) ){
+ workorderLog.setUrgeButton(Constants.ONE);
+ }
+ }
+ //宸ョ▼甯堝鐞嗕腑
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.TWO)){
+ Member member = memberMapper.selectById(workorderLog.getParam1());
+ if(Objects.nonNull(member) && org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())
+ && member.getQwId().equals(workorder.getDealerId()) && canOpenUrgeButton){
+ workorderLog.setUrgeButton(Constants.ONE);
+ canOpenUrgeButton = false;
+ }
+ }
//鏌ヨ闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getIsdeleted,Constants.ZERO)
@@ -553,9 +660,17 @@
.leftJoin(Member.class,Member::getId,Workorder::getMemberId)
.leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
.leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA涓�绾ч棶棰樼紪鐮�
- .apply(Objects.nonNull(pageWrap.getMyWorkOrder())&& org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getQwId())
+ .apply(Objects.nonNull(pageWrap.getMyWorkOrder())&&
+ org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getQwId())
&&Constants.equalsInteger(Constants.ONE,pageWrap.getMyWorkOrder()),
" ( t.id in ( select OBJ_ID from notices where param1 = '"+pageWrap.getQwId()+"' and type != 3 )) ")
+ .ne(org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getQwId()),Workorder::getType,Constants.TWO)
+ .in(Objects.nonNull(pageWrap.getDealStatus())&&
+ Constants.equalsInteger(pageWrap.getDealStatus(),Constants.ZERO),
+ Workorder::getStatus,Constants.WorkOrderStatus.waitConfirm.getKey(),Constants.WorkOrderStatus.waitAllocation.getKey(),Constants.WorkOrderStatus.waitDeal.getKey())
+ .in(Objects.nonNull(pageWrap.getDealStatus())&&
+ Constants.equalsInteger(pageWrap.getDealStatus(),Constants.ONE),
+ Workorder::getStatus,Constants.WorkOrderStatus.sheClose.getKey(),Constants.WorkOrderStatus.close.getKey(),Constants.WorkOrderStatus.wtsClose.getKey())
.eq( pageWrap.getId() != null, Workorder::getId, pageWrap.getId())
.eq( pageWrap.getCreator() != null, Workorder::getCreator, pageWrap.getCreator())
.ge( pageWrap.getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart( pageWrap.getCreateDate()))
@@ -660,7 +775,7 @@
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())){
+ || com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(closeDTO.getMultifileList())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
Workorder workorder = workorderMapper.selectById(closeDTO.getWorkorderId());
@@ -712,15 +827,16 @@
workorder.setDealInfo(closeDTO.getInfo());
workorderMapper.updateById(workorder);
//澶勭悊涓婃姤鏃ュ織
- Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,workorder.getMemberId(),"浠诲姟宸插鐞�",closeDTO.getInfo());
- List<Multifile> multifileList = workorder.getMultifileList();
+ Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,workorder.getMemberId(),"浠诲姟宸插鐞�",closeDTO.getInfo(),null);
+ List<Multifile> multifileList = closeDTO.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
multifile.setObjId(logId);
+ multifile.setIsdeleted(Constants.ZERO);
multifile.setCreateDate(new Date());
multifile.setObjType(Constants.multiFileType.deal);
+ multifileMapper.insert(multifile);
}
- multifileMapper.insert(multifileList);
}
//鍙戦�佷紒寰�氱煡
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(qwIds)){
@@ -773,10 +889,11 @@
workorder.setEditDate(new Date());
workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
workorderMapper.updateById(workorder);
+ String paramr2 = member.getCompanyName()+"/"+member.getName();
//澶勭悊涓婃姤鏃ュ織
Integer logId = this.saveLog(beforeJson,workorder,
Constants.equalsInteger(passOnDTO.getPassOnType(),Constants.ZERO)?Constants.ONE:Constants.TWO
- ,workorder.getMemberId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo());
+ ,workorder.getMemberId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo(),paramr2);
List<Multifile> multifileList = workorder.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
@@ -991,7 +1108,7 @@
this.saveLog(null,workorder,
Constants.ONE
- ,member.getId(),"鍌績","宸插偓淇� "+urgeUser.getCompanyName() + "/" + urgeUser.getName());
+ ,member.getId(),"鍌績","宸插偓淇� "+urgeUser.getCompanyName() + "/" + urgeUser.getName(),null);
//鍙戦�佷紒寰�氱煡
Category category = categoryMapper.selectById(workorder.getTypeId());
if(Objects.nonNull(category)){
diff --git a/server/src/main/resources/application-dev.yml b/server/src/main/resources/application-dev.yml
index 634538d..9560ad4 100644
--- a/server/src/main/resources/application-dev.yml
+++ b/server/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/lianhelihua_sh?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://112.26.66.154:3306/lianhelihua_sh?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: doumee
password: rtjgfEr@&0c0m
driver-class-name: com.mysql.cj.jdbc.Driver
--
Gitblit v1.9.3