From 1cf0d473658a04ff6144a888b8d13b110b39c96a Mon Sep 17 00:00:00 2001
From: zhangtq <2452618307@qq.com>
Date: Thu, 23 Jan 2025 13:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluate/beans/EvalSummaryBean.java       |  1 +
 .../OutsourcerEvaluateController.java         | 57 ++++++++++---------
 .../mappers/evaluate/EvalSummaryMapper.xml    |  4 ++
 .../js/evaluate/summaryAudit/summaryAudit.js  |  5 +-
 src/main/resources/static/login.html          |  6 +-
 .../evaluateSummaryList.html                  | 21 ++++++-
 .../template/evaluateTemplateFrom.html        |  7 ++-
 7 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvalSummaryBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvalSummaryBean.java
index 81afc36..50c6c97 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvalSummaryBean.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvalSummaryBean.java
@@ -40,4 +40,5 @@ public class EvalSummaryBean {
     private String evStatus;
     private String status;
     private String keyWord;
+    private String type;
 }
diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java
index 2dd06b0..979888e 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java
@@ -204,34 +204,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
             //汇总审核结束 更新状态
             outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2",o.getEvaluateId());
             //添加到月度排名表
-            EvaluateSubBean subBean = new EvaluateSubBean();
-            subBean.setEvaluateId(o.getEvaluateId());
-            subBean.setTemplateId(o.getTemplateId());
-            subBean.setType("total");
-            AjaxRes ajaxRes = getCollectTitle(subBean);
-            JSONArray childDataList = new JSONArray();
-            childDataList = JSONArray.parseArray(ajaxRes.getResMsg());
-
-            List<EvaluateDataBean> dataBeanList = outsourcerEvaluateDao.getEvaluateSubInfo(o);
-            o.setUserName(UserUtil.getLoginUser().getNickname());
-            System.out.println("childDataList==" + childDataList);
-            System.out.println("o==" + o);
-            System.out.println("dataBeanList==" + dataBeanList);
-            JSONArray finalChildDataList = childDataList;
-            dataBeanList.forEach(dataBean -> {
-                finalChildDataList.forEach(item ->{
-                    if ( dataBean.getSubId().equals(((JSONObject) item).getString("subId"))) {
-                        //取出item中的所有包含total的数据
-                        dataBean.setTotalScore(String.format("%.2f", ((JSONObject) item).getDouble("totalScore")));
-                        dataBean.setTitleName(dataBean.getEvaluateDate() + "对标得分");
-                    }
-                });
-            });
-            String deptId = outsourcerEvaluateDao.getOrgIddByEvaluateId(o.getEvaluateId());
-            o.setDeptId(deptId);
-            int code1 = outsourcerEvaluateDao.addMonthRank(o,dataBeanList);
-            System.out.println("dataBean==" + dataBeanList);
-            System.out.println("o==" + o);
+            addMonthRank(o);
         }else{
             //过程中 暂不做处理
 
@@ -240,6 +213,34 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
 
         return  ar;
     }
+    /**
+     * 添加到月度排名表
+     * @param o
+     */
+    private void addMonthRank(EvaluateDataBean o) {
+        //添加到月度排名表
+        EvaluateSubBean subBean = new EvaluateSubBean();
+        subBean.setEvaluateId(o.getEvaluateId());
+        subBean.setTemplateId(o.getTemplateId());
+        subBean.setType("total");
+        AjaxRes ajaxRes = getCollectTitle(subBean);
+        JSONArray childDataList = JSONArray.parseArray(ajaxRes.getResMsg());
+
+        List<EvaluateDataBean> dataBeanList = outsourcerEvaluateDao.getEvaluateSubInfo(o);
+        o.setUserName(UserUtil.getLoginUser().getNickname());
+        dataBeanList.forEach(dataBean -> {
+            childDataList.forEach(item ->{
+                if ( dataBean.getSubId().equals(((JSONObject) item).getString("subId"))) {
+                    //取出item中的所有包含total的数据
+                    dataBean.setTotalScore(String.format("%.2f", ((JSONObject) item).getDouble("totalScore")));
+                    dataBean.setTitleName(dataBean.getEvaluateDate() + "对标得分");
+                }
+            });
+        });
+        String deptId = outsourcerEvaluateDao.getOrgIddByEvaluateId(o.getEvaluateId());
+        o.setDeptId(deptId);
+        outsourcerEvaluateDao.addMonthRank(o,dataBeanList);
+    }
 
     @RequestMapping("audit")
     @ResponseBody
diff --git a/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml b/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml
index 218ec48..2795847 100644
--- a/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml
+++ b/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml
@@ -68,6 +68,10 @@
         <if test="status != null and status != ''">
             having status = #{status}
         </if>
+        <if test="type == 'view'">
+            having status = 1
+        </if>
+
         order by MAX(per.create_time) desc
     </select>
     <select id="getOfflineSummaryList" resultType="com.bonus.gs.sub.evaluate.evaluate.beans.OutSourceBean">
