From 0066572118c7565c2489c5f454d7fb5251de8b47 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Thu, 25 Jul 2024 10:36:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=96=B9=E6=B3=95=202.=E5=AD=A3=E5=BA=A6=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=203.?=
 =?UTF-8?q?=E7=BB=93=E9=A1=B9=E7=BC=96=E8=BE=91=E9=99=84=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kehui/mapper/xml/ProjectInfoDao.xml       |  1 +
 ...ProjectAssessmentIndicatorsController.java | 69 -------------------
 .../project/action/ProjectInitComtroller.java |  5 +-
 3 files changed, 2 insertions(+), 73 deletions(-)

diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
index d0b66f3..aaf7a46 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
@@ -153,6 +153,7 @@
                 #{id}
             </foreach>
         </if>
+        order by project_info.created_at desc
     </select>
     <select id="getInfoByProName" resultType="com.xqopen.kehui.project.entity.ProjectInfo"
             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 339be02..4367230 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
@@ -17,7 +17,6 @@ import com.xqopen.kehui.personal.service.IPersonalMemberService;
 import com.xqopen.kehui.project.api.ProjectAssessmentIndicatorsApi;
 import com.xqopen.kehui.project.entity.ProjectAssessmentIndicators;
 import com.xqopen.kehui.project.entity.ProjectInfo;
-import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation;
 import com.xqopen.kehui.project.service.IProjectAssessmentIndicatorsService;
 import com.xqopen.kehui.project.service.IProjectInfoService;
 import com.xqopen.kehui.project.service.ProjectQuarterlyEvaluationService;
@@ -32,7 +31,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.sql.Timestamp;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -433,73 +431,6 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
             indicatorsService.updateAllColumnBatchById(list);
         }
     }
-
-    /**
-     * 审核
-     *
-     * @param taskName
-     * @param ext
-     * @param role
-     * @param projectInfo
-     */
-    public void examine(Long userId, String taskName, JSONObject ext, String role, ProjectInfo projectInfo) {
-        EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
-        evaluationEntityWrapper.eq("project_id", String.valueOf(projectInfo.getId()));
-        evaluationEntityWrapper.eq("is_deleted", "0");
-        ProjectQuarterlyEvaluation quarterlyEvaluation = evaluationService.selectOne(evaluationEntityWrapper);
-        if (!ObjectUtils.isEmpty(quarterlyEvaluation)) {
-            JSONObject quarterlyEvaluationExt = quarterlyEvaluation.getExt();
-            String user = new String();
-            if (!"部门主任评级".equals(taskName)) {
-                user = String.valueOf(quarterlyEvaluationExt.get(role));
-                if ("流程结束".equals(taskName)) {
-                    user = " ";
-                }
-            } else {
-                //如果节点是部门主任评级时，则当前责任人是四个业务部的部门主任
-                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.setSqlSelect("id_");
-                List<Object> objectList = orgService.selectObjs(orgEntityWrapper);//先拿到部门集合ids
-                if (!StringUtils.isEmpty(objectList)) {
-                    // 使用Streams将Object集合转换为Long集合
-                    List<Long> longs = objectList.stream()
-                            .map(obj -> (Long) obj) // 强制类型转换
-                            .collect(Collectors.toList());
-                    EntityWrapper<FlowsConfiguration> flowsConfigurationEntityWrapper = new EntityWrapper<>();
-                    flowsConfigurationEntityWrapper.eq("approved_role", "business");
-                    flowsConfigurationEntityWrapper.eq("is_deleted", false);
-                    flowsConfigurationEntityWrapper.in("org_id", longs);
-                    flowsConfigurationEntityWrapper.setSqlSelect("approver_id");
-                    List<Object> objectList1 = flowsConfigurationService.selectObjs(flowsConfigurationEntityWrapper);//拿到人事集合ids
-                    longs = objectList1.stream()
-                            .map(obj -> (Long) obj) // 强制类型转换
-                            .collect(Collectors.toList());
-                    EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
-                    userLoginEntityWrapper.eq("is_deleted", false);
-                    userLoginEntityWrapper.in("userinfo_id", longs);
-                    userLoginEntityWrapper.setSqlSelect("string_agg(id_::text,',')");
-                    user = String.valueOf(userLoginService.selectObj(userLoginEntityWrapper));
-                }
-            }
-            quarterlyEvaluationExt.put("taskName", taskName);
-            quarterlyEvaluationExt.put("executor", user);
-            quarterlyEvaluation.setExt(quarterlyEvaluationExt);
-            quarterlyEvaluation.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
-            quarterlyEvaluation.setUpdatedBy(String.valueOf(userId));
-            evaluationService.updateById(quarterlyEvaluation);
-
-            ext.put("taskName", taskName);
-            ext.put("executor", user);
-            projectInfo.setExt(ext);
-            projectInfoService.updateById(projectInfo);
-        }
-    }
-
     private SystemUserLogin getSystemUserLogin(String name) {
         SystemUserLogin systemUserLogin = new SystemUserLogin();
         if (!StringUtils.isEmpty(name)) {
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
index 70ce165..5505b7b 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
@@ -369,10 +369,7 @@ public class ProjectInitComtroller implements ProjectInitApi {
                 String execution = String.valueOf(map.get("execution"));
                 if (!StringUtils.isEmpty(execution)) {
                     ext.put("execution", execution);
-                   ArrayList conclusionFile= (ArrayList) map.get("conclusionFile");
-                    if(!ObjectUtils.isEmpty(conclusionFile)){
-                        ext.put("conclusionFile",conclusionFile);
-                    }
+                    ext.put("conclusionFile",map.get("conclusionFile"));
                     if (infoService.updateById(projectInfo)) {
                         return ApiResponse.fillSuccess("操作成功!");
                     }