From b1bdcf27abee02fc166cc1b47282bf14b34f34e2 Mon Sep 17 00:00:00 2001
From: bandigits <673853573@qq.com>
Date: Mon, 12 Jul 2021 13:57:06 +0800
Subject: [PATCH 1/6] no message
---
ServiceSite/pom.xml | 2 +-
.../command/projectplan/ProjectPlanSvrImpl.java | 4 ++--
.../seasky/projectplan/domain/service/FlowSvr.java | 11 +++++++++++
.../projectplan/domain/service/FlowSvrImpl.java | 4 ++++
.../projectplan/infrastructure/rpc/FlowRpc.java | 2 ++
.../projectplan/infrastructure/rpc/FlowRpcImpl.java | 9 +++++++++
6 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/ServiceSite/pom.xml b/ServiceSite/pom.xml
index 353c5a5a1..9161bfc5d 100644
--- a/ServiceSite/pom.xml
+++ b/ServiceSite/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>com.seasky</groupId>
<artifactId>micro-flow-api</artifactId>
- <version>1.0.2.22</version>
+ <version>1.0.2.23</version>
</dependency>
<dependency>
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
index 6b521f7d7..08f2fb33c 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
@@ -385,7 +385,7 @@ public class ProjectPlanSvrImpl implements ProjectPlanSvr {
/**
- * 閲嶆柊璋冪敤娴�
+ * 鍥炴挙
*
* @param id id
* @return int
@@ -396,7 +396,7 @@ public class ProjectPlanSvrImpl implements ProjectPlanSvr {
String nodeId = "sid-D4784941-DBF9-4BA0-863F-6BC7515878C3";
List<String> userCode = getAuditCodeByInfo(nodeId, id);
//璋冪敤娴佺▼鐨勫井鏈嶅姟鍥為€€
- flowSvr.submitFLow(projectPlanBaseAgg.getProcessId().toString(), nodeId, "鍒跺崟浜鸿嚜琛屾挙鍥�", userCode);
+ flowSvr.reCallFLow(projectPlanBaseAgg.getProcessId().toString(), nodeId, "鍒跺崟浜鸿嚜琛屾挙鍥�", userCode);
//鑾峰彇閫€鍥炲悗鐨勭姸鎬�
String stateLabel = flowSvr.getStateLabelByProcessId(projectPlanBaseAgg.getProcessId().toString());
//鍥炲啓
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvr.java b/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvr.java
index 1b92933d7..72726a9c8 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvr.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvr.java
@@ -18,6 +18,17 @@ public interface FlowSvr {
*/
String submitFLow(String processId, String nodeId, String remake, List<String> userCodeList);
+ /**
+ * 閲嶆柊璋冪敤娴�
+ *
+ * @param processId 杩涚▼id
+ * @param nodeId 鑺傜偣id
+ * @param remake 鏀归€�
+ * @param userCodeList 鐢ㄦ埛浠ｇ爜鍒楄〃
+ * @return {@link String}
+ */
+ String reCallFLow(String processId, String nodeId, String remake, List<String> userCodeList);
+
/**
* 鑾峰彇鐘舵€佹爣绛鹃€氳繃杩囩▼id
*
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvrImpl.java
index d42ba4699..d143fd03c 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvrImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvrImpl.java
@@ -26,6 +26,10 @@ public class FlowSvrImpl implements FlowSvr {
public String submitFLow(String processId, String nodeId, String remake, List<String> userCodeList) {
return flowRpc.submitFLow(processId, nodeId, remake, userCodeList);
}
+ @Override
+ public String reCallFLow(String processId, String nodeId, String remake, List<String> userCodeList) {
+ return flowRpc.reCallFLow(processId, nodeId, remake, userCodeList);
+ }
@Override
public String getStateLabelByProcessId(String processId) {
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/FlowRpc.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/FlowRpc.java
index 753f509b4..ffd7d5977 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/FlowRpc.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/FlowRpc.java
@@ -20,6 +20,8 @@ public interface FlowRpc {
*/
String submitFLow(String processId, String nodeId, String remake, List<String> userCodeList);
+ String reCallFLow(String processId, String nodeId, String remake, List<String> userCodeList);
+
/**
* 鑾峰彇鐘舵€佹爣绛鹃€氳繃杩囩▼id
*
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/FlowRpcImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/FlowRpcImpl.java
index b69c36742..bbb45bdbf 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/FlowRpcImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/rpc/FlowRpcImpl.java
@@ -45,6 +45,15 @@ public class FlowRpcImpl implements FlowRpc {
}
return "";
}
+ @Override
+ public String reCallFLow(String processId, String nodeId, String remake, List<String> userCodeList) {
+ Result<Integer> integerResult = flow.reCallProcess(processId, nodeId, remake, userCodeList);
+ if (!ResponseCode.SUCCESS.value().equals(integerResult.getCode())) {
+ throw new DataAccessException(new Error(ResponseCode.BUNISESS_EXCEPTION, null, "娴佺▼绉诲姩澶辫触", ""));
+ }
+ return "";
+ }
+
/**
* 鑾峰彇鍥為€€鍚庣殑鐘舵€�
--
GitLab
From e95bfa8cb4b3426ca7e458697534e1251f69ff8e Mon Sep 17 00:00:00 2001
From: bandigits <673853573@qq.com>
Date: Wed, 14 Jul 2021 00:41:46 +0800
Subject: [PATCH 2/6] no message
---
ServiceSite/facade/pom.xml | 2 +-
ServiceSite/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ServiceSite/facade/pom.xml b/ServiceSite/facade/pom.xml
index c54cf283c..747b37136 100644
--- a/ServiceSite/facade/pom.xml
+++ b/ServiceSite/facade/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.seasky</groupId>
<artifactId>projectplan-api</artifactId>
- <version>1.0.56</version>
+ <version>1.0.58</version>
<name>projectplan-api</name>
<description>projectplan-api project for projectplan</description>
diff --git a/ServiceSite/pom.xml b/ServiceSite/pom.xml
index 9161bfc5d..95cebad58 100644
--- a/ServiceSite/pom.xml
+++ b/ServiceSite/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>com.seasky</groupId>
<artifactId>projectplan-api</artifactId>
- <version>1.0.56</version>
+ <version>1.0.58</version>
</dependency>
<dependency>
<groupId>com.seasky</groupId>
--
GitLab
From af5c1663b67c1e65bf6d32dbaa3df86ab4f4965e Mon Sep 17 00:00:00 2001
From: bandigits <673853573@qq.com>
Date: Wed, 14 Jul 2021 09:37:45 +0800
Subject: [PATCH 3/6] no message
---
.../application/command/projectplan/ProjectPlanSvrImpl.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
index 08f2fb33c..e1ff97d97 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
@@ -605,6 +605,9 @@ public class ProjectPlanSvrImpl implements ProjectPlanSvr {
out.setBudgetControl(out.getBudgetControl().add(multiply));
}
}
+ if("琛屾斂".equals(deptType) && out.getActualNumber().compareTo(new BigInteger("10")) < 0){
+ out.setBudgetControl(out.getBudgetControl().add(new BigDecimal(15000)));
+ }
}
out.setBudgetControl(out.getBudgetControl().add(money));
--
GitLab
From 38a01cf9eb79647ed97a424e5bcc0ae4173805f3 Mon Sep 17 00:00:00 2001
From: bandigits <673853573@qq.com>
Date: Thu, 15 Jul 2021 17:02:33 +0800
Subject: [PATCH 4/6] no message
---
ServiceSite/facade/pom.xml | 2 +-
ServiceSite/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ServiceSite/facade/pom.xml b/ServiceSite/facade/pom.xml
index 747b37136..7a96b44e6 100644
--- a/ServiceSite/facade/pom.xml
+++ b/ServiceSite/facade/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.seasky</groupId>
<artifactId>projectplan-api</artifactId>
- <version>1.0.58</version>
+ <version>1.0.59</version>
<name>projectplan-api</name>
<description>projectplan-api project for projectplan</description>
diff --git a/ServiceSite/pom.xml b/ServiceSite/pom.xml
index 95cebad58..8b57032b9 100644
--- a/ServiceSite/pom.xml
+++ b/ServiceSite/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>com.seasky</groupId>
<artifactId>projectplan-api</artifactId>
- <version>1.0.58</version>
+ <version>1.0.59</version>
</dependency>
<dependency>
<groupId>com.seasky</groupId>
--
GitLab
From 00433ae39dfa8711ce6ff931085675e958f4c0d5 Mon Sep 17 00:00:00 2001
From: bandigits <673853573@qq.com>
Date: Mon, 19 Jul 2021 09:28:19 +0800
Subject: [PATCH 5/6] no message
---
ServiceSite/facade/pom.xml | 2 +-
ServiceSite/pom.xml | 2 +-
.../application/command/projectplan/ProjectPlanSvrImpl.java | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ServiceSite/facade/pom.xml b/ServiceSite/facade/pom.xml
index 7a96b44e6..6d00501fe 100644
--- a/ServiceSite/facade/pom.xml
+++ b/ServiceSite/facade/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.seasky</groupId>
<artifactId>projectplan-api</artifactId>
- <version>1.0.59</version>
+ <version>1.0.62</version>
<name>projectplan-api</name>
<description>projectplan-api project for projectplan</description>
diff --git a/ServiceSite/pom.xml b/ServiceSite/pom.xml
index 8b57032b9..78d6c5447 100644
--- a/ServiceSite/pom.xml
+++ b/ServiceSite/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>com.seasky</groupId>
<artifactId>projectplan-api</artifactId>
- <version>1.0.59</version>
+ <version>1.0.62</version>
</dependency>
<dependency>
<groupId>com.seasky</groupId>
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
index e1ff97d97..206cebbad 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java
@@ -332,6 +332,7 @@ public class ProjectPlanSvrImpl implements ProjectPlanSvr {
throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "璇疯ˉ鍏呴」鐩噾棰�", ""));
}
if (fixedAmount.compareTo(projectDailyPlanAgg1.getTotalMoney()) < 0) {
+ System.out.println("鏍稿畾閲戦锛�"+fixedAmount+",鐢虫姤閲戦锛�"+projectDailyPlanAgg1.getTotalMoney());
throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鐢虫姤閲戦涓嶈兘瓒呭嚭閮ㄩ棬鏃ュ父鏍稿畾閲戦", ""));
}
Stream<PlanSubjectEntity> planSubjectEntityStream = projectDailyPlanAgg1.getSubjectDetailList().stream().filter(b -> "26".equals(b.getSubjectCode()) || "27".equals(b.getSubjectCode()));
--
GitLab
From 338f0073c8dd337f7d57adc9f824adc7a3c894b2 Mon Sep 17 00:00:00 2001
From: bandigits <673853573@qq.com>
Date: Mon, 19 Jul 2021 09:58:59 +0800
Subject: [PATCH 6/6] no message
---
ServiceSite/facade/pom.xml | 2 +-
ServiceSite/pom.xml | 2 +-
.../projectplan/interfaces/controller/InComePlanController.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ServiceSite/facade/pom.xml b/ServiceSite/facade/pom.xml
index 6d00501fe..cc3773c29 100644
--- a/ServiceSite/facade/pom.xml
+++ b/ServiceSite/facade/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.seasky</groupId>
<artifactId>projectplan-api</artifactId>
- <version>1.0.62</version>
+ <version>1.0.63</version>
<name>projectplan-api</name>
<description>projectplan-api project for projectplan</description>
diff --git a/ServiceSite/pom.xml b/ServiceSite/pom.xml
index 78d6c5447..ccf467ac4 100644
--- a/ServiceSite/pom.xml
+++ b/ServiceSite/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>com.seasky</groupId>
<artifactId>projectplan-api</artifactId>
- <version>1.0.62</version>
+ <version>1.0.63</version>
</dependency>
<dependency>
<groupId>com.seasky</groupId>
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/InComePlanController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/InComePlanController.java
index 0f9a7e016..0f99b491d 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/InComePlanController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/InComePlanController.java
@@ -168,7 +168,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
@Override
public Result<InComePlanOut> queryInComePlanApprovalPage(@RequestBody IncomeplanApprovalQry qry) {
if (ObjectUtil.isNull(qry.getProcessKey()) || "".equals(qry.getProcessKey())){
- qry.setProcessKey("seaskytest");
+ qry.setProcessKey("shouru");
}
return ok(ResponseCode.SUCCESS, inComePlanService.queryInComePlanApprovalPage(qry));
}
--
GitLab