Merge remote-tracking branch 'origin/master'

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java

@@ -0,0 +1,50 @@
+package com.jero.commonProject.common;
+
+public class PayProjectCommon {
+
+    /**
+     * 打包（1：是，0：否）
+     */
+    public final static Integer PACKAGING1 = 1;
+    /**
+     * 打包（1：是，0：否）
+     */
+    public final static Integer PACKAGING0 = 0;
+    /**
+     * 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
+     */
+    public final static Integer IN_ACCOUNT1 = 1;
+    /**
+     * 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
+     */
+    public final static Integer IN_ACCOUNT2 = 2;
+    /**
+     * 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
+     */
+    public final static Integer IN_ACCOUNT3 = 3;
+    /**
+     * 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
+     */
+    public final static Integer MAKE_INVOICE1 = 1;
+    /**
+     * 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
+     */
+    public final static Integer MAKE_INVOICE2 = 2;
+    /**
+     * 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
+     */
+    public final static Integer MAKE_INVOICE3 = 3;
+    /**
+     * 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））
+     */
+    public final static Integer MAIL1 = 1;
+    /**
+     * 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））
+     */
+    public final static Integer MAIL2 = 2;
+    /**
+     * 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））
+     */
+    public final static Integer MAIL3 = 3;
+
+}

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

