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-16 11:22:22 +08:00
parent 76f8444f69
commit 3b13454148
10 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
+6 -5
View File
@@ -4,7 +4,7 @@
<select id="queryProject" resultType="com.jero.project.entity.PayCommonProject">
<!-- 普通项目-->
select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email,c.remarks,c.contract_num,c.charge_company_temporary_id,c.charge_way
select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email,c.remarks,c.contract_num,c.charge_company_temporary_id,c.charge_way,c.files
from pay_common_project c
<where>
<if test="projectId != null and projectId != ''">
@@ -13,7 +13,8 @@
</where>
<!--工作组项目-->
UNION ALL
select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way
select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',gsub.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,
(select GROUP_CONCAT(file_id) from pay_distribution_record where project_id=gsub.id) as files
from pay_working_group g
inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
<where>
@@ -23,7 +24,7 @@
</where>
<!-- 会议项目-->
UNION ALL
select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,'','',sit.remark,'',sit.company_temporary_id,sit.pay_mode
select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,'','',sit.remark,'',sit.company_temporary_id,sit.pay_mode,''
from pay_meeting meeting
inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
<where>
@@ -33,7 +34,7 @@
</where>
<!-- 会员项目-->
UNION ALL
select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,pmp.director_name,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','',msub.remark,msub.contract_no,msub.company_temporary_id,msub.payment_method
select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,pmp.director_name,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','',msub.remark,msub.contract_no,msub.company_temporary_id,msub.payment_method,''
from pay_member_project pmp
inner join pay_member_project_subitem msub on pmp.id = msub.project_id
<where>
@@ -43,7 +44,7 @@
</where>
<!-- 标协会员项目-->
UNION ALL
select tmsub.id,tmember.project_name,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method
select tmsub.id,tmember.project_name,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,''
from tb_member_project tmember
inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
<where>
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+1
View File
@@ -81,6 +81,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
projectDetailVO.setRemarks(payCommonProject.getRemarks());
projectDetailVO.setProjectType(payCommonProject.getProjectType());
projectDetailVO.setChargeWay(payCommonProject.getChargeWay());
projectDetailVO.setFiles(payCommonProject.getFiles());
if(!Objects.isNull(payCommonProject.getChargeWay())){
// 普通项目，工作组，会员
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()),ProjectCommon.PROJECT_TYPE1)
jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
+3
View File
@@ -127,6 +127,9 @@ public class ProjectDetailVO implements Serializable {
*/
@ApiModelProperty(value = "企业联系人地址")
private String contactAddress;
/** 资料id，多个资料文件，逗号分隔 **/
@ApiModelProperty(value = "资料id，多个资料文件，逗号分隔")
private String files;
/**
* 到账信息
*/
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+3 -3
View File
@@ -202,12 +202,12 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
return Result.OK("编辑成功!");
}
/**
* 审核
* 确认
*
* @param id 企业管理id
* @return
*/
@ApiOperation(value="企业管理-审核", notes="企业管理-审核")
@ApiOperation(value="企业管理-确认", notes="企业管理-确认")
@GetMapping(value = "/audit")
public Result<?> audit(@RequestParam(name="id") String id) {
if(StringUtils.isBlank(id)){
@@ -220,7 +220,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
updatePayCompanyManagement.set(PayCompanyManagement::getUpdateBy,sysUser.getUsername());
updatePayCompanyManagement.set(PayCompanyManagement::getUpdateTime,new Date());
payCompanyManagementService.update(updatePayCompanyManagement);
return Result.OK("审核成功!");
return Result.OK("确认成功!");
}
/**
* 通过id删除
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java
+3 -3
View File
@@ -160,9 +160,9 @@ public class PayIncomeContract implements Serializable {
@DecimalMax(value = "9999999999.99",message = "未收金额格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal outstandingAmount;
/**账款状态（1：未支付，2：部分支付，3：已付全款）*/
@Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15)
@ApiModelProperty(value = "账款状态（1：未支付，2：部分支付，3：已付全款）")
/**账款状态（1：待收款，2：部分收款，3：已收全款）*/
@Excel(name = "账款状态（1：待收款，2：部分收款，3：已收全款）", width = 15)
@ApiModelProperty(value = "账款状态（1：待收款，2：部分收款，3：已收全款）")
@Max(value = 3,message = "账款状态格式错误")
@Dict(dicCode = "revenue_contract_account_status")
private java.lang.Integer accountStatus;
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+1 -1
View File
@@ -517,7 +517,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}else{
paySpendingContract.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS1);
}
paySpendingContract.setNoTaxAmount(paySpendingContract.getContractAmount().subtract(paySpendingContract.getContractAmount().multiply(paySpendingContract.getRate().divide(new BigDecimal("100")))));
paySpendingContract.setNoTaxAmount(paySpendingContract.getContractAmount().divide(new BigDecimal("1").add(paySpendingContract.getRate().divide(new BigDecimal("100")))));
setPaySpendingContract(paySpendingContract);
paySpendingContractService.save(paySpendingContract);
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
-6
View File
@@ -1,6 +1,5 @@
package com.jero.project.controller;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -11,14 +10,11 @@ import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.service.ProjectDetailService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.ValidUtil;
import com.jero.common.vo.ProjectDetailVO;
import com.jero.contract.entity.PayIncomeContract;
@@ -28,9 +24,7 @@ import com.jero.contract.service.IPayIncomeContractService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.pack.service.IPayPackCompanyService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.service.IPayCommonProjectService;
import com.jero.project.entity.PayCommonProject;
import com.baomidou.mybatisplus.core.metadata.IPage;
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+3
View File
@@ -151,6 +151,9 @@ public class PayCommonProject implements Serializable {
@ApiModelProperty(value = "备注")
@Size(max = 200,message = "备注长度不能大于200个字符")
private String remarks;
/** 资料id，多个资料文件，逗号分隔 **/
@ApiModelProperty(value = "资料id，多个资料文件，逗号分隔")
private String files;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java
+2 -6
View File
@@ -64,13 +64,9 @@ public class PayCompanyManagementTemporary implements Serializable {
@ApiModelProperty(value = "税号")
private java.lang.String dutyCode;
/**数据来源(1：管理端，2：报名)*/
@Excel(name = "数据来源(1：管理端，2：报名)", width = 15)
@ApiModelProperty(value = "数据来源(1：管理端，2：报名)")
@Excel(name = "数据来源(1：财务人员，2：其他人)", width = 15)
@ApiModelProperty(value = "数据来源(1：财务人员，2：其他人)")
private java.lang.Integer dataSource;
/**报名新增（1：是，0：否）*/
@Excel(name = "报名新增（1：是，0：否）", width = 15)
@ApiModelProperty(value = "报名新增（1：是，0：否）")
private java.lang.Integer signingUp;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java
-8
View File
@@ -67,14 +67,6 @@ public class PayContactsManagementTemporary implements Serializable {
@Excel(name = "邮政编码", width = 15)
@ApiModelProperty(value = "邮政编码")
private java.lang.String postalCode;
/**数据来源(1：管理端，2：报名)*/
@Excel(name = "数据来源(1：管理端，2：报名)", width = 15)
@ApiModelProperty(value = "数据来源(1：管理端，2：报名)")
private java.lang.Integer dataSource;
/**报名新增（0：否，1：:是）*/
@Excel(name = "报名新增（0：否，1：:是）", width = 15)
@ApiModelProperty(value = "报名新增（0：否，1：:是）")
private java.lang.Integer signingUp;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")