From 8cf2316b52f754a108d77a92fa54d463d7711011 Mon Sep 17 00:00:00 2001
From: XLR_asd <xueyawei@seaskysh.com>
Date: Tue, 6 Jul 2021 14:11:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=20=E6=B7=BB=E5=8A=A0=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C=20=E7=94=B3=E6=8A=A5=E4=B9=A6=E6=96=B0=E5=A2=9E/?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=20=E6=A0=A1=E9=AA=8C=E7=94=B3?=
=?UTF-8?q?=E6=8A=A5=E4=B9=A6=E7=B1=BB=E5=9E=8B=E4=B8=8D=E8=83=BD=E4=B8=BA?=
=?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../projectplan/dto/projectplan/ProjectPlanBookCmd.java | 2 ++
.../application/command/projectplan/ProjectPlanSvr.java | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookCmd.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookCmd.java
index b53b19035..ec8c01a57 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookCmd.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookCmd.java
@@ -8,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -60,6 +61,7 @@ public class ProjectPlanBookCmd extends BaseDto {
@ApiModelProperty(value = "瀹℃牳鐘舵€�",example = "")
private String state;
+ @NotEmpty(message = "鐢虫姤涔︾被鍨嬩笉鑳戒负绌�")
@ApiModelProperty(value = "鐢虫姤涔︾被鍨�",example = "")
private String planType;
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvr.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvr.java
index 8ad03693e..07819fd3d 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvr.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvr.java
@@ -5,6 +5,7 @@ import com.seasky.projectplan.dto.projectplan.ActionFlowCmd;
import com.seasky.projectplan.dto.projectplan.ProjectPlanBookCmd;
import org.springframework.validation.annotation.Validated;
+import javax.validation.Valid;
import java.util.List;
/**
@@ -22,7 +23,7 @@ public interface ProjectPlanSvr {
* @param projectPlanBookCmd 椤圭洰淇℃伅璁″垝cmd
* @return {@link Result <Integer>}
*/
- Long saveProjectInfoPlan(ProjectPlanBookCmd projectPlanBookCmd);
+ Long saveProjectInfoPlan(@Valid ProjectPlanBookCmd projectPlanBookCmd);
/**
* 淇濆瓨鏃ュ父缁忚垂鐢虫姤涔�
@@ -30,7 +31,7 @@ public interface ProjectPlanSvr {
* @param projectPlanBookCmd 椤圭洰瑙勫垝涔md
* @return {@link Result<Integer>}
*/
- Long saveProjectDailyPlan(ProjectPlanBookCmd projectPlanBookCmd);
+ Long saveProjectDailyPlan(@Valid ProjectPlanBookCmd projectPlanBookCmd);
/**
* 淇濆瓨浜哄憳缁忚垂鐢虫姤涔�
@@ -38,7 +39,7 @@ public interface ProjectPlanSvr {
* @param projectPlanBookCmd 椤圭洰瑙勫垝涔md
* @return {@link Result<Integer>}
*/
- Long saveProjectPersonPlan(ProjectPlanBookCmd projectPlanBookCmd);
+ Long saveProjectPersonPlan(@Valid ProjectPlanBookCmd projectPlanBookCmd);
/**
* 鍒犻櫎椤圭洰缁忚垂鐢虫姤涔�
--
GitLab
From 54613c20d51e47043f06960282d03b9b119c06e6 Mon Sep 17 00:00:00 2001
From: XLR_asd <xueyawei@seaskysh.com>
Date: Tue, 6 Jul 2021 14:58:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=20=20=20=E9=A1=B9=E7=9B=AE=E7=94=B3?=
=?UTF-8?q?=E6=8A=A5=E4=B9=A6/=E6=97=A5=E5=B8=B8=E7=94=B3=E6=8A=A5?=
=?UTF-8?q?=E4=B9=A6=20=E4=BF=AE=E6=94=B9=E6=97=B6=20=20=E7=BB=8F=E6=B5=8E?=
=?UTF-8?q?=E7=A7=91=E7=9B=AE=E6=98=8E=E7=BB=86=E4=BF=A1=E6=81=AF=E4=B8=A2?=
=?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PlanBookSubjectRepositoryImpl.java | 4 +---
.../PlanBookSubjectDetailConvert.java | 15 ++++++---------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubject/PlanBookSubjectRepositoryImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubject/PlanBookSubjectRepositoryImpl.java
index 5259c01e3..1b67e0053 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubject/PlanBookSubjectRepositoryImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubject/PlanBookSubjectRepositoryImpl.java
@@ -103,13 +103,11 @@ public class PlanBookSubjectRepositoryImpl implements PlanBookSubjectRepository
@Override
public Integer saveProjectDailyPlanEntity(ProjectDailyPlanAgg projectDailyPlanAgg) {
List<PlanBookSubjectPo> planBookSubjectPos = PlanBookSubjectConvert.DailyAggEntityListToPoList(projectDailyPlanAgg);
- //鐗╃悊鍒犻櫎璇ョ敵鎶ヤ功涓嬪師鏈夌殑缁忔祹绉戠洰淇℃伅
-// mapper.deleteByPId(projectDailyPlanAgg.getId());
Boolean existDetail = false;
//淇濆瓨缁忔祹绉戠洰 骞� 鍒ゆ柇缁忔祹绉戠洰鏄庣粏鏄惁瀛樺湪
for (int i = 0; i < planBookSubjectPos.size(); i++) {
planBookSubjectPos.get(i).setPlanBookId(projectDailyPlanAgg.getId());
-// subjectDetailMapper.deleteByPId(planBookSubjectPos.get(i).getId());
+ planBookSubjectPos.get(i).setId(null);
savePo(planBookSubjectPos.get(i));
projectDailyPlanAgg.getSubjectDetailList().get(i).setId(planBookSubjectPos.get(i).getId());
if (projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList() !=null){
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubjectdetail/PlanBookSubjectDetailConvert.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubjectdetail/PlanBookSubjectDetailConvert.java
index 4e3ccabeb..93f774369 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubjectdetail/PlanBookSubjectDetailConvert.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubjectdetail/PlanBookSubjectDetailConvert.java
@@ -29,10 +29,9 @@ public class PlanBookSubjectDetailConvert {
if (projectInfoPlanAgg.getPlanSubjectList().get(i).getSubjectDetailList() != null) {
if (projectInfoPlanAgg.getPlanSubjectList().get(i).getSubjectDetailList().size() > 0) {
List<PlanBookSubjectDetailPo> pos = MapperUtils.INSTANCE.mapAsList(PlanBookSubjectDetailPo.class, projectInfoPlanAgg.getPlanSubjectList().get(i).getSubjectDetailList());
- if (pos.get(0).getId() == null) {
- for (PlanBookSubjectDetailPo po : pos) {
- po.setParentId(projectInfoPlanAgg.getPlanSubjectList().get(i).getId());
- }
+ for (PlanBookSubjectDetailPo po : pos) {
+ po.setParentId(projectInfoPlanAgg.getPlanSubjectList().get(i).getId());
+ po.setPlanBookId(projectInfoPlanAgg.getId());
}
poList.addAll(pos);
}
@@ -53,11 +52,9 @@ public class PlanBookSubjectDetailConvert {
if (!ObjectUtil.isNull(projectDailyPlanAgg.getSubjectDetailList().get(i))) {
if(projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList() != null && projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList().size() > 0) {
List<PlanBookSubjectDetailPo> pos = MapperUtils.INSTANCE.mapAsList(PlanBookSubjectDetailPo.class, projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList());
- if (pos.get(0).getId() == null) {
- for (PlanBookSubjectDetailPo po : pos) {
- po.setParentId(projectDailyPlanAgg.getSubjectDetailList().get(i).getId());
- po.setPlanBookId(projectDailyPlanAgg.getId());
- }
+ for (PlanBookSubjectDetailPo po : pos) {
+ po.setParentId(projectDailyPlanAgg.getSubjectDetailList().get(i).getId());
+ po.setPlanBookId(projectDailyPlanAgg.getId());
}
poList.addAll(pos);
}
--
GitLab