2025-09-22 wj 整体修改3

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjBzxxServiceImpl.java

@@ -8,6 +8,7 @@ import com.qianhe.common.annotation.DataScope;
 import com.qianhe.common.core.domain.entity.SysDept;
 import com.qianhe.common.core.domain.entity.SysDept;
 import com.qianhe.common.utils.DateUtils;
 import com.qianhe.common.utils.DateUtils;
 import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.common.utils.SecurityUtils;
+import com.qianhe.common.utils.StringUtils;
 import com.qianhe.system.domain.SysDeptCb;
 import com.qianhe.system.domain.SysDeptCb;
 import com.qianhe.system.mapper.SysDeptMapper;
 import com.qianhe.system.mapper.SysDeptMapper;
 import com.qianhe.system.service.ISysDeptCbService;
 import com.qianhe.system.service.ISysDeptCbService;
@@ -152,6 +153,15 @@ public class SjBzxxServiceImpl implements ISjBzxxService
             SysDeptCb zsdwcb = cbs.stream().filter(e->String.valueOf(zsdwId).equals(e.getDeptId())).findAny().orElse(new SysDeptCb());
             SysDeptCb zsdwcb = cbs.stream().filter(e->String.valueOf(zsdwId).equals(e.getDeptId())).findAny().orElse(new SysDeptCb());
             String zsdwfl = zsdwcb.getDwlx();
             String zsdwfl = zsdwcb.getDwlx();
 
 
+            //求和 中间变量
+            long tmp_bzsl1 = 0;//管理类班组（室中心）数量
+            long tmp_bzsl2 = 0;//一线生产班组数量
+            long tmp_bzsl3 = 0;//研究类班组（室中心）数量
+            long tmp_bzsl4 = 0;//后勤服务类班组数量
+            long tmp_bzsl5 = 0;//其他
+            long tmp_rs = 0;//全部用工人数
+            long tmp_ygrsxj = 0;//用工人数小计
+
             //当前直属单位下的 基层单位
             //当前直属单位下的 基层单位
             List<SysDept> bdwjcs = jcs.stream().filter(e->zsdwId.equals(e.getParentId())).collect(Collectors.toList());
             List<SysDept> bdwjcs = jcs.stream().filter(e->zsdwId.equals(e.getParentId())).collect(Collectors.toList());
             for(int j = 0; j < bdwjcs.size(); j++){//循环直属单位下基层单位
             for(int j = 0; j < bdwjcs.size(); j++){//循环直属单位下基层单位
@@ -189,10 +199,20 @@ public class SjBzxxServiceImpl implements ISjBzxxService
                     String bzsl4 = String.valueOf(count4);//后勤服务类班组数量
                     String bzsl4 = String.valueOf(count4);//后勤服务类班组数量
                     String bzsl5 = String.valueOf(count5);//其他
                     String bzsl5 = String.valueOf(count5);//其他
 
 
+                    tmp_bzsl1 += count1;//累加
+                    tmp_bzsl2 += count2;
+                    tmp_bzsl3 += count3;
+                    tmp_bzsl4 += count4;
+                    tmp_bzsl5 += count5;
+                    tmp_ygrsxj += jcdwrs;//累加用工人数小计
+
                     //有下属班组 就循环
                     //有下属班组 就循环
                     for(int k = 0; k < bdwbzs.size(); k++) {//循环基层单位下班组
                     for(int k = 0; k < bdwbzs.size(); k++) {//循环基层单位下班组
                         SjBzxx bz = bdwbzs.get(k);
                         SjBzxx bz = bdwbzs.get(k);
 
 
+                        long rs = StringUtils.isNotEmpty(bz.getRs())? Long.parseLong(bz.getRs()):0L;
+                        tmp_rs += rs;//累加全部用工人数
+
                         SjBzxx rt = new SjBzxx();
                         SjBzxx rt = new SjBzxx();
                         rt.setZsdw(zsdw);
                         rt.setZsdw(zsdw);
                         rt.setZsdwfl(zsdwfl);
                         rt.setZsdwfl(zsdwfl);
@@ -224,9 +244,28 @@ public class SjBzxxServiceImpl implements ISjBzxxService
                     rt.setRs(jcdwrs == null? "":String.valueOf(jcdwrs));
                     rt.setRs(jcdwrs == null? "":String.valueOf(jcdwrs));
                     rt.setYgrsxj(jcdwrs == null? "":String.valueOf(jcdwrs));
                     rt.setYgrsxj(jcdwrs == null? "":String.valueOf(jcdwrs));
 
 
+                    tmp_rs += jcdwrs;//累加全部用工人数
+                    tmp_ygrsxj += jcdwrs;//累加用工人数小计
+
                     rts.add(rt);
                     rts.add(rt);
                 }
                 }
             }
             }
+
+            //直属单位合计
+            SjBzxx rt = new SjBzxx();
+            rt.setZsdw(zsdw);
+            rt.setZsdwfl(zsdwfl);
+            rt.setBzlx("合计");
+
+            rt.setBzsl1(String.valueOf(tmp_bzsl1));
+            rt.setBzsl2(String.valueOf(tmp_bzsl2));
+            rt.setBzsl3(String.valueOf(tmp_bzsl3));
+            rt.setBzsl4(String.valueOf(tmp_bzsl4));
+            rt.setBzsl5(String.valueOf(tmp_bzsl5));
+            rt.setRs(String.valueOf(tmp_rs));
+            rt.setYgrsxj(String.valueOf(tmp_ygrsxj));
+
+            rts.add(rt);
         }
         }
         return rts;
         return rts;
     }
     }