修复登陆部门账号领导驾驶舱报错，修复登陆员工账号删选合计数值错误

module_kzks/src/main/java/org/jeecg/modules/Index/service/impl/IndexZcbServiceImpl.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.Index.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
@@ -15,8 +17,10 @@ import org.jeecg.modules.Index.mapper.IndexZcbMapper;
 import org.jeecg.modules.Index.service.IndexZcbService;
 import org.jeecg.modules.Index.util.AuthMark;
 import org.jeecg.modules.Index.util.CommonMethod;
+import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.mapper.SysDepartMapper;
 import org.jeecg.modules.system.mapper.SysUserDepartMapper;
+import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -63,7 +67,8 @@ public class IndexZcbServiceImpl implements IndexZcbService {
     @Autowired
     private SysDepartMapper sysDepartMapper;
 
-
+    @Autowired
+    private SysUserMapper sysUserMapper;
     /**
      *   author: dzc
      *   version: 1.0
@@ -87,8 +92,8 @@ public class IndexZcbServiceImpl implements IndexZcbService {
             role = AuthMark.DEPT_LEADER;
             deptList = departNameList;
         }else {
-            System.out.println(sysUser);
-            String[] deptIds = sysUser.getDepartIds().split(",");
+            SysUser sysUser1 = sysUserMapper.selectUserById(sysUser.getId());
+            String[] deptIds = sysUser1.getDepartIds().split(",");
             deptList = sysDepartMapper.getDepNameByIds(deptIds);
         }
         // 根据用户名查询对应的部门

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -148,12 +148,16 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
         if (projectCostHuiji == null) projectCostHuiji = new ProjectCostHuiji();
         boolean hasTaskno = projectCostHuiji.getTaskno() != null && !projectCostHuiji.getTaskno().isEmpty() ;
 
+        boolean isStaff;
         if (AuthMark.STAFF.equals(role)) {
             LoginUser finalSysUser = sysUser;
             queryWrapper.lambda().and(i -> {
                 i.eq(ProjectCostHuiji::getBusinessManName, finalSysUser.getRealname()).or()
                         .eq(ProjectCostHuiji::getYwfzrname, finalSysUser.getRealname());
             });
+            isStaff = true;
+        } else {
+            isStaff = false;
         }
 
         boolean tips;
@@ -203,12 +207,16 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 
         boolean finalFlag = flag;
         ProjectCostHuiji finalProjectCostHuiji = projectCostHuiji;
+        LoginUser finalSysUser = sysUser;
         CompletableFuture<ProjectCostHuiji> huijiFuture = CompletableFuture.supplyAsync(() -> {
             if (tips && !finalFlag) {
                 ProjectCostHuiji huiji = new ProjectCostHuiji();
                 huiji.setDeptNames(finalProjectCostHuiji.getDeptNames());
                 return projectCostHuijiService.costHJSum(huiji);
             }
+            if (!finalFlag && isStaff){
+                return  projectCostHuijiService.costHJSumIsStaff(finalProjectCostHuiji,finalSysUser.getRealname());
+            }
             if (!finalFlag)
                 return projectCostHuijiService.costHJSum(finalProjectCostHuiji);//汇集总和
             if (taskNos.isEmpty())

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/mapper/ProjectCostHuijiMapper.java

@@ -47,4 +47,5 @@ public interface ProjectCostHuijiMapper extends BaseMapper<ProjectCostHuiji> {
     */
     public int updateStatus2(@Param("tasknoList") List<String> tasknoList);
 
+    ProjectCostHuiji costHJSumIsStaff(@Param("huiji") ProjectCostHuiji finalProjectCostHuiji,@Param("realname") String realname);
 }

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/mapper/xml/ProjectCostHuijiMapper.xml

@@ -89,6 +89,22 @@
             #{taskno}
         </foreach>
     </select>
+    <select id="costHJSumIsStaff" resultType="org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji">
+        select sum(yzsl) as yzsl, sum(lre) as lre,sum(lre)/sum(COALESCE(contractfpe,EstimationCoat)) as
+        lrl,sum(EstimationCoat) as EstimationCoat,sum(contractfpe) as contractfpe,
+        sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
+        sum(wxf) as wxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
+        sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
+        sum(scgs) as scgs
+        from kzks_project_cost_huiji
+        <where>
+            <if test="huiji.taskno != null  and huiji.taskno != ''">and taskno = #{huiji.taskno}</if>
+            <if test="huiji.processpercent != null  and huiji.processpercent != ''">and processPercent = #{huiji.processpercent}</if>
+            <if test="huiji.jycs != null  and huiji.jycs != ''">and jycs like concat('%', #{huiji.jycs}, '%')</if>
+            <if test="huiji.zrbm != null  and huiji.zrbm != ''">and zrbm like concat('%', #{huiji.zrbm}, '%')</if>
+            and (ywfzrname = #{realname} or business_man_name = #{realname})
+        </where>
+    </select>
 
     <!-- 根据任务号批量修改status 改为"4" -->
     <update id="updateStatus1">

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/IProjectCostHuijiService.java

@@ -52,4 +52,6 @@ public interface IProjectCostHuijiService extends IService<ProjectCostHuiji> {
     *   date: 2023/10/24
     */
     public Boolean insertIntoCostModel(List<ProjectCostHuiji> projectCostHuijis);
+
+    ProjectCostHuiji costHJSumIsStaff(ProjectCostHuiji finalProjectCostHuiji, String realname);
 }

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -110,6 +110,11 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
     public ProjectCostHuiji costHJSum(ProjectCostHuiji projectCostHuiji) {
         return huijiMapper.costHJSum(projectCostHuiji);
     }
+    @Override
+    public ProjectCostHuiji costHJSumIsStaff(ProjectCostHuiji finalProjectCostHuiji, String realname) {
+        return huijiMapper.costHJSumIsStaff(finalProjectCostHuiji,  realname);
+    }
+
 
     @Override
     public ProjectCostHuiji costHJSumByProjectCost(ProjectCost projectCost) {