From 8a299b1ef2d1289e649b4ed46ea5baf164260d57 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 19 六月 2025 16:08:53 +0800
Subject: [PATCH] 维修调度-维修 增加剩余未处理数量
---
src/main/java/com/whyc/pojo/web_site/WorkflowMain.java | 204 +--------------------------------------------------
src/main/java/com/whyc/service/WorkflowMainService.java | 13 ++-
2 files changed, 13 insertions(+), 204 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java b/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
index 971c1f3..6abed7c 100644
--- a/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
+++ b/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.ToString;
import org.apache.ibatis.type.Alias;
@@ -15,6 +16,7 @@
* 宸ヤ綔娴佷富琛�
*/
@ToString
+@Data
@Alias("WorkflowMain")
@TableName(schema = "web_site",value = "tb_workflow_main")
public class WorkflowMain {
@@ -55,6 +57,8 @@
@ApiModelProperty("鐢宠鏁伴噺")
private Integer quantity;
+ @ApiModelProperty("鏈鐞嗙殑鏁伴噺.缁翠慨鐢宠鏃堕渶濉叆")
+ private Integer quantityUnprocessed;
/**浠诲姟绛夌骇*/
@ApiModelProperty("浠诲姟绛夌骇")
private Integer taskLevel;
@@ -111,204 +115,4 @@
}
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public void setOrderId(String orderId) {
- this.orderId = orderId;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getTaskDesc() {
- return taskDesc;
- }
-
- public void setTaskDesc(String taskDesc) {
- this.taskDesc = taskDesc;
- }
-
- public Integer getCreateUserId() {
- return createUserId;
- }
-
- public void setCreateUserId(Integer createUserId) {
- this.createUserId = createUserId;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getPlanBeginTime() {
- return planBeginTime;
- }
-
- public void setPlanBeginTime(Date planBeginTime) {
- this.planBeginTime = planBeginTime;
- }
-
- public Date getPlanEndTime() {
- return planEndTime;
- }
-
- public void setPlanEndTime(Date planEndTime) {
- this.planEndTime = planEndTime;
- }
-
- public Date getBeginTime() {
- return beginTime;
- }
-
- public void setBeginTime(Date beginTime) {
- this.beginTime = beginTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Integer getTaskLevel() {
- return taskLevel;
- }
-
- public void setTaskLevel(Integer taskLevel) {
- this.taskLevel = taskLevel;
- }
-
- public Integer getInTime() {
- return inTime;
- }
-
- public void setInTime(Integer inTime) {
- this.inTime = inTime;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
- public String getFileUrl() {
- return fileUrl;
- }
-
- public void setFileUrl(String fileUrl) {
- this.fileUrl = fileUrl;
- }
-
- public String getPicName() {
- return picName;
- }
-
- public void setPicName(String picName) {
- this.picName = picName;
- }
-
- public String getPicUrl() {
- return picUrl;
- }
-
- public void setPicUrl(String picUrl) {
- this.picUrl = picUrl;
- }
-
- public String getEndReason() {
- return endReason;
- }
-
- public void setEndReason(String endReason) {
- this.endReason = endReason;
- }
-
- public Integer getAuto() {
- return auto;
- }
-
- public void setAuto(Integer auto) {
- this.auto = auto;
- }
-
- public List<WorkflowLink> getLinkList() {
- return linkList;
- }
-
- public void setLinkList(List<WorkflowLink> linkList) {
- this.linkList = linkList;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getCreateUserName() {
- return createUserName;
- }
-
- public void setCreateUserName(String createUserName) {
- this.createUserName = createUserName;
- }
-
- public Integer getQuantity() {
- return quantity;
- }
-
- public void setQuantity(Integer quantity) {
- this.quantity = quantity;
- }
-
- public String getProcessStage() {
- return processStage;
- }
-
- public void setProcessStage(String processStage) {
- this.processStage = processStage;
- }
-
- public Integer getRelatedId() {
- return relatedId;
- }
-
- public void setRelatedId(Integer relatedId) {
- this.relatedId = relatedId;
- }
}
diff --git a/src/main/java/com/whyc/service/WorkflowMainService.java b/src/main/java/com/whyc/service/WorkflowMainService.java
index b031a7f..4958f8e 100644
--- a/src/main/java/com/whyc/service/WorkflowMainService.java
+++ b/src/main/java/com/whyc/service/WorkflowMainService.java
@@ -244,8 +244,8 @@
Date now = new Date();
WorkflowMain mainRelated = getById(main.getRelatedId());
if(main.getRelatedId() != null) {
- if (main.getQuantity() > mainRelated.getQuantity()) {
- return new Response().setII(1, "鍏ュ簱鏁伴噺涓嶈兘澶т簬缁翠慨鐢宠鍏宠仈鍗曟嵁鐨勬暟閲�");
+ if (main.getQuantity() > mainRelated.getQuantityUnprocessed()) {
+ return new Response().setII(1, "鍏ュ簱鏁伴噺涓嶈兘澶т簬缁翠慨鐢宠鍏宠仈鍗曟嵁鐨勬湭澶勭悊鏁伴噺");
}
}
//涓昏〃鎻掑叆
@@ -267,6 +267,9 @@
main.setBeginTime(now);
main.setStatus(mainStatus);
main.setProcessStage(process.getStage());
+ if(main.getType() == WorkflowTypeEnum.DEVICE_REPAIR.getType().intValue()){ //缁翠慨鐢宠鍗�,闇�濉叆
+ main.setQuantityUnprocessed(main.getQuantity());
+ }
add(main);
//鍐呭瓨涓幓闄ゅ凡鎻掑叆鏁版嵁搴撶殑鍗曞彿
ServletContext application = ActionUtil.getApplication();
@@ -300,7 +303,7 @@
private void checkRelatedAndDone(WorkflowMain main, Date now, WorkflowMain mainRelated, User user) {
if(main.getRelatedId() != null){
//鍒ゆ柇鏄敵璇风殑鍏ュ簱,杩樻槸鎶ュ簾.
- if (main.getQuantity() < mainRelated.getQuantity()){ //璇存槑闇�瑕佽嚜鍔ㄧ敓鎴愬叆搴撴垨鑰呮姤搴熷崟鎹�
+ if (main.getQuantity() < mainRelated.getQuantityUnprocessed()){ //璇存槑闇�瑕佽嚜鍔ㄧ敓鎴愬叆搴撴垨鑰呮姤搴熷崟鎹�
//闇�瑕佽嚜鍔ㄧ敓鎴愭姤搴熺殑鐢宠
WorkflowMain mainAuto = new WorkflowMain();
WorkflowTypeEnum typeEnumAuto;
@@ -310,9 +313,10 @@
mainAuto.setCreateUserId(user.getId());
mainAuto.setCreateTime(now);
mainAuto.setBeginTime(now);
- mainAuto.setQuantity(mainRelated.getQuantity()- main.getQuantity());
+ mainAuto.setQuantity(mainRelated.getQuantityUnprocessed()- main.getQuantity());
mainAuto.setProcessStage(processAuto.getStage());
mainAuto.setStatus(statusAuto);
+ mainAuto.setRelatedId(main.getRelatedId());
if(main.getType() == WorkflowTypeEnum.DEVICE_IN.getType().intValue()) { //鐢宠鐨勫叆搴�
mainAuto.setTaskDesc("鎻愪氦浜嗙淮淇悗鐨勫叆搴撶敵璇�,绯荤粺鑷姩鐢熸垚鍓╀綑鏁伴噺鐨勬姤搴熺敵璇�");
@@ -351,6 +355,7 @@
}else{
relatedMain.setEndReason("鐢ㄦ埛鎻愪氦缁翠慨鐢宠鍚庣殑鎶ュ簾鐢宠,缁翠慨娴佺▼缁撴潫");
}
+ relatedMain.setQuantityUnprocessed(0);
updateStatus(relatedMain);
}
}
--
Gitblit v1.9.1