LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangqinlin
2021-09-07 18:11:17 +08:00
parent d12a2c8a5d 48bd77818f
commit faa7c3af56
46 changed files with 2599 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/pay.pdm
+929 -543
View File
File diff suppressed because it is too large Load Diff
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+8 -6
View File
@@ -97,15 +97,15 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
if(!StringUtils.isBlank(payIncomeContract.getContractName()) && payIncomeContract.getContractName().length() > 50){
return Result.error("合同名称长度不能大于50个字符!");
}
if(!StringUtils.isBlank(projectName) && projectName.length() > 50){
return Result.error("关联项目长度不能大于50个字符!");
}
// todo 缺少会议，会员项目，标协会员
Page<PayIncomeContractOutput> page = new Page<>(pageNo, pageSize);
IPage<PayIncomeContractOutput> pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime);
pageList.getRecords().forEach(p->{
System.out.println(JSONObject.toJSONString(p));
});
if(!CollectionUtils.isEmpty(pageList.getRecords())){
List<PayIncomeContractOutput> list = pageList.getRecords();
list.forEach(p->{
});
}
return Result.OK(pageList);
}
@@ -374,6 +374,8 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
exportList.forEach(p->{
String str = JSON.toJSONString(p);
Map<String,String> map = JSONObject.parseObject(str,Map.class);
map.put("contractDate",DateUtils.date2Str(p.getContractDate(),new SimpleDateFormat("yyyy-MM-dd")));
map.put("terminationDate",DateUtils.date2Str(p.getTerminationDate(),new SimpleDateFormat("yyyy-MM-dd")));
map.put("opening",sysBaseAPI.translateDict("yn",String.valueOf(p.getOpening())));
map.put("accountStatus",sysBaseAPI.translateDict("revenue_contract_account_status",String.valueOf(p.getAccountStatus())));
map.put("pack",sysBaseAPI.translateDict("yn",String.valueOf(p.getPack())));
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+174
View File
@@ -0,0 +1,174 @@
package com.jero.contract.controller;
import java.util.Arrays;
import java.util.List;
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.PayIncomeContract;
import com.jero.contract.entity.PaySpendingContract;
import com.jero.contract.service.IPaySpendingContractService;
import com.jero.contract.vo.PayIncomeContractOutput;
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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* @Description: 支出合同
* @Author: jeecg-boot
* @Date: 2021-09-07
* @Version: V1.0
*/
@Api(tags="支出合同")
@RestController
@RequestMapping("/contract/paySpendingContract")
@Slf4j
public class PaySpendingContractController extends JeroController<PaySpendingContract, IPaySpendingContractService> {
@Autowired
private IPaySpendingContractService paySpendingContractService;
/**
* 分页列表查询
*
* @param paySpendingContract 支出合同
* @param pageNo 页数
* @param pageSize 条数
* @param startTime 开始时间
* @param endTime 结束时间
* @return
*/
@AutoLog(value = "支出合同-分页列表查询")
@ApiOperation(value="支出合同-分页列表查询", notes="支出合同-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PaySpendingContract paySpendingContract,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="startTime",required = false) String startTime,
@RequestParam(name="endTime",required = false) String endTime) {
if(!StringUtils.isBlank(paySpendingContract.getContractNum()) && paySpendingContract.getContractNum().length() > 50){
return Result.error("合同编号长度不能大于50个字符!");
}
if(!StringUtils.isBlank(paySpendingContract.getContractName()) && paySpendingContract.getContractName().length() > 50){
return Result.error("合同名称长度不能大于50个字符!");
}
// Page<PaySpendingContractOutput> page = new Page<>(pageNo, pageSize);
// IPage<PaySpendingContract> pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime);
// if(!CollectionUtils.isEmpty(pageList.getRecords())){
// List<PayIncomeContractOutput> list = pageList.getRecords();
// list.forEach(p->{
//
// });
// }
return Result.OK(null);
}
/**
* 添加
*
* @param paySpendingContract
* @return
*/
@AutoLog(value = "支出合同-添加")
@ApiOperation(value="支出合同-添加", notes="支出合同-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PaySpendingContract paySpendingContract) {
paySpendingContractService.save(paySpendingContract);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param paySpendingContract
* @return
*/
@AutoLog(value = "支出合同-编辑")
@ApiOperation(value="支出合同-编辑", notes="支出合同-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PaySpendingContract paySpendingContract) {
paySpendingContractService.updateById(paySpendingContract);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "支出合同-通过id删除")
@ApiOperation(value="支出合同-通过id删除", notes="支出合同-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paySpendingContractService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "支出合同-批量删除")
@ApiOperation(value="支出合同-批量删除", notes="支出合同-批量删除")
@GetMapping(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 = "支出合同-通过id查询")
@ApiOperation(value="支出合同-通过id查询", notes="支出合同-通过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);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java
+153
View File
@@ -0,0 +1,153 @@
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;
/**
* @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<PaySpendingContractInstallment, IPaySpendingContractInstallmentService> {
@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<PaySpendingContractInstallment> queryWrapper = QueryGenerator.initQueryWrapper(paySpendingContractInstallment, req.getParameterMap());
Page<PaySpendingContractInstallment> page = new Page<PaySpendingContractInstallment>(pageNo, pageSize);
IPage<PaySpendingContractInstallment> 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-编辑")
@PostMapping(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删除")
@GetMapping(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-批量删除")
@GetMapping(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);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAssociated.java
+8
View File
@@ -13,6 +13,10 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.Size;
/**
* @Description: pay_income_contract_associated
* @Author: jeecg-boot
@@ -34,14 +38,18 @@ public class PayIncomeContractAssociated implements Serializable {
/**合同id*/
@Excel(name = "合同id", width = 15)
@ApiModelProperty(value = "合同id")
@Size(max = 32, message = "合同id长度不能大于32个字符")
private java.lang.String contractId;
/**项目id*/
@Excel(name = "项目id", width = 15)
@ApiModelProperty(value = "项目id")
@Size(max = 32, message = "项目id长度不能大于32个字符")
private java.lang.String projectId;
/**项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）*/
@Excel(name = "项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）", width = 15)
@ApiModelProperty(value = "项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）")
@Max(5)
@Min(1)
private java.lang.Integer projectType;
/**创建人*/
@ApiModelProperty(value = "创建人")
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java
+8
View File
@@ -14,6 +14,10 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.Size;
/**
* @Description: pay_income_contract_audit
* @Author: jeecg-boot
@@ -35,15 +39,19 @@ public class PayIncomeContractAudit implements Serializable {
/**合同id*/
@Excel(name = "合同id", width = 15)
@ApiModelProperty(value = "合同id")
@Size(max = 32, message = "合同id长度不能大于32个字符")
private java.lang.String contractId;
/**合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）*/
@Excel(name = "合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）", width = 15)
@ApiModelProperty(value = "合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）")
@Dict(dicCode = "revenue_contract_status")
@Max(5)
@Min(1)
private java.lang.Integer contractStatus;
/**拒绝说明*/
@Excel(name = "拒绝说明", width = 15)
@ApiModelProperty(value = "拒绝说明")
@Size(max = 200, message = "拒绝说明长度不能大于200个字符")
private java.lang.String explainRemarks;
/**创建人*/
@ApiModelProperty(value = "创建人")
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java
+7
View File
@@ -13,6 +13,9 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Max;
import javax.validation.constraints.Size;
/**
* @Description: pay_income_contract_installment
* @Author: jeecg-boot
@@ -34,14 +37,17 @@ public class PayIncomeContractInstallment implements Serializable {
/**合同id*/
@Excel(name = "合同id", width = 15)
@ApiModelProperty(value = "合同id")
@Size(max = 32, message = "合同id长度不能大于32个字符")
private java.lang.String contractId;
/**阶段*/
@Excel(name = "阶段", width = 15)
@ApiModelProperty(value = "阶段")
@Size(max = 50, message = "阶段长度不能大于50个字符")
private java.lang.String phaseName;
/**应收金额*/
@Excel(name = "应收金额", width = 15)
@ApiModelProperty(value = "应收金额")
@Max(value = 999999999,message = "应收金额格式错误")
private java.lang.Integer accountsReceivableAmount;
/**应收时间*/
@Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd")
@@ -52,6 +58,7 @@ public class PayIncomeContractInstallment implements Serializable {
/**实收金额*/
@Excel(name = "实收金额", width = 15)
@ApiModelProperty(value = "实收金额")
@Max(value = 999999999,message = "实收金额格式错误")
private java.lang.Integer paidAmount;
/**实收时间*/
@Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd")
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java
+159
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java
+86
View File
@@ -0,0 +1,86 @@
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;
import javax.validation.constraints.Max;
import javax.validation.constraints.Size;
/**
* @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")
@Size(max = 32, message = "合同id长度不能大于32个字符")
private String contractId;
/**阶段名称*/
@Excel(name = "阶段名称", width = 15)
@ApiModelProperty(value = "阶段名称")
@Size(max = 50, message = "阶段名称长度不能大于50个字符")
private String phaseName;
/**应收金额*/
@Excel(name = "应收金额", width = 15)
@ApiModelProperty(value = "应收金额")
@Max(value = 999999999,message = "应收金额格式错误")
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 = "实收金额")
@Max(value = 999999999,message = "应收金额格式错误")
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;
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java
+15
View File
@@ -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<PaySpendingContractInstallment> {
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java
+15
View File
@@ -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<PaySpendingContract> {
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+31 -24
View File
@@ -3,13 +3,15 @@
<mapper namespace="com.jero.contract.mapper.PayIncomeContractMapper">
<!--缺少会议项目，会员项目-->
<select id="queryPageList" resultType="com.jero.contract.vo.PayIncomeContractOutput">
SELECT
SELECT * FROM
(
SELECT
pic.id,
pic.contract_num AS contractNum,
pic.contract_name AS contractName,
pic.signed_company_id AS signedCompanyId,
pic.signed_company_temporary_id AS signedCompanyTemporaryId,
pic.signed_company_temporary_name AS signedCompanyTemporaryName,
pic.signed_company_temporary_id AS signedCompanyTemporaryId,
pic.signed_company_temporary_name AS signedCompanyTemporaryName,
pic.signed_contacts_id AS signedContactsId,
pic.signed_contacts_temporary_id AS signedContactsTemporaryId,
pic.signed_contacts_temporary_name AS signedContactsTemporaryName,
@@ -35,45 +37,50 @@
pic.create_time AS createTime,
pic.update_by AS updateBy,
pic.update_time AS updateTime,
if(pic.chargeStatus > 0,1,0) AS chargeStatus
FROM
(
if(pic.chargeStatus > 0,1,0) AS chargeStatus,
GROUP_CONCAT(project.projectName) AS associatedProject
FROM
(
select pay_income_contract.*,(select count(*) from pay_income_contract_installment
where contract_id = pay_income_contract.id AND accounts_receivable_time > DATE_FORMAT(NOW(),'%Y-%m-%d')
AND accounts_receivable_amount != 0 AND accounts_receivable_amount &lt; paid_amount) AS chargeStatus
FROM pay_income_contract
) pic
LEFT JOIN pay_income_contract_associated pica ON pica.contract_id = pic.id
LEFT JOIN pay_common_project pcp ON pcp.id = pica.project_id
LEFT JOIN pay_working_group_subitem pwgs ON pwgs.id = pica.project_id
LEFT JOIN pay_working_group pwg ON pwg.id = pwgs.working_group_id
) pic
LEFT JOIN pay_income_contract_associated pica ON pica.contract_id = pic.id
LEFT JOIN
(
select id,charge_project AS projectName from pay_common_project
union all
select pwgs.id,pwg.working_group_project AS projectName from pay_working_group_subitem pwgs
left join pay_working_group pwg ON pwg.id = pwgs.working_group_id
WHERE pwg.working_group_project is not null and pwg.working_group_project!=''
) project ON project.id = pica.project_id
GROUP BY pic.id
) aa
<where>
<if test="payIncomeContract.contractNum != null and payIncomeContract.contractNum != ''">
AND pic.contract_num LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractNum},'%'))
AND aa.contractNum LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractNum},'%'))
</if>
<if test="payIncomeContract.contractName != null and payIncomeContract.contractName != ''">
AND pic.contract_name LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractName},'%'))
</if>
<if test="projectName != null and projectName != ''">
AND (
pcp.charge_project LIKE CONCAT('%',CONCAT(#{projectName},'%'))
OR pwg.working_group_project LIKE CONCAT('%',CONCAT(#{projectName},'%'))
)
AND aa.contractName LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractName},'%'))
</if>
<if test="startTime != null and startTime != ''">
AND pic.create_time >= #{startTime}
AND DATE_FORMAT(aa.createTime,'%Y-%m-%d') >= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
AND pic.create_time &lt;= #{endTime}
AND DATE_FORMAT(aa.createTime,'%Y-%m-%d') &lt;= #{endTime}
</if>
<if test="payIncomeContract.status != null and payIncomeContract.status != ''">
AND pic.status = #{payIncomeContract.status}
AND aa.status = #{payIncomeContract.status}
</if>
<if test="chargeStatus != null and chargeStatus != ''">
AND pic.chargeStatus = #{chargeStatus}
AND aa.chargeStatus = #{chargeStatus}
</if>
<if test="projectName != null and projectName != ''">
AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))
</if>
</where>
GROUP BY pic.id ORDER BY pic.create_time desc
ORDER BY aa.chargeStatus,aa.createTime desc
</select>
<select id="getAssociated" resultType="com.jero.contract.vo.ProjectOutput">
SELECT * FROM (
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.contract.mapper.PaySpendingContractInstallmentMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.contract.mapper.PaySpendingContractMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java
+15
View File
@@ -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<PaySpendingContractInstallment> {
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
+14
View File
@@ -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<PaySpendingContract> {
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+16 -19
View File
@@ -406,25 +406,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
break;
case PayIncomeContractCommon.PROJECT_TYPE2:
// 工作组项目
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payIncomeContractAssociated.getProjectId());
if(Objects.isNull(payWorkingGroup)){
throw new JeroBootException("工作组项目不存在！");
}
LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroup.getId());
queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,payIncomeContract.getSignedCompanyId());
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
if(CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
PayWorkingGroupSubItem listPayWorkingGroupSubItem = payWorkingGroupSubItemService.getById(payIncomeContractAssociated.getProjectId());
if(Objects.isNull(listPayWorkingGroupSubItem)){
throw new JeroBootException("工作组成员单位不存在！");
}
// 更新项目id
payIncomeContractAssociated.setProjectId(listPayWorkingGroupSubItem.get(0).getId());
payIncomeContractAssociated.setProjectId(listPayWorkingGroupSubItem.getId());
// todo 不是打包企业 取消打包 将关联项目取消打包
LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK0);
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId());
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.getId());
payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
break;
case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -516,6 +509,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
throw new JeroBootException("请输入拒绝说明！");
}
if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS3)){
// todo 缺少插入合同邮寄表
payIncomeContractAudit.setExplainRemarks("");
}
@@ -564,7 +558,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
throw new JeroBootException("收入合同不存在！");
}
if(!Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS1)
&& !Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS4)){
&& Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS4)){
throw new JeroBootException("收入合同不可删除！");
}
payIncomeContractService.removeById(id);
@@ -582,16 +576,19 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
@Override
@Transactional
public void deletePayIncomeContractInputByIds(List<String> ids) {
ids.forEach(p->{
PayIncomeContract payIncomeContractStatus = payIncomeContractService.getById(p);
if(Objects.isNull(payIncomeContractStatus)){
throw new JeroBootException("收入合同不存在！");
}
if(!Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS1)
&& !Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS4)){
LambdaQueryWrapper<PayIncomeContract> query = new LambdaQueryWrapper<>();
query.in(PayIncomeContract::getId,ids);
List<PayIncomeContract> listPayIncomeContractStatus = payIncomeContractService.list(query);
if(CollectionUtils.isEmpty(listPayIncomeContractStatus)){
throw new JeroBootException("收入合同不存在！");
}
listPayIncomeContractStatus.forEach(p->{
if(!Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS1)
&& !Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS4)){
throw new JeroBootException("收入合同不可删除！");
}
});
payIncomeContractService.removeByIds(ids);
LambdaUpdateWrapper<PayIncomeContractInstallment> updatePayIncomeContractInstallment = new LambdaUpdateWrapper<>();
updatePayIncomeContractInstallment.in(PayIncomeContractInstallment::getContractId,ids);
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java
+18
View File
@@ -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<PaySpendingContractInstallmentMapper, PaySpendingContractInstallment> implements IPaySpendingContractInstallmentService {
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+18
View File
@@ -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<PaySpendingContractMapper, PaySpendingContract> implements IPaySpendingContractService {
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractOutput.java
+7
View File
@@ -1,6 +1,7 @@
package com.jero.contract.vo;
import com.jero.contract.entity.PayIncomeContract;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -10,5 +11,11 @@ public class PayIncomeContractOutput extends PayIncomeContract implements Serial
/**
* 来款状态 0：全部 1:到期未付款
*/
@ApiModelProperty(value = "来款状态 0：全部 1:到期未付款")
private String chargeStatus;
/**
* 关联项目
*/
@ApiModelProperty(value = "关联项目")
private String associatedProject;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+19 -4
View File
@@ -1,14 +1,13 @@
package com.jero.meeting.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.jero.common.api.vo.Result;
@@ -76,6 +75,22 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
);
}else if (ObjectUtil.isNotEmpty(meetingStartTime)){
queryWrapper.not(
a -> a.lt("end_time", meetingStartTime)
);
}else if (ObjectUtil.isNotEmpty(meetingEndTime)){
queryWrapper.not(
a -> a.gt("start_time", meetingEndTime)
);
}
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+10 -2
View File
@@ -218,7 +218,15 @@ public class PayMeeting implements Serializable {
@ApiModelProperty(value = "备注")
private String remark;
/**会议文件*/
@ApiModelProperty(value = "备注")
/**会议通知文件*/
@ApiModelProperty(value = "会议通知文件")
private String meetingFiles;
/**会议资料*/
@ApiModelProperty(value = "会议资料")
private String meetingData;
/**是否提醒*/
@ApiModelProperty(value = "是否提醒")
private Integer remind;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+159 -10
View File
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 会议报名信息
* @Author: jero-boot
* @Date: 2021-09-02
* @Date: 2021-09-07
* @Version: V1.0
*/
@Data
@@ -70,26 +70,95 @@ public class PayMeetingSituation implements Serializable {
@ApiModelProperty(value = "企业名称")
private String companyName;
/**姓名*/
@Excel(name = "姓名", width = 15)
@ApiModelProperty(value = "姓名")
private String userName;
/**企业联系人id*/
@Excel(name = "企业联系人id", width = 15)
@ApiModelProperty(value = "企业联系人id")
private String companyContactId;
/**身份*/
@Excel(name = "身份", width = 15)
@ApiModelProperty(value = "身份")
private Integer identity;
/**企业联系人姓名*/
@Excel(name = "企业联系人姓名", width = 15)
@ApiModelProperty(value = "企业联系人姓名")
private String companyContactName;
/**职务*/
@Excel(name = "职务", width = 15)
@ApiModelProperty(value = "职务")
private String post;
/**手机号*/
@Excel(name = "手机号", width = 15)
@ApiModelProperty(value = "手机号")
private String phone;
/**邮箱*/
@Excel(name = "邮箱", width = 15)
@ApiModelProperty(value = "邮箱")
private String email;
/**身份*/
@Excel(name = "身份", width = 15)
@ApiModelProperty(value = "身份")
private Integer identity;
/**嘉宾类型*/
@Excel(name = "嘉宾类型", width = 15)
@ApiModelProperty(value = "嘉宾类型")
private Integer guestType;
/**演讲题目*/
@Excel(name = "演讲题目", width = 15)
@ApiModelProperty(value = "演讲题目")
private String speechTopic;
/**演讲ppt*/
@Excel(name = "演讲ppt", width = 15)
@ApiModelProperty(value = "演讲ppt")
private String speechPpt;
/**照片*/
@Excel(name = "照片", width = 15)
@ApiModelProperty(value = "照片")
private String photo;
/**个人简介*/
@Excel(name = "个人简介", width = 15)
@ApiModelProperty(value = "个人简介")
private String profile;
/**是否用餐*/
@Excel(name = "是否用餐", width = 15)
@ApiModelProperty(value = "是否用餐")
private Integer haveMeals;
/**是否回民*/
@Excel(name = "是否回民", width = 15)
@ApiModelProperty(value = "是否回民")
private Integer huiPeople;
/**是否入住协议酒店*/
@Excel(name = "是否入住协议酒店", width = 15)
@ApiModelProperty(value = "是否入住协议酒店")
private Integer checkInHotel;
/**入住酒店时间*/
@Excel(name = "入住酒店时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "入住酒店时间")
private java.util.Date inHotelTime;
/**离开酒店时间*/
@Excel(name = "离开酒店时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "离开酒店时间")
private java.util.Date outHotelTime;
/**房型*/
@Excel(name = "房型", width = 15)
@ApiModelProperty(value = "房型")
private String roomLayout;
/**抵达时间*/
@Excel(name = "抵达时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -97,12 +166,67 @@ public class PayMeetingSituation implements Serializable {
@ApiModelProperty(value = "抵达时间")
private java.util.Date arrivalTime;
/**到达站*/
@Excel(name = "到达站", width = 15)
@ApiModelProperty(value = "到达站")
private String destination;
/**到达班次*/
@Excel(name = "到达班次", width = 15)
@ApiModelProperty(value = "到达班次")
private String arrivalShift;
/**是否需要送站*/
@Excel(name = "是否需要送站", width = 15)
@ApiModelProperty(value = "是否需要送站")
private Integer deliveryStation;
/**离开时间*/
@Excel(name = "离开时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "离开时间")
private java.util.Date leaveTime;
private java.util.Date departureTime;
/**离开站*/
@Excel(name = "离开站", width = 15)
@ApiModelProperty(value = "离开站")
private String departureStation;
/**离开班次*/
@Excel(name = "离开班次", width = 15)
@ApiModelProperty(value = "离开班次")
private String departureShift;
/**同行人*/
@Excel(name = "同行人", width = 15)
@ApiModelProperty(value = "同行人")
private String peer;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
/**是否签到*/
@Excel(name = "是否签到", width = 15)
@ApiModelProperty(value = "是否签到")
private Integer checkIn;
/**是否需要接站*/
@Excel(name = "是否需要接站", width = 15)
@ApiModelProperty(value = "是否需要接站")
private Integer pickUp;
/**邮寄联系人*/
@Excel(name = "邮寄联系人", width = 15)
@ApiModelProperty(value = "邮寄联系人")
private String postContactId;
/**邮寄联系人地址*/
@Excel(name = "邮寄联系人地址", width = 15)
@ApiModelProperty(value = "邮寄联系人地址")
private String postContactAddress;
/**缴费方式*/
@Excel(name = "缴费方式", width = 15)
@@ -114,6 +238,11 @@ public class PayMeetingSituation implements Serializable {
@ApiModelProperty(value = "需要发票")
private Integer needInvoice;
/**付款凭证*/
@Excel(name = "付款凭证", width = 15)
@ApiModelProperty(value = "付款凭证")
private String paymentRecord;
/**状态（导入、未导入）*/
@Excel(name = "状态（导入、未导入）", width = 15)
@ApiModelProperty(value = "状态（导入、未导入）")
@@ -124,4 +253,24 @@ public class PayMeetingSituation implements Serializable {
@ApiModelProperty(value = "是否为新增")
private Integer isNew;
/**打包*/
@Excel(name = "打包", width = 15)
@ApiModelProperty(value = "打包")
private Integer pack;
/**到账*/
@Excel(name = "到账", width = 15)
@ApiModelProperty(value = "到账")
private Integer inAccount;
/**开票*/
@Excel(name = "开票", width = 15)
@ApiModelProperty(value = "开票")
private Integer makeInvoice;
/**邮寄*/
@Excel(name = "邮寄", width = 15)
@ApiModelProperty(value = "邮寄")
private Integer mail;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
+32 -3
View File
@@ -10,15 +10,44 @@
<result column="meeting_id" property="meetingId" />
<result column="company_id" property="companyId" />
<result column="company_name" property="companyName" />
<result column="user_name" property="userName" />
<result column="identity" property="identity" />
<result column="company_contact_id" property="companyContactId" />
<result column="company_contact_name" property="companyContactName" />
<result column="post" property="post" />
<result column="phone" property="phone" />
<result column="email" property="email" />
<result column="identity" property="identity" />
<result column="guest_type" property="guestType" />
<result column="speech_topic" property="speechTopic" />
<result column="speech_ppt" property="speechPpt" />
<result column="photo" property="photo" />
<result column="profile" property="profile" />
<result column="have_meals" property="haveMeals" />
<result column="hui_people" property="huiPeople" />
<result column="check_in_hotel" property="checkInHotel" />
<result column="in_hotel_time" property="inHotelTime" />
<result column="out_hotel_time" property="outHotelTime" />
<result column="room_layout" property="roomLayout" />
<result column="arrival_time" property="arrivalTime" />
<result column="leave_time" property="leaveTime" />
<result column="destination" property="destination" />
<result column="arrival_shift" property="arrivalShift" />
<result column="delivery_station" property="deliveryStation" />
<result column="departure_time" property="departureTime" />
<result column="departure_station" property="departureStation" />
<result column="departure_shift" property="departureShift" />
<result column="peer" property="peer" />
<result column="remark" property="remark" />
<result column="check_in" property="checkIn" />
<result column="pick_up" property="pickUp" />
<result column="post_contact_id" property="postContactId" />
<result column="post_contact_address" property="postContactAddress" />
<result column="pay_mode" property="payMode" />
<result column="need_invoice" property="needInvoice" />
<result column="payment_record" property="paymentRecord" />
<result column="status" property="status" />
<result column="is_new" property="isNew" />
<result column="pack" property="pack" />
<result column="in_account" property="inAccount" />
<result column="make_invoice" property="makeInvoice" />
<result column="mail" property="mail" />
</resultMap>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+1 -2
View File
@@ -56,7 +56,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
@Override
public void add(PayMeetingVO payMeetingVO) {
//酒店联系人列表
List<PayMeetingHotelContacts> hotelContactsList = new ArrayList<>();
List<PayMeetingHotelContacts> hotelContactsList = payMeetingVO.getHotelContactsList();
PayMeeting payMeeting = getPayMeeting(payMeetingVO,hotelContactsList);
save(payMeeting);
//如果酒店联系人列表不为空，就新增
@@ -146,7 +146,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
if (standardMeetingType == null){
throw new JeroBootException("标协会议类型不存在");
}
hotelContactsList = payMeetingVO.getHotelContactsList();
for (PayMeetingHotelContacts hotelContacts : hotelContactsList) {
ValidUtil.validate(hotelContacts, StandardMeeting.class);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+1 -1
View File
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 会议报名信息
* @Author: jero-boot
* @Date: 2021-09-02
* @Date: 2021-09-07
* @Version: V1.0
*/
@Service
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+11 -3
View File
@@ -229,9 +229,17 @@ public class PayMeetingVO implements Serializable {
@Size(max = 200, message = "备注最大为200字符")
private String remark;
/**会议文件*/
@ApiModelProperty(value = "备注")
@Size(max = 1000, message = "会议文件数量超出最大限制")
/**会议通知文件*/
@ApiModelProperty(value = "会议通知文件")
@Size(max = 1000, message = "会议通知文件数量超出最大限制")
private String meetingFiles;
/**会议资料*/
@ApiModelProperty(value = "会议资料")
@Size(max = 1000, message = "会议资料数量超出最大限制")
private String meetingData;
/**是否提醒*/
@ApiModelProperty(value = "是否提醒")
private Integer remind;
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
+155
View File
@@ -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<PayPackCompany, IPayPackCompanyService> {
@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<PayPackCompany> queryWrapper = QueryGenerator.initQueryWrapper(payPackCompany, req.getParameterMap());
Page<PayPackCompany> page = new Page<PayPackCompany>(pageNo, pageSize);
IPage<PayPackCompany> 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);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java
+155
View File
@@ -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<PayPackCompanyProject, IPayPackCompanyProjectService> {
@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<PayPackCompanyProject> queryWrapper = QueryGenerator.initQueryWrapper(payPackCompanyProject, req.getParameterMap());
Page<PayPackCompanyProject> page = new Page<PayPackCompanyProject>(pageNo, pageSize);
IPage<PayPackCompanyProject> 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);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java
+116
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java
+62
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java
+15
View File
@@ -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<PayPackCompany> {
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyProjectMapper.java
+15
View File
@@ -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<PayPackCompanyProject> {
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.pack.mapper.PayPackCompanyMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.pack.mapper.PayPackCompanyProjectMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java
+15
View File
@@ -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<PayPackCompanyProject> {
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java
+14
View File
@@ -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<PayPackCompany> {
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+18
View File
@@ -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<PayPackCompanyProjectMapper, PayPackCompanyProject> implements IPayPackCompanyProjectService {
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
+18
View File
@@ -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<PayPackCompanyMapper, PayPackCompany> implements IPayPackCompanyService {
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
+4
View File
@@ -35,6 +35,10 @@ public class PayPaymentRecord implements Serializable {
@Excel(name = "项目id", width = 15)
@ApiModelProperty(value = "项目id")
private java.lang.String projectId;
/**项目类型*/
@Excel(name = "项目类型", width = 15)
@ApiModelProperty(value = "项目类型")
private java.lang.String projectType;
/**到账金额*/
@Excel(name = "到账金额", width = 15)
@ApiModelProperty(value = "到账金额")
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+8 -7
View File
@@ -83,7 +83,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
}
/**
* 列表
* 收入合同-列表
*
* @param payCommonProject 普通项目管理
* @return
@@ -102,7 +102,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
List<String> listProjectId = list.stream().map(PayCommonProject::getId).collect(Collectors.toList());
// 获取已经关联合同的普通项目
LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getId, listProjectId);
queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getProjectId, listProjectId);
queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType, PayProjectCommon.PROJECT_TYPE1);
List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
List<String> listProjectIdNew = new ArrayList<>();
@@ -114,12 +114,13 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
List<String> 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);
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+19 -1
View File
@@ -97,8 +97,9 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
return Result.OK(list);
}
/**
* 根据成员单位列表查询
* 收入合同-根据成员单位列表查询
*
* @param companyId 企业id
* @param workingGroupProject 工作组项目
@@ -120,6 +121,23 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
}
return Result.OK(list);
}
/**
* 收入合同-查询不存在成员单位的列表
*
* @param companyId 企业id
* @return
*/
@AutoLog(value = "工作组项目-查询不存在成员单位的列表")
@ApiOperation(value="工作组项目-查询不存在成员单位的列表", notes="工作组项目-查询不存在成员单位的列表")
@GetMapping(value = "/queryListByNotCompany")
public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) {
if(StringUtils.isBlank(companyId)){
return Result.error("企业id不能为空！");
}
List<PayWorkingGroup> list = payWorkingGroupService.queryListByNotCompany(companyId);
return Result.OK(list);
}
/**
* @Description 获取进度
* @Author lqt
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+10
View File
@@ -37,4 +37,14 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
List<PayWorkingGroupVO> queryListByCompany(@Param("companyId") String companyId,@Param("workingGroupProject") String workingGroupProject,
@Param("year") String year,@Param("projectType") String projectType);
/**
* @Description 查询不存在成员单位的列表
* @Author lqt
* @Date 2021/9/7
* @Param
* @Return
* @Exception
*/
List<PayWorkingGroup> queryListByNotCompany(@Param("companyId") String companyId);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+27 -1
View File
@@ -66,11 +66,37 @@
WHERE pwg.id is not null AND pwg.id !='' AND pwgs.charge_company_id = #{companyId}
AND pwgs.id NOT IN (SELECT project_id FROM pay_income_contract_associated WHERE project_type=#{projectType})
<if test="workingGroupProject != null and workingGroupProject != ''">
AND pwg.working_group_project = #{workingGroupProject}
AND pwg.working_group_project LIKE concat('%',concat(#{workingGroupProject},'%'))
</if>
<if test="year != null and year != ''">
AND pwg.year = #{year}
</if>
GROUP BY pwg.id ORDER BY pwg.create_time DESC
</select>
<select id="queryListByNotCompany" resultType="com.jero.project.entity.PayWorkingGroup">
SELECT
id,
working_group_project AS workingGroupProject,
year,
principal_id_a AS principalIdA,
principal_name_a AS principalNameA,
principal_id_b AS principalIdB,
principal_name_b AS principalNameB,
convoke_num AS convokeNum,
operation_cycle AS operationCycle,
year_charge_a AS yearChargeA,
charge_notice_no_a AS chargeNoticeNoA,
charge_notice_a_id AS chargeNoticeAId,
year_charge_b AS yearChargeB,
charge_notice_no_b AS chargeNoticeNoB,
charge_notice_b_id AS chargeNoticeBId,
mission_and_objectives AS missionAndObjectives,
remarks,
create_by AS createBy,
create_time AS createTime,
update_by AS updateBy,
update_time AS updateTime
FROM pay_working_group
WHERE id NOT IN (SELECT working_group_id FROM pay_working_group_subitem WHERE charge_company_id=#{companyId})
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+9
View File
@@ -33,4 +33,13 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
* @Exception
*/
List<PayWorkingGroupVO> queryListByCompany(String companyId,String workingGroupProject,String year,String projectType);
/**
* @Description 查询不存在成员单位的列表
* @Author lqt
* @Date 2021/9/7
* @Param
* @Return
* @Exception
*/
List<PayWorkingGroup> queryListByNotCompany(String companyId);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+5
View File
@@ -34,4 +34,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
public List<PayWorkingGroupVO> queryListByCompany(String companyId,String workingGroupProject, String year,String projectType) {
return payWorkingGroupMapper.queryListByCompany(companyId,workingGroupProject,year,projectType);
}
@Override
public List<PayWorkingGroup> queryListByNotCompany(String companyId) {
return payWorkingGroupMapper.queryListByNotCompany(companyId);
}
}