From 09712b50fa36b58aaaf2d8e2e721acb799d884c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 9 Jan 2024 17:23:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=EF=BC=8C=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=BB=84=E6=93=8D=E4=BD=9C=E5=88=97=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayDraftingGroupSubItemController.java | 26 +++++++++++++------ .../PayWorkingGroupSubItemController.java | 26 ++++++++++++++++--- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index c87664ca..c41ca7a5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -6,14 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; -import com.jero.common.service.ProjectDetailService; import com.jero.common.service.RolePermissionService; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; -import com.jero.common.vo.ProjectDetailVO; import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; @@ -21,11 +19,6 @@ import com.jero.drafting.service.IPayDraftingGroupService; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; import com.jero.drafting.service.IPayDraftingGroupSubItemService; import com.jero.drafting.vo.PayDraftingGroupSubItemExcel; -import com.jero.modules.system.service.ISysUserService; -import com.jero.project.entity.PayWorkingGroup; -import com.jero.project.entity.PayWorkingGroupSubItem; -import com.jero.project.entity.PayWorkingGroupSubItemContacts; -import com.jero.project.vo.excel.PayWorkingGroupSubItemExcel; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import io.swagger.annotations.Api; @@ -41,7 +34,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -175,6 +167,24 @@ public class PayDraftingGroupSubItemController extends JeroController editCompany(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) { + StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem); + if (!StringUtils.isBlank(msg)) { + return Result.error(msg.toString()); + } + payDraftingGroupSubItemService.editPayWorkingGroupSubItem(payDraftingGroupSubItem); + return Result.OK("编辑成功!"); + } + // /** // * 通过id查询 // * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index cbc6ea53..11929740 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -2,7 +2,6 @@ package com.jero.project.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; @@ -14,13 +13,11 @@ import com.jero.common.service.ProjectDetailService; import com.jero.common.service.RolePermissionService; import com.jero.common.service.SendMessageService; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; import com.jero.common.vo.ProjectDetailVO; -import com.jero.company.entity.PayContactsManagement; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; @@ -52,7 +49,6 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; @@ -390,6 +386,28 @@ public class PayWorkingGroupSubItemController extends JeroController editCompany(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { + if (Objects.isNull(payWorkingGroupSubItem.getEstimatedArrivalDate())) { + return Result.error("预估到账日期不能为空"); + } + StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem); + if (!StringUtils.isBlank(msg)) { + return Result.error(msg.toString()); + } + payWorkingGroupSubItemService.editPayWorkingGroupSubItem(payWorkingGroupSubItem); + return Result.OK("编辑成功!"); + } + /** * 催款提醒 *