From 8ca42fcb7ea07f829e68b172f58ba8f929be74b6 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Sun, 29 Sep 2024 10:42:16 +0800
Subject: [PATCH] =?UTF-8?q?0.=E5=85=AC=E5=85=B1=E7=9B=91=E6=8E=A7=E5=99=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=8B=E9=A1=B9=E5=88=86=E7=AE=A1=E9=A2=86?=
 =?UTF-8?q?=E5=AF=BC=E6=96=B9=E6=B3=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=BA=BA=E4=B8=BA=E5=89=AF=E6=89=80=E9=95=BF=201.?=
 =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAbug-=E3=80=8BB=E8=A1=A8=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=9C=AA=E6=AD=A3=E7=A1=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E5=8E=86=E5=8F=B2=E4=BF=A1=E6=81=AF=EF=BC=9B?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=83=A8ID=E9=80=9A=E8=BF=87=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E9=83=A8=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=94=A8=E6=8C=87=E5=AE=9AID=202.=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=89=A7=E8=A1=8C=E7=8E=87=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8id=203.=E9=A1=B9=E7=9B=AE=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=8E=87dot-=E3=80=8BProjectBudgetImplementA?=
 =?UTF-8?q?ddDto=E5=A2=9E=E5=8A=A0=E6=88=90=E5=91=98=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E6=96=B9=E4=BE=BF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=204.=E9=A1=B9=E7=9B=AE=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97=E6=89=A7=E8=A1=8C=E7=8E=87xml=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=205.?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=91=A8=E6=8A=A5=E6=9F=A5=E8=AF=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0flag=E5=88=A4=E6=96=AD=E9=83=A8=E9=97=A8/=E5=85=A8?=
 =?UTF-8?q?=E6=89=80=E5=91=A8=E6=8A=A5=206.=E9=A1=B9=E7=9B=AE=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97=E6=89=A7=E8=A1=8C=E7=8E=87=E6=B7=BB=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D=E5=A4=84=E7=90=86=E4=BA=BA?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=207.=E9=83=A8=E9=97=A8=E5=91=A8=E6=8A=A5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B0=86=E9=83=A8=E9=97=A8=207.=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=91=A8=E6=8A=A5dto-=E3=80=8BProjectWeeklyFindReq?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=90=E5=91=98=E5=8F=98=E9=87=8F=20flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kehui/flows/util/MyTaskListener.java      |  2 +-
 .../xml/ProjectBudgetImplementMapper.xml      |  6 +++--
 .../kehui/mapper/xml/ProjectWeeklyDao.xml     |  5 +++-
 ...ProjectAssessmentIndicatorsController.java | 27 +++++++++++++------
 .../action/ProjectDepartmentController.java   | 15 ++++++-----
 .../action/ProjectWeeklyController.java       |  2 ++
 .../dto/ProjectBudgetImplementAddDto.java     |  1 +
 .../project/dto/ProjectWeeklyFindReq.java     |  4 +--
 .../entity/ProjectBudgetImplement.java        |  1 +
 9 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
index 9695d8e..8171c4e 100644
--- a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
+++ b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java
@@ -380,6 +380,7 @@ public class MyTaskListener implements TaskListener {
                         case "办公室":
                         case "人财中心":
                         case "财务中心":
+                        default:
                             return "depDirector";
                     }
                 }
@@ -558,7 +559,6 @@ public class MyTaskListener implements TaskListener {
                                 case "办公室":
                                 case "人财中心":
                                 case "财务中心":
-                                default:
                                     return "depDirector";
                             }
                         }
diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectBudgetImplementMapper.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectBudgetImplementMapper.xml
index e04a92a..9d7fd60 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectBudgetImplementMapper.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectBudgetImplementMapper.xml
@@ -23,8 +23,10 @@
         created_at,updated_by,updated_at
     </sql>
     <select id="getList" resultType="com.xqopen.kehui.project.dto.ProjectBudgetImplementAddDto">
-        select pbi.*,pi.project_no,pi.project_name from project_budget_implement pbi left join project_info pi on pi.id_=cast(pbi.project_id as BIGINT)
-                 where 1=1 and pbi.is_deleted='0' and pi.is_deleted=false
+        select pbi.*,pi.project_no,pi.project_name,o.org_name as "deptName" from project_budget_implement pbi
+            left join project_info pi on pi.id_=cast(pbi.project_id as BIGINT)
+            left join system_org o on cast(pbi.dept_id as BIGINT)=o.id_
+        where 1=1 and pbi.is_deleted='0' and pi.is_deleted=false and o.is_deleted=false
         <if test="projectBudgetImplementFindReq.id!=null">
             and pbi.id_=#{projectBudgetImplementFindReq.id}
         </if>
diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
index 73c57c2..f257f48 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
@@ -80,7 +80,10 @@
         <if test="projectWeekly.week!=null">
             and pw.week=#{projectWeekly.week}
         </if>
-         and pw.dept_id=#{projectWeekly.deptId} and pw.weekly_type = '1'
+          <if test="projectWeekly.deptId!=null">
+              and pw.dept_id=#{projectWeekly.deptId}
+          </if>
+          and pw.weekly_type = '1'
         ORDER BY pi.created_at DESC
     </select>
     <select id="getDeptId" resultType="java.lang.String" parameterType="java.lang.String">
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
index db542f5..5a3543c 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
@@ -475,6 +475,7 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
                         boolean isOffice = (boolean) map.get("isOffice");
                         if (isOffice & "管理员审核".equals(taskName)) {
                             if (!ObjectUtils.isEmpty(ext.get("businessNumber")) & "3".equals(String.valueOf(map.get("businessNumber")))) {
+                                str=ext.get("historyExecutor").toString();
                                 if (!str.contains(String.valueOf(userId))) {
                                     historyExecutor = str + "," + userId;
                                     ext.put("historyExecutor", historyExecutor);
@@ -493,17 +494,27 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
                 //如果节点是部门主任评级时，则当前责任人是四个业务部的部门主任
                 EntityWrapper<SystemOrg> orgEntityWrapper = new EntityWrapper<>();
                 orgEntityWrapper.andNew().eq("is_deleted", false);
-                orgEntityWrapper.andNew().eq("org_name", "战略规划部").or()
-                        .eq("org_name", "平台建设部").or()
-                        .eq("org_name", "市场发展部").or()
-                        .eq("org_name", "服务产品部");
+//                orgEntityWrapper.andNew().eq("org_name", "战略规划部").or()
+//                        .eq("org_name", "平台建设部").or()
+//                        .eq("org_name", "市场发展部").or()
+//                        .eq("org_name", "服务产品部");
+//                orgEntityWrapper.andNew().eq("id_",939036815719927809L).or()
+//                                .eq("id_",1215550126769049601L).or()
+//                                .eq("id_",1496282215842058241L).or()
+//                                .eq("id_",1215550163188191233L);
                 orgEntityWrapper.setSqlSelect("id_");
-                List<Object> objectList = orgService.selectObjs(orgEntityWrapper);//先拿到部门集合ids
+//                List<Object> objectList = orgService.selectObjs(orgEntityWrapper);//先拿到部门集合ids
+                List<Long> objectList=new ArrayList<>();
+                objectList.add(939036815719927809L);
+                objectList.add(1215550126769049601L);
+                objectList.add(1496282215842058241L);
+                objectList.add(1215550163188191233L);
                 if (!StringUtils.isEmpty(objectList)) {
                     // 使用Streams将Object集合转换为Long集合
-                    List<Long> longs = objectList.stream()
-                            .map(obj -> (Long) obj) // 强制类型转换
-                            .collect(Collectors.toList());
+//                    List<Long> longs = objectList.stream()
+//                            .map(obj -> (Long) obj) // 强制类型转换
+//                            .collect(Collectors.toList());
+                    List<Long> longs=objectList;
                     EntityWrapper<FlowsConfiguration> flowsConfigurationEntityWrapper = new EntityWrapper<>();
                     flowsConfigurationEntityWrapper.eq("approved_role", "business");
                     flowsConfigurationEntityWrapper.eq("is_deleted", false);
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
index 42bbe87..6573dc4 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
@@ -57,6 +57,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
             //根据项目id获取proId和week
         EntityWrapper<ProjectWeekly> Wrapper = new EntityWrapper<>();
         Wrapper.eq("id_",id.toString());
+        Wrapper.eq("is_deleted","0");
         ProjectWeekly project = projectWeeklyService.selectOne(Wrapper);
         // 根据 week proId 查询 该实例信息
        List<ProjectWeeklyDto> list = projectDepartmentService.showById(project.getWeek(),project.getProjectId());
@@ -83,15 +84,17 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
                 EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
                 userLoginEntityWrapper.eq("id_",userId);
                 SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
-                //根据用户id拿到部门信息
-                EntityWrapper<PersonalMember> member = new EntityWrapper<>();
-                member.eq("id_",systemUserLogin.getUserinfoId());
-                PersonalMember personalMember = personalMemberService.selectOne(member);
-                Object deptId = personalMember.getExt().get("deptId");
 
                 Page<ProjectWeekly> page = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
                 ProjectWeekly projectWeekly = new ProjectWeekly();
-                projectWeekly.setDeptId(deptId.toString());
+                if(!"1".equals(projectWeeklyFindReq.getFlag())){
+                    //根据用户id拿到部门信息
+                    EntityWrapper<PersonalMember> member = new EntityWrapper<>();
+                    member.eq("id_",systemUserLogin.getUserinfoId());
+                    PersonalMember personalMember = personalMemberService.selectOne(member);
+                    Object deptId = personalMember.getExt().get("deptId");
+                    projectWeekly.setDeptId(deptId.toString());
+                }
                 projectWeekly.setIsDeleted("0");
                 projectWeekly.setUserId(String.valueOf(userId));
                 projectWeekly.setWeeklyType("0");
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
index 0098563..90afcc1 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
@@ -98,6 +98,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
                     if (project.getExt().get("openRange").equals(5)){
                         ProjectBudgetImplement budgetImplement = new ProjectBudgetImplement();
                         budgetImplement.setWeek(projectWeekly.getWeek());
+                        budgetImplement.setDeptId(projectWeekly.getDeptId());
                         budgetImplement.setProjectId(projectWeekly.getProjectId());
                         budgetImplement.setBudget(project.getExt().get("budget").toString());
                         budgetImplement.setCreatedAt(new Timestamp(System.currentTimeMillis()));
@@ -314,6 +315,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
                         if (project.getExt().get("openRange").equals(5)){
                             ProjectBudgetImplement budgetImplement = new ProjectBudgetImplement();
                             budgetImplement.setWeek(list.getWeek());
+                            budgetImplement.setDeptId(weekly.getDeptId());
                             budgetImplement.setProjectId(projectWeekly.getProjectId());
                             budgetImplement.setBudget(project.getExt().get("budget").toString());
                             budgetImplement.setCreatedAt(new Timestamp(System.currentTimeMillis()));
diff --git a/src/main/java/com/xqopen/kehui/project/dto/ProjectBudgetImplementAddDto.java b/src/main/java/com/xqopen/kehui/project/dto/ProjectBudgetImplementAddDto.java
index df609a8..cfc8655 100644
--- a/src/main/java/com/xqopen/kehui/project/dto/ProjectBudgetImplementAddDto.java
+++ b/src/main/java/com/xqopen/kehui/project/dto/ProjectBudgetImplementAddDto.java
@@ -7,4 +7,5 @@ import lombok.Data;
 public class ProjectBudgetImplementAddDto extends ProjectBudgetImplement {
     private String projectNo;
     private String projectName;
+    private String deptName;
 }
diff --git a/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyFindReq.java b/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyFindReq.java
index 035676c..743e3ba 100644
--- a/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyFindReq.java
+++ b/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyFindReq.java
@@ -3,13 +3,11 @@ package com.xqopen.kehui.project.dto;
 import com.xqopen.kehui.project.entity.ProjectWeekly;
 import lombok.Data;
 
-import java.io.Serializable;
-
 @Data
 public class ProjectWeeklyFindReq extends ProjectWeekly {
     private Integer pageNo;
     private Integer pageSize;
     private String projectName;
     private String deptName;
-
+    private String flag;
 }
diff --git a/src/main/java/com/xqopen/kehui/project/entity/ProjectBudgetImplement.java b/src/main/java/com/xqopen/kehui/project/entity/ProjectBudgetImplement.java
index 43ae7e0..8aa213c 100644
--- a/src/main/java/com/xqopen/kehui/project/entity/ProjectBudgetImplement.java
+++ b/src/main/java/com/xqopen/kehui/project/entity/ProjectBudgetImplement.java
@@ -65,6 +65,7 @@ public class ProjectBudgetImplement implements Serializable {
      *
      */
     private String week;
+    private String deptId;
 
     private static final long serialVersionUID = 1L;