From abbafe11099dc215ffd7693c93fb4974d9adbeb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 25 Oct 2021 16:18:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41370?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/ProjectDetailServiceImpl.java | 9 +++++++++ .../java/com/jero/contract/entity/PayIncomeContract.java | 2 +- .../com/jero/contract/entity/PaySpendingContract.java | 2 +- .../service/impl/PayIncomeContractServiceImpl.java | 8 ++++++++ .../project/controller/PayCommonProjectController.java | 8 ++++++++ .../controller/PayWorkingGroupSubItemController.java | 5 +++++ 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 95d84e6a..9e8ea675 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -29,6 +29,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; +import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupDistributionRecord; import com.jero.project.service.IPayWorkingGroupDistributionRecordService; @@ -86,6 +87,14 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.isNull(payCommonProject)){ throw new JeroBootException("项目不存在！"); } + if(Objects.equals(PayProjectCommon.PROJECT_TYPE4,String.valueOf(payCommonProject.getProjectType())) && !StringUtils.isEmpty(payCommonProject.getPrincipalId())){ + LambdaQueryWrapper querySysUser = new LambdaQueryWrapper<>(); + querySysUser.eq(SysUser::getId,payCommonProject.getPrincipalId()); + List listSysUser = sysUserService.list(querySysUser); + if(!CollectionUtils.isEmpty(listSysUser)){ + payCommonProject.setPrincipalName(listSysUser.get(0).getRealname()); + } + } if(Objects.isNull(payCommonProject.getPaidAmount())){ payCommonProject.setPaidAmount(new BigDecimal("0.00")); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java index a3ae65ba..96f4e955 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java @@ -138,7 +138,7 @@ public class PayIncomeContract implements Serializable { /**合同约定主要时点*/ @Excel(name = "合同约定主要时点", width = 15) @ApiModelProperty(value = "合同约定主要时点") - @Size(max = 50, message = "合同约定主要时点不能大于50个字符") + @Size(max = 200, message = "合同约定主要时点不能大于200个字符") private java.lang.String contractTimePoints; /**应收金额*/ @Excel(name = "应收金额", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java index 6151ebdb..a6af2b0d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -132,7 +132,7 @@ public class PaySpendingContract implements Serializable { /**合同约定主要时点*/ @Excel(name = "合同约定主要时点", width = 15) @ApiModelProperty(value = "合同约定主要时点") - @Size(max = 50, message = "合同约定主要时点不能大于50个字符") + @Size(max = 200, message = "合同约定主要时点不能大于200个字符") private String contractTimePoints; /**应收金额*/ @Excel(name = "应收金额", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index e79bb8bd..e6aea71e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -63,6 +63,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -324,6 +325,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{ String projectName = ""; String principalId = ""; @@ -341,6 +345,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl querySysUser = new LambdaQueryWrapper<>(); + querySysUser.eq(SysUser::getId,payCommonProject.getPrincipalId()); + List listSysUser = sysUserService.list(querySysUser); + if(!CollectionUtils.isEmpty(listSysUser)){ + payCommonProject.setPrincipalName(listSysUser.get(0).getRealname()); + } + } // 工作组项目资料 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); 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 27e40550..7b6e8938 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 @@ -13,6 +13,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; +import com.jero.common.exception.JeroBootException; import com.jero.common.service.ProjectDetailService; import com.jero.common.service.SendMessageService; import com.jero.common.system.base.controller.JeroController; @@ -496,6 +497,10 @@ public class PayWorkingGroupSubItemController extends JeroController importExcel(HttpServletRequest request) { + List excelData = super.getExcelData(request, PayWorkingGroupSubItem.class); + if (excelData.isEmpty()) { + throw new JeroBootException("导入数据为空，请填写数据之后重新导入！"); + } payWorkingGroupSubItemService.importExcel(request); return Result.OK("文件导入成功！"); }