收入合同功能开发

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java

@@ -0,0 +1,154 @@
+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.PayIncomeContractAssociated;
+import com.jero.contract.service.IPayIncomeContractAssociatedService;
+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_income_contract_associated
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Api(tags="pay_income_contract_associated")
+@RestController
+@RequestMapping("/contract/payIncomeContractAssociated")
+@Slf4j
+public class PayIncomeContractAssociatedController extends JeroController<PayIncomeContractAssociated, IPayIncomeContractAssociatedService> {
+	@Autowired
+	private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payIncomeContractAssociated
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_associated-分页列表查询")
+	@ApiOperation(value="pay_income_contract_associated-分页列表查询", notes="pay_income_contract_associated-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayIncomeContractAssociated payIncomeContractAssociated,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PayIncomeContractAssociated> queryWrapper = QueryGenerator.initQueryWrapper(payIncomeContractAssociated, req.getParameterMap());
+		Page<PayIncomeContractAssociated> page = new Page<PayIncomeContractAssociated>(pageNo, pageSize);
+		IPage<PayIncomeContractAssociated> pageList = payIncomeContractAssociatedService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payIncomeContractAssociated
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_associated-添加")
+	@ApiOperation(value="pay_income_contract_associated-添加", notes="pay_income_contract_associated-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
+		payIncomeContractAssociatedService.save(payIncomeContractAssociated);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param payIncomeContractAssociated
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_associated-编辑")
+	@ApiOperation(value="pay_income_contract_associated-编辑", notes="pay_income_contract_associated-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
+		payIncomeContractAssociatedService.updateById(payIncomeContractAssociated);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_associated-通过id删除")
+	@ApiOperation(value="pay_income_contract_associated-通过id删除", notes="pay_income_contract_associated-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		payIncomeContractAssociatedService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_associated-批量删除")
+	@ApiOperation(value="pay_income_contract_associated-批量删除", notes="pay_income_contract_associated-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.payIncomeContractAssociatedService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_associated-通过id查询")
+	@ApiOperation(value="pay_income_contract_associated-通过id查询", notes="pay_income_contract_associated-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PayIncomeContractAssociated payIncomeContractAssociated = payIncomeContractAssociatedService.getById(id);
+		if(payIncomeContractAssociated==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(payIncomeContractAssociated);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param payIncomeContractAssociated
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PayIncomeContractAssociated payIncomeContractAssociated) {
+        return super.exportXls(request, payIncomeContractAssociated, PayIncomeContractAssociated.class, "pay_income_contract_associated");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PayIncomeContractAssociated.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.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.PayIncomeContractAudit;
+import com.jero.contract.service.IPayIncomeContractAuditService;
+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_income_contract_audit
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Api(tags="pay_income_contract_audit")
+@RestController
+@RequestMapping("/contract/payIncomeContractAudit")
+@Slf4j
+public class PayIncomeContractAuditController extends JeroController<PayIncomeContractAudit, IPayIncomeContractAuditService> {
+	@Autowired
+	private IPayIncomeContractAuditService payIncomeContractAuditService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payIncomeContractAudit
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_audit-分页列表查询")
+	@ApiOperation(value="pay_income_contract_audit-分页列表查询", notes="pay_income_contract_audit-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayIncomeContractAudit payIncomeContractAudit,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PayIncomeContractAudit> queryWrapper = QueryGenerator.initQueryWrapper(payIncomeContractAudit, req.getParameterMap());
+		Page<PayIncomeContractAudit> page = new Page<PayIncomeContractAudit>(pageNo, pageSize);
+		IPage<PayIncomeContractAudit> pageList = payIncomeContractAuditService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payIncomeContractAudit
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_audit-添加")
+	@ApiOperation(value="pay_income_contract_audit-添加", notes="pay_income_contract_audit-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
+		payIncomeContractAuditService.save(payIncomeContractAudit);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param payIncomeContractAudit
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_audit-编辑")
+	@ApiOperation(value="pay_income_contract_audit-编辑", notes="pay_income_contract_audit-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
+		payIncomeContractAuditService.updateById(payIncomeContractAudit);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_audit-通过id删除")
+	@ApiOperation(value="pay_income_contract_audit-通过id删除", notes="pay_income_contract_audit-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		payIncomeContractAuditService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_audit-批量删除")
+	@ApiOperation(value="pay_income_contract_audit-批量删除", notes="pay_income_contract_audit-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.payIncomeContractAuditService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_audit-通过id查询")
+	@ApiOperation(value="pay_income_contract_audit-通过id查询", notes="pay_income_contract_audit-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PayIncomeContractAudit payIncomeContractAudit = payIncomeContractAuditService.getById(id);
+		if(payIncomeContractAudit==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(payIncomeContractAudit);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param payIncomeContractAudit
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PayIncomeContractAudit payIncomeContractAudit) {
+        return super.exportXls(request, payIncomeContractAudit, PayIncomeContractAudit.class, "pay_income_contract_audit");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PayIncomeContractAudit.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java

@@ -0,0 +1,145 @@
+package com.jero.contract.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+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.contract.entity.PayIncomeContract;
+import com.jero.contract.service.IPayIncomeContractService;
+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: 收入合同
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Api(tags="收入合同")
+@RestController
+@RequestMapping("/contract/payIncomeContract")
+@Slf4j
+public class PayIncomeContractController extends JeroController<PayIncomeContract, IPayIncomeContractService> {
+	@Autowired
+	private IPayIncomeContractService payIncomeContractService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payIncomeContract 收入合同
+	 * @param pageNo 页码
+	 * @param pageSize 条数
+	 * @param chargeStatus 来款状态
+	 */
+	@AutoLog(value = "收入合同-分页列表查询")
+	@ApiOperation(value="收入合同-分页列表查询", notes="收入合同-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayIncomeContract payIncomeContract,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name="chargeStatus",required = false) String chargeStatus) {
+		Page<PayIncomeContract> page = new Page<>(pageNo, pageSize);
+		IPage<PayIncomeContract> pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payIncomeContract 收入合同
+	 */
+	@AutoLog(value = "收入合同-添加")
+	@ApiOperation(value="收入合同-添加", notes="收入合同-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayIncomeContract payIncomeContract) {
+		payIncomeContractService.save(payIncomeContract);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param payIncomeContract 收入合同
+	 */
+	@AutoLog(value = "收入合同-编辑")
+	@ApiOperation(value="收入合同-编辑", notes="收入合同-编辑")
+	@PostMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayIncomeContract payIncomeContract) {
+		payIncomeContractService.updateById(payIncomeContract);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id 合同id
+	 */
+	@AutoLog(value = "收入合同-通过id删除")
+	@ApiOperation(value="收入合同-通过id删除", notes="收入合同-通过id删除")
+	@GetMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		payIncomeContractService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids 合同id逗号分隔
+	 */
+	@AutoLog(value = "收入合同-批量删除")
+	@ApiOperation(value="收入合同-批量删除", notes="收入合同-批量删除")
+	@GetMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.payIncomeContractService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id 合同id
+	 */
+	@AutoLog(value = "收入合同-通过id查询")
+	@ApiOperation(value="收入合同-通过id查询", notes="收入合同-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PayIncomeContract payIncomeContract = payIncomeContractService.getById(id);
+		if(payIncomeContract==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(payIncomeContract);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param payIncomeContract
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PayIncomeContract payIncomeContract) {
+        return super.exportXls(request, payIncomeContract, PayIncomeContract.class, "pay_income_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, PayIncomeContract.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.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.PayIncomeContractInstallment;
+import com.jero.contract.service.IPayIncomeContractInstallmentService;
+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_income_contract_installment
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Api(tags="pay_income_contract_installment")
+@RestController
+@RequestMapping("/contract/payIncomeContractInstallment")
+@Slf4j
+public class PayIncomeContractInstallmentController extends JeroController<PayIncomeContractInstallment, IPayIncomeContractInstallmentService> {
+	@Autowired
+	private IPayIncomeContractInstallmentService payIncomeContractInstallmentService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payIncomeContractInstallment
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_installment-分页列表查询")
+	@ApiOperation(value="pay_income_contract_installment-分页列表查询", notes="pay_income_contract_installment-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayIncomeContractInstallment payIncomeContractInstallment,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PayIncomeContractInstallment> queryWrapper = QueryGenerator.initQueryWrapper(payIncomeContractInstallment, req.getParameterMap());
+		Page<PayIncomeContractInstallment> page = new Page<PayIncomeContractInstallment>(pageNo, pageSize);
+		IPage<PayIncomeContractInstallment> pageList = payIncomeContractInstallmentService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payIncomeContractInstallment
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_installment-添加")
+	@ApiOperation(value="pay_income_contract_installment-添加", notes="pay_income_contract_installment-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) {
+		payIncomeContractInstallmentService.save(payIncomeContractInstallment);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param payIncomeContractInstallment
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_installment-编辑")
+	@ApiOperation(value="pay_income_contract_installment-编辑", notes="pay_income_contract_installment-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) {
+		payIncomeContractInstallmentService.updateById(payIncomeContractInstallment);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_installment-通过id删除")
+	@ApiOperation(value="pay_income_contract_installment-通过id删除", notes="pay_income_contract_installment-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		payIncomeContractInstallmentService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_installment-批量删除")
+	@ApiOperation(value="pay_income_contract_installment-批量删除", notes="pay_income_contract_installment-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.payIncomeContractInstallmentService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_income_contract_installment-通过id查询")
+	@ApiOperation(value="pay_income_contract_installment-通过id查询", notes="pay_income_contract_installment-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PayIncomeContractInstallment payIncomeContractInstallment = payIncomeContractInstallmentService.getById(id);
+		if(payIncomeContractInstallment==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(payIncomeContractInstallment);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param payIncomeContractInstallment
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PayIncomeContractInstallment payIncomeContractInstallment) {
+        return super.exportXls(request, payIncomeContractInstallment, PayIncomeContractInstallment.class, "pay_income_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, PayIncomeContractInstallment.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java

@@ -0,0 +1,142 @@
+package com.jero.contract.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_income_contract
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_income_contract")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_income_contract对象", description="pay_income_contract")
+public class PayIncomeContract implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**合同编号*/
+	@Excel(name = "合同编号", width = 15)
+    @ApiModelProperty(value = "合同编号")
+    private java.lang.String contractNum;
+	/**合同名称*/
+	@Excel(name = "合同名称", width = 15)
+    @ApiModelProperty(value = "合同名称")
+    private java.lang.String contractName;
+	/**签订单位*/
+	@Excel(name = "签订单位", width = 15)
+    @ApiModelProperty(value = "签订单位")
+    private java.lang.String signedCompany;
+	/**签订单位联系人id*/
+	@Excel(name = "签订单位联系人id", width = 15)
+    @ApiModelProperty(value = "签订单位联系人id")
+    private java.lang.String signedContactsId;
+	/**是否开口（1为是，2为否）*/
+	@Excel(name = "是否开口（1为是，2为否）", width = 15)
+    @ApiModelProperty(value = "是否开口（1为是，2为否）")
+    private java.lang.Integer opening;
+	/**负责人id*/
+	@Excel(name = "负责人id", width = 15)
+    @ApiModelProperty(value = "负责人id")
+    private java.lang.String principalId;
+	/**负责人名称*/
+	@Excel(name = "负责人名称", width = 15)
+    @ApiModelProperty(value = "负责人名称")
+    private java.lang.String principalName;
+	/**部门名称*/
+	@Excel(name = "部门名称", width = 15)
+    @ApiModelProperty(value = "部门名称")
+    private java.lang.String departmentName;
+	/**签订合同金额*/
+	@Excel(name = "签订合同金额", width = 15)
+    @ApiModelProperty(value = "签订合同金额")
+    private java.lang.String contractAmount;
+	/**税率*/
+	@Excel(name = "税率", width = 15)
+    @ApiModelProperty(value = "税率")
+    private java.lang.String rate;
+	/**未税金额*/
+	@Excel(name = "未税金额", width = 15)
+    @ApiModelProperty(value = "未税金额")
+    private java.lang.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 java.util.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 java.util.Date terminationDate;
+	/**合同约定主要时点*/
+	@Excel(name = "合同约定主要时点", width = 15)
+    @ApiModelProperty(value = "合同约定主要时点")
+    private java.lang.String contractTimePoints;
+	/**应收金额*/
+	@Excel(name = "应收金额", width = 15)
+    @ApiModelProperty(value = "应收金额")
+    private java.lang.String accountsReceivableAmount;
+	/**已收金额*/
+	@Excel(name = "已收金额", width = 15)
+    @ApiModelProperty(value = "已收金额")
+    private java.lang.String amountReceived;
+	/**未收金额*/
+	@Excel(name = "未收金额", width = 15)
+    @ApiModelProperty(value = "未收金额")
+    private java.lang.String outstandingAmount;
+	/**账款状态（1：未支付，2：部分支付，3：已付全款）*/
+	@Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15)
+    @ApiModelProperty(value = "账款状态（1：未支付，2：部分支付，3：已付全款）")
+    private java.lang.Integer accountStatus;
+	/**合同约定付款次数*/
+	@Excel(name = "合同约定付款次数", width = 15)
+    @ApiModelProperty(value = "合同约定付款次数")
+    private java.lang.String contractPaymentTimes;
+	/**是否打包（1：是，2：否）*/
+	@Excel(name = "是否打包（1：是，2：否）", width = 15)
+    @ApiModelProperty(value = "是否打包（1：是，2：否）")
+    private java.lang.Integer pack;
+	/**打包年份*/
+	@Excel(name = "打包年份", width = 15)
+    @ApiModelProperty(value = "打包年份")
+    private java.lang.String packYear;
+	/**合同状态（1：草稿，2：已通过，3：未通过，4：已归档）*/
+	@Excel(name = "合同状态（1：草稿，2：已通过，3：未通过，4：已归档）", width = 15)
+    @ApiModelProperty(value = "合同状态（1：草稿，2：已通过，3：未通过，4：已归档）")
+    private java.lang.Integer status;
+	/**创建人*/
+    @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/contract/entity/PayIncomeContractAssociated.java

@@ -0,0 +1,62 @@
+package com.jero.contract.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_income_contract_associated
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_income_contract_associated")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_income_contract_associated对象", description="pay_income_contract_associated")
+public class PayIncomeContractAssociated implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**合同id*/
+	@Excel(name = "合同id", width = 15)
+    @ApiModelProperty(value = "合同id")
+    private java.lang.String contractId;
+	/**项目id*/
+	@Excel(name = "项目id", width = 15)
+    @ApiModelProperty(value = "项目id")
+    private java.lang.String projectId;
+	/**项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目）*/
+	@Excel(name = "项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目）", width = 15)
+    @ApiModelProperty(value = "项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目）")
+    private java.lang.Integer projectType;
+	/**创建人*/
+    @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/contract/entity/PayIncomeContractAudit.java

@@ -0,0 +1,62 @@
+package com.jero.contract.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_income_contract_audit
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_income_contract_audit")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_income_contract_audit对象", description="pay_income_contract_audit")
+public class PayIncomeContractAudit implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**合同id*/
+	@Excel(name = "合同id", width = 15)
+    @ApiModelProperty(value = "合同id")
+    private java.lang.String contractId;
+	/**合同状态（2：已通过，3：未通过，4：已归档）*/
+	@Excel(name = "合同状态（2：已通过，3：未通过，4：已归档）", width = 15)
+    @ApiModelProperty(value = "合同状态（2：已通过，3：未通过，4：已归档）")
+    private java.lang.Integer contractStatus;
+	/**拒绝说明*/
+	@Excel(name = "拒绝说明", width = 15)
+    @ApiModelProperty(value = "拒绝说明")
+    private java.lang.String explainRemarks;
+	/**创建人*/
+    @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/contract/entity/PayIncomeContractInstallment.java

@@ -0,0 +1,78 @@
+package com.jero.contract.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_income_contract_installment
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_income_contract_installment")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_income_contract_installment对象", description="pay_income_contract_installment")
+public class PayIncomeContractInstallment implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**合同id*/
+	@Excel(name = "合同id", width = 15)
+    @ApiModelProperty(value = "合同id")
+    private java.lang.String contractId;
+	/**阶段名称*/
+	@Excel(name = "阶段名称", width = 15)
+    @ApiModelProperty(value = "阶段名称")
+    private java.lang.String phaseName;
+	/**应收金额*/
+	@Excel(name = "应收金额", width = 15)
+    @ApiModelProperty(value = "应收金额")
+    private java.lang.String 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 java.util.Date accountsReceivableTime;
+	/**实收金额*/
+	@Excel(name = "实收金额", width = 15)
+    @ApiModelProperty(value = "实收金额")
+    private java.lang.String 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 java.util.Date paidTime;
+	/**创建人*/
+    @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/contract/mapper/PayIncomeContractAssociatedMapper.java

@@ -0,0 +1,14 @@
+package com.jero.contract.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.contract.entity.PayIncomeContractAssociated;
+
+/**
+ * @Description: pay_income_contract_associated
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+public interface PayIncomeContractAssociatedMapper extends BaseMapper<PayIncomeContractAssociated> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractAuditMapper.java

@@ -0,0 +1,15 @@
+package com.jero.contract.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.contract.entity.PayIncomeContractAudit;
+
+/**
+ * @Description: pay_income_contract_audit
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+public interface PayIncomeContractAuditMapper extends BaseMapper<PayIncomeContractAudit> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractInstallmentMapper.java

@@ -0,0 +1,14 @@
+package com.jero.contract.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.contract.entity.PayIncomeContractInstallment;
+
+/**
+ * @Description: pay_income_contract_installment
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+public interface PayIncomeContractInstallmentMapper extends BaseMapper<PayIncomeContractInstallment> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractMapper.java

@@ -0,0 +1,27 @@
+package com.jero.contract.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.contract.entity.PayIncomeContract;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: pay_income_contract
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+public interface PayIncomeContractMapper extends BaseMapper<PayIncomeContract> {
+
+    /**
+     * @Description 分页列表
+     * @Author  lqt
+     * @Date   2021/9/3
+     * @Param
+     * @Return
+     * @Exception
+     */
+    IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, @Param("payIncomeContract") PayIncomeContract payIncomeContract,@Param("chargeStatus") String chargeStatus);
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractAssociatedMapper.xml

@@ -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.PayIncomeContractAssociatedMapper">
+
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractAuditMapper.xml

@@ -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.PayIncomeContractAuditMapper">
+
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractInstallmentMapper.xml

@@ -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.PayIncomeContractInstallmentMapper">
+
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml

@@ -0,0 +1,65 @@
+<?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.PayIncomeContractMapper">
+
+    <select id="queryPageList" resultType="com.jero.contract.entity.PayIncomeContract">
+        SELECT
+            pic.id,
+            pic.contract_num AS contractNum,
+            pic.contract_name AS contractName,
+            pic.signed_company AS signedCompany,
+            pic.signed_contacts_id AS signedContactsId,
+            pic.opening,
+            pic.principal_id AS principalId,
+            pic.principal_name AS principalName,
+            pic.department_name AS departmentName,
+            pic.contract_amount AS contractAmount,
+            pic.rate,
+            pic.no_tax_amount AS noTaxAmount,
+            pic.contract_date AS contractDate,
+            pic.termination_date AS terminationDate,
+            pic.contract_time_points AS contractTimePoints,
+            pic.accounts_receivable_amount AS accountsReceivableAmount,
+            pic.amount_received AS amountReceived,
+            pic.outstanding_amount AS outstandingAmount,
+            pic.account_status AS accountStatus,
+            pic.contract_payment_times AS contractPaymentTimes,
+            pic.pack,
+            pic.package_year AS packageYear,
+            pic.status,
+            pic.create_by AS createBy,
+            pic.create_time AS createTime,
+            pic.update_by AS updateBy,
+            pic.update_time AS updateTime,
+            if(count(pici.id) > 0,1,0) AS chargeStatus
+        FROM pay_income_contract pic
+        LEFT JOIN pay_income_contract_installment pici ON pic.id=pici.contract_id
+        AND pici.accounts_receivable_time > DATE_FORMAT(NOW(),'%Y-%m-%d') AND pici.accounts_receivable_amount != 0 AND pici.accounts_receivable_amount &lt; pici.paid_amount
+        LEFT JOIN pay_income_contract_associated pica ON pica.contract_id = pic.id
+        LEFT JOIN pay_common_project pcp ON pcp.id = pcp.project_id
+        <where>
+            <if test="chargeStatus != null and chargeStatus != ''">
+                pici.id != null
+            </if>
+            <if test="payIncomeContract.contractNum != null and payIncomeContract.contractNum != ''">
+                AND pic.contract_num = #{payIncomeContract.contractNum}
+            </if>
+            <if test="payIncomeContract.contractName != null and payIncomeContract.contractName != ''">
+                AND pic.contract_name = #{payIncomeContract.contractName}
+            </if>
+            <if test="projectId != null and projectId != ''">
+                AND pica.project_id = #{projectId}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND pic.create_time >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND pic.create_time &lt;= #{endTime}
+            </if>
+            <if test="payIncomeContract.status != null and payIncomeContract.status != ''">
+                AND pic.status = #{payIncomeContract.status}
+            </if>
+        </where>
+        order by pic.create_time desc
+    </select>
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractAssociatedService.java

@@ -0,0 +1,14 @@
+package com.jero.contract.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.contract.entity.PayIncomeContractAssociated;
+
+/**
+ * @Description: pay_income_contract_associated
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+public interface IPayIncomeContractAssociatedService extends IService<PayIncomeContractAssociated> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractAuditService.java

@@ -0,0 +1,14 @@
+package com.jero.contract.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.contract.entity.PayIncomeContractAudit;
+
+/**
+ * @Description: pay_income_contract_audit
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+public interface IPayIncomeContractAuditService extends IService<PayIncomeContractAudit> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractInstallmentService.java

@@ -0,0 +1,14 @@
+package com.jero.contract.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.contract.entity.PayIncomeContractInstallment;
+
+/**
+ * @Description: pay_income_contract_installment
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+public interface IPayIncomeContractInstallmentService extends IService<PayIncomeContractInstallment> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractService.java

@@ -0,0 +1,25 @@
+package com.jero.contract.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.contract.entity.PayIncomeContract;
+
+/**
+ * @Description: pay_income_contract
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+public interface IPayIncomeContractService extends IService<PayIncomeContract> {
+    /**
+    * @Description 分页列表
+    * @Author  lqt
+    * @Date   2021/9/3
+    * @Param
+    * @Return
+    * @Exception
+    */
+    IPage<PayIncomeContract>  queryPageList(Page<PayIncomeContract> page,PayIncomeContract payIncomeContract,String chargeStatus);
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractAssociatedServiceImpl.java

@@ -0,0 +1,18 @@
+package com.jero.contract.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.contract.entity.PayIncomeContractAssociated;
+import com.jero.contract.mapper.PayIncomeContractAssociatedMapper;
+import com.jero.contract.service.IPayIncomeContractAssociatedService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: pay_income_contract_associated
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Service
+public class PayIncomeContractAssociatedServiceImpl extends ServiceImpl<PayIncomeContractAssociatedMapper, PayIncomeContractAssociated> implements IPayIncomeContractAssociatedService {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractAuditServiceImpl.java

@@ -0,0 +1,18 @@
+package com.jero.contract.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.contract.entity.PayIncomeContractAudit;
+import com.jero.contract.mapper.PayIncomeContractAuditMapper;
+import com.jero.contract.service.IPayIncomeContractAuditService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: pay_income_contract_audit
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Service
+public class PayIncomeContractAuditServiceImpl extends ServiceImpl<PayIncomeContractAuditMapper, PayIncomeContractAudit> implements IPayIncomeContractAuditService {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java

@@ -0,0 +1,18 @@
+package com.jero.contract.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.contract.entity.PayIncomeContractInstallment;
+import com.jero.contract.mapper.PayIncomeContractInstallmentMapper;
+import com.jero.contract.service.IPayIncomeContractInstallmentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: pay_income_contract_installment
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Service
+public class PayIncomeContractInstallmentServiceImpl extends ServiceImpl<PayIncomeContractInstallmentMapper, PayIncomeContractInstallment> implements IPayIncomeContractInstallmentService {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -0,0 +1,29 @@
+package com.jero.contract.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.contract.entity.PayIncomeContract;
+import com.jero.contract.mapper.PayIncomeContractMapper;
+import com.jero.contract.service.IPayIncomeContractService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description: pay_income_contract
+ * @Author: jeecg-boot
+ * @Date:   2021-09-03
+ * @Version: V1.0
+ */
+@Service
+public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractMapper, PayIncomeContract> implements IPayIncomeContractService {
+
+    @Resource
+    private PayIncomeContractMapper payIncomeContractMapper;
+
+    @Override
+    public IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus) {
+        return payIncomeContractMapper.queryPageList(page,payIncomeContract,chargeStatus);
+    }
+}

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java

@@ -1,7 +1,6 @@
 package com.jero.project.controller;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -13,8 +12,6 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.ValidUtil;
-import com.jero.mail.entity.PayMailBill;
-import com.jero.mail.service.IPayMailBillService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
@@ -27,8 +24,6 @@ import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
-import com.jero.payment.entity.PayPaymentRecord;
-import com.jero.payment.service.IPayPaymentRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java

@@ -125,9 +125,15 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 			}
 		}
 
+		PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
+		if(Objects.isNull(payWorkingGroup)){
+			return Result.error("工作组不存在！");
+		}
+
 		try {
 			// 编辑保存前再次校验来款项目是否存在
 			LambdaQueryWrapper<PayWorkingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupSubItem.getWorkingGroupId());
 			queryWrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId,payWorkingGroupSubItem.getChargeCompanyId());
 			queryWrapper.eq(PayWorkingGroupSubItem::getContactsIdOne,payWorkingGroupSubItem.getContactsIdOne());
 			PayWorkingGroupSubItem payWorkingGroupSubItemNew = payWorkingGroupSubItemService.getOne(queryWrapper);
@@ -139,10 +145,6 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 			log.info("工作组成员-添加异常",e);
 			return Result.error("工作组成员已存在！");
 		}
-		PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
-		if(Objects.isNull(payWorkingGroup)){
-			return Result.error("工作组不存在！");
-		}
 
 		payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
 		payWorkingGroupSubItem.setPack(PayProjectCommon.PACKAGING0);
@@ -182,9 +184,14 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 				return Result.error("应收金额不能为空");
 			}
 		}
+		PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
+		if(Objects.isNull(payWorkingGroup)){
+			return Result.error("工作组不存在！");
+		}
 		try {
 			// 编辑保存前再次校验来款项目是否存在
 			LambdaQueryWrapper<PayWorkingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupSubItem.getWorkingGroupId());
 			queryWrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId,payWorkingGroupSubItem.getChargeCompanyId());
 			queryWrapper.eq(PayWorkingGroupSubItem::getContactsIdOne,payWorkingGroupSubItem.getContactsIdOne());
 			PayWorkingGroupSubItem payWorkingGroupSubItemNew = payWorkingGroupSubItemService.getOne(queryWrapper);
@@ -197,10 +204,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 			log.info("工作组成员-编辑异常",e);
 			return Result.error("工作组成员已存在！");
 		}
-		PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
-		if(Objects.isNull(payWorkingGroup)){
-			return Result.error("工作组不存在！");
-		}
+
 		payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
 		payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
 		return Result.OK("编辑成功!");
@@ -444,8 +448,27 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 					if(CollectionUtils.isEmpty(listCompanyInfo)){
 						throw new RuntimeException("excel中企业不存在 ！");
 					}
-					// 获取excel中联系人名称
-					List<String> listContactsName = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameOne).collect(Collectors.toList());
+					List<String> listContactsName = new ArrayList<>();
+					// 获取excel中联系人一名称
+					List<String> listContactsNameOne = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameOne).collect(Collectors.toList());
+					if(!CollectionUtils.isEmpty(listContactsNameOne)){
+						listContactsName.addAll(listContactsNameOne);
+					}
+					// 获取excel中联系人二名称
+					List<String> listContactsNameTwo = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameTwo).collect(Collectors.toList());
+					if(!CollectionUtils.isEmpty(listContactsNameTwo)){
+						listContactsName.addAll(listContactsNameTwo);
+					}
+					// 获取excel中联系人三名称
+					List<String> listContactsNameThree = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameThree).collect(Collectors.toList());
+					if(!CollectionUtils.isEmpty(listContactsNameThree)){
+						listContactsName.addAll(listContactsNameThree);
+					}
+					// 获取excel中邮寄联系人名称
+					List<String> listContactsNameMail = list.stream().map(PayWorkingGroupSubItem::getMailContactsTemporaryName).collect(Collectors.toList());
+					if(!CollectionUtils.isEmpty(listContactsNameMail)){
+						listContactsName.addAll(listContactsNameMail);
+					}
 					// 获取excel联系人信息
 					LambdaQueryWrapper<PayContactsManagement> contactsWrapper = new LambdaQueryWrapper<>();
 					contactsWrapper.in(PayContactsManagement::getName,listContactsName);
@@ -453,6 +476,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 					if(CollectionUtils.isEmpty(listContactsInfo)){
 						throw new RuntimeException("excel中联系人不存在 ！");
 					}
+					// 获取工作组信息
+					PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workGroupId);
+					if(Objects.isNull(payWorkingGroup)){
+						throw new RuntimeException("工作组不存在 ！");
+					}
+
 					// 获取工作组成员
 					LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
 					query.eq(PayWorkingGroupSubItem::getWorkingGroupId,workGroupId);
@@ -460,22 +489,6 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 					list.forEach(p->{
 						p.setWorkingGroupId(workGroupId);
 						int count = list.indexOf(p);
-						if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
-							if(Objects.isNull(p.getReceivableAmount())){
-								msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。</br>");
-							}
-							if(StringUtils.isBlank(p.getContractNum())){
-								msg.append("第 ").append(count + 3).append(" 行：合同号不能为空，请修改。</br>");
-							}
-						}
-						if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){
-							if(Objects.isNull(p.getChargeNoticeNo())){
-								msg.append("第 ").append(count + 3).append(" 行：收费通知号不能为空，请修改。</br>");
-							}
-							if(Objects.isNull(p.getReceivableAmount())){
-								msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。</br>");
-							}
-						}
 						// 校验企业名称
 						List<PayCompanyManagement> listCompany = new ArrayList<>();
 						if(StringUtils.isBlank(p.getChargeCompanyTemporaryName())){
@@ -570,6 +583,34 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 						}
 						listCompanyAndContacts.add(p);
 
+						if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
+							if(Objects.isNull(p.getReceivableAmount())){
+								msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。</br>");
+							}
+							if(StringUtils.isBlank(p.getContractNum())){
+								msg.append("第 ").append(count + 3).append(" 行：合同号不能为空，请修改。</br>");
+							}
+						}
+						if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){
+							if(Objects.isNull(p.getChargeNoticeNo())){
+								msg.append("第 ").append(count + 3).append(" 行：收费通知号不能为空，请修改。</br>");
+							}else{
+								if(Objects.equals(payWorkingGroup.getChargeNoticeNoA(),p.getChargeNoticeNo())) {
+									p.setChargeNoticeId(payWorkingGroup.getChargeNoticeAId());
+								}else if(Objects.equals(payWorkingGroup.getChargeNoticeNoB(),p.getChargeNoticeNo()) ){
+									p.setChargeNoticeId(payWorkingGroup.getChargeNoticeBId());
+								}else{
+									msg.append("第 ").append(count + 3).append(" 行：收费通知号不存在，请修改。</br>");
+								}
+							}
+							if(Objects.isNull(p.getReceivableAmount())){
+								msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。</br>");
+							}
+						}
+						p.setPack(PayProjectCommon.PACKAGING0);
+						p.setInAccount(PayProjectCommon.IN_ACCOUNT0);
+						p.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
+						p.setMail(PayProjectCommon.MAIL0);
 						// 校验字段值
 						StringBuilder s = ValidUtil.validateExcel(p,(count+3));
 						if(!StringUtils.isBlank(s)){

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java

@@ -148,7 +148,6 @@ public class PayWorkingGroupSubItem implements Serializable {
     @ApiModelProperty(value = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））")
     private java.lang.Integer mail;
 	/**催款次数*/
-	@Excel(name = "催款次数", width = 15)
     @ApiModelProperty(value = "催款次数")
     @Max(value = 999999999,message = "催款次数格式错误")
     private java.lang.Integer pressMoneyTimes;