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 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 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})
- 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 gs_xs_test.pm_user
+ update gs_exam.pm_user
set dept_id=#{deptId}
where LOGIN_NAME = #{idCard}
- UPDATE gs_xs_test.pm_dept
+ UPDATE gs_exam.pm_dept
SET IS_ACTIVE=0
where id = #{deptId}
@@ -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 @@
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 gs_xs_test.pm_user
+ update gs_exam.pm_user
set evaluate_pass_word = #{item.evaluatePassWord}
where TELPHONE = #{item.phone}
@@ -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
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();