diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index e2c40f5f..b48500a8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -32,6 +32,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -188,7 +189,7 @@ public class PayCompanyManagementController extends JeroController listPayCompanyManagement(List companyList); + /** + * @Description 删除企业 + * @Author lqt + * @Date 2021/9/3 + * @Param + * @Return + * @Exception + */ + void removePayCompanyManagementById(String id); + /** + * @Description 批量删除企业 + * @Author lqt + * @Date 2021/9/3 + * @Param + * @Return + * @Exception + */ + void removePayCompanyManagementByIds(List ids); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index 4517cbd5..1f9b05d8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -1,9 +1,12 @@ package com.jero.company.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayContactsManagement; import com.jero.company.mapper.PayCompanyManagementMapper; import com.jero.company.service.IPayCompanyManagementService; +import com.jero.company.service.IPayContactsManagementService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +25,10 @@ import java.util.List; public class PayCompanyManagementServiceImpl extends ServiceImpl implements IPayCompanyManagementService { @Autowired - IPayCompanyManagementService iPayCompanyManagementService; + IPayCompanyManagementService payCompanyManagementService; + + @Autowired + private IPayContactsManagementService payContactsManagementService; @Resource PayCompanyManagementMapper payCompanyManagementMapper; @@ -32,11 +38,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl listSigning, List list) { // 已存在企业名称，变更数据来源 if(!CollectionUtils.isEmpty(listSigning)){ - iPayCompanyManagementService.updateBatchById(listSigning); + payCompanyManagementService.updateBatchById(listSigning); } // 更新excel数据 if(!CollectionUtils.isEmpty(list)){ - iPayCompanyManagementService.saveBatch(list); + payCompanyManagementService.saveBatch(list); } } @@ -44,4 +50,22 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl listPayCompanyManagement(List companyList) { return payCompanyManagementMapper.listPayCompanyManagement(companyList); } + + @Override + @Transactional + public void removePayCompanyManagementById(String id) { + payCompanyManagementService.removeById(id); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(PayContactsManagement::getCompanyId,id); + payContactsManagementService.remove(query); + } + + @Override + @Transactional + public void removePayCompanyManagementByIds(List ids) { + payCompanyManagementService.removeByIds(ids); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.in(PayContactsManagement::getCompanyId,ids); + payContactsManagementService.remove(query); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java index 1dd57529..69f2ff99 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java @@ -20,12 +20,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** - * @Description: pay_income_contract_associated + * @Description: 收入合同关联 * @Author: jeecg-boot * @Date: 2021-09-03 * @Version: V1.0 */ -@Api(tags="pay_income_contract_associated") +@Api(tags="收入合同关联") @RestController @RequestMapping("/contract/payIncomeContractAssociated") @Slf4j @@ -42,8 +42,8 @@ public class PayIncomeContractAssociatedController extends JeroController queryPageList(PayIncomeContractAssociated payIncomeContractAssociated, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -61,8 +61,8 @@ public class PayIncomeContractAssociatedController extends JeroController add(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) { payIncomeContractAssociatedService.save(payIncomeContractAssociated); @@ -75,9 +75,9 @@ public class PayIncomeContractAssociatedController extends JeroController edit(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) { payIncomeContractAssociatedService.updateById(payIncomeContractAssociated); return Result.OK("编辑成功!"); @@ -89,9 +89,9 @@ public class PayIncomeContractAssociatedController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payIncomeContractAssociatedService.removeById(id); return Result.OK("删除成功!"); @@ -103,9 +103,9 @@ public class PayIncomeContractAssociatedController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payIncomeContractAssociatedService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -117,8 +117,8 @@ public class PayIncomeContractAssociatedController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayIncomeContractAssociated payIncomeContractAssociated = payIncomeContractAssociatedService.getById(id); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java index c240ceb2..866ce5cf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java @@ -21,12 +21,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** - * @Description: pay_income_contract_audit + * @Description: 审核记录 * @Author: jeecg-boot * @Date: 2021-09-03 * @Version: V1.0 */ -@Api(tags="pay_income_contract_audit") +@Api(tags="审核记录") @RestController @RequestMapping("/contract/payIncomeContractAudit") @Slf4j @@ -43,8 +43,8 @@ public class PayIncomeContractAuditController extends JeroController queryPageList(PayIncomeContractAudit payIncomeContractAudit, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -62,8 +62,8 @@ public class PayIncomeContractAuditController extends JeroController add(@RequestBody PayIncomeContractAudit payIncomeContractAudit) { payIncomeContractAuditService.save(payIncomeContractAudit); @@ -76,9 +76,9 @@ public class PayIncomeContractAuditController extends JeroController edit(@RequestBody PayIncomeContractAudit payIncomeContractAudit) { payIncomeContractAuditService.updateById(payIncomeContractAudit); return Result.OK("编辑成功!"); @@ -90,9 +90,9 @@ public class PayIncomeContractAuditController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payIncomeContractAuditService.removeById(id); return Result.OK("删除成功!"); @@ -104,9 +104,9 @@ public class PayIncomeContractAuditController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payIncomeContractAuditService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -118,8 +118,8 @@ public class PayIncomeContractAuditController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayIncomeContractAudit payIncomeContractAudit = payIncomeContractAuditService.getById(id); 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 4d927042..081e8738 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,16 +1,29 @@ package com.jero.contract.controller; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.util.ValidUtil; import com.jero.contract.entity.PayIncomeContract; +import com.jero.contract.entity.PayIncomeContractInstallment; +import com.jero.contract.service.IPayIncomeContractInstallmentService; import com.jero.contract.service.IPayIncomeContractService; +import com.jero.contract.vo.PayIncomeContractInput; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -30,6 +43,8 @@ import io.swagger.annotations.ApiOperation; public class PayIncomeContractController extends JeroController { @Autowired private IPayIncomeContractService payIncomeContractService; + @Autowired + private IPayIncomeContractInstallmentService payIncomeContractInstallmentService; /** * 分页列表查询 @@ -38,6 +53,8 @@ public class PayIncomeContractController extends JeroController queryPageList(PayIncomeContract payIncomeContract, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - @RequestParam(name="chargeStatus",required = false) String chargeStatus) { + @RequestParam(name="chargeStatus",required = false) String chargeStatus, + @RequestParam(name="startTime",required = false) String startTime, + @RequestParam(name="endTime",required = false) String endTime) { Page page = new Page<>(pageNo, pageSize); - IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus); + IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,startTime,endTime); return Result.OK(pageList); } /** * 添加 * - * @param payIncomeContract 收入合同 + * @param input 收入合同 */ @AutoLog(value = "收入合同-添加") @ApiOperation(value="收入合同-添加", notes="收入合同-添加") @PostMapping(value = "/add") - public Result add(@RequestBody PayIncomeContract payIncomeContract) { + public Result add(@RequestBody PayIncomeContractInput input) { + if(Objects.isNull(input)){ + return Result.error("收入合同信息不能为空！"); + } + if(StringUtils.isBlank(input.getContract())){ + return Result.error("收入合同信息不能为空！"); + } + PayIncomeContract payIncomeContract = JSONObject.parseObject(input.getContract(),PayIncomeContract.class); + if(Objects.isNull(payIncomeContract)){ + return Result.error("收入合同信息不能为空！"); + } + StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract); + if(!StringUtils.isBlank(msgPayIncomeContract)){ + return Result.error(msgPayIncomeContract.toString()); + } + List listPayIncomeContractInstallment = new ArrayList<>(); + if(!StringUtils.isBlank(input.getInstallment())){ + listPayIncomeContractInstallment = JSONArray.parseArray(input.getInstallment(),PayIncomeContractInstallment.class); + } payIncomeContractService.save(payIncomeContract); + StringBuilder msgPayIncomeContractInstallment = new StringBuilder(); + if(!CollectionUtils.isEmpty(listPayIncomeContractInstallment)){ + List finalListPayIncomeContractInstallment = listPayIncomeContractInstallment; + listPayIncomeContractInstallment.forEach(p->{ + p.setContractId(payIncomeContract.getId()); + msgPayIncomeContractInstallment.append("第").append(finalListPayIncomeContractInstallment.indexOf(p)).append("阶段:").append(ValidUtil.validateAll(p)); + }); + payIncomeContractInstallmentService.saveBatch(listPayIncomeContractInstallment); + } + if(!StringUtils.isBlank(msgPayIncomeContractInstallment)){ + return Result.error(msgPayIncomeContractInstallment.toString()); + } return Result.OK("添加成功！"); } /** * 编辑 * - * @param payIncomeContract 收入合同 + * @param input 收入合同 */ @AutoLog(value = "收入合同-编辑") @ApiOperation(value="收入合同-编辑", notes="收入合同-编辑") @PostMapping(value = "/edit") - public Result edit(@RequestBody PayIncomeContract payIncomeContract) { + public Result edit(@RequestBody PayIncomeContractInput input) { + if(Objects.isNull(input)){ + return Result.error("收入合同信息不能为空！"); + } + if(StringUtils.isBlank(input.getContract())){ + return Result.error("收入合同信息不能为空！"); + } + PayIncomeContract payIncomeContract = JSONObject.parseObject(input.getContract(),PayIncomeContract.class); + if(Objects.isNull(payIncomeContract)){ + return Result.error("收入合同信息不能为空！"); + } + StringBuilder msgPayIncomeContract = ValidUtil.validateAll(payIncomeContract); + if(!StringUtils.isBlank(msgPayIncomeContract)){ + return Result.error(msgPayIncomeContract.toString()); + } + List listPayIncomeContractInstallment = new ArrayList<>(); + if(!StringUtils.isBlank(input.getInstallment())){ + listPayIncomeContractInstallment = JSONArray.parseArray(input.getInstallment(),PayIncomeContractInstallment.class); + } + StringBuilder msgPayIncomeContractInstallment = new StringBuilder(); + if(!CollectionUtils.isEmpty(listPayIncomeContractInstallment)){ + List list = listPayIncomeContractInstallment.stream().map(PayIncomeContractInstallment::getId).collect(Collectors.toList()); + payIncomeContractInstallmentService.removeByIds(list); + List finalListPayIncomeContractInstallment = listPayIncomeContractInstallment; + listPayIncomeContractInstallment.forEach(p->{ + p.setContractId(payIncomeContract.getId()); + msgPayIncomeContractInstallment.append("第").append(finalListPayIncomeContractInstallment.indexOf(p)).append("阶段:").append(ValidUtil.validateAll(p)); + }); + payIncomeContractInstallmentService.saveBatch(listPayIncomeContractInstallment); + } + if(!StringUtils.isBlank(msgPayIncomeContractInstallment)){ + return Result.error(msgPayIncomeContractInstallment.toString()); + } payIncomeContractService.updateById(payIncomeContract); return Result.OK("编辑成功!"); } @@ -86,6 +167,9 @@ public class PayIncomeContractController extends JeroController delete(@RequestParam(name="id",required=true) String id) { + if(StringUtils.isBlank(id)){ + return Result.error("id不能为空!"); + } payIncomeContractService.removeById(id); return Result.OK("删除成功!"); } @@ -99,6 +183,15 @@ public class PayIncomeContractController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { + if(StringUtils.isBlank(ids)){ + return Result.error("id不能为空!"); + } + String[] s = ids.split(","); + for (String s1 : s) { + if(StringUtils.isBlank(s1)){ + return Result.error("id不能为空!"); + } + } this.payIncomeContractService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java index fe1d6a30..dc809379 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java @@ -21,12 +21,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** - * @Description: pay_income_contract_installment + * @Description: 分期信息 * @Author: jeecg-boot * @Date: 2021-09-03 * @Version: V1.0 */ -@Api(tags="pay_income_contract_installment") +@Api(tags="分期信息") @RestController @RequestMapping("/contract/payIncomeContractInstallment") @Slf4j @@ -43,8 +43,8 @@ public class PayIncomeContractInstallmentController extends JeroController queryPageList(PayIncomeContractInstallment payIncomeContractInstallment, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -62,8 +62,8 @@ public class PayIncomeContractInstallmentController extends JeroController add(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) { payIncomeContractInstallmentService.save(payIncomeContractInstallment); @@ -76,9 +76,9 @@ public class PayIncomeContractInstallmentController extends JeroController edit(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) { payIncomeContractInstallmentService.updateById(payIncomeContractInstallment); return Result.OK("编辑成功!"); @@ -90,9 +90,9 @@ public class PayIncomeContractInstallmentController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payIncomeContractInstallmentService.removeById(id); return Result.OK("删除成功!"); @@ -104,9 +104,9 @@ public class PayIncomeContractInstallmentController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payIncomeContractInstallmentService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -118,8 +118,8 @@ public class PayIncomeContractInstallmentController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayIncomeContractInstallment payIncomeContractInstallment = payIncomeContractInstallmentService.getById(id); 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 9650caef..8cd53c88 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 @@ -39,15 +39,30 @@ public class PayIncomeContract implements Serializable { @Excel(name = "合同名称", width = 15) @ApiModelProperty(value = "合同名称") private java.lang.String contractName; - /**签订单位*/ - @Excel(name = "签订单位", width = 15) - @ApiModelProperty(value = "签订单位") - private java.lang.String signedCompany; + /**签订单位id*/ + @ApiModelProperty(value = "签订单位id") + private java.lang.String signedCompanyId; + /**临时签订单位id*/ + @Excel(name = "临时签订单位id", width = 15) + @ApiModelProperty(value = "临时签订单位id") + private java.lang.String signedCompanyTemporaryId; + /**临时签订单位名称*/ + @Excel(name = "临时签订单位名称", width = 15) + @ApiModelProperty(value = "临时签订单位名称") + private java.lang.String signedCompanyTemporaryName; /**签订单位联系人id*/ @Excel(name = "签订单位联系人id", width = 15) @ApiModelProperty(value = "签订单位联系人id") private java.lang.String signedContactsId; - /**是否开口（1为是，2为否）*/ + /**临时签订单位联系人id*/ + @Excel(name = "临时签订单位联系人id", width = 15) + @ApiModelProperty(value = "临时签订单位联系人id") + private java.lang.String signedContactsTemporaryId; + /**临时签订单位联系人名称*/ + @Excel(name = "临时签订单位联系人名称", width = 15) + @ApiModelProperty(value = "临时签订单位联系人名称") + private java.lang.String signedContactsTemporaryName; + /**是否开口（1为是，2为否）*/ @Excel(name = "是否开口（1为是，2为否）", width = 15) @ApiModelProperty(value = "是否开口（1为是，2为否）") private java.lang.Integer opening; 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 f463905b..6201df1d 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 @@ -23,5 +23,6 @@ public interface PayIncomeContractMapper extends BaseMapper { * @Return * @Exception */ - IPage queryPageList(Page page, @Param("payIncomeContract") PayIncomeContract payIncomeContract,@Param("chargeStatus") String chargeStatus); + IPage queryPageList(Page page, @Param("payIncomeContract") PayIncomeContract payIncomeContract, + @Param("chargeStatus") String chargeStatus,@Param("startTime") String startTime,@Param("endTime") String endTime); } 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 efc35da3..781e4f82 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 @@ -20,6 +20,6 @@ public interface IPayIncomeContractService extends IService { * @Return * @Exception */ - IPage queryPageList(Page page,PayIncomeContract payIncomeContract,String chargeStatus); + IPage queryPageList(Page page,PayIncomeContract payIncomeContract,String chargeStatus,String startTime,String endTime); } 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 999fed26..f0ea6df1 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 @@ -23,7 +23,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl queryPageList(Page page, PayIncomeContract payIncomeContract, String chargeStatus) { - return payIncomeContractMapper.queryPageList(page,payIncomeContract,chargeStatus); + public IPage queryPageList(Page page, PayIncomeContract payIncomeContract, String chargeStatus,String startTime,String endTime) { + return payIncomeContractMapper.queryPageList(page,payIncomeContract,chargeStatus,startTime,endTime); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractInput.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractInput.java new file mode 100644 index 00000000..862186a4 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractInput.java @@ -0,0 +1,20 @@ +package com.jero.contract.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PayIncomeContractInput implements Serializable { + /** + * 合同数据 + */ + @ApiModelProperty(value = "合同数据") + private String contract; + /** + * 分期信息 + */ + @ApiModelProperty(value = "分期信息") + private String installment; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index bf1b560a..ec6fe323 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -47,12 +47,6 @@ public class PayCommonProjectController extends JeroController add(@RequestBody PayCommonProject payCommonProject) { StringBuilder msg = ValidUtil.validateAll(payCommonProject); if(!StringUtils.isBlank(msg)){ return Result.error(msg.toString()); } - try { - // 编辑保存前再次校验来款项目是否存在 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCommonProject::getChargeProject,payCommonProject.getChargeProject()); - PayCommonProject payCommonProjectNew = payCommonProjectService.getOne(queryWrapper); - // 来款项目存在，并且编辑id与查询不同，则校验不通过 - if(!Objects.isNull(payCommonProjectNew)) { - return Result.error("来款项目已存在！"); - } - }catch (Exception e){ - log.info("普通项目管理-添加异常",e); - return Result.error("来款项目已存在！"); - } - payCommonProject = setPayCommonProject(payCommonProject); - payCommonProject.setPack(PayProjectCommon.PACKAGING0); - payCommonProject.setInAccount(PayProjectCommon.IN_ACCOUNT0); - payCommonProject.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0); - payCommonProject.setMail(PayProjectCommon.MAIL0); - payCommonProjectService.save(payCommonProject); + payCommonProjectService.addPayCommonProject(payCommonProject); return Result.OK("添加成功！"); } @@ -131,70 +106,10 @@ public class PayCommonProjectController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCommonProject::getChargeProject,payCommonProject.getChargeProject()); - PayCommonProject payCommonProjectNew = payCommonProjectService.getOne(queryWrapper); - // 来款项目存在，并且编辑id与查询不同，则校验不通过 - if(!Objects.isNull(payCommonProjectNew) && !Objects.equals(payCommonProjectNew.getId(),payCommonProject.getId())) { - return Result.error("来款项目已存在！"); - } - }catch (Exception e){ - log.info("普通项目管理-编辑异常",e); - return Result.error("来款项目已存在！"); - } - - payCommonProject = setPayCommonProject(payCommonProject); - // 先删除临时表企业信息，联系人信息，邮寄联系人信息 - PayCommonProject payCommonProjectOld = payCommonProjectService.getById(payCommonProject.getId()); - if(Objects.isNull(payCommonProjectOld)){ - return Result.error("来款项目不存在！"); - } - payCompanyManagementTemporaryService.removeById(payCommonProjectOld.getChargeCompanyId()); - payContactsManagementTemporaryService.removeByIds(Arrays.asList(payCommonProjectOld.getContactsId(),payCommonProjectOld.getMailContactsId())); - payCommonProjectService.updateById(payCommonProject); + payCommonProjectService.editPayCommonProject(payCommonProject); return Result.OK("编辑成功!"); } - /** - * @Description 插入企业信息，联系人信息到临时表，更新项目记录 - * @Author lqt - * @Date 2021/8/31 - * @Param payCommonProject - * @Return - * @Exception - */ - private PayCommonProject setPayCommonProject(PayCommonProject payCommonProject){ - // 企业 - PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payCommonProject.getChargeCompanyId()); - if(Objects.isNull(chargeCompanyName)){ - throw new JeroBootException("企业名称为空！"); - } - // 联系人 - PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payCommonProject.getContactsId()); - if(Objects.isNull(contactsName)){ - throw new JeroBootException("联系人名称为空！"); - } - // 邮寄联系人 - PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payCommonProject.getMailContactsId()); - if(Objects.isNull(mailContactsName)){ - throw new JeroBootException("邮寄联系人名称为空！"); - } - // 负责人名称 - SysUser principalName = sysUserService.getById(payCommonProject.getPrincipalId()); - if(Objects.isNull(principalName)){ - throw new JeroBootException("负责人名称为空！"); - } - payCommonProject.setPrincipalId(principalName.getId()); - payCommonProject.setPrincipalName(principalName.getRealname()); - payCommonProject.setContactsTemporaryId(contactsName.getId()); - payCommonProject.setContactsTemporaryName(contactsName.getName()); - payCommonProject.setMailContactsTemporaryId(mailContactsName.getId()); - payCommonProject.setMailContactsTemporaryName(mailContactsName.getName()); - payCommonProject.setChargeCompanyTemporaryId(chargeCompanyName.getId()); - payCommonProject.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName()); - return payCommonProject; - } + /** * 通过id删除 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 29d71968..8434a81e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -8,10 +8,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; 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.aspect.annotation.AutoLog; 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.contract.entity.PayIncomeContractAudit; import com.jero.project.vo.PayWorkingGroupPayment; import com.jero.project.vo.PayWorkingGroupVO; import com.jero.project.entity.PayWorkingGroupSubItem; @@ -108,6 +112,22 @@ public class PayWorkingGroupController extends JeroController queryList(PayWorkingGroup payWorkingGroup,HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, req.getParameterMap()); + List list = payWorkingGroupService.list(queryWrapper); + return Result.OK(list); + } /** * 添加 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java index 6789d6cd..7cf85136 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java @@ -21,4 +21,23 @@ public interface IPayCommonProjectService extends IService { * @Exception */ IPage queryPageList(Page page,PayCommonProject payCommonProject, String paymentDate); + + /** + * @Description 新增 + * @Author lqt + * @Date 2021/9/3 + * @Param + * @Return + * @Exception + */ + void addPayCommonProject(PayCommonProject payCommonProject); + /** + * @Description 编辑 + * @Author lqt + * @Date 2021/9/3 + * @Param + * @Return + * @Exception + */ + void editPayCommonProject(PayCommonProject payCommonProject); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 43cd1221..3ce3c653 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -1,15 +1,31 @@ package com.jero.project.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.common.service.ProjectDetailService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; +import com.jero.project.common.PayProjectCommon; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.entity.PayCommonProject; import com.jero.project.mapper.PayCommonProjectMapper; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Arrays; +import java.util.Objects; /** * @Description: pay_common_project @@ -17,14 +33,116 @@ import javax.annotation.Resource; * @Date: 2021-08-27 * @Version: V1.0 */ +@Slf4j @Service public class PayCommonProjectServiceImpl extends ServiceImpl implements IPayCommonProjectService { @Resource private PayCommonProjectMapper payCommonProjectMapper; + @Autowired + private IPayCommonProjectService payCommonProjectService; + @Autowired + private ISysUserService sysUserService; + @Autowired + private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService; + @Autowired + private IPayContactsManagementTemporaryService payContactsManagementTemporaryService; + + @Override public IPage queryPageList(Page page, PayCommonProject payCommonProject, String paymentDate) { return payCommonProjectMapper.queryPageList(page,payCommonProject,paymentDate); } + + @Override + public void addPayCommonProject(PayCommonProject payCommonProject) { + try { + // 编辑保存前再次校验来款项目是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCommonProject::getChargeProject,payCommonProject.getChargeProject()); + PayCommonProject payCommonProjectNew = payCommonProjectService.getOne(queryWrapper); + // 来款项目存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payCommonProjectNew)) { + throw new JeroBootException("来款项目已存在！"); + } + }catch (Exception e){ + log.info("普通项目管理-添加异常",e); + throw new JeroBootException("来款项目已存在！"); + } + payCommonProject = setPayCommonProject(payCommonProject); + payCommonProject.setPack(PayProjectCommon.PACKAGING0); + payCommonProject.setInAccount(PayProjectCommon.IN_ACCOUNT0); + payCommonProject.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0); + payCommonProject.setMail(PayProjectCommon.MAIL0); + payCommonProjectService.save(payCommonProject); + } + + @Override + @Transactional + public void editPayCommonProject(PayCommonProject payCommonProject) { + try { + // 编辑保存前再次校验来款项目是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCommonProject::getChargeProject,payCommonProject.getChargeProject()); + PayCommonProject payCommonProjectNew = payCommonProjectService.getOne(queryWrapper); + // 来款项目存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payCommonProjectNew) && !Objects.equals(payCommonProjectNew.getId(),payCommonProject.getId())) { + throw new JeroBootException("来款项目已存在！"); + } + }catch (Exception e){ + log.info("普通项目管理-编辑异常",e); + throw new JeroBootException("来款项目已存在！"); + } + + payCommonProject = setPayCommonProject(payCommonProject); + // 先删除临时表企业信息，联系人信息，邮寄联系人信息 + PayCommonProject payCommonProjectOld = payCommonProjectService.getById(payCommonProject.getId()); + if(Objects.isNull(payCommonProjectOld)){ + throw new JeroBootException("来款项目不存在！"); + } + payCompanyManagementTemporaryService.removeById(payCommonProjectOld.getChargeCompanyId()); + payContactsManagementTemporaryService.removeByIds(Arrays.asList(payCommonProjectOld.getContactsId(),payCommonProjectOld.getMailContactsId())); + payCommonProjectService.updateById(payCommonProject); + } + + /** + * @Description 插入企业信息，联系人信息到临时表，更新项目记录 + * @Author lqt + * @Date 2021/8/31 + * @Param payCommonProject + * @Return + * @Exception + */ + private PayCommonProject setPayCommonProject(PayCommonProject payCommonProject){ + // 企业 + PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payCommonProject.getChargeCompanyId()); + if(Objects.isNull(chargeCompanyName)){ + throw new JeroBootException("企业名称为空！"); + } + // 联系人 + PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payCommonProject.getContactsId()); + if(Objects.isNull(contactsName)){ + throw new JeroBootException("联系人名称为空！"); + } + // 邮寄联系人 + PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payCommonProject.getMailContactsId()); + if(Objects.isNull(mailContactsName)){ + throw new JeroBootException("邮寄联系人名称为空！"); + } + // 负责人名称 + SysUser principalName = sysUserService.getById(payCommonProject.getPrincipalId()); + if(Objects.isNull(principalName)){ + throw new JeroBootException("负责人名称为空！"); + } + payCommonProject.setPrincipalId(principalName.getId()); + payCommonProject.setPrincipalName(principalName.getRealname()); + payCommonProject.setContactsTemporaryId(contactsName.getId()); + payCommonProject.setContactsTemporaryName(contactsName.getName()); + payCommonProject.setMailContactsTemporaryId(mailContactsName.getId()); + payCommonProject.setMailContactsTemporaryName(mailContactsName.getName()); + payCommonProject.setChargeCompanyTemporaryId(chargeCompanyName.getId()); + payCommonProject.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName()); + return payCommonProject; + } }