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

laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java

@@ -233,8 +233,6 @@ public class CommonConstant {
     public static final String SQL_INDEX_INDEX_USER_NAME = "index_user_name";
     /** sys_user 表 username 唯一键索引 */
     public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username";
-    /** sys_user 表 work_no 唯一键索引 */
-    public static final String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no";
     /** sys_user 表 phone 唯一键索引 */
     public static final String SQL_INDEX_UNIQ_SYS_USER_PHONE = "uniq_sys_user_phone";
     /** sys_user 表 email 唯一键索引 */

laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -644,8 +644,6 @@ public class SysUserController {
         if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_USERNAME)
                 || message.contains(CommonConstant.SQL_INDEX_INDEX_USER_NAME)) {
             errorMessage.add("第 " + lineNumber + " 行：用户名已经存在，忽略导入。");
-        } else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_WORK_NO)) {
-            errorMessage.add("第 " + lineNumber + " 行：工号已经存在，忽略导入。");
         } else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_PHONE)) {
             errorMessage.add("第 " + lineNumber + " 行：手机号已经存在，忽略导入。");
         } else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_EMAIL)) {

laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml

@@ -116,8 +116,8 @@
 			<if test="userParams.realname != null and userParams.realname != ''">
 				AND sys_user.realname LIKE concat(concat('%',#{userParams.realname}),'%')
 			</if>
-			<if test="userParams.workNo != null and userParams.workNo != ''">
+			<if test="userParams.username != null and userParams.username != ''">
-				AND sys_user.work_no LIKE concat(concat('%',#{userParams.workNo}),'%')
+				AND sys_user.username LIKE concat(concat('%',#{userParams.username}),'%')
 			</if>
 		</if>
 	</sql>
@@ -128,7 +128,7 @@
 			sys_user.id AS id,
 			sys_user.realname AS realname,
 			sys_user.avatar AS avatar,
-			sys_user.work_no AS workNo,
+			sys_user.username AS username,
 			sys_user.telephone AS telephone,
 			sys_user.email AS email,
 			sys_user.phone AS phone,

laws-module-system/src/main/java/com/jero/modules/system/model/SysUserSysDepartModel.java

@@ -12,7 +12,7 @@ public class SysUserSysDepartModel {
 
     private String id;
     private String realname;
-    private String workNo;
+    private String username;
     private String post;
     private String telephone;
     private String email;

laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml

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

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

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