add 打包管理增加确认收入金额

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

@@ -90,6 +90,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 			// 获取 打包费用，实际到账金额
 			List<String> listPackIds = list.stream().map(PayPackCompany::getId).collect(Collectors.toList());
 			List<PayCommonProject> listPayCommonProject = payPackCompanyService.queryPackListCount(listPackIds);
+			List<PayCommonProject> listConfirmAmount = payPackCompanyService.queryConfirmAmount(listPackIds);
 			list.forEach(p->{
 				if(!CollectionUtils.isEmpty(listPayCommonProject)){
 					List<PayCommonProject> listCount = listPayCommonProject.stream().filter(item->Objects.equals(p.getId(),item.getId())).collect(Collectors.toList());
@@ -97,6 +98,12 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 						p.setReceiptExpense(listCount.get(0).getPaidAmount());
 					}
 				}
+				if(!CollectionUtils.isEmpty(listConfirmAmount)){
+					List<PayCommonProject> listCount = listConfirmAmount.stream().filter(item->Objects.equals(p.getId(),item.getId())).collect(Collectors.toList());
+					if(!CollectionUtils.isEmpty(listCount)){
+						p.setConfirmAmount(listCount.get(0).getPaidAmount());
+					}
+				}
 				if(!StringUtils.isEmpty(p.getPhone())){
 					p.setPhone(PasswordUtil.decrypt(p.getPhone()));
 				}
@@ -106,6 +113,9 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 				if(Objects.isNull(p.getReceiptExpense())){
 					p.setReceiptExpense(new BigDecimal("0.00"));
 				}
+				if (Objects.isNull(p.getConfirmAmount())) {
+					p.setConfirmAmount(new BigDecimal("0.00"));
+				}
 				if(Objects.isNull(p.getPackChargeTotal())){
 					p.setPackChargeTotal(new BigDecimal("0.00"));
 				}
@@ -117,6 +127,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 
 		HashMap<String, Object> hashMap = new HashMap<>();
 		hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
+		hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
 		hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
 		hashMap.put("pageList", pageList);
 		return Result.OK(hashMap);
@@ -309,6 +320,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 		if(!CollectionUtils.isEmpty(exportList)){
 			List<String> listPackIds = exportList.stream().map(PayPackCompany::getId).collect(Collectors.toList());
 			List<PayCommonProject> listPayCommonProject = payPackCompanyService.queryPackListCount(listPackIds);
+			List<PayCommonProject> listConfirmAmount = payPackCompanyService.queryConfirmAmount(listPackIds);
 			exportList.forEach(p->{
 				if (!CollectionUtils.isEmpty(listPayCommonProject)) {
 					List<PayCommonProject> listCount = listPayCommonProject.stream().filter(item -> Objects.equals(p.getId(), item.getId())).collect(Collectors.toList());
@@ -316,6 +328,12 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 						p.setReceiptExpense(listCount.get(0).getPaidAmount());
 					}
 				}
+				if(!CollectionUtils.isEmpty(listConfirmAmount)){
+					List<PayCommonProject> listCount = listConfirmAmount.stream().filter(item->Objects.equals(p.getId(),item.getId())).collect(Collectors.toList());
+					if(!CollectionUtils.isEmpty(listCount)){
+						p.setConfirmAmount(listCount.get(0).getPaidAmount());
+					}
+				}
 				if(!StringUtils.isEmpty(p.getPhone())){
 					p.setPhone(PasswordUtil.decrypt(p.getPhone()));
 				}
@@ -325,6 +343,9 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 				if (Objects.isNull(p.getReceiptExpense())) {
 					p.setReceiptExpense(new BigDecimal("0.00"));
 				}
+				if (Objects.isNull(p.getConfirmAmount())) {
+					p.setConfirmAmount(new BigDecimal("0.00"));
+				}
 				if (Objects.isNull(p.getPackChargeTotal())) {
 					p.setPackChargeTotal(new BigDecimal("0.00"));
 				}

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

@@ -139,4 +139,9 @@ public class PayPackCompany implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "邮箱")
 	private String email;
+
+    @Excel(name = "确认收入金额", width = 15)
+    @TableField(exist = false)
+    @ApiModelProperty(value = "确认收入金额")
+    private BigDecimal confirmAmount;
 }

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

@@ -37,7 +37,9 @@ public interface PayPackCompanyMapper extends BaseMapper<PayPackCompany> {
      * @Return
      * @Exception
      */
-    List<PayCommonProject> queryPackListCount(List<String> listPackIds);
+    List<PayCommonProject> queryPackListCount(@Param("listPackIds") List<String> listPackIds);
+
+    List<PayCommonProject> queryConfirmAmount(@Param("listPackIds") List<String> listPackIds);
 
     /**
      * @Description 打包列表excel导出
@@ -52,4 +54,6 @@ public interface PayPackCompanyMapper extends BaseMapper<PayPackCompany> {
     String getSumMoney(@Param("payPackCompany") PayPackCompany payPackCompany);
 
     String getConfirmAmountMoney(@Param("payPackCompany") PayPackCompany payPackCompany);
+
+    String getComeAllMoney(@Param("payPackCompany") PayPackCompany payPackCompany);
 }

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

@@ -14,6 +14,19 @@
         </where>
         group by ppcp.pack_id
     </select>
+    <select id="queryConfirmAmount" resultType="com.jero.project.entity.PayCommonProject">
+        SELECT sum(pcpr.amount_received) AS paid_amount, ppcp.pack_id AS id FROM pay_pack_company_project ppcp
+        LEFT JOIN pay_confirm_payment_record pcpr ON ppcp.project_id = pcpr.project_id
+        <where>
+            <if test="listPackIds != null and listPackIds.size() > 0">
+                ppcp.pack_id  in
+                <foreach collection="listPackIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by ppcp.pack_id
+    </select>
     <select id="queryPageList" resultType="com.jero.pack.entity.PayPackCompany">
         select ppc.*,pcmt.phone,pcmt.email from pay_pack_company ppc
         LEFT JOIN pay_company_management pcm on ppc.company_id = pcm.id
@@ -68,4 +81,20 @@
             </if>
         </where>
     </select>
+
+    <select id="getComeAllMoney" resultType="java.lang.String">
+        SELECT sum(pcpr.amount_received) FROM
+        pay_pack_company ppc left join pay_pack_company_project ppcp on ppc.id = ppcp.pack_id
+        LEFT JOIN pay_confirm_payment_record pcpr ON ppcp.project_id = pcpr.project_id
+        <where>
+            <if test="payPackCompany.companyTemporaryName != null and payPackCompany.companyTemporaryName != ''">
+                AND ppc.company_temporary_name like concat('%',concat(#{payPackCompany.companyTemporaryName},'%'))
+            </if>
+            <if test="payPackCompany.packYear != null and payPackCompany.packYear != ''">
+                AND ppc.pack_year = #{payPackCompany.packYear}
+            </if>
+        </where>
+    </select>
+
+
 </mapper>

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

@@ -54,6 +54,8 @@ public interface IPayPackCompanyService extends IService<PayPackCompany> {
     */
     List<PayCommonProject> queryPackListCount(List<String> listPackIds);
 
+    List<PayCommonProject> queryConfirmAmount(List<String> listPackIds);
+
     /**
      * @Description 打包列表excel导出
      * @Author  lqt

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

@@ -102,6 +102,11 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
         return payPackCompanyMapper.queryPackListCount(listPackIds);
     }
 
+    @Override
+    public List<PayCommonProject> queryConfirmAmount(List<String> listPackIds) {
+        return payPackCompanyMapper.queryConfirmAmount(listPackIds);
+    }
+
     @Override
     public List<PayPackCompany> queryPageListExport(PayPackCompany payPackCompany) {
         return payPackCompanyMapper.queryPageListExport(payPackCompany) ;
@@ -114,6 +119,9 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
         String sumMoney = payPackCompanyMapper.getSumMoney(payPackCompany);
         allMoney.setAllMoney(sumMoney);
         //总实际到账费用
+        String comeAllMoney = payPackCompanyMapper.getComeAllMoney(payPackCompany);
+        allMoney.setComeAllMoney(comeAllMoney);
+        //总确认收入金额
         String confirmAmount = payPackCompanyMapper.getConfirmAmountMoney(payPackCompany);
         allMoney.setConfirmAmount(confirmAmount);
         return allMoney;