From ffc5c6b152165b763458c4b129b5a5017bb6d22d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 09 四月 2025 16:01:42 +0800
Subject: [PATCH] 工单业务
---
server/src/main/java/com/doumee/dao/business/model/WorkorderLog.java | 19 +
server/src/main/java/com/doumee/core/utils/DateUtil.java | 17 +
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 72 ++++++
server/src/main/java/com/doumee/core/constants/Constants.java | 35 ++
server/src/main/java/com/doumee/dao/web/dto/CloseDTO.java | 5
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 321 +++++++++++++++++++++++++++--
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 18 +
server/src/main/java/com/doumee/dao/web/dto/PassOnDTO.java | 38 +++
server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java | 36 +++
server/src/main/java/com/doumee/service/business/WorkorderService.java | 36 +++
server/src/main/java/com/doumee/dao/business/model/Multifile.java | 6
server/src/main/java/com/doumee/dao/business/WorkorderLogMapper.java | 3
12 files changed, 555 insertions(+), 51 deletions(-)
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 e1a58ff..b4d14cc 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -8,7 +8,10 @@
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.CloseDTO;
+import com.doumee.dao.web.dto.PassOnDTO;
import com.doumee.dao.web.dto.UpdEmailDTO;
+import com.doumee.dao.web.vo.WorkOrderDataVO;
import com.doumee.service.business.ManagersService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.WorkorderService;
@@ -70,7 +73,6 @@
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());
@@ -98,9 +100,77 @@
+ @LoginRequired
+ @ApiOperation("宸ュ崟鍏抽棴")
+ @PostMapping("/closeWorkOrder")
+ public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ closeDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
+ workorderService.closeWorkOrder(closeDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
+ @LoginRequired
+ @ApiOperation("宸ュ崟鎸囨淳")
+ @PostMapping("/passOn")
+ public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ passOnDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
+ workorderService.passOn(passOnDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation("宸ュ崟鍌績")
+ @GetMapping("/urge")
+ public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ workorderService.urge(workorderId,jwtTokenUtil.getUserInfoByToken(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
+
+ @LoginRequired
+ @ApiOperation("鎶ヨ〃")
+ @GetMapping("/getWorkOrderData")
+ public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestParam Integer queryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ return ApiResponse.success(workorderService.getWorkOrderData(queryType));
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
+
+
+
}
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 b7d21d9..b35c5f1 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -188,14 +188,31 @@
* 鏂囦欢闄勪欢绫诲瀷
*/
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;
+ //0闂涓婃姤 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;
+
+ //0宸ュ崟涓婃姤 1宸ュ崟澶勭悊 2宸ュ崟杞氦
+ int upload = 0;
+ int deal = 1;
+ int passOn = 2;
}
+
+
+ public interface workOrderStatus{
+ int waitConfirm = 0;
+ int waitAllocation = 1;
+ int waitDeal = 2;
+ int sheClose = 3;
+ int wtsClose = 4;
+ int close = 5;
+ }
+
+
}
diff --git a/server/src/main/java/com/doumee/core/utils/DateUtil.java b/server/src/main/java/com/doumee/core/utils/DateUtil.java
index 637e297..17439fd 100644
--- a/server/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -594,12 +594,12 @@
* @return String
* @throws Exception
*/
- public static String getNowMonth() throws Exception {
+ public static Integer getNowMonth() throws Exception {
String nowMonth = "";
try {
String strTemp = getNowLongTime();
nowMonth = strTemp.substring(4, 6);
- return nowMonth;
+ return Integer.valueOf(nowMonth);
} catch (Exception e) {
throw e;
}
@@ -2928,8 +2928,9 @@
// System.out.println(DateUtil.afterMinutesDate(-5));
- System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
-// System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
+// List<String> s = DateUtil.getDayByMonth();
+// System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
+ System.out.println(DateUtil.getNowMonth());
// List<Date> list =getThisMonthDateList();
// for(Date d :list){
@@ -3236,6 +3237,14 @@
return cal.getTime();
}
+ public static Date afterHoursDate(Date date,Integer hours){
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.add(Calendar.HOUR,hours);
+ return cal.getTime();
+ }
+
+
/**
* LocalDateTime to date
* @param now
diff --git a/server/src/main/java/com/doumee/dao/business/WorkorderLogMapper.java b/server/src/main/java/com/doumee/dao/business/WorkorderLogMapper.java
index ea8c650..7e5a595 100644
--- a/server/src/main/java/com/doumee/dao/business/WorkorderLogMapper.java
+++ b/server/src/main/java/com/doumee/dao/business/WorkorderLogMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.WorkorderLog;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
/**
* @author 姹熻箘韫�
* @since 2025/04/02 17:49
*/
-public interface WorkorderLogMapper extends BaseMapper<WorkorderLog> {
+public interface WorkorderLogMapper extends MPJJoinMapper<WorkorderLog> {
}
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 dc861ea..5408a5c 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,10 @@
@ExcelExportColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
private Integer type;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖", example = "1")
- @ExcelExportColumn(name="鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖")
+// @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖", example = "1")
+// @ExcelExportColumn(name="鍏宠仈瀵硅薄绫诲瀷 0SHE涓婃姤 1璺岀粖婊戜笂鎶� 2璺岀粖婊戝鐞� 3璺岀粖婊戝垎閰嶇墿涓氫富绠� 4璺岀粖婊戝垎閰嶅鐞嗕汉 5DCA椋庨櫓涓婃姤 6DCA椋庨櫓澶勭悊 7DCA宸ュ崟鍥剧墖")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0宸ュ崟涓婃姤 1宸ュ崟澶勭悊 2宸ュ崟杞氦", example = "1")
+ @ExcelExportColumn(name="鍏宠仈瀵硅薄绫诲瀷 0宸ュ崟涓婃姤 1宸ュ崟澶勭悊 2宸ュ崟杞氦")
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 51fd4c2..1d7f413 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
@@ -58,8 +58,8 @@
@ExcelExportColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3 宸叉挙鍥� 4宸插鐞�", example = "1")
- @ExcelExportColumn(name="鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3 宸叉挙鍥� 4宸插鐞�")
+ @ApiModelProperty(value = "鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3SHE鍏抽棴 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�", example = "1")
+ @ExcelExportColumn(name="鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3SHE鍏抽棴 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@@ -126,9 +126,9 @@
@ExcelExportColumn(name="浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎")
private String qwnoticeMemberIds;
- @ApiModelProperty(value = "鍙戠幇鏃堕棿")
- @ExcelExportColumn(name="鍙戠幇鏃堕棿")
- private String happenTime;
+ @ApiModelProperty(value = "鍙戠敓鏃堕棿")
+ @ExcelExportColumn(name="鍙戠敓鏃堕棿")
+ private Date happenTime;
@ApiModelProperty(value = "椋庨櫓銆佷激瀹炽�佽瀵熶富棰樼被鍨�(鍏宠仈category锛�")
@ExcelExportColumn(name="椋庨櫓銆佷激瀹炽�佽瀵熶富棰樼被鍨�(鍏宠仈category锛�")
@@ -140,11 +140,11 @@
@ApiModelProperty(value = "褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜", example = "1")
@ExcelExportColumn(name="褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜")
- private Integer managerId;
+ private String managerId;
@ApiModelProperty(value = "褰撳墠澶勭悊浜哄憳浼佷笟寰俊缂栫爜", example = "1")
@ExcelExportColumn(name="褰撳墠澶勭悊浜哄憳浼佷笟寰俊缂栫爜")
- private Integer dealerId;
+ private String dealerId;
@ApiModelProperty(value = "鍒嗛厤鏃堕棿")
@ExcelExportColumn(name="鍒嗛厤鏃堕棿")
@@ -199,6 +199,10 @@
@ExcelExportColumn(name="DCA宸ュ崟鎶勯�佷汉鍛樹紒涓氬井淇＄紪鐮侀泦鍚�(澶氫釜鑻辨枃閫楀彿闅斿紑锛�")
private String dcaCsIds;
+ @ApiModelProperty(value = "涓嬫鍌績鏃堕棿")
+ @ExcelExportColumn(name="涓嬫鍌績鏃堕棿")
+ private Date urgeDate;
+
@ApiModelProperty("闄勪欢淇℃伅")
@TableField(exist = false)
private List<Multifile> multifileList;
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 78c5f45..f7398b7 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
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelExportColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 宸ュ崟鎿嶄綔鍘嗗彶琛�
@@ -63,8 +65,8 @@
@ExcelExportColumn(name="绠�浠�")
private String content;
- @ApiModelProperty(value = "鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟纭 2浠诲姟鍒嗛厤鐗╀笟涓荤 3浠诲姟鍏抽棴 4浠诲姟鍒嗛厤澶勭悊浜� 5浠诲姟鍌績", example = "1")
- @ExcelExportColumn(name="鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟纭 2浠诲姟鍒嗛厤鐗╀笟涓荤 3浠诲姟鍏抽棴 4浠诲姟鍒嗛厤澶勭悊浜� 5浠诲姟鍌績")
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟鍒嗛厤鐗╀笟涓荤 2浠诲姟鍒嗛厤澶勭悊浜� 3浠诲姟澶勭悊鍏抽棴 4浠诲姟鍌績", example = "1")
+ @ExcelExportColumn(name="鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟鍒嗛厤鐗╀笟涓荤 2浠诲姟鍒嗛厤澶勭悊浜� 3浠诲姟澶勭悊鍏抽棴 4浠诲姟鍌績")
private Integer objType;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
@@ -95,4 +97,17 @@
@ExcelExportColumn(name="鍙傛暟4")
private String param4;
+ @ApiModelProperty(value = "鎿嶄綔浜哄悕绉�")
+ @TableField(exist = false)
+ private String userName;
+
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅")
+ @TableField(exist = false)
+ private List<Multifile> multifileList;
+
+
}
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
index 9de8e67..11ae618 100644
--- a/server/src/main/java/com/doumee/dao/web/dto/CloseDTO.java
+++ b/server/src/main/java/com/doumee/dao/web/dto/CloseDTO.java
@@ -1,5 +1,6 @@
package com.doumee.dao.web.dto;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Multifile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,8 +25,8 @@
@ApiModelProperty(value = "宸ュ崟鍏抽棴闄勪欢鍥剧墖")
private List<Multifile> multifileList;
- @ApiModelProperty(value = "鐢ㄦ埛涓婚敭",hidden = true)
- private Integer memberId;
+ @ApiModelProperty(value = "鐢ㄦ埛淇℃伅",hidden = true)
+ private Member member;
diff --git a/server/src/main/java/com/doumee/dao/web/dto/PassOnDTO.java b/server/src/main/java/com/doumee/dao/web/dto/PassOnDTO.java
new file mode 100644
index 0000000..9bcabe1
--- /dev/null
+++ b/server/src/main/java/com/doumee/dao/web/dto/PassOnDTO.java
@@ -0,0 +1,38 @@
+package com.doumee.dao.web.dto;
+
+import com.doumee.dao.business.model.Member;
+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 PassOnDTO {
+
+ @ApiModelProperty(value = "宸ュ崟涓婚敭")
+ private Integer workorderId;
+
+ @ApiModelProperty(value = "琚浆浜や汉锛堜笅涓�姝ュ鐞嗕汉锛�")
+ private Integer passOnUserId;
+
+ @ApiModelProperty(value = "璇存槑")
+ private String info;
+
+ @ApiModelProperty(value = "闄勪欢鍥剧墖")
+ private List<Multifile> multifileList;
+
+ @ApiModelProperty(value = "鐢ㄦ埛淇℃伅",hidden = true)
+ private Member member;
+
+ @ApiModelProperty(value = "杞氦绫诲瀷锛�0=SHE杞氦锛�1=WTS杞氦",hidden = true)
+ private Integer passOnType;
+
+
+}
diff --git a/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java b/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java
new file mode 100644
index 0000000..da032de
--- /dev/null
+++ b/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java
@@ -0,0 +1,36 @@
+package com.doumee.dao.web.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2025/4/8 9:20
+ */
+@Data
+public class WorkOrderDataVO {
+
+ @ApiModelProperty(value = "鏃ユ湡")
+ private String dateStr;
+
+ @ApiModelProperty(value = "鎬绘暟")
+ private Integer total;
+
+ @ApiModelProperty(value = "SHE鎬绘暟")
+ private Integer sheTotal;
+
+ @ApiModelProperty(value = "WTS鎬绘暟")
+ private Integer wtsTotal;
+
+ @ApiModelProperty(value = "宸ョ▼甯堟�绘暟")
+ private Integer gcsTotal;
+
+ @ApiModelProperty(value = "鏈叧闂�绘暟")
+ private Integer unCloseTotal;
+
+
+}
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 e44b2e4..2c09414 100644
--- a/server/src/main/java/com/doumee/service/business/WorkorderService.java
+++ b/server/src/main/java/com/doumee/service/business/WorkorderService.java
@@ -2,7 +2,12 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Workorder;
+import com.doumee.dao.web.dto.CloseDTO;
+import com.doumee.dao.web.dto.PassOnDTO;
+import com.doumee.dao.web.vo.WorkOrderDataVO;
+
import java.util.List;
/**
@@ -104,7 +109,36 @@
Workorder getDetail(Integer id);
/**
- * 鍒濆鍖朿ode
+ * 姣忓ぉ鍒濆鍖栧伐鍗曠紪鍙穋ode
*/
void initializationCode();
+
+ /**
+ * 宸ュ崟鍏抽棴
+ * @param closeDTO
+ */
+ void closeWorkOrder(CloseDTO closeDTO);
+
+
+ /**
+ * 宸ュ崟杞氦澶勭悊
+ * @param passOnDTO
+ */
+ void passOn(PassOnDTO passOnDTO);
+
+
+ /**
+ * 宸ュ崟鍌績
+ * @param workorderId
+ * @param member
+ */
+ void urge(Integer workorderId, Member member);
+
+ /**
+ * 瀹氭椂鍌績宸ュ崟
+ */
+ void jobUrge();
+
+ List<WorkOrderDataVO> getWorkOrderData(Integer queryType) throws Exception;
+
}
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 a1eea89..6a03643 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
@@ -9,10 +9,13 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.qiyeweixin.QywxUtil;
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.dao.web.dto.PassOnDTO;
+import com.doumee.dao.web.vo.WorkOrderDataVO;
import com.doumee.service.business.WorkorderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -23,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -72,22 +76,34 @@
workorder.setEditDate(new Date());
workorder.setMemberId(workorder.getMemberId());
workorder.setIsdeleted(Constants.ZERO);
- workorder.setStatus(Constants.ZERO);
workorder.setCode(this.getNextCode(workorder.getType()));
//澶勭悊浜哄憳绫讳俊鎭�
this.dealNoticeData(workorder);
+ //澶勭悊SHE浜嬩欢鐘舵��
+ workorder.setStatus(Constants.equalsInteger(workorder.getType(),Constants.ZERO)?Constants.workOrderStatus.close:Constants.workOrderStatus.waitConfirm);
workorderMapper.insert(workorder);
//瀛樺偍DCA 闂璁板綍琛�
this.saveProblemData(workorder);
//瀛樺偍闄勪欢淇℃伅
this.saveMutiFile(workorder);
- //澶勭悊涓婃姤鏃ュ織
- this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId());
- //TODO 鍙戦�侀�氱煡
+ //瀛樺偍鏃ュ織
+ this.dealLogData(workorder);
+ //TODO 鍙戦�佷紒寰�氱煡
return workorder.getId();
}
+
+ public void dealLogData(Workorder workorder){
+ //澶勭悊涓婃姤鏃ュ織 DCA宸ュ崟 鏃ュ織瀛樺偍鑷冲瓙涓氬姟 涓嶅瓨鍦ㄤ簬鐖剁骇
+ if(!Constants.equalsInteger(workorder.getType(),Constants.ONE)){
+ String logTitle = "宸ュ崟鎻愭姤";
+ if(!Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+ logTitle = Constants.equalsInteger(workorder.getType(),Constants.ONE)?"璺岀粖婊戦闄╂彁鎶�":"DCA涓婃姤";
+ }
+ this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId(),logTitle,null);
+ }
+ }
/**
* 瀛樺偍闄勪欢淇℃伅
@@ -99,13 +115,7 @@
for (Multifile multifile:multifileList) {
multifile.setObjId(workorder.getId());
multifile.setCreateDate(new Date());
- if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){//SHE浜嬩欢涓婃姤鍥剧墖
- multifile.setObjType(Constants.multiFileType.sheUpload);
- }else if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){//璺岀粖婊戜簨浠朵笂鎶ュ浘鐗�
- multifile.setObjType(Constants.multiFileType.dbhUpload);
- }else if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){//DCA浜嬩欢涓婃姤
- multifile.setObjType(Constants.multiFileType.dcaUpload);
- }
+ multifile.setObjType(Constants.multiFileType.upload);
}
multifileMapper.insert(multifileList);
}
@@ -134,13 +144,16 @@
dcaWorkOrder.setProblemId(problem.getId());
dcaWorkOrder.setProblemInfo(problem.getRemark());
dcaWorkOrder.setDcaRecordId(workorder.getId());
+ dcaWorkOrder.setEventInfo(dcaNoProblemDTO.getEventInfo());
workorderMapper.insert(dcaWorkOrder);
+ //瀛樺偍鏃ュ織
+ this.dealLogData(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);
+ multifile.setObjType(Constants.multiFileType.upload);
}
multifileMapper.insert(multifileList);
}
@@ -187,10 +200,10 @@
*
* @param beforeJson
* @param afterWorkorder
- * @param objType 鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟纭 2浠诲姟鍒嗛厤鐗╀笟涓荤 3浠诲姟鍏抽棴 4浠诲姟鍒嗛厤澶勭悊浜� 5浠诲姟鍌績
+ * @param objType 鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟鍒嗛厤鐗╀笟涓荤 2浠诲姟鍒嗛厤澶勭悊浜� 3浠诲姟澶勭悊鍏抽棴 4浠诲姟鍌績
* @param memberId
*/
- public void saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId){
+ public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content){
WorkorderLog workorderLog = new WorkorderLog();
workorderLog.setCreateDate(new Date());
workorderLog.setEditDate(new Date());
@@ -200,7 +213,10 @@
workorderLog.setParam1(memberId.toString());
workorderLog.setObjId(afterWorkorder.getId().toString());
workorderLog.setObjType(objType);
+ workorderLog.setTitle(title);
+ workorderLog.setContent(content);
workorderLogMapper.insert(workorderLog);
+ return workorderLog.getId();
}
@@ -290,8 +306,44 @@
workorder.setMultifileList(multifileList);
}
}
+ //鏌ヨ鏃ュ織淇℃伅
+ workorder.setLogList(this.getLogList(workorder.getId()));
return workorder;
}
+
+
+ public List<WorkorderLog> getLogList(Integer orderId){
+ 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)
+ );
+ 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_FILE_PATH).getCode();
+ for (WorkorderLog workorderLog:logList) {
+ //鏌ヨ闄勪欢淇℃伅
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .ne(Multifile::getObjType,Constants.multiFileType.upload)
+ .eq(Multifile::getObjId,workorderLog.getId())
+ .orderByAsc(Multifile::getId));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path+multifile.getFileurl());
+ }
+ workorderLog.setMultifileList(multifileList);
+ }
+ }
+ }
+ return logList;
+
+ }
+
@Override
@@ -445,29 +497,254 @@
+ @Override
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())){
+ || 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());
+ String beforeJson = JSONObject.toJSONString(workorder);
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(),"宸ュ崟鐘舵�佸凡娴佽浆鏃犳硶杩涜鎿嶄綔");
+ if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"SHE宸ュ崟鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.sheClose)||Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.wtsClose)||Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.close)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆");
+ }
+ //鎻愪氦鍚庣殑 寰呯‘璁�/寰呭垵瀹＄姸鎬� 濡傛灉鍘诲叧闂� 鍙湁宸ュ崟閲岀粦瀹氱殑SHE浜哄憳鍙互鍏抽棴
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitConfirm)){
+ //鍒ゆ柇SHE浜哄憳鍐呮槸鍚︽湁褰撳墠鐧诲綍璐﹀彿
+ if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())<Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
+ }
+ workorder.setStatus(Constants.workOrderStatus.sheClose);
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitAllocation)){
+ //鍒ゆ柇SHE浜哄憳鍐呮槸鍚︽湁褰撳墠鐧诲綍璐﹀彿
+ if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())<Constants.ZERO && !workorder.getManagerId().equals(closeDTO.getMember().getQwId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
+ }
+ workorder.setStatus(Constants.workOrderStatus.wtsClose);
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitDeal)){
+ //鍒ゆ柇SHE浜哄憳鍐呮槸鍚︽湁褰撳墠鐧诲綍璐﹀彿
+ if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())<Constants.ZERO && !workorder.getManagerId().equals(closeDTO.getMember().getQwId())
+ && !workorder.getDealerId().equals(closeDTO.getMember().getQwId()) ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
+ }
+ workorder.setStatus(Constants.workOrderStatus.wtsClose);
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆");
+ }
+ workorder.setEditDate(new Date());
+ workorder.setDealTime(new Date());
+ workorder.setDealInfo(closeDTO.getInfo());
+ workorderMapper.updateById(workorder);
+ //澶勭悊涓婃姤鏃ュ織
+ Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,workorder.getMemberId(),"浠诲姟宸插鐞�",closeDTO.getInfo());
+ List<Multifile> multifileList = workorder.getMultifileList();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setObjId(logId);
+ multifile.setCreateDate(new Date());
+ multifile.setObjType(Constants.multiFileType.deal);
+ }
+ multifileMapper.insert(multifileList);
+ }
+ }
+
+
+ @Override
+ public void passOn(PassOnDTO passOnDTO){
+ if(Objects.isNull(passOnDTO)
+ || Objects.isNull(passOnDTO.getWorkorderId())
+ || Objects.isNull(passOnDTO.getPassOnUserId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member member = memberMapper.selectById(passOnDTO.getPassOnUserId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌琚浆浜や汉淇℃伅");
+ }
+ Workorder workorder = workorderMapper.selectById(passOnDTO.getWorkorderId());
+ String beforeJson = JSONObject.toJSONString(workorder);
+ if(Objects.isNull(workorder)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸ュ崟鏁版嵁");
+ }
+ if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"SHE宸ュ崟鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(Constants.equalsInteger(passOnDTO.getPassOnType(),Constants.ZERO)){
+ if(!Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitConfirm)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆");
+ }
+ workorder.setManagerId(member.getQwId());
+ workorder.setStatus(Constants.workOrderStatus.waitAllocation);
+ }else{
+ if(!(Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitAllocation)
+ || Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitDeal))){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆");
+ }
+ workorder.setDealerId(member.getQwId());
+ workorder.setStatus(Constants.workOrderStatus.waitDeal);
+ }
+ workorder.setEditDate(new Date());
+ workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
+ workorderMapper.updateById(workorder);
+ //澶勭悊涓婃姤鏃ュ織
+ Integer logId = this.saveLog(beforeJson,workorder,
+ Constants.equalsInteger(passOnDTO.getPassOnType(),Constants.ZERO)?Constants.ONE:Constants.TWO
+ ,workorder.getMemberId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo());
+ List<Multifile> multifileList = workorder.getMultifileList();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setObjId(logId);
+ multifile.setCreateDate(new Date());
+ multifile.setObjType(Constants.multiFileType.passOn);
+ }
+ multifileMapper.insert(multifileList);
+ }
+ //TODO 浼佷笟寰俊閫氱煡
+ }
+
+
+
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void urge(Integer workorderId,Member member){
+ Workorder workorder = workorderMapper.selectById(workorderId);
+ workorder.setEditDate(new Date());
+ workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
+ workorderMapper.updateById(workorder);
+ if(Objects.isNull(workorder)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸ュ崟鏁版嵁");
+ }
+ Member urgeUser = new Member();
+ //濡傛灉宸插垎閰� wts 鍒欐槸鍌績wts
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitAllocation)){
+ urgeUser = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getQwId,workorder.getManagerId()).last("limit 1 "));
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitAllocation)){
+ urgeUser = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getQwId,workorder.getDealerId()).last("limit 1 "));
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐘舵�佸凡娴佽浆鏃犳硶杩涜璇ユ搷浣�");
}
+ this.saveLog(null,workorder,
+ Constants.ONE
+ ,member.getId(),"鍌績","宸插偓淇� "+urgeUser.getCompanyName() + "/" + urgeUser.getName());
+ //TODO 鍙戦�佷紒寰�氱煡
+
+ }
+
+ @Override
+ public void jobUrge(){
+ List<Workorder> workorderList = workorderMapper.selectList(new QueryWrapper<Workorder>().lambda().eq(Workorder::getIsdeleted,Constants.ZERO)
+ .in(Workorder::getStatus,Constants.workOrderStatus.waitAllocation,Constants.workOrderStatus.waitDeal)
+ .apply(" urge_time > now() ")
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(workorderList)){
+ for (Workorder workorder:workorderList) {
+ this.autoUrge(workorder);
+ workorder.setEditDate(new Date());
+ workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
+ workorderMapper.updateById(workorder);
+ }
+ }
+ }
+ public void autoUrge(Workorder workorder){
+ if(Objects.isNull(workorder)){
+ return;
+ }
+ Member urgeUser = new Member();
+ //濡傛灉宸插垎閰� wts 鍒欐槸鍌績wts
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitAllocation)){
+ urgeUser = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getQwId,workorder.getManagerId()).last("limit 1 "));
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.workOrderStatus.waitAllocation)){
+ urgeUser = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getQwId,workorder.getDealerId()).last("limit 1 "));
+ }else{
+ return;
+ }
+ //TODO 鍙戦�佷紒寰�氱煡
+ }
-
+ /**
+ * 鏁版嵁鎶ヨ〃
+ * @param queryType 0=鎸夌収鏈堜唤锛�1=鎸夌収瀛ｅ害锛�2=鎸夌収骞翠唤锛堟殏涓嶅鐞嗭級
+ * @return
+ */
+ @Override
+ public List<WorkOrderDataVO> getWorkOrderData(Integer queryType) throws Exception {
+ String year = DateUtil.getNowYear();
+ Integer nowMonth = DateUtil.getNowMonth();
+ Integer quarter = (nowMonth - 1) / 3 + 1;
+ List<WorkOrderDataVO> workOrderDataVOList = new ArrayList<>();
+ //鏌ヨ浠婂勾鎵�鏈夌殑鏁版嵁
+ List<Workorder> workorderList = workorderMapper.selectList(new QueryWrapper<Workorder>().lambda().like(Workorder::getCreateDate,year)
+ .eq(Workorder::getIsdeleted,Constants.ZERO));
+ if(Constants.equalsInteger(queryType,Constants.ZERO)){
+ for (int i = 1 ; i <= nowMonth; i++) {
+ WorkOrderDataVO workOrderDataVO = new WorkOrderDataVO();
+ String monthDay = year + "-" + org.apache.commons.lang3.StringUtils.leftPad(nowMonth.toString(),2,"0");
+ List<Workorder> dataList = workorderList.stream().filter(j->DateUtil.formatDate(j.getCreateDate(),"yyyy-MM").equals(monthDay))
+ .collect(Collectors.toList());
+ workOrderDataVO.setDateStr(monthDay);
+ workOrderDataVO.setGcsTotal(Constants.ZERO);
+ workOrderDataVO.setWtsTotal(Constants.ZERO);
+ workOrderDataVO.setSheTotal(Constants.ZERO);
+ workOrderDataVO.setUnCloseTotal(Constants.ZERO);
+ workOrderDataVO.setTotal(Constants.ZERO);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dataList)){
+ workOrderDataVO.setTotal(dataList.size());
+ workOrderDataVO.setGcsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.workOrderStatus.close)).collect(Collectors.toList()).size());
+ workOrderDataVO.setSheTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.workOrderStatus.sheClose)).collect(Collectors.toList()).size());
+ workOrderDataVO.setWtsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.workOrderStatus.wtsClose)).collect(Collectors.toList()).size());
+ workOrderDataVO.setUnCloseTotal(workOrderDataVO.getTotal() - workOrderDataVO.getSheTotal() - workOrderDataVO.getWtsTotal() - workOrderDataVO.getGcsTotal());
+ }
+ workOrderDataVOList.add(workOrderDataVO);
+ }
+ }else if(Constants.equalsInteger(queryType,Constants.ONE)){
+ //鎸夌収瀛ｅ害鏌ヨ
+ for (int i = 1 ; i <= quarter; i++) {
+ List<Workorder> dataList = new ArrayList<>();
+ if(Constants.equalsInteger(i,Constants.ONE)){
+ dataList = workorderList.stream().filter(j->Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))<=3 )
+ .collect(Collectors.toList());
+ }else if(Constants.equalsInteger(i,Constants.TWO)){
+ dataList = workorderList.stream().filter(j->Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))<=6 && Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))>=4 )
+ .collect(Collectors.toList());
+ }else if(Constants.equalsInteger(i,Constants.THREE)){
+ dataList = workorderList.stream().filter(j->Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))<=9 && Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))>=7 )
+ .collect(Collectors.toList());
+ }else {
+ dataList = workorderList.stream().filter(j-> Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))>=10 )
+ .collect(Collectors.toList());
+ }
+ WorkOrderDataVO workOrderDataVO = new WorkOrderDataVO();
+ workOrderDataVO.setDateStr(i+"瀛ｅ害");
+ workOrderDataVO.setGcsTotal(Constants.ZERO);
+ workOrderDataVO.setWtsTotal(Constants.ZERO);
+ workOrderDataVO.setSheTotal(Constants.ZERO);
+ workOrderDataVO.setUnCloseTotal(Constants.ZERO);
+ workOrderDataVO.setTotal(Constants.ZERO);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dataList)){
+ workOrderDataVO.setTotal(dataList.size());
+ workOrderDataVO.setGcsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.workOrderStatus.close)).collect(Collectors.toList()).size());
+ workOrderDataVO.setSheTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.workOrderStatus.sheClose)).collect(Collectors.toList()).size());
+ workOrderDataVO.setWtsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.workOrderStatus.wtsClose)).collect(Collectors.toList()).size());
+ workOrderDataVO.setUnCloseTotal(workOrderDataVO.getTotal() - workOrderDataVO.getSheTotal() - workOrderDataVO.getWtsTotal() - workOrderDataVO.getGcsTotal());
+ }
+ workOrderDataVOList.add(workOrderDataVO);
+
+ }
+ }
+ return workOrderDataVOList;
}
--
Gitblit v1.9.3