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-10 17:31:08 +08:00
parent f726c56b8e
commit 14ef14d149
22 changed files with 620 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+8
View File
@@ -64,6 +64,14 @@ public class PayIncomeContractCommon {
* 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）
*/
public final static String PROJECT_TYPE5 = "5";
/**
* 来款状态 0：全部 1:到期未付款
*/
public final static String CHARGE_STATUS0 = "0";
/**
* 来款状态 0：全部 1:到期未付款
*/
public final static String CHARGE_STATUS1 = "1";
/**
* 支出合同excel表头
*/
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+5 -8
View File
@@ -96,15 +96,12 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
if(!StringUtils.isBlank(payIncomeContract.getContractName()) && payIncomeContract.getContractName().length() > 50){
return Result.error("合同名称长度不能大于50个字符!");
}
// todo 缺少会议，会员项目，标协会员
Page<PayIncomeContractOutput> page = new Page<>(pageNo, pageSize);
IPage<PayIncomeContractOutput> pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime);
if(!CollectionUtils.isEmpty(pageList.getRecords())){
List<PayIncomeContractOutput> list = pageList.getRecords();
list.forEach(p->{
});
if(Objects.equals(chargeStatus,PayIncomeContractCommon.CHARGE_STATUS0)){
chargeStatus = "";
}
// todo 缺少会议，会员项目，标协会员
Page<PayIncomeContract> page = new Page<>(pageNo, pageSize);
IPage<PayIncomeContract> pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime);
return Result.OK(pageList);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+1
View File
@@ -21,6 +21,7 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.DateUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.contract.common.PayIncomeContractCommon;
import com.jero.contract.entity.*;
import com.jero.contract.service.IPaySpendingContractInstallmentService;
import com.jero.contract.service.IPaySpendingContractService;
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java
+15
View File
@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict;
@@ -200,4 +201,18 @@ public class PayIncomeContract implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
/**
* 来款状态 0：全部 1:到期未付款
*/
@TableField(exist = false)
@ApiModelProperty(value = "来款状态 0：全部 1:到期未付款")
private Integer chargeStatus;
/**
* 关联项目
*/
@TableField(exist = false)
@ApiModelProperty(value = "关联项目")
private String associatedProject;
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java
+8
View File
@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict;
@@ -180,4 +181,11 @@ public class PaySpendingContract implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 来款状态 0：全部 1:到期未付款
*/
@TableField(exist = false)
@ApiModelProperty(value = "来款状态 0：全部 1:到期未付款")
private Integer chargeStatus;
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java
+1 -2
View File
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.vo.PayIncomeContractOutput;
import com.jero.contract.vo.ProjectOutput;
import org.apache.ibatis.annotations.Param;
@@ -27,7 +26,7 @@ public interface PayIncomeContractMapper extends BaseMapper<PayIncomeContract> {
* @Return
* @Exception
*/
IPage<PayIncomeContractOutput> queryPageList(Page<PayIncomeContractOutput> page, @Param("payIncomeContract") PayIncomeContract payIncomeContract,
IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, @Param("payIncomeContract") PayIncomeContract payIncomeContract,
@Param("chargeStatus") String chargeStatus,@Param("projectName") String projectName,
@Param("startTime") String startTime, @Param("endTime") String endTime);
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.contract.mapper.PayIncomeContractMapper">
<!--缺少会议项目，会员项目-->
<select id="queryPageList" resultType="com.jero.contract.vo.PayIncomeContractOutput">
<select id="queryPageList" resultType="com.jero.contract.entity.PayIncomeContract">
SELECT * FROM
(
SELECT
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java
+1 -3
View File
@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.entity.PayIncomeContractAudit;
import com.jero.contract.vo.PayIncomeContractAssociatedInput;
import com.jero.contract.vo.PayIncomeContractInput;
import com.jero.contract.vo.PayIncomeContractOutput;
import com.jero.contract.vo.ProjectOutput;
import java.util.List;
@@ -31,7 +29,7 @@ public interface IPayIncomeContractService extends IService<PayIncomeContract> {
* @Return
* @Exception
*/
IPage<PayIncomeContractOutput> queryPageList(Page<PayIncomeContractOutput> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime);
IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime);
/**
* @Description 添加
* @Author lqt
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+1 -3
View File
@@ -19,7 +19,6 @@ import com.jero.contract.service.IPayIncomeContractAuditService;
import com.jero.contract.service.IPayIncomeContractInstallmentService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.contract.vo.PayIncomeContractInput;
import com.jero.contract.vo.PayIncomeContractOutput;
import com.jero.contract.vo.ProjectOutput;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
@@ -43,7 +42,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -84,7 +82,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Override
public IPage<PayIncomeContractOutput> queryPageList(Page<PayIncomeContractOutput> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime) {
public IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime) {
return payIncomeContractMapper.queryPageList(page,payIncomeContract,chargeStatus,projectName,startTime,endTime);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractOutput.java
-21
View File
@@ -1,21 +0,0 @@
package com.jero.contract.vo;
import com.jero.contract.entity.PayIncomeContract;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
public class PayIncomeContractOutput extends PayIncomeContract implements Serializable {
/**
* 来款状态 0：全部 1:到期未付款
*/
@ApiModelProperty(value = "来款状态 0：全部 1:到期未付款")
private Integer chargeStatus;
/**
* 关联项目
*/
@ApiModelProperty(value = "关联项目")
private String associatedProject;
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractOutput.java
-20
View File
@@ -1,20 +0,0 @@
package com.jero.contract.vo;
import com.jero.contract.entity.PaySpendingContract;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Description: pay_spending_contract
* @Author: jeecg-boot
* @Date: 2021-09-07
* @Version: V1.0
*/
@Data
public class PaySpendingContractOutput extends PaySpendingContract implements Serializable {
/**
* 来款状态 0：全部 1:到期未付款
*/
@ApiModelProperty(value = "来款状态 0：全部 1:到期未付款")
private Integer chargeStatus;
}