From 251934fdac13610f0fd3e78af999297973eec1c9 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, 6 Sep 2021 17:08:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayIncomeContractController.java | 117 ++++++++---------- .../contract/entity/PayIncomeContract.java | 11 +- .../entity/PayIncomeContractAudit.java | 8 +- .../mapper/PayIncomeContractMapper.java | 14 +++ .../mapper/xml/PayIncomeContractMapper.xml | 35 ++++++ .../service/IPayIncomeContractService.java | 9 ++ .../impl/PayIncomeContractServiceImpl.java | 73 ++++++++--- .../vo/PayIncomeContractAuditOutput.java | 14 +++ .../vo/PayIncomeContractDetailOutput.java | 21 +++- .../com/jero/contract/vo/ProjectOutput.java | 8 +- 10 files changed, 222 insertions(+), 88 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractAuditOutput.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 5bde7a79..1380e56e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -1,6 +1,7 @@ package com.jero.contract.controller; 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; @@ -38,7 +39,6 @@ import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.def.MapExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgMapExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; @@ -146,10 +146,31 @@ public class PayIncomeContractController extends JeroController getAssociated(@RequestParam("contractId") String contractId) { + List list = payIncomeContractService.getAssociated(contractId); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + if(!StringUtils.isBlank(p.getChargeUse())){ + p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",p.getChargeUse())); + } + }); + } + return Result.OK(list); + } + /** * 关联 * - * @param listPayIncomeContractAssociated + * @param listPayIncomeContractAssociated 关联项目集合 * @return */ @AutoLog(value = "收入合同-关联") @@ -163,7 +184,7 @@ public class PayIncomeContractController extends JeroController cancelAssociated(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) { payIncomeContractService.cancelAssociated(payIncomeContractAssociated); - return Result.OK("关联成功！"); + return Result.OK("取消关联成功！"); } /** @@ -273,77 +294,50 @@ public class PayIncomeContractController extends JeroController queryPayIncomeContractInstallment = new LambdaQueryWrapper<>(); queryPayIncomeContractInstallment.eq(PayIncomeContractInstallment::getContractId,payIncomeContract.getId()); List listPayIncomeContractInstallment = payIncomeContractInstallmentService.list(queryPayIncomeContractInstallment); // 获取关联项目id - List listProject = new ArrayList<>(); - LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); - queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getContractId,id); - List listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); - if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){ - List listId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listId)){ - // 普通项目 - LambdaQueryWrapper queryPayCommonProject = new LambdaQueryWrapper<>(); - queryPayCommonProject.in(PayCommonProject::getId,listId); - List listPayCommonProject = payCommonProjectService.list(queryPayCommonProject); - if(!CollectionUtils.isEmpty(listPayCommonProject)){ - listPayCommonProject.forEach(p->{ - ProjectOutput projectOutput = new ProjectOutput(); - projectOutput.setProjectId(p.getId()); - projectOutput.setProjectType(PayIncomeContractCommon.PROJECT_TYPE1); - projectOutput.setChargeProject(p.getChargeProject()); - projectOutput.setChargeUse(p.getChargeUse()); - projectOutput.setChargeCompanyName(p.getChargeCompanyTemporaryName()); - projectOutput.setContactsName(p.getChargeCompanyTemporaryName()); - projectOutput.setPaidAmount(p.getPaidAmount()); - projectOutput.setReceivableAmount(p.getReceivableAmount()); - listProject.add(projectOutput); - }); - } - // 工作组项目 - LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getId,listId); - List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); - if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ - listPayWorkingGroupSubItem.forEach(p->{ - PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(p.getWorkingGroupId()); - ProjectOutput projectOutput = new ProjectOutput(); - projectOutput.setProjectId(p.getId()); - projectOutput.setProjectType(PayIncomeContractCommon.PROJECT_TYPE2); - if(Objects.isNull(payWorkingGroup)){ - projectOutput.setChargeProject(payWorkingGroup.getWorkingGroupProject()); - } - projectOutput.setChargeProject(p.getChargeProject()); - projectOutput.setChargeCompanyName(p.getChargeCompanyTemporaryName()); - projectOutput.setContactsName(p.getChargeCompanyTemporaryName()); - projectOutput.setPaidAmount(p.getPaidAmount()); - projectOutput.setReceivableAmount(p.getReceivableAmount()); - listProject.add(projectOutput); - }); - } - // todo 会议项目 - // todo 会员项目 - } - } - // 获取存档记录 + List listProject = payIncomeContractService.getAssociated(id); + LambdaQueryWrapper queryPayIncomeContractAudit = new LambdaQueryWrapper<>(); queryPayIncomeContractAudit.in(PayIncomeContractAudit::getContractId,id); List listPayIncomeContractAudit = payIncomeContractAuditService.list(queryPayIncomeContractAudit); - List listArchive = listPayIncomeContractAudit.stream().filter(p->Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList()); - // 获取审核记录 - List listAudit = listPayIncomeContractAudit.stream().filter(p->!Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList()); + List listArchive = new ArrayList<>(); + List listAudit = new ArrayList<>(); + if(!CollectionUtils.isEmpty(listPayIncomeContractAudit)){ + String str = JSON.toJSONString(listPayIncomeContractAudit); + List listAll = JSONArray.parseArray(str,PayIncomeContractAuditOutput.class); + listAll.forEach(p->{ + if(!Objects.isNull(p.getContractStatus())){ + p.setContractStatus_dictText(sysBaseAPI.translateDict("revenue_contract_status",String.valueOf(p.getContractStatus()))); + } + }); + // 获取存档记录 + listArchive = listAll.stream().filter(p->Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList()); + // 获取审核记录 + listAudit = listAll.stream().filter(p->!Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList()); + } String str = JSON.toJSONString(payIncomeContract); PayIncomeContractDetailOutput payIncomeContractDetailOutput = JSONObject.parseObject(str,PayIncomeContractDetailOutput.class); + // 字典翻译 + payIncomeContractDetailOutput.setOpening_dictText(sysBaseAPI.translateDict("yn",String.valueOf(payIncomeContract.getOpening()))); + payIncomeContractDetailOutput.setAccountStatus_dictText(sysBaseAPI.translateDict("revenue_contract_account_status",String.valueOf(payIncomeContract.getAccountStatus()))); + payIncomeContractDetailOutput.setPack_dictText(sysBaseAPI.translateDict("yn",String.valueOf(payIncomeContract.getPack()))); + payIncomeContractDetailOutput.setContractStatus_dictText(sysBaseAPI.translateDict("revenue_contract_status",String.valueOf(payIncomeContract.getStatus()))); if(!CollectionUtils.isEmpty(listPayIncomeContractInstallment)){ payIncomeContractDetailOutput.setListInstallment(listPayIncomeContractInstallment); } if(!CollectionUtils.isEmpty(listProject)){ - listProject.sort((m1,m2)->m2.getCreateTime().compareToIgnoreCase(m1.getCreateTime())); + listProject.forEach(p->{ + if(!StringUtils.isBlank(p.getChargeUse())){ + p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",p.getChargeUse())); + } + }); payIncomeContractDetailOutput.setListProject(listProject); } if(!CollectionUtils.isEmpty(listArchive)){ @@ -380,7 +374,6 @@ public class PayIncomeContractController extends JeroController> list = new ArrayList<>(); // excel字段长度 - // todo 缺少字典转换 Map mapCount = new HashMap<>(); mapCount.put("count",0); if(!CollectionUtils.isEmpty(exportList)){ @@ -392,9 +385,9 @@ public class PayIncomeContractController extends JeroController{ String str = JSON.toJSONString(p); Map map = JSONObject.parseObject(str,Map.class); - map.put("opening",sysBaseAPI.translateDict("revenue_contract_open",String.valueOf(p.getOpening()))); + map.put("opening",sysBaseAPI.translateDict("yn",String.valueOf(p.getOpening()))); map.put("accountStatus",sysBaseAPI.translateDict("revenue_contract_account_status",String.valueOf(p.getAccountStatus()))); - map.put("pack",sysBaseAPI.translateDict("pack_status",String.valueOf(p.getPack()))); + map.put("pack",sysBaseAPI.translateDict("yn",String.valueOf(p.getPack()))); List listSub = listPayIncomeContractInstallment.stream().filter(item-> Objects.equals(p.getId(),item.getContractId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listSub)){ 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 538672b7..f38f9b19 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 @@ -4,6 +4,7 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -79,10 +80,11 @@ public class PayIncomeContract implements Serializable { @ApiModelProperty(value = "临时签订单位联系人名称") @Size(max = 50, message = "临时签订单位联系人名称长度不能大于50个字符") private java.lang.String signedContactsTemporaryName; - /**是否开口（1为是，2为否）*/ - @Excel(name = "是否开口（1为是，2为否）", width = 15) - @ApiModelProperty(value = "是否开口（1为是，2为否）") + /**是否开口（1为是，0为否）*/ + @Excel(name = "是否开口（1为是，0为否）", width = 15) + @ApiModelProperty(value = "是否开口（1为是，0为否）") @Max(2) + @Dict(dicCode = "yn") private java.lang.Integer opening; /**负责人id*/ @Excel(name = "负责人id", width = 15) @@ -156,6 +158,7 @@ public class PayIncomeContract implements Serializable { @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; /**合同约定付款次数*/ @Excel(name = "合同约定付款次数", width = 15) @@ -164,6 +167,7 @@ public class PayIncomeContract implements Serializable { /**是否打包（1：是，2：否）*/ @Excel(name = "是否打包（1：是，2：否）", width = 15) @ApiModelProperty(value = "是否打包（1：是，2：否）") + @Dict(dicCode = "yn") private java.lang.Integer pack; /**打包年份*/ @Excel(name = "打包年份", width = 15) @@ -172,6 +176,7 @@ public class PayIncomeContract implements Serializable { /**合同状态（1：草稿，2：已通过，3：未通过，4：已归档）*/ @Excel(name = "合同状态（1：草稿，2：已通过，3：未通过，4：已归档）", width = 15) @ApiModelProperty(value = "合同状态（1：草稿，2：已通过，3：未通过，4：已归档）") + @Dict(dicCode = "revenue_contract_status") private java.lang.Integer status; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java index e0a6a2f9..7137846b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java @@ -4,6 +4,7 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -35,9 +36,10 @@ public class PayIncomeContractAudit implements Serializable { @Excel(name = "合同id", width = 15) @ApiModelProperty(value = "合同id") private java.lang.String contractId; - /**合同状态（2：已通过，3：未通过，4：已归档）*/ - @Excel(name = "合同状态（2：已通过，3：未通过，4：已归档）", width = 15) - @ApiModelProperty(value = "合同状态（2：已通过，3：未通过，4：已归档）") + /**合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）*/ + @Excel(name = "合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）", width = 15) + @ApiModelProperty(value = "合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）") + @Dict(dicCode = "revenue_contract_status") private java.lang.Integer contractStatus; /**拒绝说明*/ @Excel(name = "拒绝说明", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java index d69f6fc6..ce7f8b08 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java @@ -6,8 +6,11 @@ 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; +import java.util.List; + /** * @Description: pay_income_contract * @Author: jeecg-boot @@ -27,4 +30,15 @@ public interface PayIncomeContractMapper extends BaseMapper { IPage queryPageList(Page page, @Param("payIncomeContract") PayIncomeContract payIncomeContract, @Param("chargeStatus") String chargeStatus,@Param("projectName") String projectName, @Param("startTime") String startTime, @Param("endTime") String endTime); + + /** + * @Description 关联项目列表 + * @Author lqt + * @Date 2021/9/6 + * @Param contractId 合同id + * @Return + * @Exception + */ + // todo 缺少会议，会员项目数据 + List getAssociated(@Param("contractId") String contractId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index f51b0498..68247fa2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -75,4 +75,39 @@ GROUP BY pic.id ORDER BY pic.create_time desc + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java index 35bd1da6..e1f5d965 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java @@ -42,6 +42,15 @@ public interface IPayIncomeContractService extends IService { */ void addPayIncomeContractInput(PayIncomeContractInput input); /** + * @Description 关联项目列表 + * @Author lqt + * @Date 2021/9/6 + * @Param contractId 合同id + * @Return + * @Exception + */ + List getAssociated(String contractId); + /** * @Description 编辑 * @Author lqt * @Date 2021/9/3 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 102062a1..90902abe 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 @@ -1,14 +1,12 @@ package com.jero.contract.service.impl; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ValidUtil; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.contract.entity.PayIncomeContract; @@ -20,7 +18,6 @@ import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractAuditService; import com.jero.contract.service.IPayIncomeContractInstallmentService; import com.jero.contract.service.IPayIncomeContractService; -import com.jero.contract.vo.PayIncomeContractAssociatedInput; import com.jero.contract.vo.PayIncomeContractInput; import com.jero.contract.vo.PayIncomeContractOutput; import com.jero.contract.vo.ProjectOutput; @@ -39,12 +36,14 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -148,6 +147,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl getAssociated(String contractId) { + return payIncomeContractMapper.getAssociated(contractId); + } + @Override @Transactional public void editPayIncomeContractInput(PayIncomeContractInput input) { @@ -233,6 +237,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl listProjectOutput = new ArrayList<>(); listPayIncomeContractAssociated.forEach(p->{ ProjectOutput projectOutput = new ProjectOutput(); @@ -263,8 +268,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayCommonProject = new LambdaUpdateWrapper<>(); - updatePayCommonProject.eq(PayCommonProject::getPack,PayIncomeContractCommon.PACK1); updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId()); + updatePayCommonProject.set(PayCommonProject::getPack,PayIncomeContractCommon.PACK1); + updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername()); + updatePayCommonProject.set(PayCommonProject::getUpdateTime,new Date()); payCommonProjectService.update(updatePayCommonProject); // todo 添加打包企业 } @@ -290,13 +297,19 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); - updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK1); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK1); updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId()); payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); // todo 添加打包企业 @@ -325,15 +338,27 @@ public class PayIncomeContractServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); - query.eq(PayIncomeContractAssociated::getContractId,contractId); query.eq(PayIncomeContractAssociated::getProjectId,projectId); List list = payIncomeContractAssociatedService.list(query); if(!CollectionUtils.isEmpty(list)){ + List listNew = list.stream().filter(p->Objects.equals(p.getContractId(),contractId)).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listNew)){ + throw new JeroBootException("项目已关联！"); + } throw new JeroBootException("项目已被其他合同关联！"); } + } @Override @@ -343,6 +368,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayCommonProject = new LambdaUpdateWrapper<>(); - updatePayCommonProject.eq(PayCommonProject::getPack,PayIncomeContractCommon.PACK0); + updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername()); + updatePayCommonProject.set(PayCommonProject::getUpdateTime,new Date()); + updatePayCommonProject.set(PayCommonProject::getPack,PayIncomeContractCommon.PACK0); updatePayCommonProject.eq(PayCommonProject::getId,payIncomeContractAssociated.getProjectId()); payCommonProjectService.update(updatePayCommonProject); } @@ -375,9 +403,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); - updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK0); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK0); updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId()); payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); break; @@ -389,11 +419,12 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayIncomeContract = new LambdaUpdateWrapper<>(); + updatePayIncomeContract.set(PayIncomeContract::getUpdateBy,sysUser.getUsername()); + updatePayIncomeContract.set(PayIncomeContract::getUpdateTime,new Date()); updatePayIncomeContract.eq(PayIncomeContract::getId,payIncomeContract.getId()); - updatePayIncomeContract.eq(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS3); + updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS3); payIncomeContractService.update(updatePayIncomeContract); } @@ -463,8 +496,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl update = new LambdaUpdateWrapper(); - update.eq(PayIncomeContract::getId,payIncomeContractAudit.getContractId()); + update.set(PayIncomeContract::getUpdateBy,sysUser.getUsername()); + update.set(PayIncomeContract::getUpdateTime,new Date()); + update.set(PayIncomeContract::getId,payIncomeContractAudit.getContractId()); update.eq(PayIncomeContract::getStatus, payIncomeContractAudit.getContractStatus()); payIncomeContractService.update(update); // 添加审核记录 @@ -482,9 +518,12 @@ public class PayIncomeContractServiceImpl extends ServiceImpl update = new LambdaUpdateWrapper(); + update.set(PayIncomeContract::getUpdateBy,sysUser.getUsername()); + update.set(PayIncomeContract::getUpdateTime,new Date()); update.eq(PayIncomeContract::getId,id); - update.eq(PayIncomeContract::getStatus, PayIncomeContractCommon.STATUS5); + update.set(PayIncomeContract::getStatus, PayIncomeContractCommon.STATUS5); payIncomeContractService.update(update); // 添加归档记录 PayIncomeContractAudit payIncomeContractAudit = new PayIncomeContractAudit(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractAuditOutput.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractAuditOutput.java new file mode 100644 index 00000000..40a04380 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractAuditOutput.java @@ -0,0 +1,14 @@ +package com.jero.contract.vo; + +import com.jero.contract.entity.PayIncomeContractAudit; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PayIncomeContractAuditOutput extends PayIncomeContractAudit implements Serializable { + /** + * 合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档） + */ + private String contractStatus_dictText; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractDetailOutput.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractDetailOutput.java index ab52524e..ffa08c41 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractDetailOutput.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractDetailOutput.java @@ -11,6 +11,23 @@ import java.util.List; @Data public class PayIncomeContractDetailOutput extends PayIncomeContract implements Serializable { + + /** + * 是否开口（1为是，0为否） + */ + private String opening_dictText; + /** + * 账款状态（1：未支付，2：部分支付，3：已付全款） + */ + private String accountStatus_dictText; + /** + * 是否打包（1：是，2：否） + */ + private String pack_dictText; + /** + * 合同状态（1：草稿，2：已通过，3：未通过，4：已归档） + */ + private String contractStatus_dictText; /** * 分期记录 */ @@ -25,10 +42,10 @@ public class PayIncomeContractDetailOutput extends PayIncomeContract implements * 归档记录 */ @ApiModelProperty(value = "归档记录") - private List listArchive; + private List listArchive; /** * 审核记录 */ @ApiModelProperty(value = "审核记录") - private List listAudit; + private List listAudit; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/ProjectOutput.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/ProjectOutput.java index 36faf743..5837f4f2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/ProjectOutput.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/ProjectOutput.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Date; @Data @ApiModel(value="关联项目", description="关联项目") @@ -30,6 +31,11 @@ public class ProjectOutput implements Serializable { */ @ApiModelProperty(value = "来款用途") private String chargeUse; + /** + * 来款用途 + */ + @ApiModelProperty(value = "来款用途") + private String chargeUse_dictText; /** * 来款单位 */ @@ -59,5 +65,5 @@ public class ProjectOutput implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") - private String createTime; + private Date createTime; }