BUG修改

jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiSalaryStatisticsController.java

@@ -3,6 +3,7 @@ package com.kms.statistics.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.utils.poi.ExcelUtil;
@@ -50,9 +51,9 @@ public class BsSgcJsjdBuiSalaryStatisticsController extends BaseController
      */
     @PostMapping("/list")
     @ApiOperation("工资统计列表")
-    public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiSalaryStatistics> sp)
+    public Page<BsSgcJsjdBuiSalaryStatistics> list(@RequestBody SearchParam<BsSgcJsjdBuiSalaryStatistics> sp)
     {
-        return bsSgcJsjdBuiSalaryStatisticsService.selectPage(sp);
+        return bsSgcJsjdBuiSalaryStatisticsService.select(sp);
     }
 
     /**

jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdBuiSalaryStatistics.java

@@ -1,5 +1,6 @@
 package com.kms.statistics.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,6 +36,10 @@ public class BsSgcJsjdBuiSalaryStatistics extends BaseEntity
     @ApiModelProperty("${comment}")
     private String proCode;
 
+    /** 统计年月 */
+    @TableField(exist = false)
+    private String statisticsDate;
+
     /** 当期应发 */
     @Excel(name = "当期应发")
     @ApiModelProperty("当期应发")

jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java

@@ -1,10 +1,20 @@
 package com.kms.statistics.service;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.kms.build.domain.BsSgcJsjdBuiSalaryPayable;
+import com.kms.build.mapper.BsSgcJsjdBuiSalaryPayableMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.statistics.mapper.BsSgcJsjdBuiSalaryStatisticsMapper;
 import com.kms.statistics.domain.BsSgcJsjdBuiSalaryStatistics;
 
+import java.util.*;
+
 /**
  * 工资统计Service接口
  *
@@ -13,5 +23,73 @@ import com.kms.statistics.domain.BsSgcJsjdBuiSalaryStatistics;
  */
 @Service
 public class BsSgcJsjdBuiSalaryStatisticsService extends BaseService<BsSgcJsjdBuiSalaryStatisticsMapper, BsSgcJsjdBuiSalaryStatistics>{
+   @Autowired
+   BsSgcJsjdBuiSalaryStatisticsMapper bsSgcJsjdBuiSalaryStatisticsMapper;
+
+   @Autowired
+    BsSgcJsjdBuiSalaryPayableMapper bsSgcJsjdBuiSalaryPayableMapper;
+
+    public Page<BsSgcJsjdBuiSalaryStatistics> select(SearchParam<BsSgcJsjdBuiSalaryStatistics> sp){
+        String proCode=sp.getData().getProCode();
+        String proNo=sp.getData().getProNo();
+        Page<BsSgcJsjdBuiSalaryStatistics>page=new Page<>(sp.getPageNum(),sp.getPageSize());
+        QueryWrapper<BsSgcJsjdBuiSalaryPayable>qw=new QueryWrapper<>();
+        List<BsSgcJsjdBuiSalaryPayable> bsSgcJsjdBuiSalaryPayables = bsSgcJsjdBuiSalaryPayableMapper
+                .selectList(qw.eq("pro_no", proNo)
+                .eq("pro_code", proCode));
+        List<BsSgcJsjdBuiSalaryStatistics>bsSgcJsjdBuiSalaryStatistics=new ArrayList<>();
+        Map<String,String>map=new HashMap<>();
+        for (BsSgcJsjdBuiSalaryPayable bsSgcJsjdBuiSalaryPayable:bsSgcJsjdBuiSalaryPayables){
+            String date= DateUtil.format(bsSgcJsjdBuiSalaryPayable.getSalaryTime(),"yyyy-MM");
+            map.put(date,"");
+        }
 
+        map.forEach((key,value)->{
+            BsSgcJsjdBuiSalaryStatistics bsSgcJsjdBuiSalaryStatistics1=new BsSgcJsjdBuiSalaryStatistics();
+            bsSgcJsjdBuiSalaryStatistics1.setStatisticsDate(key);
+            bsSgcJsjdBuiSalaryStatistics1.setCurrentArrears("0");
+            bsSgcJsjdBuiSalaryStatistics1.setCurrentNetPay("0");
+            bsSgcJsjdBuiSalaryStatistics1.setCurrentPayable("0");
+            bsSgcJsjdBuiSalaryStatistics1.setCumulativeArrears("0");
+            bsSgcJsjdBuiSalaryStatistics.add(bsSgcJsjdBuiSalaryStatistics1);
+        });
+        Integer num=0;
+        if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryStatistics)){
+        for (BsSgcJsjdBuiSalaryPayable bsSgcJsjdBuiSalaryPayable:bsSgcJsjdBuiSalaryPayables){
+            String date= DateUtil.format(bsSgcJsjdBuiSalaryPayable.getSalaryTime(),"yyyy-MM");
+            for (BsSgcJsjdBuiSalaryStatistics item:bsSgcJsjdBuiSalaryStatistics){
+                if (ObjectUtil.isNotEmpty(date)){
+                    if (item.getStatisticsDate().equals(date)){
+                        if (ObjectUtil.isNotEmpty(item.getCurrentPayable())&&ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryPayable())) {
+                            item.setCurrentPayable(String.valueOf(Integer.parseInt(item.getCurrentPayable()) + Integer.parseInt(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryPayable())));
+                        }
+                        if (ObjectUtil.isNotEmpty(item.getCurrentNetPay())&&ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryCurrent())){
+                            item.setCurrentNetPay(String.valueOf(Integer.parseInt(item.getCurrentNetPay()) + Integer.parseInt(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryCurrent())));
+                        }
+                        if (ObjectUtil.isNotEmpty(item.getCurrentArrears())&&ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct())) {
+                            item.setCurrentArrears(String.valueOf(Integer.parseInt(item.getCurrentArrears()) + Integer.parseInt(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct())));
+                            num+=Integer.parseInt(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct());
+                        }
+                    }
+                }
+            };
+            }
+        }
+        for (BsSgcJsjdBuiSalaryStatistics bs:bsSgcJsjdBuiSalaryStatistics){
+            bs.setCumulativeArrears(String.valueOf(num));
+        }
+        if (ObjectUtil.isNotEmpty(sp.getData().getStatisticsDate())&&ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryStatistics)){
+            List<BsSgcJsjdBuiSalaryStatistics>list=new ArrayList<>();
+            for (BsSgcJsjdBuiSalaryStatistics bsSgcJsjdBuiSalaryStatistics1:bsSgcJsjdBuiSalaryStatistics){
+                if (bsSgcJsjdBuiSalaryStatistics1.getStatisticsDate().equals(sp.getData().getStatisticsDate())){
+                    list.add(bsSgcJsjdBuiSalaryStatistics1);
+                } }
+            Page<BsSgcJsjdBuiSalaryStatistics>iPage=new Page<>();
+            iPage.setRecords(list);
+            return iPage;
+        }
+        Page<BsSgcJsjdBuiSalaryStatistics>iPage=new Page<>();
+        iPage.setRecords(bsSgcJsjdBuiSalaryStatistics);
+        return iPage;
+    }
 }

jwtech-system/src/main/resources/mapper/statistics/BsSgcJsjdBuiSalaryStatisticsMapper.xml

@@ -0,0 +1,13 @@
+<?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.kms.statistics.mapper.BsSgcJsjdBuiSalaryStatisticsMapper">
+
+
+
+
+
+
+
+</mapper>