From 8004b213d08a44f97d9f6ec832565dfed54702eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 4 Nov 2021 12:06:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayWorkingGroupController.java | 23 ++++++++++++++++++- .../jero/project/entity/PayWorkingGroup.java | 3 --- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 7013f518..8e1a1385 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.common.RoleCommon; @@ -329,7 +330,27 @@ public class PayWorkingGroupController extends JeroController updatePayWorkingGroup = new LambdaUpdateWrapper<>(); + updatePayWorkingGroup.eq(PayWorkingGroup::getId,payWorkingGroup.getId()); + updatePayWorkingGroup.set(PayWorkingGroup::getWorkingGroupProject,payWorkingGroup.getWorkingGroupProject()); + updatePayWorkingGroup.set(PayWorkingGroup::getYear,payWorkingGroup.getYear()); + updatePayWorkingGroup.set(PayWorkingGroup::getPrincipalIdA,payWorkingGroup.getPrincipalIdA()); + updatePayWorkingGroup.set(PayWorkingGroup::getPrincipalNameA,payWorkingGroup.getPrincipalNameA()); + updatePayWorkingGroup.set(PayWorkingGroup::getPrincipalIdB,StringUtils.isBlank(payWorkingGroup.getPrincipalIdB()) ? null : payWorkingGroup.getPrincipalIdB()); + updatePayWorkingGroup.set(PayWorkingGroup::getPrincipalNameB,StringUtils.isBlank(payWorkingGroup.getPrincipalNameB()) ? null :payWorkingGroup.getPrincipalNameB()); + updatePayWorkingGroup.set(PayWorkingGroup::getConvokeNum,payWorkingGroup.getConvokeNum()); + updatePayWorkingGroup.set(PayWorkingGroup::getOperationCycle,payWorkingGroup.getOperationCycle()); + updatePayWorkingGroup.set(PayWorkingGroup::getChargeA,payWorkingGroup.getChargeA()); + updatePayWorkingGroup.set(PayWorkingGroup::getYearChargeA,Objects.isNull(payWorkingGroup.getYearChargeA()) ? null : payWorkingGroup.getYearChargeA()); + updatePayWorkingGroup.set(PayWorkingGroup::getChargeNoticeNoA,payWorkingGroup.getChargeNoticeNoA()); + updatePayWorkingGroup.set(PayWorkingGroup::getChargeNoticeAId,payWorkingGroup.getChargeNoticeAId()); + updatePayWorkingGroup.set(PayWorkingGroup::getChargeB,payWorkingGroup.getChargeB()); + updatePayWorkingGroup.set(PayWorkingGroup::getYearChargeB,Objects.isNull(payWorkingGroup.getYearChargeB()) ? null : payWorkingGroup.getYearChargeB()); + updatePayWorkingGroup.set(PayWorkingGroup::getChargeNoticeNoB,payWorkingGroup.getChargeNoticeNoB()); + updatePayWorkingGroup.set(PayWorkingGroup::getChargeNoticeBId,payWorkingGroup.getChargeNoticeBId()); + updatePayWorkingGroup.set(PayWorkingGroup::getMissionAndObjectives,payWorkingGroup.getMissionAndObjectives()); + updatePayWorkingGroup.set(PayWorkingGroup::getRemarks,payWorkingGroup.getRemarks()); + payWorkingGroupService.update(updatePayWorkingGroup); return Result.OK("编辑成功!"); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java index c09eaba3..27ced072 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -55,18 +55,15 @@ public class PayWorkingGroup implements Serializable { /**负责人名称A*/ @Excel(name = "负责人名称A", width = 15) @ApiModelProperty(value = "负责人名称A") - @TableField(updateStrategy = FieldStrategy.IGNORED) private String principalNameA; /**负责人Bid*/ @Excel(name = "负责人Bid", width = 15) @ApiModelProperty(value = "负责人Bid") @Size(max = 32,message = "负责人Bid长度不能大于32个字符") - @TableField(updateStrategy = FieldStrategy.IGNORED) private String principalIdB; /**负责人名称B*/ @Excel(name = "负责人名称B", width = 15) @ApiModelProperty(value = "负责人名称B") - @TableField(updateStrategy = FieldStrategy.IGNORED) private String principalNameB; /**每年召开次数*/ @Excel(name = "每年召开次数", width = 15)