add 打包管理增加总计

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

@@ -1,10 +1,7 @@
 package com.jero.pack.controller;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -26,10 +23,12 @@ import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
 import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.project.entity.PayCommonProject;
+import com.jero.statistics.entity.AllMoney;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -113,7 +112,14 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 			});
 			pageList.setRecords(list);
 		}
-		return Result.OK(pageList);
+		//总打包金额
+		AllMoney allMoney = payPackCompanyService.getAllMoney(payPackCompany);
+
+		HashMap<String, Object> hashMap = new HashMap<>();
+		hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
+		hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
+		hashMap.put("pageList", pageList);
+		return Result.OK(hashMap);
 	}
 	
 	/**

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

@@ -49,4 +49,7 @@ public interface PayPackCompanyMapper extends BaseMapper<PayPackCompany> {
      */
     List<PayPackCompany> queryPageListExport(@Param("payPackCompany") PayPackCompany payPackCompany);
 
+    String getSumMoney(@Param("payPackCompany") PayPackCompany payPackCompany);
+
+    String getConfirmAmountMoney(@Param("payPackCompany") PayPackCompany payPackCompany);
 }

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

@@ -42,4 +42,30 @@
         </where>
         ORDER BY pcm.create_time desc,ppc.pack_year desc
     </select>
+
+    <select id="getSumMoney" resultType="java.lang.String">
+        select sum(pack_charge_total) from pay_pack_company ppc
+        <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>
+
+    <select id="getConfirmAmountMoney" resultType="java.lang.String">
+        SELECT sum(ppr.amount_received) FROM
+        pay_pack_company ppc left join pay_pack_company_project ppcp on ppc.id = ppcp.pack_id
+        LEFT JOIN pay_payment_record ppr ON ppcp.project_id = ppr.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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.pack.entity.PayPackCompany;
 import com.jero.pack.vo.PayPackCompanyProjectInput;
 import com.jero.project.entity.PayCommonProject;
+import com.jero.statistics.entity.AllMoney;
 
 import java.util.List;
 
@@ -62,4 +63,6 @@ public interface IPayPackCompanyService extends IService<PayPackCompany> {
      * @Exception
      */
     List<PayPackCompany> queryPageListExport(PayPackCompany payPackCompany);
+
+    AllMoney getAllMoney(PayPackCompany payPackCompany);
 }

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

@@ -12,6 +12,7 @@ import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.pack.vo.PayPackCompanyProjectInput;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayWorkingGroupSubItem;
+import com.jero.statistics.entity.AllMoney;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -22,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -105,6 +107,18 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
         return payPackCompanyMapper.queryPageListExport(payPackCompany) ;
     }
 
+    @Override
+    public AllMoney getAllMoney(PayPackCompany payPackCompany) {
+        AllMoney allMoney = new AllMoney();
+        //总打包金额
+        String sumMoney = payPackCompanyMapper.getSumMoney(payPackCompany);
+        allMoney.setAllMoney(sumMoney);
+        //总实际到账费用
+        String confirmAmount = payPackCompanyMapper.getConfirmAmountMoney(payPackCompany);
+        allMoney.setConfirmAmount(confirmAmount);
+        return allMoney;
+    }
+
     /**
      * @Description 插入企业信息，联系人信息到临时表，更新项目记录
      * @Author  lqt