工作组统计

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

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.List;
 
@@ -57,12 +58,15 @@ public class PayWorkingGroupStatisticsController {
                            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
         Page<PayWorkingGroupStatistics> page = new Page<>(pageNo, pageSize);
         IPage<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch);
-        double sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney()==null ? "0" : t.getAllMoney())).sum();
-        double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney()==null ? "0" : t.getComeAllMoney())).sum();
+        double sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney()==null ? "0.00" : t.getAllMoney())).sum();
+        double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney()==null ? "0.00" : t.getComeAllMoney())).sum();
         HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+        DecimalFormat df = new DecimalFormat("#.00");
         objectObjectHashMap.put("pageList",pageList);
-        objectObjectHashMap.put("sumOfMoney",sum);
-        objectObjectHashMap.put("sumOfReallyMoney",sum2);
+        objectObjectHashMap.put("sumOfMoney", df.format(sum));
+        objectObjectHashMap.put("sumOfReallyMoney", df.format(sum2));
+
+
         return Result.OK(objectObjectHashMap);
     }
 
@@ -106,11 +110,12 @@ public class PayWorkingGroupStatisticsController {
         IPage<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch);
         double sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null ? "0" : t.getAllMoney())).sum();
         double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null ? "0" : t.getComeAllMoney())).sum();
-        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
-        objectObjectHashMap.put("pageList", pageList);
-        objectObjectHashMap.put("sumOfMoney", sum);
-        objectObjectHashMap.put("sumOfReallyMoney", sum2);
-        return Result.OK(objectObjectHashMap);
+        HashMap<String, Object> hashMap = new HashMap<>();
+        DecimalFormat df = new DecimalFormat("#.00");
+        hashMap.put("pageList",pageList);
+        hashMap.put("sumOfMoney", df.format(sum));
+        hashMap.put("sumOfReallyMoney", df.format(sum2));
+        return Result.OK(hashMap);
     }
     /**
      *导出

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

@@ -17,8 +17,8 @@ public class PayWorkGroupSubletStatistics {
     private String id;
 
     @Excel(name = "项目负责人", width = 15)
-    @ApiModelProperty(value = "项目负责人")
-    private String principalName;
+    @ApiModelProperty(value = "项目负责人id")
+    private String principalNameId;
 
     @Excel(name = "来款单位", width = 15)
     @ApiModelProperty(value = "来款单位")

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

@@ -93,7 +93,7 @@
                 AND  date_format(ppr.payment_date,'%Y-%m-%d') LIKE concat('%',concat(#{payWorkingGroupSubletSearch.year},'%'))
             </if>
             <if test="payWorkingGroupSubletSearch.principalName != null and payWorkingGroupSubletSearch.principalName != ''">
-                AND pwg.principal_name_a=#{payWorkingGroupSubletSearch.principalName}
+                AND pwg.principal_id_a=#{payWorkingGroupSubletSearch.principalNameId}
             </if>
             <choose>
                 <when test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != '' and payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">