From c0608112ab881e821a0d4eb3d1f2a942d755f3cc Mon Sep 17 00:00:00 2001
From: wxj334 <2241669945@qq.com>
Date: Mon, 20 Jun 2022 17:05:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E7=BB=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../projectPlan/ProjectPlanSvrImpl.java | 41 ++++++++++++-------
.../dataobject/po/EmpowerPo.java | 6 +++
.../projectPlan/ProjectPlanQuerySvrImpl.java | 2 +
3 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/application/command/projectPlan/ProjectPlanSvrImpl.java b/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/application/command/projectPlan/ProjectPlanSvrImpl.java
index 62d3c17..36c72ca 100644
--- a/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/application/command/projectPlan/ProjectPlanSvrImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/application/command/projectPlan/ProjectPlanSvrImpl.java
@@ -861,22 +861,33 @@ public class ProjectPlanSvrImpl implements IProjectPlanSvr {
Map<String, Object> map = new HashMap<>(1);
map.put("relationId", projectPlanEducationPo.getRelationId());
List<EmpowerPo> empowerPos = iEmpowerMapper.selectByMap(map);
- if (ObjectUtils.isEmpty(empowerPos)) {
- EmpowerPo empowerPo = new EmpowerPo();
- if (!ObjectUtils.isEmpty(highLevelEditingCmd.getOwnerCode())) {
- empowerPo.setOwnerCode(highLevelEditingCmd.getOwnerCode());
- }
- if (!ObjectUtils.isEmpty(highLevelEditingCmd.getAssistant())) {
- empowerPo.setAssistant(highLevelEditingCmd.getAssistant());
- }
- if (!ObjectUtils.isEmpty(highLevelEditingCmd.getAscriptionDepartmentCode())) {
- empowerPo.setAscriptionDepartmentCode(highLevelEditingCmd.getAscriptionDepartmentCode());
- }
- if (!ObjectUtils.isEmpty(highLevelEditingCmd.getRelationId())) {
- empowerPo.setRelationId(highLevelEditingCmd.getRelationId());
- }
- iEmpowerMapper.insert(empowerPo);
+
+ //EmpowerPo empowerPo = new EmpowerPo();
+ if (!ObjectUtils.isEmpty(highLevelEditingCmd.getOwnerCode())) {
+ empowerPos.get(0).setOwnerCode(highLevelEditingCmd.getOwnerCode());
+ }
+ if (!ObjectUtils.isEmpty(highLevelEditingCmd.getOwnerName())) {
+ empowerPos.get(0).setOwnerName(highLevelEditingCmd.getOwnerName());
+ }
+ if (!ObjectUtils.isEmpty(highLevelEditingCmd.getAssistant())) {
+ empowerPos.get(0).setAssistant(highLevelEditingCmd.getAssistant());
+ }
+ if (!ObjectUtils.isEmpty(highLevelEditingCmd.getAscriptionDepartmentCode())) {
+ empowerPos.get(0).setAscriptionDepartmentCode(highLevelEditingCmd.getAscriptionDepartmentCode());
+ }
+ if (!ObjectUtils.isEmpty(highLevelEditingCmd.getAscriptionDepartmentName())) {
+ empowerPos.get(0).setAscriptionDepartmentName(highLevelEditingCmd.getAscriptionDepartmentName());
}
+ if (!ObjectUtils.isEmpty(highLevelEditingCmd.getRelationId())) {
+ empowerPos.get(0).setRelationId(highLevelEditingCmd.getRelationId());
+ }
+
+ if (ObjectUtils.isEmpty(empowerPos.get(0).getId())) {
+ iEmpowerMapper.insert(empowerPos.get(0));
+ }else {
+ iEmpowerMapper.updateById(empowerPos.get(0));
+ }
+
if (!ObjectUtils.isEmpty(highLevelEditingCmd.getOwnerCode())) {
projectPlanEducationPo.setOwnerCode(highLevelEditingCmd.getOwnerCode());
diff --git a/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/infrastructure/dataobject/po/EmpowerPo.java b/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/infrastructure/dataobject/po/EmpowerPo.java
index 438b2b3..50d70fa 100644
--- a/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/infrastructure/dataobject/po/EmpowerPo.java
+++ b/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/infrastructure/dataobject/po/EmpowerPo.java
@@ -30,4 +30,10 @@ public class EmpowerPo extends BasePO{
@TableField("relationId")
private String relationId;
+ @TableField("ownerName")
+ private String ownerName;
+
+ @TableField("ascriptionDepartmentName")
+ private String ascriptionDepartmentName;
+
}
diff --git a/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/infrastructure/reader/projectPlan/ProjectPlanQuerySvrImpl.java b/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/infrastructure/reader/projectPlan/ProjectPlanQuerySvrImpl.java
index 944ace5..4bc46e7 100644
--- a/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/infrastructure/reader/projectPlan/ProjectPlanQuerySvrImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/infrastructure/reader/projectPlan/ProjectPlanQuerySvrImpl.java
@@ -337,6 +337,8 @@ public class ProjectPlanQuerySvrImpl implements ProjectPlanQuerySvr {
//璁剧疆鎺堟潈涓夊瓧娈�
record.setAssistant(empowerPos.get(0).getAssistant());
record.setAscriptionDepartmentCode(empowerPos.get(0).getAscriptionDepartmentCode());
+ record.setAscriptionDepartmentName(empowerPos.get(0).getAscriptionDepartmentName());
+ record.setOwnerName(empowerPos.get(0).getOwnerName());
record.setOwnerCode(empowerPos.get(0).getOwnerCode());
}
}
--
GitLab