From 7db5ac80c8cc11a943551eda79447025fe6ee58d Mon Sep 17 00:00:00 2001
From: zhangtq <2452618307@qq.com>
Date: Mon, 20 Jan 2025 15:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE=E3=80=81?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcerEvaluateServiceImpl.java        |  2 +-
 .../mappers/evaluate/OrganizationalMapper.xml | 22 +++++++++----------
 .../mappers/evaluate/PersonMapper.xml         | 12 +++++-----
 .../mappers/evaluate/TeamEvaluateMapper.xml   |  4 ++--
 .../resources/mappers/user/NewUserMapper.xml  |  2 +-
 .../js/evaluate/summaryAudit/summaryAudit.js  |  7 +++++-
 .../evaluateSummaryList.html                  |  4 +++-
 .../subEvaluate/InitiateEvaluationList.html   |  2 +-
 .../evaluate/template/evaluateTemplate.html   |  1 +
 .../template/evaluateTemplateFrom.html        |  4 +++-
 10 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java
index 7ad8376..3f6e645 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java
@@ -502,7 +502,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
             }
             //合计为加和
 
-            childMap.put("totalScore",score);
+            childMap.put("totalScore",String.format("%.2f", score));
             childDataList.add(childMap);
         }
 
diff --git a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml
index b4e3be4..3260624 100644
--- a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml
+++ b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml
@@ -9,19 +9,19 @@
     </insert>
     <!--查询机构数据 -->
     <insert id="addDepartData" useGeneratedKeys="true" keyProperty="addId">
