LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug#41370

Browse Source
This commit is contained in:
梁琦涛
2021-10-25 16:18:27 +08:00
parent 0548f84f22
commit abbafe1109
6 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+9
View File
@@ -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<SysUser> querySysUser = new LambdaQueryWrapper<>();
querySysUser.eq(SysUser::getId,payCommonProject.getPrincipalId());
List<SysUser> 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"));
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java
+1 -1
View File
@@ -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)
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java
+1 -1
View File
@@ -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)
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+8
View File
@@ -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<PayIncomeContractM
throw new JeroBootException("收入合同不可操作！");
}
}
if(Objects.isNull(payIncomeContract.getAmountReceived())){
payIncomeContract.setAmountReceived(new BigDecimal("0.00"));
}
listPayIncomeContractAssociated.forEach(p->{
String projectName = "";
String principalId = "";
@@ -341,6 +345,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
if(Objects.isNull(payCommonProject)){
throw new JeroBootException("项目不存在！");
}
payIncomeContract.getAmountReceived().add(Objects.isNull(payCommonProject.getPaidAmount()) ? new BigDecimal("0.00") : payCommonProject.getPaidAmount());
// 验证企业是否正确
if(!Objects.equals(payCommonProject.getChargeCompanyId(),payIncomeContract.getSignedCompanyId())){
throw new JeroBootException("企业不匹配！");
@@ -381,6 +386,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
if(CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
throw new JeroBootException("工作组成员单位不存在！");
}
payIncomeContract.getAmountReceived().add(Objects.isNull(listPayWorkingGroupSubItem.get(0).getPaidAmount()) ? new BigDecimal("0.00") : listPayWorkingGroupSubItem.get(0).getPaidAmount());
// 验证企业是否正确
if(!Objects.equals(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),payIncomeContract.getSignedCompanyId())){
throw new JeroBootException("企业不匹配！");
@@ -415,6 +421,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
if(Objects.isNull(payMeetingSituation)){
throw new JeroBootException("会议项目不存在！");
}
payIncomeContract.getAmountReceived().add(Objects.isNull(payMeetingSituation.getPaidAmount()) ? new BigDecimal("0.00") : payMeetingSituation.getPaidAmount());
PayMeeting payMeeting = payMeetingService.getById(payMeetingSituation.getMeetingId());
if (Objects.isNull(payMeeting)) {
throw new JeroBootException("会议项目不存在！");
@@ -452,6 +459,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
if(CollectionUtils.isEmpty(listPayMemberProjectSubitem)){
throw new JeroBootException("会员项目成员单位不存在！");
}
payIncomeContract.getAmountReceived().add(Objects.isNull(listPayMemberProjectSubitem.get(0).getPaidAmount()) ? new BigDecimal("0.00") : listPayMemberProjectSubitem.get(0).getPaidAmount());
// 验证企业是否正确
if(!Objects.equals(listPayMemberProjectSubitem.get(0).getCompanyId(),payIncomeContract.getSignedCompanyId())){
throw new JeroBootException("企业不匹配！");
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+8
View File
@@ -422,6 +422,14 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
if(Objects.isNull(payCommonProject)){
return Result.error("项目不存在!");
}
if(Objects.equals(PayProjectCommon.PROJECT_TYPE4,String.valueOf(payCommonProject.getProjectType())) && !StringUtils.isEmpty(payCommonProject.getPrincipalId())){
LambdaQueryWrapper<SysUser> querySysUser = new LambdaQueryWrapper<>();
querySysUser.eq(SysUser::getId,payCommonProject.getPrincipalId());
List<SysUser> 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();
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+5
View File
@@ -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<PayWorkingG
@PostMapping(value = "/importExcel")
@ApiOperation(value = "工作组成员-通过excel导入数据", notes = "工作组成员-通过excel导入数据")
public Result<?> importExcel(HttpServletRequest request) {
List<Object> excelData = super.getExcelData(request, PayWorkingGroupSubItem.class);
if (excelData.isEmpty()) {
throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
}
payWorkingGroupSubItemService.importExcel(request);
return Result.OK("文件导入成功！");
}