將 审核人员状态翻译为中文

WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.html

@@ -64,6 +64,7 @@
                             <th class="text-center">用户ID</th>
                             <th class="text-center">用户名称</th>
                             <th class="text-center">审核环节</th>
+                            <th class="text-center">流程对象</th>
                             <th class="text-center">操作</th>
 
 
@@ -74,7 +75,8 @@
                             <td class="text-center">{{auditUser.auditUserId}}</td>
                             <td class="text-center">{{auditUser.userId}}</td>
                             <td class="text-center">{{auditUser.userName}}</td>
-                            <td class="text-center">{{auditUser.auditLink}}</td>
+                            <td class="text-center">{{auditUser.auditLinkName}}</td>
+                            <td class="text-center">{{auditUser.objCodeName}}</td>
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"

java110-bean/src/main/java/com/java110/dto/auditUser/AuditUserDto.java

@@ -21,6 +21,8 @@ public class AuditUserDto extends PageDto implements Serializable {
     private String userName;
     private String userId;
     private String auditLink;
+    private String auditLinkName;
+    private String objCodeName;
 
 
     private Date createTime;
@@ -92,4 +94,20 @@ public class AuditUserDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getAuditLinkName() {
+        return auditLinkName;
+    }
+
+    public void setAuditLinkName(String auditLinkName) {
+        this.auditLinkName = auditLinkName;
+    }
+
+    public String getObjCodeName() {
+        return objCodeName;
+    }
+
+    public void setObjCodeName(String objCodeName) {
+        this.objCodeName = objCodeName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/auditUser/ApiAuditUserDataVo.java

@@ -6,41 +6,66 @@ import java.util.Date;
 public class ApiAuditUserDataVo implements Serializable {
 
     private String auditUserId;
-private String userId;
-private String userName;
-private String auditLink;
-private String objCode;
-public String getAuditUserId() {
+    private String userId;
+    private String userName;
+    private String auditLink;
+    private String objCode;
+    private String auditLinkName;
+    private String objCodeName;
+
+    public String getAuditUserId() {
         return auditUserId;
     }
-public void setAuditUserId(String auditUserId) {
+
+    public void setAuditUserId(String auditUserId) {
         this.auditUserId = auditUserId;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getUserName() {
+
+    public String getUserName() {
         return userName;
     }
-public void setUserName(String userName) {
+
+    public void setUserName(String userName) {
         this.userName = userName;
     }
-public String getAuditLink() {
+
+    public String getAuditLink() {
         return auditLink;
     }
-public void setAuditLink(String auditLink) {
+
+    public void setAuditLink(String auditLink) {
         this.auditLink = auditLink;
     }
-public String getObjCode() {
+
+    public String getObjCode() {
         return objCode;
     }
-public void setObjCode(String objCode) {
+
+    public void setObjCode(String objCode) {
         this.objCode = objCode;
     }
 
+    public String getAuditLinkName() {
+        return auditLinkName;
+    }
 
+    public void setAuditLinkName(String auditLinkName) {
+        this.auditLinkName = auditLinkName;
+    }
 
+    public String getObjCodeName() {
+        return objCodeName;
+    }
+
+    public void setObjCodeName(String objCodeName) {
+        this.objCodeName = objCodeName;
+    }
 }

java110-db/src/main/resources/mapper/common/AuditUserServiceDaoImplMapper.xml

@@ -5,182 +5,194 @@
 <mapper namespace="auditUserServiceDaoImpl">
 
     <!-- 保存审核人员信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessAuditUserInfo" parameterType="Map">
+    <insert id="saveBusinessAuditUserInfo" parameterType="Map">
            insert into business_audit_user(
-obj_code,audit_user_id,operate,store_id,user_name,b_id,user_id,audit_link
-) values (
-#{objCode},#{auditUserId},#{operate},#{storeId},#{userName},#{bId},#{userId},#{auditLink}
-)
+            obj_code,audit_user_id,operate,store_id,user_name,b_id,user_id,audit_link
+            ) values (
+            #{objCode},#{auditUserId},#{operate},#{storeId},#{userName},#{bId},#{userId},#{auditLink}
+            )
        </insert>
 
 
-       <!-- 查询审核人员信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessAuditUserInfo" parameterType="Map" resultType="Map">
-           select  t.obj_code,t.obj_code objCode,t.audit_user_id,t.audit_user_id auditUserId,t.operate,t.store_id,t.store_id storeId,t.user_name,t.user_name userName,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.audit_link,t.audit_link auditLink 
-from business_audit_user t 
-where 1 =1 
-<if test="objCode !=null and objCode != ''">
-   and t.obj_code= #{objCode}
-</if> 
-<if test="auditUserId !=null and auditUserId != ''">
-   and t.audit_user_id= #{auditUserId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="userName !=null and userName != ''">
-   and t.user_name= #{userName}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="auditLink !=null and auditLink != ''">
-   and t.audit_link= #{auditLink}
-</if> 
-
-       </select>
-
-
+    <!-- 查询审核人员信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessAuditUserInfo" parameterType="Map" resultType="Map">
+        select t.obj_code,t.obj_code objCode,t.audit_user_id,t.audit_user_id auditUserId,t.operate,t.store_id,t.store_id
+        storeId,t.user_name,t.user_name userName,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.audit_link,t.audit_link
+        auditLink
+        from business_audit_user t
+        where 1 =1
+        <if test="objCode !=null and objCode != ''">
+            and t.obj_code= #{objCode}
+        </if>
+        <if test="auditUserId !=null and auditUserId != ''">
+            and t.audit_user_id= #{auditUserId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and t.user_name= #{userName}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="auditLink !=null and auditLink != ''">
+            and t.audit_link= #{auditLink}
+        </if>
 
+    </select>
 
 
     <!-- 保存审核人员信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveAuditUserInfoInstance" parameterType="Map">
         insert into audit_user(
-obj_code,audit_user_id,status_cd,store_id,user_name,b_id,user_id,audit_link
-) select t.obj_code,t.audit_user_id,'0',t.store_id,t.user_name,t.b_id,t.user_id,t.audit_link from business_audit_user t where 1=1
-<if test="objCode !=null and objCode != ''">
-   and t.obj_code= #{objCode}
-</if> 
-<if test="auditUserId !=null and auditUserId != ''">
-   and t.audit_user_id= #{auditUserId}
-</if> 
-   and t.operate= 'ADD'
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="userName !=null and userName != ''">
-   and t.user_name= #{userName}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="auditLink !=null and auditLink != ''">
-   and t.audit_link= #{auditLink}
-</if> 
+        obj_code,audit_user_id,status_cd,store_id,user_name,b_id,user_id,audit_link
+        ) select t.obj_code,t.audit_user_id,'0',t.store_id,t.user_name,t.b_id,t.user_id,t.audit_link from
+        business_audit_user t where 1=1
+        <if test="objCode !=null and objCode != ''">
+            and t.obj_code= #{objCode}
+        </if>
+        <if test="auditUserId !=null and auditUserId != ''">
+            and t.audit_user_id= #{auditUserId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and t.user_name= #{userName}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="auditLink !=null and auditLink != ''">
+            and t.audit_link= #{auditLink}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询审核人员信息 add by wuxw 2018-07-03 -->
     <select id="getAuditUserInfo" parameterType="Map" resultType="Map">
-        select  t.obj_code,t.obj_code objCode,t.audit_user_id,t.audit_user_id auditUserId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.user_name,t.user_name userName,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.audit_link,t.audit_link auditLink 
-from audit_user t 
-where 1 =1 
-<if test="objCode !=null and objCode != ''">
-   and t.obj_code= #{objCode}
-</if> 
-<if test="auditUserId !=null and auditUserId != ''">
-   and t.audit_user_id= #{auditUserId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="userName !=null and userName != ''">
-   and t.user_name= #{userName}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="auditLink !=null and auditLink != ''">
-   and t.audit_link= #{auditLink}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.obj_code,t.obj_code objCode,t.audit_user_id,t.audit_user_id auditUserId,t.status_cd,t.status_cd
+        statusCd,t.store_id,t.store_id storeId,t.user_name,t.user_name userName,t.b_id,t.b_id bId,t.user_id,t.user_id
+        userId,t.audit_link,t.audit_link auditLink,d1.name auditLinkName,d2.name objCodeName
+        from audit_user t,t_dict d1,t_dict d2
+        where 1 =1
+        and t.audit_link = d1.status_cd
+        and d1.table_name='audit_user'
+        and d1.table_columns='audit_link'
+        and t.obj_code = d2.status_cd
+        and d2.table_name='audit_user'
+        and d2.table_columns='obj_code'
+        <if test="objCode !=null and objCode != ''">
+            and t.obj_code= #{objCode}
+        </if>
+        <if test="auditUserId !=null and auditUserId != ''">
+            and t.audit_user_id= #{auditUserId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and t.user_name= #{userName}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="auditLink !=null and auditLink != ''">
+            and t.audit_link= #{auditLink}
+        </if>
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改审核人员信息 add by wuxw 2018-07-03 -->
     <update id="updateAuditUserInfoInstance" parameterType="Map">
-        update  audit_user t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="objCode !=null and objCode != ''">
-, t.obj_code= #{objCode}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="userName !=null and userName != ''">
-, t.user_name= #{userName}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
-<if test="auditLink !=null and auditLink != ''">
-, t.audit_link= #{auditLink}
-</if> 
- where 1=1 <if test="auditUserId !=null and auditUserId != ''">
-and t.audit_user_id= #{auditUserId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update audit_user t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="objCode !=null and objCode != ''">
+            , t.obj_code= #{objCode}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="userName !=null and userName != ''">
+            , t.user_name= #{userName}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        <if test="auditLink !=null and auditLink != ''">
+            , t.audit_link= #{auditLink}
+        </if>
+        where 1=1
+        <if test="auditUserId !=null and auditUserId != ''">
+            and t.audit_user_id= #{auditUserId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 查询审核人员数量 add by wuxw 2018-07-03 -->
-     <select id="queryAuditUsersCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from audit_user t 
-where 1 =1 
-<if test="objCode !=null and objCode != ''">
-   and t.obj_code= #{objCode}
-</if> 
-<if test="auditUserId !=null and auditUserId != ''">
-   and t.audit_user_id= #{auditUserId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="userName !=null and userName != ''">
-   and t.user_name= #{userName}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="auditLink !=null and auditLink != ''">
-   and t.audit_link= #{auditLink}
-</if> 
-
-
-     </select>
+    <select id="queryAuditUsersCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from audit_user t,t_dict d1,t_dict d2
+        where 1 =1
+        and t.audit_link = d1.status_cd
+        and d1.table_name='audit_user'
+        and d1.table_columns='audit_link'
+        and t.obj_code = d2.status_cd
+        and d2.table_name='audit_user'
+        and d2.table_columns='obj_code'
+        <if test="objCode !=null and objCode != ''">
+            and t.obj_code= #{objCode}
+        </if>
+        <if test="auditUserId !=null and auditUserId != ''">
+            and t.audit_user_id= #{auditUserId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and t.user_name= #{userName}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="auditLink !=null and auditLink != ''">
+            and t.audit_link= #{auditLink}
+        </if>
+
+
+    </select>
 
 </mapper>