-        insert into gs_xs_test.pm_dept(NAME, PARENT_ID, IS_ACTIVE, create_time, data_source)
+        insert into gs_exam.pm_dept(NAME, PARENT_ID, IS_ACTIVE, create_time, data_source)
         values (#{name}, #{parentId}, 1, now(), 1)
     </insert>
 
     <insert id="addUserData" useGeneratedKeys="true" keyProperty="addId">
-        insert into gs_xs_test.pm_user(NAME, id_card, dept_id, LOGIN_NAME, SEX, TELPHONE, data_source, CREATE_TIME,
+        insert into gs_exam.pm_user(NAME, id_card, dept_id, LOGIN_NAME, SEX, TELPHONE, data_source, CREATE_TIME,
                                        IS_ACTIVE, SALT, PASSWD)
         values (#{userName}, #{idCard}, #{addId}, #{idCard}, #{sex}, #{userPhone}, 1, now(), 1, #{salt}, #{password})
     </insert>
 
 
     <update id="updateUserInfo">
-        update gs_xs_test.pm_user
+        update gs_exam.pm_user
            set NAME=#{userName},
                SEX=#{sex},
                TELPHONE=#{userPhone},
@@ -48,13 +48,13 @@
          where id = #{id}
     </update>
     <update id="updateDept">
-        update gs_xs_test.pm_user
+        update gs_exam.pm_user
            set dept_id=#{deptId}
          where LOGIN_NAME = #{idCard}
 
     </update>
     <update id="theTeamExits">
-        UPDATE gs_xs_test.pm_dept
+        UPDATE gs_exam.pm_dept
            SET IS_ACTIVE=0
          where id = #{deptId}
     </update>
@@ -83,7 +83,7 @@
                         dp.id        id,
                         dp.PARENT_ID parentId,
                         'pm_dept'    tableSource
-          from gs_xs_test.pm_dept dp
+          from gs_exam.pm_dept dp
                    LEFT JOIN pm_org_info poi
                              on dp.id = poi.lk_id AND poi.status = 1
          where dp.IS_ACTIVE = 1
@@ -100,7 +100,7 @@
                    LEFT JOIN pm_org_info poi
                              on pa.id = poi.lk_id and poi.table_source = 'project_assignment' AND poi.level = 2 AND
                                 poi.status = 1 AND POI.parent_id = #{id}
-                   LEFT JOIN gs_xs_test.pm_dept pd
+                   LEFT JOIN gs_exam.pm_dept pd
                              on pd.id = poi.lk_id
          where pa.is_active = 1
            and poi.parent_id is null
@@ -115,8 +115,8 @@
                pu.sex,
                pu.TELPHONE   userPhone,
                'pm_dept'     tableSource
-          from gs_xs_test.pm_user pu
-                   left join gs_xs_test.pm_dept pd
+          from gs_exam.pm_user pu
+                   left join gs_exam.pm_dept pd
                              on pu.dept_id = pd.id and pd.IS_ACTIVE = 1
                    left join pm_user_outsource puo
                              on pu.LOGIN_NAME = puo.LOGIN_NAME
@@ -162,7 +162,7 @@
                pu.sex,
                pu.TELPHONE   userPhone,
                'pm_dept'     tableSource
-          from gs_xs_test.pm_user pu
+          from gs_exam.pm_user pu
                    left join pm_user_outsource puo
                              on pu.LOGIN_NAME = puo.LOGIN_NAME
          where pu.IS_ACTIVE = 1
@@ -196,7 +196,7 @@
     </insert>
     <select id="getUserList" resultType="com.bonus.gs.sub.evaluate.evaluate.beans.OrganizationalBean">
         select NAME userName, LOGIN_NAME idCard, SEX, TELPHONE userPhone, dept_id tableId
-          FROM gs_xs_test.pm_user
+          FROM gs_exam.pm_user
          where IS_ACTIVE = 1
            and dept_id = #{deptId}
     </select>
diff --git a/src/main/resources/mappers/evaluate/PersonMapper.xml b/src/main/resources/mappers/evaluate/PersonMapper.xml
index c084689..c50d61f 100644
--- a/src/main/resources/mappers/evaluate/PersonMapper.xml
+++ b/src/main/resources/mappers/evaluate/PersonMapper.xml
@@ -33,7 +33,7 @@
     </update>
     <update id="updateOldUser">
         <foreach collection="list" item="item" separator=";">
-            update gs_xs_test.pm_user
+            update gs_exam.pm_user
             set evaluate_pass_word = #{item.evaluatePassWord}
             where TELPHONE = #{item.phone}
         </foreach>
@@ -49,7 +49,7 @@
                PARENT_ID as parentId,
                NAME      as title,
                NAME      as name
-          from gs_xs_test.pm_dept
+          from gs_exam.pm_dept
     </select>
     <select id="getUserList" resultType="com.bonus.gs.sub.evaluate.evaluate.beans.PersonBean">
         select
@@ -62,10 +62,10 @@
         pu.LOGIN_NAME as idCard,
         if(pu.SEX = '1', '男','女') as sex,
         pu.CREATE_TIME as createTime
-        from gs_xs_test.pm_user pu
-        left join gs_xs_test.pm_dept pd on pu.DEPT_ID = pd.ID and pd.IS_ACTIVE = '1'
-        left join gs_xs_test.pm_new_role_user pnru on pu.ID = pnru.user_id and pnru.del_flag = '0'
-        left join gs_xs_test.pm_new_role pnr on pnru.ROLE_ID = pnr.id and pnr.del_flag = '0'
+        from gs_exam.pm_user pu
+        left join gs_exam.pm_dept pd on pu.DEPT_ID = pd.ID and pd.IS_ACTIVE = '1'
+        left join gs_exam.pm_new_role_user pnru on pu.ID = pnru.user_id and pnru.del_flag = '0'
+        left join gs_exam.pm_new_role pnr on pnru.ROLE_ID = pnr.id and pnr.del_flag = '0'
         where pu.IS_ACTIVE = '1' and pu.LOGIN_NAME not in (select id_card from sys_user where status = '1' and id_card is not null)
         <if test="bean.id != null and bean.id != ''">
             and pu.dept_id in
diff --git a/src/main/resources/mappers/evaluate/TeamEvaluateMapper.xml b/src/main/resources/mappers/evaluate/TeamEvaluateMapper.xml
index e579dba..a7317f8 100644
--- a/src/main/resources/mappers/evaluate/TeamEvaluateMapper.xml
+++ b/src/main/resources/mappers/evaluate/TeamEvaluateMapper.xml
@@ -153,7 +153,7 @@
     <!--获取项目经理的手机号-->
     <select id="getSendPhone" resultType="java.lang.String">
         SELECT GROUP_CONCAT(TELPHONE)
-        FROM gs_xs_test.pm_user WHERE dept_id = #{parentId}
+        FROM gs_exam.pm_user WHERE dept_id = #{parentId}
         GROUP BY dept_id
     </select>
     <select id="getTeamEvaluateList" resultType="com.bonus.gs.sub.evaluate.evaluate.beans.TeamEvaluateBean">
@@ -199,7 +199,7 @@
         pu.TELPHONE AS sendPhone,
         pte.parent_id AS parentId
         FROM pt_team_exit pte
-        LEFT JOIN gs_xs_test.pm_user pu ON pte.ev_user_id = pu.ID
+        LEFT JOIN gs_exam.pm_user pu ON pte.ev_user_id = pu.ID
         LEFT JOIN pm_org_info poi ON poi.id = pte.parent_id
         LEFT JOIN pm_org_info poi1 ON poi1.id = poi.parent_id
         <where>
diff --git a/src/main/resources/mappers/user/NewUserMapper.xml b/src/main/resources/mappers/user/NewUserMapper.xml
index c451c6e..ad7f039 100644
--- a/src/main/resources/mappers/user/NewUserMapper.xml
+++ b/src/main/resources/mappers/user/NewUserMapper.xml
@@ -86,7 +86,7 @@
 	</update>
     <update id="changOldTablePassword">
 		update
-		gs_xs_test.pm_user
+		gs_exam.pm_user
 		set
 			evaluate_pass_word = #{password}
 		where TELPHONE = #{phone}
diff --git a/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js b/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js
index 9e778fa..3b94b90 100644
--- a/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js
+++ b/src/main/resources/static/js/evaluate/summaryAudit/summaryAudit.js
@@ -61,7 +61,9 @@ function initTable() {
             , {field: 'evaluateMonth', align: 'center', title: '评价年月'}
             , {field: 'projectNum', align: 'center', title: '项目数量'}
             , {field: 'outsourcerNum', align: 'center', title: '外包商数量'}
-            , {field: 'isApprove', align: 'center', title: '评价状态'}
+            , {field: 'isApprove', align: 'center', title: '评价状态', templet: d =>
+                    Number(d.isApprove) === 0  ? '待评价' : (Number(d.isApprove) === 1 ? '已评价' : '')
+            }
             , {field: 'status', align: 'center', title: '审核状态', templet: d =>
                     Number(d.status) === 0  ? '待审核' : (Number(d.status) === 1 ? '已审核' : '审核中')
             }
@@ -136,6 +138,9 @@ function initTable() {
                 anim: 2,
                 shadeClose: false,
                 content: './summaryAuditView.html?evaluateId=' + data.id + '&templateId=' + data.templateId,
+                end: function () {
+                    search(2)
+                },
             });
         } catch (error) {
             console.error('ViewReviews 错误:', error);
diff --git a/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryList.html b/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryList.html
index c44dd02..f58fe3c 100644
--- a/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryList.html
+++ b/src/main/resources/static/pages/evaluate/evaluationSummary/evaluateSummaryList.html
@@ -148,7 +148,9 @@
                 , {field: 'evaluateMonth', align: 'center', title: '评价年月'}
                 , {field: 'projectNum', align: 'center', title: '项目数量'}
                 , {field: 'outsourcerNum', align: 'center', title: '外包商数量'}
-                , {field: 'isApprove', align: 'center', title: '评价状态'}
+                , {field: 'isApprove', align: 'center', title: '评价状态', templet: d =>
+                        Number(d.isApprove) === 0  ? '待评价' : (Number(d.isApprove) === 1 ? '已评价' : '')
+                }
                 , {
                     fixed: 'right', width: 180, title: '操作', align: 'center', templet: d => {
                         let text = "";
diff --git a/src/main/resources/static/pages/evaluate/subEvaluate/InitiateEvaluationList.html b/src/main/resources/static/pages/evaluate/subEvaluate/InitiateEvaluationList.html
index b5c898f..39e36dc 100644
--- a/src/main/resources/static/pages/evaluate/subEvaluate/InitiateEvaluationList.html
+++ b/src/main/resources/static/pages/evaluate/subEvaluate/InitiateEvaluationList.html
@@ -254,7 +254,7 @@
         layer.confirm('确认删除吗？', function (index) {
             $.ajax({
                 type: "POST",
-                url: ctxPath + '/setTemplate/deleteInitiateEvaluateById',
+                url: ctxPath + '/initiateEvaluate/deleteInitiateEvaluateById',
                 data: {id: data.id},
                 success: function (data) {
                     layer.close(index);
diff --git a/src/main/resources/static/pages/evaluate/template/evaluateTemplate.html b/src/main/resources/static/pages/evaluate/template/evaluateTemplate.html
index d679e76..1c9d8fc 100644
--- a/src/main/resources/static/pages/evaluate/template/evaluateTemplate.html
+++ b/src/main/resources/static/pages/evaluate/template/evaluateTemplate.html
@@ -204,6 +204,7 @@
 
     function view(data) {
         localStorage.setItem("jsonTxt", data.jsonTxt);
+        localStorage.setItem("templateName", data.name);
         openPage('查看模板', './evaluateTemplateFrom.html?id=' + data.id + '&type=view');
     }
 
diff --git a/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html b/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html
index 06853ca..c7d376d 100644
--- a/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html
+++ b/src/main/resources/static/pages/evaluate/template/evaluateTemplateFrom.html
@@ -225,11 +225,13 @@
             if (type === 'add') {
                 addTemplate(1)
             }
-
+            console.log(type)
             if (type === 'edit' || type === 'view') {
                 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();