提交代码

yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysDept.java

@@ -22,6 +22,9 @@ public class SysDept extends BaseEntity
     /** 部门ID */
     private Long deptId;
 
+    /** 公司编号 */
+    private Long comId;
+
     /** 父部门ID */
     private Long parentId;
 
@@ -77,6 +80,14 @@ public class SysDept extends BaseEntity
         this.deptId = deptId;
     }
 
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
     public Long getParentId()
     {
         return parentId;
@@ -229,6 +240,7 @@ public class SysDept extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("deptId", getDeptId())
+            .append("comId", getComId())
             .append("parentId", getParentId())
             .append("ancestors", getAncestors())
             .append("deptName", getDeptName())

yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java

@@ -25,6 +25,10 @@ public class SysUser extends BaseEntity
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
+    /** 公司编号 */
+    @Excel(name = "公司编号", type = Type.IMPORT)
+    private Long comId;
+
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
@@ -49,6 +53,18 @@ public class SysUser extends BaseEntity
     @Excel(name = "证件号码")
     private String cardCode;
 
+    /** 用户肖像 */
+    @Excel(name = "用户肖像")
+    private String userPicture;
+
+    /** 证件正面 */
+    @Excel(name = "证件正面")
+    private String cardImgPos;
+
+    /** 证件反面 */
+    @Excel(name = "证件反面")
+    private String cardImgInv;
+
     /** 用户详情 */
     @Excel(name = "用户详情")
     private String userInfos;
@@ -135,6 +151,14 @@ public class SysUser extends BaseEntity
         return userId != null && 1L == userId;
     }
 
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
     public Long getDeptId()
     {
         return deptId;
@@ -194,6 +218,30 @@ public class SysUser extends BaseEntity
         this.cardCode = cardCode;
     }
 
+    public String getUserPicture() {
+        return userPicture;
+    }
+
+    public void setUserPicture(String userPicture) {
+        this.userPicture = userPicture;
+    }
+
+    public String getCardImgPos() {
+        return cardImgPos;
+    }
+
+    public void setCardImgPos(String cardImgPos) {
+        this.cardImgPos = cardImgPos;
+    }
+
+    public String getCardImgInv() {
+        return cardImgInv;
+    }
+
+    public void setCardImgInv(String cardImgInv) {
+        this.cardImgInv = cardImgInv;
+    }
+
     public String getUserInfos() {
         return userInfos;
     }
@@ -348,6 +396,7 @@ public class SysUser extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("comId", getComId())
             .append("userId", getUserId())
             .append("deptId", getDeptId())
             .append("userName", getUserName())
@@ -355,6 +404,9 @@ public class SysUser extends BaseEntity
             .append("userType", getUserType())
             .append("cardType", getCardType())
             .append("cardCode", getCardCode())
+            .append("userPicture", getUserPicture())
+            .append("cardImgPos", getCardImgPos())
+            .append("cardImgInv", getCardImgInv())
             .append("userInfos", getUserInfos())
             .append("email", getEmail())
             .append("phonenumber", getPhonenumber())

yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/domain/BaseEntity.java

@@ -39,7 +39,13 @@ public class BaseEntity implements Serializable
     private String remark;
 
     /** 选中页签 */
-    private String activeName;
+    private String activeTags;
+
+    /** 选中页签 */
+    private String activeComId;
+
+    /** 选中页签 */
+    private String activeProjectId;
 
     /** 所属单位 */
     private Long activeDeptId;
@@ -122,12 +128,28 @@ public class BaseEntity implements Serializable
         this.params = params;
     }
 
