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

添加工作组进度结构调整

Browse Source
This commit is contained in:
梁琦涛
2021-09-01 15:40:53 +08:00
parent 75e2dac689
commit a1c23cfadf
4 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/VO/PayWorkingGroupPayment.java
+21
View File
@@ -0,0 +1,21 @@
package com.jero.project.VO;
import lombok.Data;
import java.io.Serializable;
@Data
public class PayWorkingGroupPayment implements Serializable {
/**
* 已付全款
*/
private Integer allPayment;
/**
* 部分付款
*/
private Integer partPayment;
/**
* 未付款
*/
private Integer notPayment;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/VO/PayWorkingGroupVO.java
+1 -12
View File
@@ -6,16 +6,5 @@ import lombok.Data;
import java.io.Serializable;
@Data
public class PayWorkingGroupVO extends PayWorkingGroup implements Serializable {
/**
* 已付全款
*/
private Integer allPayment;
/**
* 部分付款
*/
private Integer partPayment;
/**
* 未付款
*/
private Integer notPayment;
private PayWorkingGroupPayment obj;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+11 -6
View File
@@ -15,6 +15,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.ValidUtil;
import com.jero.project.VO.PayWorkingGroupPayment;
import com.jero.project.VO.PayWorkingGroupVO;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayWorkingGroupService;
@@ -80,23 +81,27 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
query.eq(PayWorkingGroupSubItem::getWorkingGroupId,p.getId());
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query);
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
PayWorkingGroupPayment payWorkingGroupPayment = new PayWorkingGroupPayment();
// 已付全款
List<PayWorkingGroupSubItem> listAllPayment = listPayWorkingGroupSubItem.stream()
.filter(p1->p1.getPaidAmount() == p1.getReceivableAmount()).collect(Collectors.toList());
p.setAllPayment(listAllPayment.size());
payWorkingGroupPayment.setAllPayment(listAllPayment.size());
// 部分付款
List<PayWorkingGroupSubItem> listPartPayment = listPayWorkingGroupSubItem.stream()
.filter(p1->p1.getPaidAmount() < p1.getReceivableAmount()).collect(Collectors.toList());
p.setPartPayment(listPartPayment.size());
payWorkingGroupPayment.setPartPayment(listPartPayment.size());
// 未付款
List<PayWorkingGroupSubItem> listNotPayment = listPayWorkingGroupSubItem.stream()
.filter(p1->p1.getPaidAmount() == 0 && p1.getReceivableAmount() != 0 )
.collect(Collectors.toList());
p.setNotPayment(listNotPayment.size());
payWorkingGroupPayment.setNotPayment(listNotPayment.size());
p.setObj(payWorkingGroupPayment);
}else{
p.setAllPayment(0);
p.setPartPayment(0);
p.setNotPayment(0);
PayWorkingGroupPayment payWorkingGroupPayment = new PayWorkingGroupPayment();
payWorkingGroupPayment.setAllPayment(0);
payWorkingGroupPayment.setPartPayment(0);
payWorkingGroupPayment.setNotPayment(0);
p.setObj(payWorkingGroupPayment);
}
});
pageList.setRecords(listPayWorkingGroupVO);
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java
+23 -1
View File
@@ -15,6 +15,11 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
/**
* @Description: pay_working_group
* @Author: jeecg-boot
@@ -36,14 +41,20 @@ public class PayWorkingGroup implements Serializable {
/**工作组项目*/
@Excel(name = "工作组项目", width = 15)
@ApiModelProperty(value = "工作组项目")
@NotEmpty(message = "工作组项目不能为空！")
@Size(max = 50,message = "工作组项目长度应小于50个字符")
private String workingGroupProject;
/**运行年份*/
@Excel(name = "运行年份", width = 15)
@ApiModelProperty(value = "运行年份")
private Integer year;
@NotEmpty(message = "运行年份不能为空！")
@Pattern(regexp = "^\\d{4}$",message = "运行年份格式错误")
private String year;
/**负责人Aid*/
@Excel(name = "负责人Aid", width = 15)
@ApiModelProperty(value = "负责人Aid")
@NotEmpty(message = "负责人Aid不能为空！")
@Size(max = 32,message = "负责人Aid长度应小于32个字符")
private String principalIdA;
/**负责人名称A*/
@Excel(name = "负责人名称A", width = 15)
@@ -52,6 +63,7 @@ public class PayWorkingGroup implements Serializable {
/**负责人Bid*/
@Excel(name = "负责人Bid", width = 15)
@ApiModelProperty(value = "负责人Bid")
@Size(max = 32,message = "负责人Bid长度应小于32个字符")
private String principalIdB;
/**负责人名称B*/
@Excel(name = "负责人名称B", width = 15)
@@ -60,42 +72,52 @@ public class PayWorkingGroup implements Serializable {
/**每年召开次数*/
@Excel(name = "每年召开次数", width = 15)
@ApiModelProperty(value = "每年召开次数")
@Size(max = 50,message = "每年召开次数长度应小于50个字符")
private String convokeNum;
/**运行周期*/
@Excel(name = "运行周期", width = 15)
@ApiModelProperty(value = "运行周期")
@Size(max = 50,message = "运行周期长度应小于50个字符")
private String operationCycle;
/**本年应收款A（元）*/
@Excel(name = "本年应收款A（元）", width = 15)
@ApiModelProperty(value = "本年应收款A（元）")
@Max(value = 999999999,message = "本年应收款A（元）格式错误")
private Integer yearChargeA;
/**收费通知号A*/
@Excel(name = "收费通知号A", width = 15)
@ApiModelProperty(value = "收费通知号A")
@Size(max = 50,message = "收费通知号A长度应小于50个字符")
private String chargeNoticeNoA;
/**收费通知文件Aid*/
@Excel(name = "收费通知文件Aid", width = 15)
@ApiModelProperty(value = "收费通知文件Aid")
@Size(max = 32,message = "收费通知文件Aid长度应小于32个字符")
private String chargeNoticeAId;
/**本年应收款B（元）*/
@Excel(name = "本年应收款B（元）", width = 15)
@ApiModelProperty(value = "本年应收款B（元）")
@Max(value = 999999999,message = "本年应收款B（元）格式错误")
private Integer yearChargeB;
/**收费通知号B*/
@Excel(name = "收费通知号B", width = 15)
@ApiModelProperty(value = "收费通知号B")
@Size(max = 50,message = "收费通知号B长度应小于50个字符")
private String chargeNoticeNoB;
/**收费通知文件Bid*/
@Excel(name = "收费通知文件Bid", width = 15)
@ApiModelProperty(value = "收费通知文件Bid")
@Size(max = 32,message = "收费通知文件Bid长度应小于32个字符")
private String chargeNoticeBId;
/**任务及目标*/
@Excel(name = "任务及目标", width = 15)
@ApiModelProperty(value = "任务及目标")
@Size(max = 200,message = "任务及目标长度应小于200个字符")
private String missionAndObjectives;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
@Size(max = 200,message = "备注长度应小于200个字符")
private String remarks;
/**创建人*/
@ApiModelProperty(value = "创建人")