Merge remote-tracking branch 'origin/master'

jero-boot-incoming-payment/src/main/java/com/jero/mail/common/MailBillCommon.java

@@ -0,0 +1,20 @@
+package com.jero.mail.common;
+
+public class MailBillCommon {
+    /**
+     * 普通项目
+     */
+    public final static String PROJECT_TYPE1 = "1";
+    /**
+     *
+     */
+    public final static String PROJECT_TYPE2 = "2";
+    /**
+     *
+     */
+    public final static String PROJECT_TYPE3 = "3";
+    /**
+     *
+     */
+    public final static String PROJECT_TYPE4 = "4";
+}

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java

@@ -1,4 +1,4 @@
-package com.jero.mailBill.controller;
+package com.jero.mail.controller;
 
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
@@ -11,8 +11,8 @@ 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.mailBill.entity.PayMailBill;
-import com.jero.mailBill.service.IPayMailBillService;
+import com.jero.mail.entity.PayMailBill;
+import com.jero.mail.service.IPayMailBillService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillProjectController.java

@@ -1,4 +1,4 @@
-package com.jero.mailBill.controller;
+package com.jero.mail.controller;
 
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
@@ -11,9 +11,9 @@ 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.mailBill.entity.PayMailBillProject;
+import com.jero.mail.entity.PayMailBillProject;
 
-import com.jero.mailBill.service.IPayMailBillProjectService;
+import com.jero.mail.service.IPayMailBillProjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java

