From 1ca41ca4532a0d2c1ed2b41deaea519339313ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 7 Sep 2021 15:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C-=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PaySpendingContractController.java | 156 +++++++++++++++++ ...SpendingContractInstallmentController.java | 155 +++++++++++++++++ .../contract/entity/PaySpendingContract.java | 159 ++++++++++++++++++ .../PaySpendingContractInstallment.java | 79 +++++++++ .../PaySpendingContractInstallmentMapper.java | 15 ++ .../mapper/PaySpendingContractMapper.java | 15 ++ .../PaySpendingContractInstallmentMapper.xml | 5 + .../mapper/xml/PaySpendingContractMapper.xml | 5 + ...PaySpendingContractInstallmentService.java | 15 ++ .../service/IPaySpendingContractService.java | 14 ++ ...pendingContractInstallmentServiceImpl.java | 18 ++ .../impl/PaySpendingContractServiceImpl.java | 18 ++ .../controller/PayPackCompanyController.java | 155 +++++++++++++++++ .../PayPackCompanyProjectController.java | 155 +++++++++++++++++ .../com/jero/pack/entity/PayPackCompany.java | 116 +++++++++++++ .../pack/entity/PayPackCompanyProject.java | 62 +++++++ .../pack/mapper/PayPackCompanyMapper.java | 15 ++ .../mapper/PayPackCompanyProjectMapper.java | 15 ++ .../pack/mapper/xml/PayPackCompanyMapper.xml | 5 + .../xml/PayPackCompanyProjectMapper.xml | 5 + .../IPayPackCompanyProjectService.java | 15 ++ .../pack/service/IPayPackCompanyService.java | 14 ++ .../PayPackCompanyProjectServiceImpl.java | 18 ++ .../impl/PayPackCompanyServiceImpl.java | 18 ++ .../PayCommonProjectController.java | 15 +- .../controller/PayWorkingGroupController.java | 2 +- 26 files changed, 1256 insertions(+), 8 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyProjectMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java new file mode 100644 index 00000000..98b12411 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -0,0 +1,156 @@ +package com.jero.contract.controller; + +import java.util.Arrays; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.system.query.QueryGenerator; +import com.jero.contract.entity.PaySpendingContract; +import com.jero.contract.service.IPaySpendingContractService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Api(tags="pay_spending_contract") +@RestController +@RequestMapping("/contract/paySpendingContract") +@Slf4j +public class PaySpendingContractController extends JeroController { + @Autowired + private IPaySpendingContractService paySpendingContractService; + + /** + * 分页列表查询 + * + * @param paySpendingContract + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_spending_contract-分页列表查询") + @ApiOperation(value="pay_spending_contract-分页列表查询", notes="pay_spending_contract-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PaySpendingContract paySpendingContract, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(paySpendingContract, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = paySpendingContractService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param paySpendingContract + * @return + */ + @AutoLog(value = "pay_spending_contract-添加") + @ApiOperation(value="pay_spending_contract-添加", notes="pay_spending_contract-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PaySpendingContract paySpendingContract) { + paySpendingContractService.save(paySpendingContract); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param paySpendingContract + * @return + */ + @AutoLog(value = "pay_spending_contract-编辑") + @ApiOperation(value="pay_spending_contract-编辑", notes="pay_spending_contract-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PaySpendingContract paySpendingContract) { + paySpendingContractService.updateById(paySpendingContract); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_spending_contract-通过id删除") + @ApiOperation(value="pay_spending_contract-通过id删除", notes="pay_spending_contract-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + paySpendingContractService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_spending_contract-批量删除") + @ApiOperation(value="pay_spending_contract-批量删除", notes="pay_spending_contract-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.paySpendingContractService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_spending_contract-通过id查询") + @ApiOperation(value="pay_spending_contract-通过id查询", notes="pay_spending_contract-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PaySpendingContract paySpendingContract = paySpendingContractService.getById(id); + if(paySpendingContract==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(paySpendingContract); + } + + /** + * 导出excel + * + * @param request + * @param paySpendingContract + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PaySpendingContract paySpendingContract) { + return super.exportXls(request, paySpendingContract, PaySpendingContract.class, "pay_spending_contract"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PaySpendingContract.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java new file mode 100644 index 00000000..612ec817 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java @@ -0,0 +1,155 @@ +package com.jero.contract.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.system.query.QueryGenerator; +import com.jero.contract.entity.PaySpendingContractInstallment; +import com.jero.contract.service.IPaySpendingContractInstallmentService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Api(tags="pay_spending_contract_installment") +@RestController +@RequestMapping("/contract/paySpendingContractInstallment") +@Slf4j +public class PaySpendingContractInstallmentController extends JeroController { + @Autowired + private IPaySpendingContractInstallmentService paySpendingContractInstallmentService; + + /** + * 分页列表查询 + * + * @param paySpendingContractInstallment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-分页列表查询") + @ApiOperation(value="pay_spending_contract_installment-分页列表查询", notes="pay_spending_contract_installment-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PaySpendingContractInstallment paySpendingContractInstallment, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(paySpendingContractInstallment, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = paySpendingContractInstallmentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param paySpendingContractInstallment + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-添加") + @ApiOperation(value="pay_spending_contract_installment-添加", notes="pay_spending_contract_installment-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { + paySpendingContractInstallmentService.save(paySpendingContractInstallment); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param paySpendingContractInstallment + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-编辑") + @ApiOperation(value="pay_spending_contract_installment-编辑", notes="pay_spending_contract_installment-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { + paySpendingContractInstallmentService.updateById(paySpendingContractInstallment); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-通过id删除") + @ApiOperation(value="pay_spending_contract_installment-通过id删除", notes="pay_spending_contract_installment-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + paySpendingContractInstallmentService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-批量删除") + @ApiOperation(value="pay_spending_contract_installment-批量删除", notes="pay_spending_contract_installment-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.paySpendingContractInstallmentService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-通过id查询") + @ApiOperation(value="pay_spending_contract_installment-通过id查询", notes="pay_spending_contract_installment-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PaySpendingContractInstallment paySpendingContractInstallment = paySpendingContractInstallmentService.getById(id); + if(paySpendingContractInstallment==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(paySpendingContractInstallment); + } + + /** + * 导出excel + * + * @param request + * @param paySpendingContractInstallment + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PaySpendingContractInstallment paySpendingContractInstallment) { + return super.exportXls(request, paySpendingContractInstallment, PaySpendingContractInstallment.class, "pay_spending_contract_installment"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PaySpendingContractInstallment.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java new file mode 100644 index 00000000..288880a5 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -0,0 +1,159 @@ +package com.jero.contract.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Data +@TableName("pay_spending_contract") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_spending_contract对象", description="pay_spending_contract") +public class PaySpendingContract implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**合同编号*/ + @Excel(name = "合同编号", width = 15) + @ApiModelProperty(value = "合同编号") + private String contractNum; + /**合同名称*/ + @Excel(name = "合同名称", width = 15) + @ApiModelProperty(value = "合同名称") + private String contractName; + /**签订单位id*/ + @Excel(name = "签订单位id", width = 15) + @ApiModelProperty(value = "签订单位id") + private String signedCompanyId; + /**临时签订单位id*/ + @Excel(name = "临时签订单位id", width = 15) + @ApiModelProperty(value = "临时签订单位id") + private String signedCompanyTemporaryId; + /**临时签订单位名称*/ + @Excel(name = "临时签订单位名称", width = 15) + @ApiModelProperty(value = "临时签订单位名称") + private String signedCompanyTemporaryName; + /**签订单位联系人id*/ + @Excel(name = "签订单位联系人id", width = 15) + @ApiModelProperty(value = "签订单位联系人id") + private String signedContactsId; + /**临时签订单位联系人id*/ + @Excel(name = "临时签订单位联系人id", width = 15) + @ApiModelProperty(value = "临时签订单位联系人id") + private String signedContactsTemporaryId; + /**临时签订单位联系人名称*/ + @Excel(name = "临时签订单位联系人名称", width = 15) + @ApiModelProperty(value = "临时签订单位联系人名称") + private String signedContactsTemporaryName; + /**是否开口（1：是，0：否）*/ + @Excel(name = "是否开口（1：是，0：否）", width = 15) + @ApiModelProperty(value = "是否开口（1：是，0：否）") + private Integer opening; + /**负责人id*/ + @Excel(name = "负责人id", width = 15) + @ApiModelProperty(value = "负责人id") + private String principalId; + /**负责人名称*/ + @Excel(name = "负责人名称", width = 15) + @ApiModelProperty(value = "负责人名称") + private String principalName; + /**部门名称*/ + @Excel(name = "部门名称", width = 15) + @ApiModelProperty(value = "部门名称") + private String departmentName; + /**签订合同金额*/ + @Excel(name = "签订合同金额", width = 15) + @ApiModelProperty(value = "签订合同金额") + private String contractAmount; + /**税率*/ + @Excel(name = "税率", width = 15) + @ApiModelProperty(value = "税率") + private String rate; + /**未税金额*/ + @Excel(name = "未税金额", width = 15) + @ApiModelProperty(value = "未税金额") + private String noTaxAmount; + /**合同签订日期*/ + @Excel(name = "合同签订日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "合同签订日期") + private Date contractDate; + /**合同终止日期*/ + @Excel(name = "合同终止日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "合同终止日期") + private Date terminationDate; + /**合同约定主要时点*/ + @Excel(name = "合同约定主要时点", width = 15) + @ApiModelProperty(value = "合同约定主要时点") + private String contractTimePoints; + /**应收金额*/ + @Excel(name = "应收金额", width = 15) + @ApiModelProperty(value = "应收金额") + private String accountsReceivableAmount; + /**已收金额*/ + @Excel(name = "已收金额", width = 15) + @ApiModelProperty(value = "已收金额") + private String amountReceived; + /**未收金额*/ + @Excel(name = "未收金额", width = 15) + @ApiModelProperty(value = "未收金额") + private String outstandingAmount; + /**账款状态（1：未支付，2：部分支付，3：已付全款）*/ + @Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15) + @ApiModelProperty(value = "账款状态（1：未支付，2：部分支付，3：已付全款）") + private Integer accountStatus; + /**合同约定付款次数*/ + @Excel(name = "合同约定付款次数", width = 15) + @ApiModelProperty(value = "合同约定付款次数") + private String contractPaymentTimes; + /**是否打包（1：是，0：否）*/ + @Excel(name = "是否打包（1：是，0：否）", width = 15) + @ApiModelProperty(value = "是否打包（1：是，0：否）") + private Integer pack; + /**打包年份*/ + @Excel(name = "打包年份", width = 15) + @ApiModelProperty(value = "打包年份") + private String packYear; + /**合同状态（1：草稿，2：已通过，3：未通过，4：已归档）*/ + @Excel(name = "合同状态（1：草稿，2：已通过，3：未通过，4：已归档）", width = 15) + @ApiModelProperty(value = "合同状态（1：草稿，2：已通过，3：未通过，4：已归档）") + private Integer contractStatus; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java new file mode 100644 index 00000000..526c4ac3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java @@ -0,0 +1,79 @@ +package com.jero.contract.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Data +@TableName("pay_spending_contract_installment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_spending_contract_installment对象", description="pay_spending_contract_installment") +public class PaySpendingContractInstallment implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**合同id*/ + @Excel(name = "合同id", width = 15) + @ApiModelProperty(value = "合同id") + private String contractId; + /**阶段名称*/ + @Excel(name = "阶段名称", width = 15) + @ApiModelProperty(value = "阶段名称") + private String phaseName; + /**应收金额*/ + @Excel(name = "应收金额", width = 15) + @ApiModelProperty(value = "应收金额") + private Integer accountsReceivableAmount; + /**应收时间*/ + @Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "应收时间") + private Date accountsReceivableTime; + /**实收金额*/ + @Excel(name = "实收金额", width = 15) + @ApiModelProperty(value = "实收金额") + private Integer paidAmount; + /**实收时间*/ + @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "实收时间") + private Date paidTime; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java new file mode 100644 index 00000000..1813b7c0 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java @@ -0,0 +1,15 @@ +package com.jero.contract.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.contract.entity.PaySpendingContractInstallment; + +/** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface PaySpendingContractInstallmentMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java new file mode 100644 index 00000000..6d5a7453 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java @@ -0,0 +1,15 @@ +package com.jero.contract.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.contract.entity.PaySpendingContract; + +/** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface PaySpendingContractMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml new file mode 100644 index 00000000..0122a7ed --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml new file mode 100644 index 00000000..4f33b071 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java new file mode 100644 index 00000000..09667fde --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java @@ -0,0 +1,15 @@ +package com.jero.contract.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.contract.entity.PaySpendingContractInstallment; + +/** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface IPaySpendingContractInstallmentService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java new file mode 100644 index 00000000..c75af376 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java @@ -0,0 +1,14 @@ +package com.jero.contract.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.contract.entity.PaySpendingContract; + +/** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface IPaySpendingContractService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java new file mode 100644 index 00000000..7391a8ec --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.contract.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.contract.entity.PaySpendingContractInstallment; +import com.jero.contract.mapper.PaySpendingContractInstallmentMapper; +import com.jero.contract.service.IPaySpendingContractInstallmentService; +import org.springframework.stereotype.Service; + +/** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Service +public class PaySpendingContractInstallmentServiceImpl extends ServiceImpl implements IPaySpendingContractInstallmentService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java new file mode 100644 index 00000000..67995987 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.contract.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.contract.entity.PaySpendingContract; +import com.jero.contract.mapper.PaySpendingContractMapper; +import com.jero.contract.service.IPaySpendingContractService; +import org.springframework.stereotype.Service; + +/** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Service +public class PaySpendingContractServiceImpl extends ServiceImpl implements IPaySpendingContractService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java new file mode 100644 index 00000000..67d147ca --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -0,0 +1,155 @@ +package com.jero.pack.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.system.query.QueryGenerator; +import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.service.IPayPackCompanyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Api(tags="pay_pack_company") +@RestController +@RequestMapping("/pack/payPackCompany") +@Slf4j +public class PayPackCompanyController extends JeroController { + @Autowired + private IPayPackCompanyService payPackCompanyService; + + /** + * 分页列表查询 + * + * @param payPackCompany + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_pack_company-分页列表查询") + @ApiOperation(value="pay_pack_company-分页列表查询", notes="pay_pack_company-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayPackCompany payPackCompany, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payPackCompany, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payPackCompanyService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payPackCompany + * @return + */ + @AutoLog(value = "pay_pack_company-添加") + @ApiOperation(value="pay_pack_company-添加", notes="pay_pack_company-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayPackCompany payPackCompany) { + payPackCompanyService.save(payPackCompany); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payPackCompany + * @return + */ + @AutoLog(value = "pay_pack_company-编辑") + @ApiOperation(value="pay_pack_company-编辑", notes="pay_pack_company-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayPackCompany payPackCompany) { + payPackCompanyService.updateById(payPackCompany); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_pack_company-通过id删除") + @ApiOperation(value="pay_pack_company-通过id删除", notes="pay_pack_company-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payPackCompanyService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_pack_company-批量删除") + @ApiOperation(value="pay_pack_company-批量删除", notes="pay_pack_company-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payPackCompanyService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_pack_company-通过id查询") + @ApiOperation(value="pay_pack_company-通过id查询", notes="pay_pack_company-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayPackCompany payPackCompany = payPackCompanyService.getById(id); + if(payPackCompany==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payPackCompany); + } + + /** + * 导出excel + * + * @param request + * @param payPackCompany + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayPackCompany payPackCompany) { + return super.exportXls(request, payPackCompany, PayPackCompany.class, "pay_pack_company"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayPackCompany.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java new file mode 100644 index 00000000..8d4d9b9a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java @@ -0,0 +1,155 @@ +package com.jero.pack.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.system.query.QueryGenerator; +import com.jero.pack.entity.PayPackCompanyProject; +import com.jero.pack.service.IPayPackCompanyProjectService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Api(tags="pay_pack_company_project") +@RestController +@RequestMapping("/pack/payPackCompanyProject") +@Slf4j +public class PayPackCompanyProjectController extends JeroController { + @Autowired + private IPayPackCompanyProjectService payPackCompanyProjectService; + + /** + * 分页列表查询 + * + * @param payPackCompanyProject + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_pack_company_project-分页列表查询") + @ApiOperation(value="pay_pack_company_project-分页列表查询", notes="pay_pack_company_project-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayPackCompanyProject payPackCompanyProject, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payPackCompanyProject, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payPackCompanyProjectService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payPackCompanyProject + * @return + */ + @AutoLog(value = "pay_pack_company_project-添加") + @ApiOperation(value="pay_pack_company_project-添加", notes="pay_pack_company_project-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayPackCompanyProject payPackCompanyProject) { + payPackCompanyProjectService.save(payPackCompanyProject); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payPackCompanyProject + * @return + */ + @AutoLog(value = "pay_pack_company_project-编辑") + @ApiOperation(value="pay_pack_company_project-编辑", notes="pay_pack_company_project-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayPackCompanyProject payPackCompanyProject) { + payPackCompanyProjectService.updateById(payPackCompanyProject); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_pack_company_project-通过id删除") + @ApiOperation(value="pay_pack_company_project-通过id删除", notes="pay_pack_company_project-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payPackCompanyProjectService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_pack_company_project-批量删除") + @ApiOperation(value="pay_pack_company_project-批量删除", notes="pay_pack_company_project-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payPackCompanyProjectService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_pack_company_project-通过id查询") + @ApiOperation(value="pay_pack_company_project-通过id查询", notes="pay_pack_company_project-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayPackCompanyProject payPackCompanyProject = payPackCompanyProjectService.getById(id); + if(payPackCompanyProject==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payPackCompanyProject); + } + + /** + * 导出excel + * + * @param request + * @param payPackCompanyProject + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayPackCompanyProject payPackCompanyProject) { + return super.exportXls(request, payPackCompanyProject, PayPackCompanyProject.class, "pay_pack_company_project"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayPackCompanyProject.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java new file mode 100644 index 00000000..9022eac7 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java @@ -0,0 +1,116 @@ +package com.jero.pack.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Data +@TableName("pay_pack_company") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_pack_company对象", description="pay_pack_company") +public class PayPackCompany implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**企业id*/ + @Excel(name = "企业id", width = 15) + @ApiModelProperty(value = "企业id") + private java.lang.String companyId; + /**企业id*/ + @Excel(name = "企业id", width = 15) + @ApiModelProperty(value = "企业id") + private java.lang.String companyTemporaryId; + /**企业名称*/ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private java.lang.String companyTemporaryName; + /**企业联系人id*/ + @Excel(name = "企业联系人id", width = 15) + @ApiModelProperty(value = "企业联系人id") + private java.lang.String companyContactId; + /**企业联系人id*/ + @Excel(name = "企业联系人id", width = 15) + @ApiModelProperty(value = "企业联系人id") + private java.lang.String companyContactTemporaryId; + /**企业联系人*/ + @Excel(name = "企业联系人", width = 15) + @ApiModelProperty(value = "企业联系人") + private java.lang.String companyContactTemporaryName; + /**打包年份*/ + @Excel(name = "打包年份", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "打包年份") + private java.util.Date packYear; + /**打包联系人id*/ + @Excel(name = "打包联系人id", width = 15) + @ApiModelProperty(value = "打包联系人id") + private java.lang.String packContactId; + /**打包联系人id*/ + @Excel(name = "打包联系人id", width = 15) + @ApiModelProperty(value = "打包联系人id") + private java.lang.String packContactTemporaryId; + /**打包联系人*/ + @Excel(name = "打包联系人", width = 15) + @ApiModelProperty(value = "打包联系人") + private java.lang.String packContactTemporaryName; + /**打包费用总计*/ + @Excel(name = "打包费用总计", width = 15) + @ApiModelProperty(value = "打包费用总计") + private java.lang.Integer packChargeTotal; + /**打包费用备注*/ + @Excel(name = "打包费用备注", width = 15) + @ApiModelProperty(value = "打包费用备注") + private java.lang.String packChargeRemark; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; + /**实际到账费用*/ + @Excel(name = "实际到账费用", width = 15) + @ApiModelProperty(value = "实际到账费用") + private java.lang.Integer receiptExpense; + /**开票金额*/ + @Excel(name = "开票金额", width = 15) + @ApiModelProperty(value = "开票金额") + private java.lang.Integer invoiceAmount; + /**未开票金额*/ + @Excel(name = "未开票金额", width = 15) + @ApiModelProperty(value = "未开票金额") + private java.lang.Integer uninvoicedAmount; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java new file mode 100644 index 00000000..054bf6d3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java @@ -0,0 +1,62 @@ +package com.jero.pack.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Data +@TableName("pay_pack_company_project") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_pack_company_project对象", description="pay_pack_company_project") +public class PayPackCompanyProject implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private java.lang.String projectId; + /**企业id*/ + @Excel(name = "企业id", width = 15) + @ApiModelProperty(value = "企业id") + private java.lang.String companyId; + /**来源（1:收入合同,2:打包管理）*/ + @Excel(name = "来源（1:收入合同,2:打包管理）", width = 15) + @ApiModelProperty(value = "来源（1:收入合同,2:打包管理）") + private java.lang.Integer come; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java new file mode 100644 index 00000000..e73efa37 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java @@ -0,0 +1,15 @@ +package com.jero.pack.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.pack.entity.PayPackCompany; + +/** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface PayPackCompanyMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyProjectMapper.java new file mode 100644 index 00000000..6085dcd8 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyProjectMapper.java @@ -0,0 +1,15 @@ +package com.jero.pack.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.pack.entity.PayPackCompanyProject; + +/** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface PayPackCompanyProjectMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml new file mode 100644 index 00000000..80b5849c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml new file mode 100644 index 00000000..e7f2b1bb --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java new file mode 100644 index 00000000..5405e5a0 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java @@ -0,0 +1,15 @@ +package com.jero.pack.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.pack.entity.PayPackCompanyProject; + +/** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface IPayPackCompanyProjectService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java new file mode 100644 index 00000000..17462d22 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java @@ -0,0 +1,14 @@ +package com.jero.pack.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.pack.entity.PayPackCompany; + +/** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface IPayPackCompanyService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java new file mode 100644 index 00000000..778d6494 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.pack.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.pack.entity.PayPackCompanyProject; +import com.jero.pack.mapper.PayPackCompanyProjectMapper; +import com.jero.pack.service.IPayPackCompanyProjectService; +import org.springframework.stereotype.Service; + +/** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Service +public class PayPackCompanyProjectServiceImpl extends ServiceImpl implements IPayPackCompanyProjectService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java new file mode 100644 index 00000000..30adb563 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.pack.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.mapper.PayPackCompanyMapper; +import com.jero.pack.service.IPayPackCompanyService; +import org.springframework.stereotype.Service; + +/** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Service +public class PayPackCompanyServiceImpl extends ServiceImpl implements IPayPackCompanyService { + +} 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 c49c6bb8..8473478c 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 @@ -83,7 +83,7 @@ public class PayCommonProjectController extends JeroController listProjectId = list.stream().map(PayCommonProject::getId).collect(Collectors.toList()); // 获取已经关联合同的普通项目 LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); - queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getId, listProjectId); + queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getProjectId, listProjectId); queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType, PayProjectCommon.PROJECT_TYPE1); List listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); List listProjectIdNew = new ArrayList<>(); @@ -114,12 +114,13 @@ public class PayCommonProjectController extends JeroController finalListProjectId = listProjectIdNew; listNew.forEach(p->{ // 没有关联合同 - if(!CollectionUtils.isEmpty(finalListProjectId) && !finalListProjectId.contains(p.getId())){ - if(!StringUtils.isBlank(p.getChargeUse())){ - p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",p.getChargeUse())); - } - listPayCommonProjectOutputNew.add(p); + if(!CollectionUtils.isEmpty(finalListProjectId) && finalListProjectId.contains(p.getId())){ + return; } + if(!StringUtils.isBlank(p.getChargeUse())){ + p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",p.getChargeUse())); + } + listPayCommonProjectOutputNew.add(p); }); } return Result.OK(listPayCommonProjectOutputNew); 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 968325a1..7c1e164a 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 @@ -98,7 +98,7 @@ public class PayWorkingGroupController extends JeroController