ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】工号字段处理，统一修改成username

Browse Source
This commit is contained in:
zer0Black
2023-09-30 16:43:33 +08:00
parent 70eb314e25
commit b1b44f21dc
7 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml
+1 -1
View File
@@ -37,7 +37,7 @@
s.implementation_date,
d.declare_date,
d.declare_user,
CONCAT(u.username, '（', u.work_no, '）') AS declareUserName,
CONCAT(u.realname, '（', u.username, '）') AS declareUserName,
d.declare_file,
f.file_name AS declareFileName
FROM
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml
+1 -1
View File
@@ -164,7 +164,7 @@
</if>
<!--推进人工号-->
<if test="param.standardPromoterWorkNo != null and param.standardPromoterWorkNo != null">
AND u3.work_no LIKE CONCAT('%',#{param.standardPromoterWorkNo},'%')
AND u3.username LIKE CONCAT('%',#{param.standardPromoterWorkNo},'%')
</if>
<!--标准类型-->
<if test="param.standardType != null and param.standardType != null">
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml
+3 -3
View File
@@ -27,7 +27,7 @@
esp.qualityFlag,
(score.avg_score_item1 + score.avg_score_item2 + score.avg_score_item3 +
score.avg_score_item4 + score.avg_score_item5 + score.avg_score_item6) AS avgScore,
GROUP_CONCAT(DISTINCT CONCAT(u.username, '（', u.work_no, '）') ORDER BY u.username ASC SEPARATOR '，') AS reviewUsers
GROUP_CONCAT(DISTINCT CONCAT(u.realname, '（', u.username, '）') ORDER BY u.username ASC SEPARATOR '，') AS reviewUsers
FROM
`laws_enterprise_standard_review_meeting_record` AS rmr
LEFT JOIN
@@ -140,7 +140,7 @@
<select id="getScoreList"
resultType="com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail">
SELECT
CONCAT(u.username, '（', u.work_no, '）') AS adjudicatorName,
CONCAT(u.realname, '（', u.username, '）') AS adjudicatorName,
d.evaluate_item,
d.evaluate_score,
d.deduction_score_reason
@@ -155,7 +155,7 @@
<select id="getScoreListByStandardNo"
resultType="com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail">
SELECT
CONCAT(u.username, '（', u.work_no, '）') AS adjudicatorName,
CONCAT(u.realname, '（', u.username, '）') AS adjudicatorName,
d.evaluate_item,
d.evaluate_score,
d.deduction_score_reason