@@ -1,4 +1,4 @@
-package com.jero.mailBill.entity;
+package com.jero.mail.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -66,13 +66,13 @@ public class PayMailBill implements Serializable {
 	/**快递单号*/
 	@Excel(name = "快递单号", width = 15)
     @ApiModelProperty(value = "快递单号")
-    private java.lang.String postno;
+    private java.lang.String postNo;
 	/**邮寄时间*/
 	@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 senddate;
+    private java.util.Date sendDate;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java

@@ -1,4 +1,4 @@
-package com.jero.mailBill.entity;
+package com.jero.mail.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;

jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java

@@ -1,9 +1,10 @@
-package com.jero.mailBill.mapper;
+package com.jero.mail.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jero.mailBill.entity.PayMailBill;
-import com.jero.mailBill.vo.MailBillVO;
+import com.jero.mail.entity.PayMailBill;
+import com.jero.mail.vo.MailBillVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,10 +20,9 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
      * @Author  lqt
      * @Date   2021/8/31
      * @Param  projectId 项目id
-     * @Param  projectType 项目类型
      * @Return
      * @Exception
      */
-    List<MailBillVO> selectMailBillVO(String projectId, String projectType);
+    List<MailBillVO> selectCommonProjectMailBillVO(@Param("projectId") String projectId);
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java

@@ -1,7 +1,7 @@
-package com.jero.mailBill.mapper;
+package com.jero.mail.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jero.mailBill.entity.PayMailBillProject;
+import com.jero.mail.entity.PayMailBillProject;
 
 /**
  * @Description: pay_mail_bill_project

jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml

@@ -0,0 +1,41 @@
+<?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.mail.mapper.PayMailBillMapper">
+    <resultMap id="MailBillVO" type="com.jero.mail.vo.MailBillVO">
+        <result property="id" column="id"></result>
+        <result property="createBy" column="create_by"></result>
+        <result property="createTime" column="create_time"></result>
+        <result property="updateBy" column="update_by"></result>
+        <result property="updateTime" column="update_time"></result>
+        <result property="billNo" column="bill_no"></result>
+        <result property="invoiceAmount" column="invoice_amount"></result>
+        <result property="postStatus" column="post_status"></result>
+        <result property="sendMethod" column="send_method"></result>
+        <result property="postNo" column="post_no"></result>
+        <result property="sendDate" column="send_date"></result>
+        <result property="remark" column="remark"></result>
+        <collection property="list" ofType="String">
+            <result column="projectName"></result>
+        </collection>
+    </resultMap>
+    <select id="selectCommonProjectMailBillVO" resultMap="MailBillVO">
+        SELECT
+            pmb.id,
+            pmb.create_by,
+            pmb.create_time,
+            pmb.update_by,
+            pmb.update_time,
+            pmb.bill_no,
+            pmb.invoice_amount,
+            pmb.post_status,
+            pmb.send_method,
+            pmb.post_no,
+            pmb.send_date,
+            pmb.remark,
+            pcp.charge_project AS projectName
+        FROM pay_mail_bill pmb
+        LEFT JOIN pay_mail_bill_project pmbp ON pmb.id = pmbp.bill_id
+        LEFT JOIN pay_common_project pcp ON pcp.id = pmbp.project_id
+        WHERE pmb.id = (SELECT id FROM pay_mail_bill_project WHERE project_id=#{projectId})
+    </select>
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillProjectService.java

@@ -1,8 +1,8 @@
-package com.jero.mailBill.service;
+package com.jero.mail.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.mailBill.entity.PayMailBillProject;
+import com.jero.mail.entity.PayMailBillProject;
 
 /**
  * @Description: pay_mail_bill_project

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java

@@ -1,8 +1,8 @@
-package com.jero.mailBill.service;
+package com.jero.mail.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.mailBill.entity.PayMailBill;
-import com.jero.mailBill.vo.MailBillVO;
+import com.jero.mail.entity.PayMailBill;
+import com.jero.mail.vo.MailBillVO;
 
 import java.util.List;
 

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillProjectServiceImpl.java

@@ -1,9 +1,9 @@
-package com.jero.mailBill.service.impl;
+package com.jero.mail.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.mailBill.entity.PayMailBillProject;
-import com.jero.mailBill.mapper.PayMailBillProjectMapper;
-import com.jero.mailBill.service.IPayMailBillProjectService;
+import com.jero.mail.entity.PayMailBillProject;
+import com.jero.mail.mapper.PayMailBillProjectMapper;
+import com.jero.mail.service.IPayMailBillProjectService;
 import org.springframework.stereotype.Service;
 
 /**

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java

@@ -0,0 +1,39 @@
+package com.jero.mail.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.mail.common.MailBillCommon;
+import com.jero.mail.entity.PayMailBill;
+import com.jero.mail.mapper.PayMailBillMapper;
+import com.jero.mail.service.IPayMailBillService;
+import com.jero.mail.vo.MailBillVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: pay_mail_bill
+ * @Author: jeecg-boot
+ * @Date:   2021-08-31
+ * @Version: V1.0
+ */
+@Service
+public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMailBill> implements IPayMailBillService {
+
+    @Resource
+    private PayMailBillMapper payMailBillMapper;
+
+    @Override
+    public List<MailBillVO> selectMailBillVO(String projectId, String projectType) {
+        List<MailBillVO> list = new ArrayList<>();
+        switch (projectType){
+            case MailBillCommon.PROJECT_TYPE1: list = payMailBillMapper.selectCommonProjectMailBillVO(projectId);break;
+            case MailBillCommon.PROJECT_TYPE2:break;
+            case MailBillCommon.PROJECT_TYPE3:break;
+            case MailBillCommon.PROJECT_TYPE4:break;
+            default:break;
+        }
+        return list;
+    }
+}

jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java

@@ -1,6 +1,6 @@
-package com.jero.mailBill.vo;
+package com.jero.mail.vo;
 
-import com.jero.mailBill.entity.PayMailBill;
+import com.jero.mail.entity.PayMailBill;
 import java.io.Serializable;
 import java.util.List;
 

jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml

@@ -1,15 +0,0 @@
-<?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.mailBill.mapper.PayMailBillMapper">
-    <resultMap id="MailBillVO" type="com.jero.mailBill.vo.MailBillVO">
-        <collection property="list" ofType="java.lang.String">
-        </collection>
-    </resultMap>
-
-    <select id="selectMailBillVO" resultMap="MailBillVO">
-        select pmb.*,pcp.charge_project from pay_mail_bill pmb
-        LEFT JOIN pay_mail_bill_project pmbp on pmb.id = pmbp.bill_id
-        LEFT JOIN pay_common_project pcp on pcp.id = pmbp.project_id
-        where pmb.id = (select id from pay_mail_bill_project where project_id='1432636878326165505')
-    </select>
-</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java

@@ -1,29 +0,0 @@
-package com.jero.mailBill.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.mailBill.entity.PayMailBill;
-import com.jero.mailBill.mapper.PayMailBillMapper;
-import com.jero.mailBill.service.IPayMailBillService;
-import com.jero.mailBill.vo.MailBillVO;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description: pay_mail_bill
- * @Author: jeecg-boot
- * @Date:   2021-08-31
- * @Version: V1.0
- */
-@Service
-public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMailBill> implements IPayMailBillService {
-
-    @Resource
-    private PayMailBillMapper payMailBillMapper;
-
-    @Override
-    public List<MailBillVO> selectMailBillVO(String projectId, String projectType) {
-        return payMailBillMapper.selectMailBillVO(projectId,projectType);
-    }
-}

jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java

@@ -1,16 +1,14 @@
 package com.jero.member.service.impl;
-import java.util.Date;
 
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.ValidUtil;
-import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.IPayContactsManagementService;
-import com.jero.companyTemporary.entity.PayCompanyManagementTemporary;
-import com.jero.companyTemporary.entity.PayContactsManagementTemporary;
-import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService;
-import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.entity.PayContactsManagementTemporary;
+import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
+import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import com.jero.member.entity.PayMemberProject;
 import com.jero.member.entity.PayMemberProjectSubitem;
 import com.jero.member.mapper.PayMemberProjectSubitemMapper;

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

@@ -1,4 +1,4 @@
-package com.jero.paymentRecord.controller;
+package com.jero.payment.controller;
 
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
@@ -10,8 +10,8 @@ import com.jero.common.system.query.QueryGenerator;
 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.paymentRecord.entity.PayPaymentRecord;
-import com.jero.paymentRecord.service.IPayPaymentRecordService;
+import com.jero.payment.entity.PayPaymentRecord;
+import com.jero.payment.service.IPayPaymentRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,4 +1,4 @@
-package com.jero.paymentRecord.entity;
+package com.jero.payment.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;

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

@@ -1,7 +1,7 @@
-package com.jero.paymentRecord.mapper;
+package com.jero.payment.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jero.paymentRecord.entity.PayPaymentRecord;
+import com.jero.payment.entity.PayPaymentRecord;
 
 /**
  * @Description: pay_payment_record

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

@@ -1,5 +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.paymentRecord.mapper.PayPaymentRecordMapper">
+<mapper namespace="com.jero.payment.mapper.PayPaymentRecordMapper">
 
 </mapper>

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

@@ -1,7 +1,7 @@
-package com.jero.paymentRecord.service;
+package com.jero.payment.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.paymentRecord.entity.PayPaymentRecord;
+import com.jero.payment.entity.PayPaymentRecord;
 
 /**
  * @Description: pay_payment_record

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

@@ -1,9 +1,9 @@
-package com.jero.paymentRecord.service.impl;
+package com.jero.payment.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.paymentRecord.entity.PayPaymentRecord;
-import com.jero.paymentRecord.mapper.PayPaymentRecordMapper;
-import com.jero.paymentRecord.service.IPayPaymentRecordService;
+import com.jero.payment.entity.PayPaymentRecord;
+import com.jero.payment.mapper.PayPaymentRecordMapper;
+import com.jero.payment.service.IPayPaymentRecordService;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -47,4 +47,21 @@ public class PayProjectCommon {
      */
     public final static Integer MAIL2 = 2;
 
+    /**
+     * 普通项目
+     */
+    public final static String PROJECT_TYPE1 = "1";
+    /**
+     *
+     */
+    public final static String PROJECT_TYPE2 = "2";
+    /**
+     *
+     */
+    public final static String PROJECT_TYPE3 = "3";
+    /**
+     *
+     */
+    public final static String PROJECT_TYPE4 = "4";
+
 }

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

