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 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