From ea939151c7a7ea7c26d302e200c263d817b5abc7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 八月 2023 11:55:46 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/api/ext/PlansExtController.java | 9 +++++++++
server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java | 2 +-
server/src/main/java/doumeemes/dao/business/model/Workorder.java | 26 --------------------------
server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java | 9 +++++++++
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java | 6 ++----
5 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/PlansExtController.java b/server/src/main/java/doumeemes/api/ext/PlansExtController.java
index d4b6aa7..61cd646 100644
--- a/server/src/main/java/doumeemes/api/ext/PlansExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/PlansExtController.java
@@ -3,6 +3,7 @@
import doumeemes.config.rocketmq.MqConfig;
import doumeemes.config.rocketmq.RocketMessageProducer;
import doumeemes.core.utils.DateUtil;
+import doumeemes.dao.business.dto.AutoWorkReportDTO;
import doumeemes.dao.business.model.Workorder;
import doumeemes.dao.ext.vo.PlansExtListCountVO;
import doumeemes.dao.ext.vo.PlansExtListH5VO;
@@ -221,6 +222,14 @@
return ApiResponse.success(plansExtService.pageCount(param));
}
+
+ @ApiOperation("涓�閿姤宸�")
+ @PostMapping("/autoWorkReport")
+ public ApiResponse autoWorkReport (@RequestBody AutoWorkReportDTO autoWorkReportDTO) {
+ plansExtService.autoWorkReport(getLoginUser(),autoWorkReportDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
/**
* 鎵归噺瀵煎叆璁″垝
*
diff --git a/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java b/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java
index 1277da9..f77d297 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java
@@ -1,5 +1,7 @@
package doumeemes.dao.business.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,13 @@
@ApiModelProperty(value = "宸ュ簭璁″垝涓婚敭")
private Integer plansId;
+ @ApiModelProperty(value = "璁惧涓婚敭", example = "1")
+ private Integer proGroupId;
+
+ @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜闆嗗悎" )
+ @TableField(exist = false)
+ private List<Integer> proUserList;
+
@ApiModelProperty(value = "鎶曟枡璁板綍")
private List<MaterialListDTO> recordList ;
diff --git a/server/src/main/java/doumeemes/dao/business/model/Workorder.java b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
index a9f914a..47a525a 100644
--- a/server/src/main/java/doumeemes/dao/business/model/Workorder.java
+++ b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
@@ -225,30 +225,4 @@
@TableField(exist = false)
private List<WorkorderUser> workorderUserList;
-
- @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
- @ExcelColumn(name="鎶ュ伐鏃堕暱锛堢锛�")
- private Integer duration;
-
- @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝厓)", example = "1")
- @ExcelColumn(name="宸ヨ祫缁撴灉锛堝厓)")
- private Integer salary;
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
- @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
- private Integer salaryPrice;
- @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
- @ExcelColumn(name="鏍囧噯鏁伴噺")
- private Integer salaryNum;
-
- @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
- @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
- private String salaryTimes;
-
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
- private Integer salaryUnqualified;
-
- @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
- @ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
- private Integer salaryType;
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
index e6ac936..1c5be18 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -1585,10 +1585,8 @@
Workorder param = new Workorder();
param.setPlanId(autoWorkReportDTO.getPlansId());
param.setPlanDate(new Date());
- List<Integer> proUserList = new ArrayList<Integer>();
- //TODO
- proUserList.add(user.getId());
- param.setProUserList(proUserList);
+ param.setProGroupId(autoWorkReportDTO.getProGroupId());
+ param.setProUserList(autoWorkReportDTO.getProUserList());
param.setPlanNum(plans.getNum());
//鐢熸垚宸ュ崟淇℃伅
Workorder workorder = this.distributeDone(user,param,plans.getNum());
diff --git a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
index 8a1ca5c..83c9733 100644
--- a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
@@ -134,7 +134,7 @@
loginLog.setSuccess(Boolean.TRUE);
systemLoginLogService.create(loginLog);
String session = (String)subject.getSession().getId();
- wxLoginVO.setLoginStatus(Constants.ONE);
+ wxLoginVO.setLoginStatus(Constants.ZERO);
wxLoginVO.setSession(session);
return wxLoginVO;
}catch (AuthenticationException e) {
--
Gitblit v1.9.3