@@ -12,20 +12,22 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.ValidUtil;
+import com.jero.mail.service.IPayMailBillService;
+import com.jero.mail.vo.MailBillVO;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.companyTemporary.entity.PayCompanyManagementTemporary;
-import com.jero.companyTemporary.entity.PayContactsManagementTemporary;
-import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService;
-import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.entity.PayContactsManagementTemporary;
+import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
+import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
-import com.jero.paymentRecord.entity.PayPaymentRecord;
-import com.jero.paymentRecord.service.IPayPaymentRecordService;
+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;
@@ -56,6 +58,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
 	@Autowired
 	private IPayPaymentRecordService payPaymentRecordService;
+	@Autowired
+	private IPayMailBillService payMailBillService;
 
 	 /**
 	 * 分页列表查询
@@ -266,8 +270,9 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		queryWrapperPayPaymentRecord.eq(PayPaymentRecord::getProjectId,payCommonProject.getId());
 		List<PayPaymentRecord> payPaymentRecordList = payPaymentRecordService.list(queryWrapperPayPaymentRecord);
 		json.put("payPaymentRecord",payPaymentRecordList);
-		// todo 开票邮寄记录
-		// json.put("payPaymentRecord",payPaymentRecordList);
+		// 开票邮寄记录
+		List<MailBillVO> listMailBillVO = payMailBillService.selectMailBillVO(payCommonProject.getId(),PayProjectCommon.PROJECT_TYPE1);
+		json.put("mailBill",listMailBillVO);
 		return Result.OK(json);
 	}
 

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

@@ -3,6 +3,7 @@ package com.jero.project.controller;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -12,6 +13,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.ValidUtil;
+import com.jero.project.entity.PayWorkingGroupSubitem;
 import com.jero.project.service.IPayWorkingGroupService;
 import com.jero.project.entity.PayWorkingGroup;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.project.service.IPayWorkingGroupSubitemService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -43,6 +46,8 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	private IPayWorkingGroupService payWorkingGroupService;
 	@Autowired
 	private ISysUserService sysUserService;
+	@Autowired
+	private IPayWorkingGroupSubitemService payWorkingGroupSubitemService;
 	
 	/**
 	 * 分页列表查询
@@ -59,12 +64,34 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		// todo 缺少验证，进度查询
+		// todo 缺少验证
 		QueryWrapper<PayWorkingGroup> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, req.getParameterMap());
 		Page<PayWorkingGroup> page = new Page<PayWorkingGroup>(pageNo, pageSize);
 		IPage<PayWorkingGroup> pageList = payWorkingGroupService.page(page, queryWrapper);
-		if(!CollectionUtils.isEmpty(pageList.getRecords())){
-			List<PayWorkingGroup> list = pageList.getRecords();
+		if(!Objects.isNull(pageList)){
+			List<PayWorkingGroup> listPayWorkingGroup = pageList.getRecords();
+			if(!CollectionUtils.isEmpty(listPayWorkingGroup)){
+				listPayWorkingGroup.forEach(p->{
+					LambdaQueryWrapper<PayWorkingGroupSubitem> query = new LambdaQueryWrapper<>();
+					query.eq(PayWorkingGroupSubitem::getWorkingGroupId,p.getId());
+					List<PayWorkingGroupSubitem> listPayWorkingGroupSubitem = payWorkingGroupSubitemService.list(query);
+					if(!CollectionUtils.isEmpty(listPayWorkingGroupSubitem)){
+						// 已付全款
+						List<PayWorkingGroupSubitem> listAllPayment = listPayWorkingGroupSubitem.stream()
+								.filter(p1->p1.getPaidAmount() == p1.getReceivableAmount()).collect(Collectors.toList());
+						p.setAllPayment(listAllPayment.size());
+						// 部分付款
+						List<PayWorkingGroupSubitem> listPartPayment = listPayWorkingGroupSubitem.stream()
+								.filter(p1->p1.getPaidAmount() < p1.getReceivableAmount()).collect(Collectors.toList());
+						p.setPartPayment(listPartPayment.size());
+						// 未付款
+						List<PayWorkingGroupSubitem> listNotPayment = listPayWorkingGroupSubitem.stream()
+								.filter(p1->p1.getPaidAmount() == 0 && p1.getReceivableAmount() != 0 )
+								.collect(Collectors.toList());
+						p.setNotPayment(listNotPayment.size());
+					}
+				});
+			}
 		}
 		return Result.OK(pageList);
 	}

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

@@ -116,13 +116,13 @@ public class PayWorkingGroup implements Serializable {
     /**
      * 已付全款
      */