@@ -1,4 +1,4 @@
-package com.jero.project.controller;
+package com.jero.commonProject.controller;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -9,16 +9,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.ValidUtil;
-import com.jero.company.entity.PayCompanyManagement;
-import com.jero.project.service.IPayCommonProjectService;
-import com.jero.project.entity.PayCommonProject;
+import com.jero.commonProject.common.PayProjectCommon;
+import com.jero.commonProject.service.IPayCommonProjectService;
+import com.jero.commonProject.entity.PayCommonProject;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.company.entity.PayContactsManagement;
+import com.jero.company.service.IPayContactsManagementService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +39,8 @@ import io.swagger.annotations.ApiOperation;
 public class PayCommonProjectController extends JeroController<PayCommonProject, IPayCommonProjectService> {
 	@Autowired
 	private IPayCommonProjectService payCommonProjectService;
+	@Autowired
+	private IPayContactsManagementService payContactsManagementService;
 	
 	/**
 	 * 分页列表查询
@@ -59,7 +64,6 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){
 			return Result.error("来款单位长度应小于50个字符");
 		}
-
 		Page<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize);
 		IPage<PayCommonProject> pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate);
 		return Result.OK(pageList);
@@ -73,7 +77,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	 */
 	@ApiOperation(value="普通项目管理-添加", notes="普通项目管理-添加")
 	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody PayCommonProject payCommonProject) {
+	public Result<?> add(@RequestBody PayCommonProject payCommonProject, MultipartFile file) {
 		StringBuilder msg = ValidUtil.validateAll(payCommonProject);
 		if(!StringUtils.isBlank(msg)){
 			return Result.error(msg.toString());
@@ -91,6 +95,20 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 			log.info("普通项目管理-添加异常",e);
 			return Result.error("来款项目已存在！");
 		}
+		PayContactsManagement contactsName = payContactsManagementService.getById(payCommonProject.getContactsId());
+		PayContactsManagement mailContactsName = payContactsManagementService.getById(payCommonProject.getContactsId());
+		if(Objects.isNull(contactsName)){
+			return Result.error("联系人名称为空！");
+		}
+		if(Objects.isNull(mailContactsName)){
+			return Result.error("邮寄联系人名称为空！");
+		}
+		payCommonProject.setContactsName(contactsName.getName());
+		payCommonProject.setMailContactsName(mailContactsName.getName());
+		payCommonProject.setPackaging(PayProjectCommon.PACKAGING0);
+		payCommonProject.setInAccount(PayProjectCommon.IN_ACCOUNT2);
+		payCommonProject.setMakeInvoice(PayProjectCommon.MAKE_INVOICE2);
+		payCommonProject.setMail(PayProjectCommon.MAIL2);
 		payCommonProjectService.save(payCommonProject);
 		return Result.OK("添加成功！");
 	}

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java

@@ -0,0 +1,150 @@
+package com.jero.commonProject.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.commonProject.service.IPayWorkingGroupService;
+import com.jero.commonProject.entity.PayWorkingGroup;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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-08-27
+ * @Version: V1.0
+ */
+@Api(tags="工作组项目")
+@RestController
+@RequestMapping("/project/payWorkingGroup")
+@Slf4j
+public class PayWorkingGroupController extends JeroController<PayWorkingGroup, IPayWorkingGroupService> {
+	@Autowired
+	private IPayWorkingGroupService payWorkingGroupService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payWorkingGroup
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="工作组项目-分页列表查询", notes="工作组项目-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayWorkingGroup payWorkingGroup,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PayWorkingGroup> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, req.getParameterMap());
+		Page<PayWorkingGroup> page = new Page<PayWorkingGroup>(pageNo, pageSize);
+		IPage<PayWorkingGroup> pageList = payWorkingGroupService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payWorkingGroup
+	 * @return
+	 */
+	@ApiOperation(value="工作组项目-添加", notes="工作组项目-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayWorkingGroup payWorkingGroup) {
+		payWorkingGroupService.save(payWorkingGroup);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param payWorkingGroup
+	 * @return
+	 */
+	@ApiOperation(value="工作组项目-编辑", notes="工作组项目-编辑")
+	@PostMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayWorkingGroup payWorkingGroup) {
+		payWorkingGroupService.updateById(payWorkingGroup);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="工作组项目-通过id删除", notes="工作组项目-通过id删除")
+	@GetMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		payWorkingGroupService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@ApiOperation(value="工作组项目-批量删除", notes="工作组项目-批量删除")
+	@GetMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.payWorkingGroupService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="工作组项目-通过id查询", notes="工作组项目-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(id);
+		if(payWorkingGroup==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(payWorkingGroup);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param payWorkingGroup
+    */
+    @GetMapping(value = "/exportXls")
+	@ApiOperation(value="工作组项目-导出excel", notes="工作组项目-导出excel")
+    public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroup payWorkingGroup) {
+        return super.exportXls(request, payWorkingGroup, PayWorkingGroup.class, "pay_working_group");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @PostMapping(value = "/importExcel")
+	@ApiOperation(value="工作组项目-通过excel导入数据", notes="工作组项目-通过excel导入数据")
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PayWorkingGroup.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java

@@ -0,0 +1,149 @@
+package com.jero.commonProject.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.commonProject.entity.PayWorkingGroupSubitem;
+import com.jero.commonProject.service.IPayWorkingGroupSubitemService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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-08-27
+ * @Version: V1.0
+ */
+@Api(tags="工作组成员")
+@RestController
+@RequestMapping("/project/payWorkingGroupSubitem")
+@Slf4j
+public class PayWorkingGroupSubitemController extends JeroController<PayWorkingGroupSubitem, IPayWorkingGroupSubitemService> {
+	@Autowired
+	private IPayWorkingGroupSubitemService payWorkingGroupSubitemService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payWorkingGroupSubitem
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="工作组成员-分页列表查询", notes="工作组成员-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayWorkingGroupSubitem payWorkingGroupSubitem,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PayWorkingGroupSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubitem, req.getParameterMap());
+		Page<PayWorkingGroupSubitem> page = new Page<PayWorkingGroupSubitem>(pageNo, pageSize);
+		IPage<PayWorkingGroupSubitem> pageList = payWorkingGroupSubitemService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payWorkingGroupSubitem
+	 * @return
+	 */
+	@ApiOperation(value="工作组成员-添加", notes="工作组成员-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayWorkingGroupSubitem payWorkingGroupSubitem) {
+		payWorkingGroupSubitemService.save(payWorkingGroupSubitem);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param payWorkingGroupSubitem
+	 * @return
+	 */
+	@ApiOperation(value="工作组成员-编辑", notes="工作组成员-编辑")
+	@PostMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayWorkingGroupSubitem payWorkingGroupSubitem) {
+		payWorkingGroupSubitemService.updateById(payWorkingGroupSubitem);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="工作组成员-通过id删除", notes="工作组成员-通过id删除")
+	@GetMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		payWorkingGroupSubitemService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@ApiOperation(value="工作组成员-批量删除", notes="工作组成员-批量删除")
+	@GetMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.payWorkingGroupSubitemService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="工作组成员-通过id查询", notes="工作组成员-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PayWorkingGroupSubitem payWorkingGroupSubitem = payWorkingGroupSubitemService.getById(id);
+		if(payWorkingGroupSubitem==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(payWorkingGroupSubitem);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param payWorkingGroupSubitem
+    */
+    @GetMapping(value = "/exportXls")
+	@ApiOperation(value="工作组成员-导出excel", notes="工作组成员-导出excel")
+    public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupSubitem payWorkingGroupSubitem) {
+        return super.exportXls(request, payWorkingGroupSubitem, PayWorkingGroupSubitem.class, "pay_working_group_subitem");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @PostMapping(value = "/importExcel")
+	@ApiOperation(value="工作组成员-通过excel导入数据", notes="工作组成员-通过excel导入数据")
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PayWorkingGroupSubitem.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java

@@ -0,0 +1,176 @@
+package com.jero.commonProject.entity;
+
+import java.io.Serializable;
+import java.sql.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.common.aspect.annotation.Dict;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+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.*;
+
+/**
+ * @Description: pay_common_project
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_common_project")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_common_project对象", description="pay_common_project")
+public class PayCommonProject implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**来款项目*/
+	@Excel(name = "来款项目", width = 15)
+    @ApiModelProperty(value = "来款项目")
+    @NotEmpty(message = "来款项目不能为空！")
+    @Size(max = 100,message = "来款项目长度应小于100个字符")
+    private String chargeProject;
+	/**运行年份*/
+	@Excel(name = "运行年份", width = 15)
+    @ApiModelProperty(value = "运行年份")
+    @NotEmpty(message = "运行年份不能为空！")
+    @Pattern(regexp = "^\\d{4}$",message = "运行年份格式错误")
+    private String year;
+	/**负责人id*/
+	@Excel(name = "负责人id", width = 15)
+    @ApiModelProperty(value = "负责人id")
+    @NotEmpty(message = "负责人id不能为空！")
+    @Size(max = 32,message = "来款项目长度应小于32个字符")
+    private String principalId;
+	/**负责人名称*/
+	@Excel(name = "负责人名称", width = 15)
+    @ApiModelProperty(value = "负责人名称")
+    @NotEmpty(message = "负责人名称不能为空！")
+    @Size(max = 50,message = "负责人名称长度应小于50个字符")
+    private String principalName;
+	/**来款企业id*/
+	@Excel(name = "来款企业id", width = 15)
+    @ApiModelProperty(value = "来款企业id")
+    @NotEmpty(message = "来款企业id不能为空！")
+    @Size(max = 32,message = "来款企业id长度应小于32个字符")
+    private String chargeCompanyId;
+	/**来款用途（字典表）*/
+	@Excel(name = "来款用途（字典表）", width = 15)
+    @ApiModelProperty(value = "来款用途（字典表）")
+    @Dict(dicCode = "payment_charge_use")
+    @NotNull(message = "来款用途不能为空！")
+    private String chargeUse;
+	/**来款企业*/
+	@Excel(name = "来款企业", width = 15)
+    @ApiModelProperty(value = "来款企业")
+    @NotEmpty(message = "来款企业不能为空！")
+    private String chargeCompanyName;
+	/**联系人id*/
+	@Excel(name = "联系人id", width = 15)
+    @ApiModelProperty(value = "联系人id")
+    @NotEmpty(message = "联系人id不能为空！")
+    @Size(max = 32,message = "来款企业id长度应小于32个字符")
+    private String contactsId;
+	/**联系人名称*/
+	@Excel(name = "联系人名称", width = 15)
+    @ApiModelProperty(value = "联系人名称")
+    private String contactsName;
+	/**应收金额（元）*/
+	@Excel(name = "应收金额（元）", width = 15)
+    @ApiModelProperty(value = "应收金额（元）")
+    @NotNull(message = "应收金额（元）不能为空！")
+    @Max(value = 999999999,message = "应收金额（元）格式错误")
+    private Integer receivableAmount;
+	/**实收金额（元）*/
+	@Excel(name = "实收金额（元）", width = 15)
+    @ApiModelProperty(value = "实收金额（元）")
+    @Max(value = 999999999,message = "实收金额（元）格式错误")
+    private Integer paidAmount;
+	/**邮寄联系人id*/
+	@Excel(name = "邮寄联系人id", width = 15)
+    @ApiModelProperty(value = "邮寄联系人id")
+    @NotEmpty(message = "邮寄联系人id不能为空！")
+    @Size(max = 32,message = "邮寄联系人id长度应小于32个字符")
+    private String mailContactsId;
+	/**邮寄联系人名称*/
+	@Excel(name = "邮寄联系人名称", width = 15)
+    @ApiModelProperty(value = "邮寄联系人名称")
+    private String mailContactsName;
+	/**打包（1：是，0：否）*/
+	@Excel(name = "打包（1：是，0：否）", width = 15)
+    @ApiModelProperty(value = "打包（1：是，0：否）")
+    private Integer packaging;
+	/**需要发票（1：增值税普通发票，2：增值税专用发票，3：否）*/
+	@Excel(name = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）", width = 15)
+    @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）")
+    @NotNull(message = "需要发票不能为空！")
+    private Integer invoice;
+	/**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/
+	@Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15)
+    @ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））")
+    private Integer inAccount;
+	/**开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/
+	@Excel(name = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15)
+    @ApiModelProperty(value = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））")
+    private Integer makeInvoice;
+	/**邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））*/
+	@Excel(name = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））", width = 15)
+    @ApiModelProperty(value = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））")
+    private Integer mail;
+	/**来款方式（1：无，2：合同，3：收费通知）*/
+	@Excel(name = "来款方式（1：无，2：合同，3：收费通知）", width = 15)
+    @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）")
+    @NotNull(message = "需要发票不能为空！")
+    private Integer chargeWay;
+	/**合同编号*/
+	@Excel(name = "合同编号", width = 15)
+    @ApiModelProperty(value = "合同编号")
+    @Size(max = 50,message = "合同编号长度应小于50个字符")
+    private String contractNum;
+	/**收费通知号*/
+	@Excel(name = "收费通知号", width = 15)
+    @ApiModelProperty(value = "收费通知号")
+    @Size(max = 50,message = "收费通知号长度应小于50个字符")
+    private String chargeNoticeNo;
+	/**收费通知文件id*/
+	@Excel(name = "收费通知文件id", width = 15)
+    @ApiModelProperty(value = "收费通知文件id")
+    private String chargeNoticeId;
+	/**催款次数*/
+	@Excel(name = "催款次数", width = 15)
+    @ApiModelProperty(value = "催款次数")
+    private Integer pressMoneyTimes;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    @Size(max = 200,message = "备注长度应小于200个字符")
+    private String remarks;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java

@@ -1,4 +1,4 @@
-package com.jero.project.entity;
+package com.jero.commonProject.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -99,16 +99,16 @@ public class PayWorkingGroup implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@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 createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@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 updateTime;
 }

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroupSubitem.java

@@ -1,4 +1,4 @@
-package com.jero.project.entity;
+package com.jero.commonProject.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -13,20 +13,18 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.Size;
-
 /**
- * @Description: pay_common_project
+ * @Description: pay_working_group_subitem
  * @Author: jeecg-boot
  * @Date:   2021-08-27
  * @Version: V1.0
  */
 @Data
-@TableName("pay_common_project")
+@TableName("pay_working_group_subitem")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="pay_common_project对象", description="pay_common_project")
-public class PayCommonProject implements Serializable {
+@ApiModel(value="pay_working_group_subitem对象", description="pay_working_group_subitem")
+public class PayWorkingGroupSubitem implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
@@ -36,40 +34,43 @@ public class PayCommonProject implements Serializable {
 	/**来款项目*/
 	@Excel(name = "来款项目", width = 15)
     @ApiModelProperty(value = "来款项目")
-    @Size(max = 100,message = "来款项目长度应小于100个字符")
     private java.lang.String chargeProject;
-	/**运行年份*/
-	@Excel(name = "运行年份", width = 15)
-    @ApiModelProperty(value = "运行年份")
-    private java.lang.Integer year;
-	/**负责人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;
-	/**来款企业id*/
-	@Excel(name = "来款企业id", width = 15)
-    @ApiModelProperty(value = "来款企业id")
+	/**工作组id*/
+	@Excel(name = "工作组id", width = 15)
+    @ApiModelProperty(value = "工作组id")
+    private java.lang.String workingGroupId;
+	/**成员单位id*/
+	@Excel(name = "成员单位id", width = 15)
+    @ApiModelProperty(value = "成员单位id")
     private java.lang.String chargeCompanyId;
-	/**来款用途（字典表）*/
-	@Excel(name = "来款用途（字典表）", width = 15)
-    @ApiModelProperty(value = "来款用途（字典表）")
-    private java.lang.String chargeUse;
-	/**来款企业*/
-	@Excel(name = "来款企业", width = 15)
-    @ApiModelProperty(value = "来款企业")
+	/**成员单位*/
+	@Excel(name = "成员单位", width = 15)
+    @ApiModelProperty(value = "成员单位")
     private java.lang.String chargeCompanyName;
-	/**联系人id*/
-	@Excel(name = "联系人id", width = 15)
-    @ApiModelProperty(value = "联系人id")
-    private java.lang.String contactsId;
-	/**联系人名称*/
-	@Excel(name = "联系人名称", width = 15)
-    @ApiModelProperty(value = "联系人名称")
-    private java.lang.String contactsName;
+	/**企业联系人一id*/
+	@Excel(name = "企业联系人一id", width = 15)
+    @ApiModelProperty(value = "企业联系人一id")
+    private java.lang.String contactsIdOne;
+	/**企业联系人一名称*/
+	@Excel(name = "企业联系人一名称", width = 15)
+    @ApiModelProperty(value = "企业联系人一名称")
+    private java.lang.String contactsNameOne;
+	/**企业联系人二id*/
+	@Excel(name = "企业联系人二id", width = 15)
+    @ApiModelProperty(value = "企业联系人二id")
+    private java.lang.String contactsIdTwo;
+	/**企业联系人二名称*/
+	@Excel(name = "企业联系人二名称", width = 15)
+    @ApiModelProperty(value = "企业联系人二名称")
+    private java.lang.String contactsNameTwo;
+	/**企业联系人三id*/
+	@Excel(name = "企业联系人三id", width = 15)
+    @ApiModelProperty(value = "企业联系人三id")
+    private java.lang.String contactsIdThree;
+	/**企业联系人三名称*/
+	@Excel(name = "企业联系人三名称", width = 15)
+    @ApiModelProperty(value = "企业联系人三名称")
+    private java.lang.String contactsNameThree;
 	/**应收金额（元）*/
 	@Excel(name = "应收金额（元）", width = 15)
     @ApiModelProperty(value = "应收金额（元）")
@@ -82,30 +83,6 @@ public class PayCommonProject implements Serializable {
 	@Excel(name = "邮寄联系人id", width = 15)
     @ApiModelProperty(value = "邮寄联系人id")
     private java.lang.String mailContactsId;
-	/**邮寄联系人名称*/
-	@Excel(name = "邮寄联系人名称", width = 15)
-    @ApiModelProperty(value = "邮寄联系人名称")
-    private java.lang.String mailContactsName;
-	/**打包（1：是，0：否）*/
-	@Excel(name = "打包（1：是，0：否）", width = 15)
-    @ApiModelProperty(value = "打包（1：是，0：否）")
-    private java.lang.Integer packaging;
-	/**需要发票（1：增值税普通发票，2：增值税专用发票，3：否）*/
-	@Excel(name = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）", width = 15)
-    @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）")
-    private java.lang.Integer invoice;
-	/**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/
-	@Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15)
-    @ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））")
-    private java.lang.String inAccount;
-	/**开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/
-	@Excel(name = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15)
-    @ApiModelProperty(value = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））")
-    private java.lang.String makeInvoice;
-	/**邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））*/
-	@Excel(name = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））", width = 15)
-    @ApiModelProperty(value = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））")
-    private java.lang.String mail;
 	/**来款方式（1：无，2：合同，3：收费通知）*/
 	@Excel(name = "来款方式（1：无，2：合同，3：收费通知）", width = 15)
     @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）")
@@ -122,6 +99,26 @@ public class PayCommonProject implements Serializable {
 	@Excel(name = "收费通知文件id", width = 15)
     @ApiModelProperty(value = "收费通知文件id")
     private java.lang.String chargeNoticeId;
+	/**打包（1：是，0：否）*/
+	@Excel(name = "打包（1：是，0：否）", width = 15)
+    @ApiModelProperty(value = "打包（1：是，0：否）")
+    private java.lang.Integer packaging;
+	/**需要发票（1：增值税普通发票，2：增值税专用发票，3：否）*/
+	@Excel(name = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）", width = 15)
+    @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）")
+    private java.lang.Integer invoice;
+	/**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/
+	@Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15)
+    @ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））")
+    private java.lang.Integer inAccount;
+	/**开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/
+	@Excel(name = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15)
+    @ApiModelProperty(value = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））")
+    private java.lang.Integer makeInvoice;
+	/**邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））*/
+	@Excel(name = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））", width = 15)
+    @ApiModelProperty(value = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））")
+    private java.lang.Integer mail;
 	/**催款次数*/
 	@Excel(name = "催款次数", width = 15)
     @ApiModelProperty(value = "催款次数")

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java

@@ -1,8 +1,8 @@
-package com.jero.project.mapper;
+package com.jero.commonProject.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.project.entity.PayCommonProject;
+import com.jero.commonProject.entity.PayCommonProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java

@@ -0,0 +1,14 @@
+package com.jero.commonProject.mapper;
+
+import com.jero.commonProject.entity.PayWorkingGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: pay_working_group
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java

@@ -0,0 +1,14 @@
+package com.jero.commonProject.mapper;
+
+import com.jero.commonProject.entity.PayWorkingGroupSubitem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: pay_working_group_subitem
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+public interface PayWorkingGroupSubitemMapper extends BaseMapper<PayWorkingGroupSubitem> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml

@@ -1,8 +1,8 @@
 <?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.project.mapper.PayCommonProjectMapper">
+<mapper namespace="com.jero.commonProject.mapper.PayCommonProjectMapper">
 
-    <select id="queryPageList" resultType="com.jero.project.entity.PayCommonProject">
+    <select id="queryPageList" resultType="com.jero.commonProject.entity.PayCommonProject">
         SELECT
             pcp.id,
             pcp.charge_project AS chargeProject,

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.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.commonProject.mapper.PayWorkingGroupMapper">
+
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.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.commonProject.mapper.PayWorkingGroupSubitemMapper">
+
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java

@@ -1,8 +1,8 @@
-package com.jero.project.service;
+package com.jero.commonProject.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.project.entity.PayCommonProject;
+import com.jero.commonProject.entity.PayCommonProject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java

@@ -0,0 +1,14 @@
+package com.jero.commonProject.service;
+
+import com.jero.commonProject.entity.PayWorkingGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: pay_working_group
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java

@@ -0,0 +1,14 @@
+package com.jero.commonProject.service;
+
+import com.jero.commonProject.entity.PayWorkingGroupSubitem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: pay_working_group_subitem
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+public interface IPayWorkingGroupSubitemService extends IService<PayWorkingGroupSubitem> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java

@@ -1,10 +1,10 @@
-package com.jero.project.service.impl;
+package com.jero.commonProject.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.project.service.IPayCommonProjectService;
-import com.jero.project.entity.PayCommonProject;
-import com.jero.project.mapper.PayCommonProjectMapper;
+import com.jero.commonProject.service.IPayCommonProjectService;
+import com.jero.commonProject.entity.PayCommonProject;
+import com.jero.commonProject.mapper.PayCommonProjectMapper;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java

@@ -0,0 +1,19 @@
+package com.jero.commonProject.service.impl;
+
+import com.jero.commonProject.service.IPayWorkingGroupService;
+import com.jero.commonProject.entity.PayWorkingGroup;
+import com.jero.commonProject.mapper.PayWorkingGroupMapper;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: pay_working_group
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Service
+public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMapper, PayWorkingGroup> implements IPayWorkingGroupService {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java

@@ -0,0 +1,19 @@
+package com.jero.commonProject.service.impl;
+
+import com.jero.commonProject.service.IPayWorkingGroupSubitemService;
+import com.jero.commonProject.entity.PayWorkingGroupSubitem;
+import com.jero.commonProject.mapper.PayWorkingGroupSubitemMapper;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: pay_working_group_subitem
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Service
+public class PayWorkingGroupSubitemServiceImpl extends ServiceImpl<PayWorkingGroupSubitemMapper, PayWorkingGroupSubitem> implements IPayWorkingGroupSubitemService {
+
+}