-    public String getActiveName() {
+    public String getActiveTags() {
-        return activeName;
+        return activeTags;
     }
 
-    public void setActiveName(String activeName) {
+    public void setActiveTags(String activeTags) {
-        this.activeName = activeName;
+        this.activeTags = activeTags;
+    }
+
+    public String getActiveComId() {
+        return activeComId;
+    }
+
+    public void setActiveComId(String activeComId) {
+        this.activeComId = activeComId;
+    }
+
+    public String getActiveProjectId() {
+        return activeProjectId;
+    }
+
+    public void setActiveProjectId(String activeProjectId) {
+        this.activeProjectId = activeProjectId;
     }
 
     public Long getActiveDeptId() {

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java

@@ -18,13 +18,13 @@ public class ProProjectInfoSubdepts extends BaseEntity
     /** 主键 */
     private Long id;
 
-    /** 单位主键 */
+    /** 公司主键 */
-    @Excel(name = "单位主键")
+    @Excel(name = "公司主键")
-    private Long deptId;
+    private Long comId;
 
-    /** 单位名称 */
+    /** 公司名称 */
-    @Excel(name = "单位名称")
+    @Excel(name = "公司名称")
-    private String deptName;
+    private String comName;
 
     /** 项目主键 */
     @Excel(name = "项目主键")
@@ -91,16 +91,16 @@ public class ProProjectInfoSubdepts extends BaseEntity
     {
         return id;
     }
-    public void setDeptId(Long deptId) 
+
-    {
+    public Long getComId() {
-        this.deptId = deptId;
+        return comId;
     }
 
-    public Long getDeptId() 
+    public void setComId(Long comId) {
-    {
+        this.comId = comId;
-        return deptId;
     }
-    public void setProjectId(Long projectId) 
+
+    public void setProjectId(Long projectId)
     {
         this.projectId = projectId;
     }
@@ -218,12 +218,12 @@ public class ProProjectInfoSubdepts extends BaseEntity
         return isDel;
     }
 
-    public String getDeptName() {
+    public String getComName() {
-        return deptName;
+        return comName;
     }
 
-    public void setDeptName(String deptName) {
+    public void setComName(String comName) {
-        this.deptName = deptName;
+        this.comName = comName;
     }
 
     public String getProjectName() {
@@ -238,7 +238,7 @@ public class ProProjectInfoSubdepts extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("deptId", getDeptId())
+            .append("comId", getComId())
             .append("projectId", getProjectId())
             .append("subDeptId", getSubDeptId())
             .append("subDeptType", getSubDeptType())

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java

@@ -18,6 +18,10 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity
     /** 主键 */
     private Long id;
 
+    /** 公司主键 */
+    @Excel(name = "公司主键")
+    private Long comId;
+
     /** 项目主键 */
     @Excel(name = "项目主键")
     private Long projectId;
@@ -30,8 +34,8 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity
     @Excel(name = "分包单位")
     private Long subDeptId;
 
-    /** 分包单位类型 */
+    /** 单位类型 */
-    @Excel(name = "分包单位类型")
+    @Excel(name = "单位类型")
     private String subDeptType;
 
     /** 分包单位名称 */
@@ -95,7 +99,16 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity
     {
         return id;
     }
-    public void setProjectId(Long projectId) 
+
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
+    public void setProjectId(Long projectId)
     {
         this.projectId = projectId;
     }
@@ -252,6 +265,7 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
+            .append("comId", getComId())
             .append("projectId", getProjectId())
             .append("subDeptId", getSubDeptId())
             .append("subDeptType", getSubDeptType())

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java

@@ -21,6 +21,10 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
     /** 主键 */
     private Long id;
 
+    /** 公司主键 */
+    @Excel(name = "公司主键")
+    private Long comId;
+
     /** 项目主键 */
     @Excel(name = "项目主键")
     private Long projectId;
@@ -33,6 +37,10 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
     @Excel(name = "分包单位")
     private Long subDeptId;
 
+    /** 单位类型 */
+    @Excel(name = "单位类型")
+    private String subDeptType;
+
     /** 分包单位名称 */
     @Excel(name = "分包单位名称")
     private String subDeptName;
@@ -41,6 +49,10 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
     @Excel(name = "用户主键")
     private Long userId;
 
+    /** 工人类型 */
+    @Excel(name = "工人类型")
+    private String userType;
+
     /** 工人姓名 */
     @Excel(name = "工人姓名")
     private String userName;
@@ -265,6 +277,30 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
         this.projectName = projectName;
     }
 
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
+    public String getSubDeptType() {
+        return subDeptType;
+    }
+
+    public void setSubDeptType(String subDeptType) {
+        this.subDeptType = subDeptType;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml

@@ -45,8 +45,8 @@
             <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and fa.businessKey in (select DISTINCT projectId from sur_project_unit_info where unitId=#{nowDept} and del_flag=0)</if>
             <!--普通用户查询项目人员-->
             <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and fa.startUserId = #{nowUser}</if>
-            <if test='activeName == "await"'> and fa.finishTime is null</if>
+            <if test='activeTags == "await"'> and fa.finishTime is null</if>
-            <if test='activeName == "finished"'> and fa.finishTime is not null</if>
+            <if test='activeTags == "finished"'> and fa.finishTime is not null</if>
         </where>
         order by fa.createTime desc
     </select>

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ProProjectInfoSubdeptsGroup" id="ProProjectInfoSubdeptsGroupResult">
         <result property="id"    column="id"    />
+        <result property="comId"    column="com_id"    />
         <result property="projectId"    column="project_id"    />
         <result property="projectName"    column="project_name"    />
         <result property="subDeptId"    column="sub_dept_id"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProProjectInfoSubdeptsGroupVo">
-        select psg.id, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, psg.craft_post, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark from pro_project_info_subdepts_group psg
+        select psg.id, psg.com_id, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, psg.craft_post, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark from pro_project_info_subdepts_group psg
         left join pro_project_info pi on pi.id = psg.project_id
         left join sys_dept sd on sd.dept_id = pi.dept_id
     </sql>
@@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectProProjectInfoSubdeptsGroupList" parameterType="ProProjectInfoSubdeptsGroup" resultMap="ProProjectInfoSubdeptsGroupResult">
         <include refid="selectProProjectInfoSubdeptsGroupVo"/>
         <where>
-            <if test="activeDeptId != null "> and sd.dept_id = #{activeDeptId}</if>
+            <if test="comId != null "> and psg.com_id = #{comId}</if>
             <if test="projectId != null "> and psg.project_id = #{projectId}</if>
             <if test="projectName != null  and projectName != ''"> and pi.project_name like concat('%', #{projectName}, '%')</if>
             <if test="subDeptId != null "> and psg.sub_dept_id = #{subDeptId}</if>
@@ -67,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertProProjectInfoSubdeptsGroup" parameterType="ProProjectInfoSubdeptsGroup" useGeneratedKeys="true" keyProperty="id">
         insert into pro_project_info_subdepts_group
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="comId != null">com_id,</if>
             <if test="projectId != null">project_id,</if>
             <if test="subDeptId != null">sub_dept_id,</if>
             <if test="subDeptType != null">sub_dept_type,</if>
@@ -90,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="comId != null">#{comId},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="subDeptId != null">#{subDeptId},</if>
             <if test="subDeptType != null">#{subDeptType},</if>
@@ -117,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateProProjectInfoSubdeptsGroup" parameterType="ProProjectInfoSubdeptsGroup">
         update pro_project_info_subdepts_group
         <trim prefix="SET" suffixOverrides=",">
+            <if test="comId != null">com_id = #{comId},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="subDeptId != null">sub_dept_id = #{subDeptId},</if>
             <if test="subDeptType != null">sub_dept_type = #{subDeptType},</if>

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsMapper.xml

@@ -6,8 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ProProjectInfoSubdepts" id="ProProjectInfoSubdeptsResult">
         <result property="id"    column="id"    />
-        <result property="deptId"    column="dept_id"    />
+        <result property="comId"    column="com_id"    />
-        <result property="deptName"    column="dept_name"    />
+        <result property="comName"    column="com_name"    />
         <result property="projectId"    column="project_id"    />
         <result property="projectName"    column="project_name"    />
         <result property="subDeptId"    column="sub_dept_id"    />
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProProjectInfoSubdeptsVo">
-        select ps.id, dept_id, sd.dept_name, ps.project_id, pi.project_name, ps.sub_dept_id, ps.sub_dept_type, ps.sub_dept_name, ps.sub_dept_code, ps.sub_dept_leader_id, ps.sub_dept_leader_name, ps.sub_dept_leader_code, ps.sub_dept_leader_phone, ps.use_status, ps.approve_status, ps.qr_code, ps.is_del, ps.create_by, ps.create_time, ps.update_by, ps.update_time, ps.remark from pro_project_info_subdepts ps
+        select ps.id, ps.com_id, sd.dept_name, ps.project_id, pi.project_name, ps.sub_dept_id, ps.sub_dept_type, ps.sub_dept_name, ps.sub_dept_code, ps.sub_dept_leader_id, ps.sub_dept_leader_name, ps.sub_dept_leader_code, ps.sub_dept_leader_phone, ps.use_status, ps.approve_status, ps.qr_code, ps.is_del, ps.create_by, ps.create_time, ps.update_by, ps.update_time, ps.remark from pro_project_info_subdepts ps
         left join pro_project_info pi on pi.id = ps.project_id
         left join sys_dept sd on sd.dept_id = pi.dept_id
     </sql>
@@ -38,8 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectProProjectInfoSubdeptsList" parameterType="ProProjectInfoSubdepts" resultMap="ProProjectInfoSubdeptsResult">
         <include refid="selectProProjectInfoSubdeptsVo"/>
         <where>  
-            <if test="deptId != null "> and ps.dept_id = #{deptId}</if>
+            <if test="comId != null "> and ps.com_id = #{comId}</if>
-            <if test="activeDeptId != null "> and sd.dept_id = #{activeDeptId}</if>
             <if test="projectId != null "> and ps.project_id = #{projectId}</if>
             <if test="projectName != null  and projectName != ''"> and pi.project_name like concat('%', #{projectName}, '%')</if>
             <if test="subDeptId != null "> and ps.sub_dept_id = #{subDeptId}</if>
@@ -65,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertProProjectInfoSubdepts" parameterType="ProProjectInfoSubdepts" useGeneratedKeys="true" keyProperty="id">
         insert into pro_project_info_subdepts
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deptId != null">dept_id,</if>
+            <if test="comId != null">com_id,</if>
             <if test="projectId != null">project_id,</if>
             <if test="subDeptId != null">sub_dept_id,</if>
             <if test="subDeptType != null">sub_dept_type,</if>
@@ -86,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deptId != null">#{deptId},</if>
+            <if test="comId != null">#{comId},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="subDeptId != null">#{subDeptId},</if>
             <if test="subDeptType != null">#{subDeptType},</if>
@@ -111,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateProProjectInfoSubdepts" parameterType="ProProjectInfoSubdepts">
         update pro_project_info_subdepts
         <trim prefix="SET" suffixOverrides=",">
-            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="comId != null">com_id = #{comId},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="subDeptId != null">sub_dept_id = #{subDeptId},</if>
             <if test="subDeptType != null">sub_dept_type = #{subDeptType},</if>

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml

@@ -6,11 +6,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ProProjectInfoSubdeptsUsers" id="ProProjectInfoSubdeptsUsersResult">
         <result property="id"    column="id"    />
+        <result property="comId"    column="com_id"    />
         <result property="projectId"    column="project_id"    />
         <result property="projectName"    column="project_name"    />
         <result property="subDeptId"    column="sub_dept_id"    />
+        <result property="subDeptType"    column="sub_dept_type"    />
         <result property="subDeptName"    column="sub_dept_name"    />
         <result property="userId"    column="user_id"    />
+        <result property="userType"    column="user_type"    />
         <result property="userName"    column="user_name"    />
         <result property="craftType"    column="craft_type"    />
         <result property="craftPost"    column="craft_post"    />
@@ -32,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProProjectInfoSubdeptsUsersVo">
-        select psu.id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_name, psu.user_id, psu.user_name, psu.craft_type, psu.craft_post, psu.edu_status, psu.edu_file_path, psu.edu_sign_path, psu.edu_date, psu.approve_status, psu.use_status, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, psu.remark from pro_project_info_subdepts_users psu
+        select psu.id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, psu.sub_dept_name, psu.user_id, psu.user_type, psu.user_name, psu.craft_type, psu.craft_post, psu.edu_status, psu.edu_file_path, psu.edu_sign_path, psu.edu_date, psu.approve_status, psu.use_status, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, psu.remark from pro_project_info_subdepts_users psu
         left join pro_project_info pi on pi.id = psu.project_id
         left join sys_dept sd on sd.dept_id = pi.dept_id
     </sql>
@@ -40,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectProProjectInfoSubdeptsUsersList" parameterType="ProProjectInfoSubdeptsUsers" resultMap="ProProjectInfoSubdeptsUsersResult">
         <include refid="selectProProjectInfoSubdeptsUsersVo"/>
         <where>
-            <if test="activeDeptId != null "> and sd.dept_id = #{activeDeptId}</if>
+            <if test="comId != null "> and psu.com_id = #{comId}</if>
             <if test="projectId != null "> and psu.project_id = #{projectId}</if>
             <if test="projectName != null  and projectName != ''"> and pi.project_name like concat('%', #{projectName}, '%')</if>
             <if test="subDeptId != null "> and psu.sub_dept_id = #{subDeptId}</if>
@@ -68,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertProProjectInfoSubdeptsUsers" parameterType="ProProjectInfoSubdeptsUsers" useGeneratedKeys="true" keyProperty="id">
         insert into pro_project_info_subdepts_users
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="comId != null">com_id,</if>
             <if test="projectId != null">project_id,</if>
             <if test="subDeptId != null">sub_dept_id,</if>
             <if test="subDeptName != null">sub_dept_name,</if>
@@ -92,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="comId != null">#{comId},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="subDeptId != null">#{subDeptId},</if>
             <if test="subDeptName != null">#{subDeptName},</if>
@@ -120,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateProProjectInfoSubdeptsUsers" parameterType="ProProjectInfoSubdeptsUsers">
         update pro_project_info_subdepts_users
         <trim prefix="SET" suffixOverrides=",">
+            <if test="comId != null">com_id = #{comId},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="subDeptId != null">sub_dept_id = #{subDeptId},</if>
             <if test="subDeptName != null">sub_dept_name = #{subDeptName},</if>

yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowBusinessKeyServiceImpl.java

@@ -43,9 +43,9 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService {
      */
     @Override
     public Map<String,Object> quueryCount(FlowTaskEntity flowTaskEntity) {
-        flowTaskEntity.setActiveName("await");
+        flowTaskEntity.setActiveTags("await");
         int awaitSize = flowBusinessKeyMapper.selectAllFlowTaskByParams(flowTaskEntity).size();
-        flowTaskEntity.setActiveName("finished");
+        flowTaskEntity.setActiveTags("finished");
         int finishedSize = flowBusinessKeyMapper.selectAllFlowTaskByParams(flowTaskEntity).size();
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("await",awaitSize);

yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -6,12 +6,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="SysUser" id="SysUserResult">
         <id     property="userId"       column="user_id"      />
+        <id     property="comId"       column="com_id"      />
         <result property="deptId"       column="dept_id"      />
         <result property="userName"     column="user_name"    />
         <result property="nickName"     column="nick_name"    />
         <result property="userType"     column="user_type"    />
         <result property="cardType"     column="card_type"    />
         <result property="cardCode"     column="card_code"    />
+        <result property="userPicture"     column="user_picture"    />
+        <result property="cardImgPos"     column="card_img_pos"    />
+        <result property="cardImgInv"     column="card_img_inv"    />
         <result property="userInfos"     column="user_infos"    />
         <result property="email"        column="email"        />
         <result property="phonenumber"  column="phonenumber"  />
@@ -54,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_type, u.card_code, u.user_infos, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+        select u.user_id, u.com_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_type, u.card_code, u.user_picture, u.card_img_pos, u.card_img_inv, u.user_infos, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.dept_short_name, d.dept_code, d.dept_type, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -64,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.user_type, u.card_type, u.card_code, u.user_infos, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.com_id, u.dept_id, u.nick_name, u.user_name, u.user_type, u.card_type, u.card_code, u.user_picture, u.card_img_pos, u.card_img_inv, u.user_infos, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -102,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_type, u.card_code, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.com_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_type, u.card_code, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -119,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_type, u.card_code, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.com_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_type, u.card_code, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -165,12 +169,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
+ 			<if test="comId != null and comId != 0">com_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="userName != null and userName != ''">user_name,</if>
  			<if test="nickName != null and nickName != ''">nick_name,</if>
  			<if test="userType != null and userType != ''">user_type,</if>
  			<if test="cardType != null and cardType != ''">card_type,</if>
  			<if test="cardCode != null and cardCode != ''">card_code,</if>
+ 			<if test="userPicture != null and userPicture != ''">user_picture,</if>
+ 			<if test="cardImgPos != null and cardImgPos != ''">card_img_pos,</if>
+ 			<if test="cardImgInv != null and cardImgInv != ''">card_img_inv,</if>
  			<if test="userInfos != null and userInfos != ''">user_infos,</if>
  			<if test="email != null and email != ''">email,</if>
  			<if test="avatar != null and avatar != ''">avatar,</if>
@@ -182,13 +190,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
  		)values(
- 			<if test="userId != null and userId != ''">#{userId},</if>
+ 			<if test="userId != null and userId != 0">#{userId},</if>
- 			<if test="deptId != null and deptId != ''">#{deptId},</if>
+ 			<if test="comId != null and comId != 0">#{comId},</if>
+ 			<if test="deptId != null and deptId != 0">#{deptId},</if>
  			<if test="userName != null and userName != ''">#{userName},</if>
  			<if test="nickName != null and nickName != ''">#{nickName},</if>
  			<if test="userType != null and userType != ''">#{userType},</if>
  			<if test="cardType != null and cardType != ''">#{cardType},</if>
  			<if test="cardCode != null and cardCode != ''">#{cardCode},</if>
+ 			<if test="userPicture != null and userPicture != ''">#{userPicture},</if>
+ 			<if test="cardImgPos != null and cardImgPos != ''">#{cardImgPos},</if>
+ 			<if test="cardImgInv != null and cardImgInv != ''">#{cardImgInv},</if>
  			<if test="userInfos != null and userInfos != ''">#{userInfos},</if>
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="avatar != null and avatar != ''">#{avatar},</if>
@@ -205,12 +217,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
+ 			<if test="comId != null and comId != 0">com_id = #{comId},</if>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
  			<if test="userName != null and userName != ''">user_name = #{userName},</if>
  			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
  			<if test="userType != null and userType != ''">user_type = #{userType},</if>
  			<if test="cardType != null and cardType != ''">card_type = #{cardType},</if>
  			<if test="cardCode != null and cardCode != ''">card_code = #{cardCode},</if>
+ 			<if test="userPicture != null and userPicture != ''">user_picture = #{userPicture},</if>
+ 			<if test="cardImgPos != null and cardImgPos != ''">card_img_pos = #{cardImgPos},</if>
+ 			<if test="cardImgInv != null and cardImgInv != ''">card_img_inv = #{cardImgInv},</if>
  			<if test="userInfos != null and userInfos != ''">user_infos = #{userInfos},</if>
  			<if test="email != null ">email = #{email},</if>
  			<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
@@ -252,7 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<!--根据用户编号查询入场项目信息-->
 	<select id="selectProjectsByUserId" parameterType="Long" resultType="Map">
-		select * from pro_project_info_users where user_id=#{userId} and is_del=0 and use_status=1 order by create_time desc
+		select * from pro_project_info_users where user_id=#{userId} and is_del=0 and use_status=1 order by sort_by asc
 	</select>
 
 </mapper> 

yanzhu-ui-vue3/src/components/Process/designer.vue

@@ -6,7 +6,7 @@
 <!--        <el-button type="danger" icon="Delete" @click="changePanel"/>-->
       </div>
     </template>
-    <el-collapse v-model="activeName" >
+    <el-collapse v-model="activeTags" >
         <!--   常规信息     -->
         <el-collapse-item name="common">
           <template #title><el-icon><InfoFilled/> </el-icon> 常规信息</template>
@@ -80,7 +80,7 @@ const modelerStore = useModelerStore()
 
 const { proxy } = getCurrentInstance();
 
-const activeName = ref('common');
+const activeTags = ref('common');
 const executionListenerCount = ref(0);
 const taskListenerCount = ref(0);
 const elementId = ref("");
@@ -123,7 +123,7 @@ const { formData, rules } = toRefs(data);
 
 // 监听数据
 watch(elementId, newVal => {
-      activeName.value = "common";
+      activeTags.value = "common";
     }
 )
 

yanzhu-ui-vue3/src/views/flowable/task/finished/detail/index.vue

@@ -7,7 +7,7 @@
           <el-button style="float: right;" size="small" type="danger" @click="goBack">关闭</el-button>
         </div>
       </template>
-      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs  tab-position="top" v-model="activeTags" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">
@@ -107,7 +107,7 @@ const { proxy } = getCurrentInstance();
 // 模型xml数据
 const flowData = ref({});
 // 切换tab标签
-const activeName = ref('1');
+const activeTags = ref('1');
 // 遮罩层
 const loading = ref(true);
 // 流程流转数据

yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/index.vue

@@ -7,7 +7,7 @@
           <el-button style="float: right;" size="small" type="danger" @click="goBack">关闭</el-button>
         </div>
       </template>
-      <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs  tab-position="top" v-model="activeTags" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">
@@ -110,7 +110,7 @@ const { proxy } = getCurrentInstance();
 // 模型xml数据
 const flowData = ref({});
 // 切换tab标签
-const activeName = ref('1');
+const activeTags = ref('1');
 // 遮罩层
 const loading = ref(true);
 // 流程流转数据

yanzhu-ui-vue3/src/views/flowable/task/myProcess/send/index.vue

@@ -7,7 +7,7 @@
           <el-button style="float: right;" size="small" type="danger" @click="goBack">关闭</el-button>
         </div>
       </template>
-      <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs tab-position="top" v-model="activeTags" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <!--初始化流程加载表单信息-->
@@ -53,7 +53,7 @@ const { proxy } = getCurrentInstance();
 // 模型xml数据
 const flowData = ref({});
 // 切换tab标签
-const activeName = ref('1');
+const activeTags = ref('1');
 // 遮罩层
 const loading = ref(true);
 // 流程定义编号

yanzhu-ui-vue3/src/views/flowable/task/todo/detail/index.vue

@@ -9,7 +9,7 @@
           <el-button style="float: right;" size="small" type="danger" @click="goBack">关闭</el-button>
         </div>
       </template>
-      <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
+      <el-tabs tab-position="top" v-model="activeTags" @tab-click="handleClick">
         <!--表单信息-->
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">
@@ -199,7 +199,7 @@ const { proxy } = getCurrentInstance();
 // 模型xml数据
 const flowData = ref({});
 // 切换tab标签
-const activeName = ref('1');
+const activeTags = ref('1');
 // 遮罩层
 const loading = ref(true);
 // 流程流转数据

yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue

@@ -171,7 +171,7 @@
           <el-input v-model="form.trainFileType" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="培训文件地址" prop="trainFilePath">
-          <file-upload v-model="form.trainFilePath" />
+          <file-upload v-model="form.trainFilePath"  :fileType="['mp4']" />
         </el-form-item>
         <el-form-item label="培训文件主图" prop="trainFileImage">
           <image-upload v-model="form.trainFileImage" />

yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue

@@ -151,7 +151,7 @@
     <el-dialog :title="title" v-model="open" width="1080px" append-to-body>
       <el-form ref="proProjectInfoRef" :model="form" :rules="rules" label-width="100px">
         <el-tabs
-          v-model="activeName"
+          v-model="activeTags"
           type="card"
           class="demo-tabs"
         >
@@ -440,7 +440,7 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
-const activeName = ref('base')
+const activeTags = ref('base')
 const addressInfos = ref("");
 const projectDeptsList = ref([]);
 const checkedProjectDepts = ref([]);

yanzhu-ui-vue3/src/views/tool/gen/editTable.vue

@@ -1,6 +1,6 @@
 <template>
   <el-card>
-    <el-tabs v-model="activeName">
+    <el-tabs v-model="activeTags">
       <el-tab-pane label="基本信息" name="basic">
         <basic-info-form ref="basicInfo" :info="info" />
       </el-tab-pane>
@@ -135,7 +135,7 @@ import genInfoForm from "./genInfoForm";
 const route = useRoute();
 const { proxy } = getCurrentInstance();
 
-const activeName = ref("columnInfo");
+const activeTags = ref("columnInfo");
 const tableHeight = ref(document.documentElement.scrollHeight - 245 + "px");
 const tables = ref([]);
 const columns = ref([]);

yanzhu-ui-vue3/src/views/tool/gen/index.vue

@@ -133,7 +133,7 @@
     />
     <!-- 预览界面 -->
     <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body custom-class="scrollbar">
-      <el-tabs v-model="preview.activeName">
+      <el-tabs v-model="preview.activeTags">
         <el-tab-pane
           v-for="(value, key) in preview.data"
           :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
@@ -179,7 +179,7 @@ const data = reactive({
     open: false,
     title: "代码预览",
     data: {},
-    activeName: "domain.java"
+    activeTags: "domain.java"
   }
 });
 
@@ -249,7 +249,7 @@ function handlePreview(row) {
   previewTable(row.tableId).then(response => {
     preview.value.data = response.data;
     preview.value.open = true;
-    preview.value.activeName = "domain.java";
+    preview.value.activeTags = "domain.java";
   });
 }
 /** 复制代码成功 */