-	private String allPayment;
+	private Integer allPayment;
     /**
      * 部分付款
      */
-	private String partPayment;
+	private Integer partPayment;
     /**
      * 未付款
      */
-	private String notPayment;
+	private Integer notPayment;
 }

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

@@ -1,7 +1,10 @@
 package com.jero.project.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.project.entity.PayWorkingGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Description: pay_working_group

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

@@ -1,5 +1,4 @@
 <?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.PayWorkingGroupMapper">
-
 </mapper>

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

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+
 /**
  * @Description: pay_working_group
  * @Author: jeecg-boot
@@ -15,5 +16,4 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMapper, PayWorkingGroup> implements IPayWorkingGroupService {
-
 }

jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayCompanyManagementTemporaryController.java

@@ -1,4 +1,4 @@
-package com.jero.companyTemporary.controller;
+package com.jero.temporary.controller;
 
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
@@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.companyTemporary.entity.PayCompanyManagementTemporary;
-import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java

@@ -1,4 +1,4 @@
-package com.jero.companyTemporary.controller;
+package com.jero.temporary.controller;
 
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
@@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.companyTemporary.entity.PayContactsManagementTemporary;
-import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService;
+import com.jero.temporary.entity.PayContactsManagementTemporary;
+import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java

@@ -1,4 +1,4 @@
-package com.jero.companyTemporary.entity;
+package com.jero.temporary.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;

jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java

@@ -1,4 +1,4 @@
-package com.jero.companyTemporary.entity;
+package com.jero.temporary.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;

jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/PayCompanyManagementTemporaryMapper.java

@@ -1,8 +1,8 @@
-package com.jero.companyTemporary.mapper;
+package com.jero.temporary.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jero.companyTemporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
 
 /**
  * @Description: pay_company_management_temporary

jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/PayContactsManagementTemporaryMapper.java

@@ -1,8 +1,8 @@
-package com.jero.companyTemporary.mapper;
+package com.jero.temporary.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jero.companyTemporary.entity.PayContactsManagementTemporary;
+import com.jero.temporary.entity.PayContactsManagementTemporary;
 
 /**
  * @Description: pay_contacts_management_temporary

jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml

@@ -1,5 +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.companyTemporary.mapper.PayCompanyManagementTemporaryMapper">
+<mapper namespace="com.jero.temporary.mapper.PayCompanyManagementTemporaryMapper">
 
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/xml/PayContactsManagementTemporaryMapper.xml

@@ -1,5 +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.companyTemporary.mapper.PayContactsManagementTemporaryMapper">
+<mapper namespace="com.jero.temporary.mapper.PayContactsManagementTemporaryMapper">
 
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayCompanyManagementTemporaryService.java

@@ -1,8 +1,8 @@
-package com.jero.companyTemporary.service;
+package com.jero.temporary.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.companyTemporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
 
 /**
  * @Description: pay_company_management_temporary

jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayContactsManagementTemporaryService.java

@@ -1,8 +1,8 @@
-package com.jero.companyTemporary.service;
+package com.jero.temporary.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.companyTemporary.entity.PayContactsManagementTemporary;
+import com.jero.temporary.entity.PayContactsManagementTemporary;
 
 /**
  * @Description: pay_contacts_management_temporary

jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java

@@ -1,21 +1,19 @@
-package com.jero.companyTemporary.service.impl;
+package com.jero.temporary.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.service.IPayCompanyManagementService;
-import com.jero.companyTemporary.entity.PayCompanyManagementTemporary;
-import com.jero.companyTemporary.mapper.PayCompanyManagementTemporaryMapper;
-import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.mapper.PayCompanyManagementTemporaryMapper;
+import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;
-import java.util.UUID;
 
 /**
  * @Description: pay_company_management_temporary

jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java

@@ -1,22 +1,19 @@
-package com.jero.companyTemporary.service.impl;
+package com.jero.temporary.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
-import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayContactsManagementService;
-import com.jero.companyTemporary.entity.PayCompanyManagementTemporary;
-import com.jero.companyTemporary.entity.PayContactsManagementTemporary;
-import com.jero.companyTemporary.mapper.PayContactsManagementTemporaryMapper;
-import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService;
+import com.jero.temporary.entity.PayContactsManagementTemporary;
+import com.jero.temporary.mapper.PayContactsManagementTemporaryMapper;
+import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;
-import java.util.UUID;
 
 /**
  * @Description: pay_contacts_management_temporary