diff --git a/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js b/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js
index 3b94b90..130a76e 100644
--- a/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js
+++ b/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js
@@ -33,6 +33,7 @@ function search(type) {
             curr: 1
         },
         where: {
+            type:'audit',
             keyWord: $("#keyWord").val(),
             evaluateDeptId: $("#evaluateDeptId").val(),
             evStatus: $("#evStatus").val(),
@@ -50,7 +51,9 @@ function initTable() {
         , url: ctxPath + '/backstage/evaluate/evalSummaryList' //数据接口
         , method: 'get' //方式默认是get
         , toolbar: 'default' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
-        , where: {} //post请求必须加where ，post请求需要的参数
+        , where: {
+            type:'audit',
+        } //post请求必须加where ，post请求需要的参数
         , cellMinWidth: 80
         , cols: [[ //表头
             {
diff --git a/src/main/resources/static/login.html b/src/main/resources/static/login.html
index 32e81b6..18da16a 100644
--- a/src/main/resources/static/login.html
+++ b/src/main/resources/static/login.html
@@ -70,7 +70,7 @@
 			url : ctxPath + '/users/tokenVerify',
 			data : {tokens:tokens,loginName:loginName},
 			success : function(data) {
-				debugger;
+				// debugger;
 				let res = data.res;
 				layer.msg(data.resMsg);
 				if(res === 1) {
@@ -91,7 +91,7 @@
 			url : ctxPath + '/login',
 			data : {username:username,password:password},
 			success : function(data) {
-				debugger;
+				// debugger;
 				localStorage.setItem("token", data.token);
 				localStorage.setItem("roleName", data.loginUser.roleName);
 				localStorage.setItem("loginUser", JSON.stringify(data.loginUser));
@@ -120,7 +120,7 @@
 				url : ctxPath + '/login',
 				data : {username:username,password:password},
 				success : function(data) {
-					debugger;
+					// debugger;
 					localStorage.setItem("token", data.token);
 				//	localStorage.setItem("roleName", data.loginUser.roleName);
 					localStorage.setItem("loginUser", JSON.stringify(data.loginUser));
diff --git a/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryList.html b/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryList.html
index f58fe3c..41b2933 100644
--- a/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryList.html
+++ b/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryList.html
@@ -118,6 +118,7 @@
                 curr: 1
             },
             where: {
+                type:'view',
                 keyWord: $("#keyWord").val(),
                 evaluateDeptId: $("#evaluateDeptId").val(),
                 evStatus: $("#evStatus").val(),
@@ -136,7 +137,9 @@
             , url: ctxPath + '/backstage/evaluate/evalSummaryList' //数据接口
             , method: 'get' //方式默认是get
             , toolbar: 'default' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
-            , where: {} //post请求必须加where ，post请求需要的参数
+            , where: {
+                type:'view',
+            } //post请求必须加where ，post请求需要的参数
             , cellMinWidth: 80
             , cols: [[ //表头
                 {type: 'checkbox', fixed: 'left'},
@@ -224,9 +227,23 @@
             return;
         }
         if (selectData.length === 0) {
-            layer.msg("请选择需要月度排名的数据！！！", {icon: 0});
+            layer.msg("请选择需要排名的月度数据！！！", {icon: 0});
             return;
         }
+        //获取evaluateDeptId下拉选 选择的name
+        let evaluateDeptName = $("#evaluateDeptId").find("option:selected").text();
+        //判断是否选择了同一个事业部
+        let evaluateDept = selectData[0].evaluateDept;
+        if (evaluateDeptName !== evaluateDept) {
+            layer.msg("选择的事业部与勾选的事业部评价不同源，请重新选择！！！", {icon: 0});
+            return;
+        }
+        for (let i = 0; i < selectData.length; i++) {
+            if (selectData[i].evaluateDept !== evaluateDept) {
+                layer.msg("请选择同一个事业部的数据！！！", {icon: 0});
+                return;
+            }
+        }
         localStorage.setItem('evaluateData', JSON.stringify(selectData));
         localStorage.setItem('evaluateDeptId', $("#evaluateDeptId").val());
 
diff --git a/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html b/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html
index c7d376d..4134808 100644
--- a/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html
+++ b/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html
@@ -230,8 +230,6 @@
                 initialData = localStorage.getItem("jsonTxt")
                 let data = JSON.parse(initialData);
                 $("#templateName").val(localStorage.getItem("templateName"));
-                console.log(localStorage.getItem("templateName"))
-                console.log(type)
                 data.forEach(function (item) {
                     addTemplate(1);
                     let clone = $(".templateSub").last();
@@ -239,6 +237,11 @@
                    //删除第一个subclass
                     $(".template_container").append(clone);
                 });
+                //如果只有一个模板 隐藏删除按钮
+                if(data.length === 1){
+                    $(".layui-btn-danger").hide();
+                }
+
                 //如果是查看页面 隐藏所有的新增删除按钮
                 if (type === 'view') {
                     $(".layui-icon-add-circle").hide();