Merge remote-tracking branch 'origin/master'

# Conflicts:
#	qianhe-ydsj/src/main/java/com/qianhe/controller/SjBzxxController.java

qianhe-common/src/main/java/com/qianhe/common/core/domain/entity/SysDept.java

@@ -73,6 +73,9 @@ public class SysDept extends BaseEntity
 
     //传入参数 是否基层单位 1 时需要是基层单位的。 dwjb 4 时，查询从表的dwlx字段  中 有一部分dwlx不属于基层
     private String ifjcdw;
+    private String ygrs;//用工人数
+    private Long bzid;//班组id
+    private String isbz;//是否是班组
 
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();

qianhe-ydsj/src/main/java/com/qianhe/controller/SjBzxxController.java

@@ -4,6 +4,12 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.qianhe.domain.Vo.JcdwxxVo;
+
+import com.qianhe.common.core.domain.entity.SysDept;
+import com.qianhe.system.domain.SysDeptCb;
+import com.qianhe.system.service.ISysDeptCbService;
+import com.qianhe.system.service.ISysDeptService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +28,8 @@ import com.qianhe.service.ISjBzxxService;
 import com.qianhe.common.utils.poi.ExcelUtil;
 import com.qianhe.common.core.page.TableDataInfo;
 
+import static org.apache.commons.lang3.StringUtils.isNumeric;
+
 /**
  * 班组信息Controller
  *
@@ -34,6 +42,10 @@ public class SjBzxxController extends BaseController
 {
     @Autowired
     private ISjBzxxService sjBzxxService;
+    @Autowired
+    private ISysDeptService deptService;
+    @Autowired
+    private ISysDeptCbService sysDeptCbService;
 
     /**
      * 查询班组信息列表
@@ -155,4 +167,56 @@ public class SjBzxxController extends BaseController
     }
 
 
+
+
+    //组织机构加班组 组合查询
+    @GetMapping("/deptAndBzList")
+    public AjaxResult deptAndBzList(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        //查询从表 配置信息
+        SysDeptCb cb_qry = new SysDeptCb();
+        cb_qry.setNd("2025");
+        List<SysDeptCb> cb_list = sysDeptCbService.selectSysDeptCbList(cb_qry);
+        //查询班组
+        SjBzxx bz_qry = new SjBzxx();
+        List<SjBzxx> bz_list = sjBzxxService.selectSjBzxxList(bz_qry);
+
+        for (SysDept dp : depts) {
+            Long deptId = dp.getDeptId();
+            String deptIdString = deptId.toString(); // 将Long类型转换为String类型
+            SysDeptCb dpcb = cb_list.stream().filter(e-> deptIdString.equals(e.getDeptId())).findAny().orElse(new SysDeptCb());
+            Long jcrysl = dpcb.getJcrysl();//设置的 从表的 基层人员数量
+            String dwlx = dpcb.getDwlx();//设置的 从表的 单位类型
+
+            //从班组中求和的人员数量
+            double sum = bz_list.stream().filter(bzxx -> bzxx.getDeptId() != null && deptId.equals(bzxx.getDeptId()))
+                    .map(SjBzxx::getRs).map(rs -> rs == null ? "" : rs.trim()).filter(StringUtils::isNumeric)
+                    .mapToDouble(Double::parseDouble).sum();
+
+            dp.setDeptLx(dwlx);
+            if (sum > 0) {
+                dp.setYgrs(String.valueOf(sum));
+            } else {
+                dp.setYgrs(String.valueOf(jcrysl));
+            }
+        }
+
+        for (SjBzxx bz : bz_list){
+            SysDept dptmp = new SysDept();
+            dptmp.setDeptId(bz.getDeptId() + 100000L);//班组id 前面加 10万 保证不重复
+            dptmp.setDeptName(bz.getBzmc());
+            dptmp.setParentId(bz.getDeptId());
+            dptmp.setDwjb("5");//一般是班组
+            dptmp.setDelFlag("0");
+            dptmp.setStatus(bz.getZt());
+            dptmp.setDeptLx(bz.getBzlx());//一般是班组
+            dptmp.setYgrs(bz.getRs());//一般是班组
+            dptmp.setBzid(bz.getId());
+            dptmp.setIsbz("班组");//是否班组
+            depts.add(dptmp);
+        }
+
+        return success(depts);
+    }
 }

qianhe-ydsj/src/main/resources/mapper/system/SjGfjsXjbzMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.create_time,
                a.update_by,
                a.update_time,
-               a.remark,
+               a.remark
         from sj_gfjs_xjbz a
     </sql>