Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

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

@@ -28,9 +28,9 @@ public class WxMenuConfigRole extends BaseEntity
     /** 角色名称 */
     private String roleName;
 
-    /** 用户主键 */
-    @Excel(name = "用户主键")
-    private Long userId;
+    /** 用户类型 */
+    @Excel(name = "用户类型")
+    private String userType;
 
     public void setSmcid(Long smcid) 
     {
@@ -50,14 +50,13 @@ public class WxMenuConfigRole extends BaseEntity
     {
         return roleId;
     }
-    public void setUserId(Long userId) 
-    {
-        this.userId = userId;
+
+    public String getUserType() {
+        return userType;
     }
 
-    public Long getUserId() 
-    {
-        return userId;
+    public void setUserType(String userType) {
+        this.userType = userType;
     }
 
     public String getRoleName() {
@@ -73,7 +72,7 @@ public class WxMenuConfigRole extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("smcid", getSmcid())
             .append("roleId", getRoleId())
-            .append("userId", getUserId())
+            .append("userType", getUserType())
             .toString();
     }
 }

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

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="WxMenuConfigRole" id="WxMenuConfigRoleResult">
         <result property="smcid"    column="sub_smcid"    />
         <result property="roleId"    column="sub_role_id"    />
-        <result property="userId"    column="sub_user_id"    />
+        <result property="userType"    column="sub_user_type"    />
     </resultMap>
 
     <sql id="selectWxMenuConfigVo">
@@ -37,17 +37,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectWxMenuConfigVo"/>
         <where>
             <if test="projectId != null "> and mc.project_id = #{projectId}</if>
+            <if test="activeComId != null "> and pi.com_id = #{activeComId}</if>
             <if test="activeProjectId != null "> and mc.project_id = #{activeProjectId}</if>
             <if test="menuName != null  and menuName != ''"> and mc.menu_name like concat('%', #{menuName}, '%')</if>
             <if test="menuType != null  and menuType != ''"> and mc.menu_type = #{menuType}</if>
+            <if test='activeTags == "sys"'> and mc.project_id is null</if>
         </where>
         order by mc.menu_sort
     </select>
     
     <select id="selectWxMenuConfigById" parameterType="Long" resultMap="WxMenuConfigWxMenuConfigRoleResult">
-        select a.id, a.project_id, a.menu_name, a.menu_identi, a.menu_img, a.menu_url, a.del_flag, a.menu_sort, a.create_time, a.menu_type,
- b.smcid as sub_smcid, b.role_id as sub_role_id, b.user_id as sub_user_id
+        select a.id, a.project_id, pi.project_name, a.menu_name, a.menu_identi, a.menu_img, a.menu_url, a.del_flag, a.menu_sort, a.create_time, a.menu_type,
+ b.smcid as sub_smcid, b.role_id as sub_role_id, b.user_type as sub_user_type
         from wx_menu_config a
+        left join pro_project_info pi on pi.id = a.project_id
         left join wx_menu_config_role b on b.smcid = a.id
         where a.id = #{id}
     </select>
@@ -117,9 +120,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <insert id="batchWxMenuConfigRole">
-        insert into wx_menu_config_role( smcid, role_id, user_id) values
+        insert into wx_menu_config_role( smcid, role_id, user_type) values
 		<foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.smcid}, #{item.roleId}, #{item.userId})
+            ( #{item.smcid}, #{item.roleId}, #{item.userType})
         </foreach>
     </insert>
 
@@ -137,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join wx_menu_config_role smcr on smcr.smcid = smc.id
         left join sys_user_role ur on ur.role_id = smcr.role_id
         where smc.del_flag = 0
-        and (ur.user_id = #{currentUserId} or smcr.user_id = #{currentUserId})
+        and ur.user_id = #{currentUserId}
         <if test="activeProjectId != null"> and smc.project_id = #{activeProjectId}</if>
         <if test="menuType != null and menuType != ''"> and smc.menu_type = #{menuType}</if>
         order by smc.menu_sort asc

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

@@ -8,11 +8,11 @@
         <result property="smcid"    column="smcid"    />
         <result property="roleId"    column="role_id"    />
         <result property="roleName"    column="role_name"    />
-        <result property="userId"    column="user_id"    />
+        <result property="userType"    column="user_type"    />
     </resultMap>
 
     <sql id="selectWxMenuConfigRoleVo">
-        select smcid, role_id, user_id from wx_menu_config_role
+        select smcid, role_id, user_type from wx_menu_config_role
     </sql>
 
     <select id="selectWxMenuConfigRoleList" parameterType="WxMenuConfigRole" resultMap="WxMenuConfigRoleResult">
@@ -20,12 +20,12 @@
         <where>
             <if test="smcid != null "> and smcid = #{smcid}</if>
             <if test="roleId != null "> and role_id = #{roleId}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userType != null "> and user_type = #{userType}</if>
         </where>
     </select>
 
     <select id="findgRoleListBySmcIds" parameterType="WxMenuConfigRole" resultMap="WxMenuConfigRoleResult">
-        select mcr.smcid, mcr.role_id, sr.role_name, mcr.user_id from wx_menu_config_role mcr
+        select mcr.smcid, mcr.role_id, sr.role_name, mcr.user_type from wx_menu_config_role mcr
         left join sys_role sr on sr.role_id = mcr.role_id
         where mcr.smcid in
         <foreach collection="smcIds" item="smcId" open="(" separator="," close=")">
@@ -43,12 +43,12 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="smcid != null">smcid,</if>
             <if test="roleId != null">role_id,</if>
-            <if test="userId != null">user_id,</if>
+            <if test="userType != null">user_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="smcid != null">#{smcid},</if>
             <if test="roleId != null">#{roleId},</if>
-            <if test="userId != null">#{userId},</if>
+            <if test="userType != null">#{userType},</if>
         </trim>
     </insert>
 
@@ -56,7 +56,7 @@
         update wx_menu_config_role
         <trim prefix="SET" suffixOverrides=",">
             <if test="roleId != null">role_id = #{roleId},</if>
-            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userType != null">user_type = #{userType},</if>
         </trim>
         where smcid = #{smcid}
     </update>

yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/GlobalEventListener.java

@@ -1,5 +1,6 @@
 package com.yanzhu.flowable.listener;
 
+import com.alibaba.fastjson2.JSON;
 import com.yanzhu.common.core.constant.SecurityConstants;
 import com.yanzhu.common.core.text.Convert;
 import com.yanzhu.common.redis.service.RedisService;
@@ -40,6 +41,7 @@ public class GlobalEventListener extends AbstractFlowableEngineEventListener {
 
     @Override
     protected void processCompleted(FlowableEngineEntityEvent event) {
+        System.out.println(JSON.toJSONString(event.getType()));
         log.info("任务流程审批完成...{}",event.getProcessInstanceId());
         super.processCompleted(event);
         Boolean isCompleted = Convert.toBool(redisService.getCacheObject(FlowCacheConstants.STOP_PROCESS+event.getProcessInstanceId()),true);

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.yanzhu.common.core.constant.CacheConstants;
 import com.yanzhu.common.core.domain.R;
+import com.yanzhu.common.core.enums.ApproveStatus;
 import com.yanzhu.common.core.enums.UseStateEnums;
 import com.yanzhu.common.core.text.Convert;
 import com.yanzhu.common.core.utils.DateUtils;
@@ -245,6 +246,16 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController
         return R.ok(proProjectInfoSubdeptsUsersService.findUserGroSign(busKey));
     }
 
+    /**
+     * 修改人员审核状态
+     * @param proUserId
+     * @return
+     */
+    @PostMapping("/editApproveStatus/{proUserId}")
+    public void updateApproveStatus(@PathVariable("proUserId") Long proUserId){
+        proProjectInfoSubdeptsUsersService.updateApproveStatus(proUserId);
+    }
+
     /**
      * 修改人员进场状态
      * @param ids

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java

@@ -182,11 +182,36 @@ public interface IProProjectInfoSubdeptsUsersService
      */
     int editDefaultProjectById(Long id);
 
+    /**
+     * 查询公司签名
+     * @param id
+     * @return
+     */
     Boolean findUserComSign(Long id);
 
+    /**
+     * 查询项目签名
+     * @param id
+     * @return
+     */
     Boolean findUserProSign(Long id);
 
+    /**
+     * 查询班组签名
+     * @param id
+     * @return
+     */
     Boolean findUserGroSign(Long id);
 
+    /**
+     * 修改花名册人员审核状态
+     * @param proUserId
+     */
+    void updateApproveStatus(Long proUserId);
+
+    /**
+     * 文件签署
+     * @param id
+     */
     void fileSign(Long id);
 }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasSignetServiceImpl.java

@@ -46,8 +46,8 @@ public class BasSignetServiceImpl implements IBasSignetService
     public List<BasSignet> selectBasSignetList(BasSignet basSignet)
     {
         if(Objects.isNull(basSignet.getProjectId())){
-            basSignet.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-            basSignet.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+            basSignet.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            basSignet.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return basSignetMapper.selectBasSignetList(basSignet);
     }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasTemplateServiceImpl.java

@@ -43,8 +43,8 @@ public class BasTemplateServiceImpl implements IBasTemplateService
     @Override
     public List<BasTemplate> selectBasTemplateList(BasTemplate basTemplate)
     {
-        basTemplate.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        basTemplate.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        basTemplate.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        basTemplate.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return basTemplateMapper.selectBasTemplateList(basTemplate);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamInfoServiceImpl.java

@@ -48,8 +48,8 @@ public class BusExamInfoServiceImpl implements IBusExamInfoService
     @Override
     public List<BusExamInfo> selectBusExamInfoList(BusExamInfo busExamInfo)
     {
-        busExamInfo.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        busExamInfo.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        busExamInfo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        busExamInfo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return busExamInfoMapper.selectBusExamInfoList(busExamInfo);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java

@@ -53,8 +53,8 @@ public class BusExamQuestionServiceImpl implements IBusExamQuestionService
     @Override
     public List<BusExamQuestion> selectBusExamQuestionList(BusExamQuestion busExamQuestion)
     {
-        busExamQuestion.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        busExamQuestion.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        busExamQuestion.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        busExamQuestion.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return busExamQuestionMapper.selectBusExamQuestionList(busExamQuestion);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java

@@ -79,8 +79,8 @@ public class BusExamUserServiceImpl implements IBusExamUserService
     @Override
     public List<BusExamUser> selectBusExamUserList(BusExamUser busExamUser)
     {
-        busExamUser.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        busExamUser.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        busExamUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        busExamUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return busExamUserMapper.selectBusExamUserList(busExamUser);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java

@@ -64,8 +64,8 @@ public class BusTrainingVideoServiceImpl implements IBusTrainingVideoService
     @Override
     public List<BusTrainingVideo> selectBusTrainingVideoList(BusTrainingVideo busTrainingVideo)
     {
-        busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return busTrainingVideoMapper.selectBusTrainingVideoList(busTrainingVideo);
     }
 
@@ -77,8 +77,8 @@ public class BusTrainingVideoServiceImpl implements IBusTrainingVideoService
      */
     @Override
     public List<Map<String, Object>> findBusTrainingVideoByLevel(BusTrainingVideo busTrainingVideo){
-        busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return busTrainingVideoMapper.findBusTrainingVideoByLevel(busTrainingVideo);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoUserServiceImpl.java

@@ -68,8 +68,8 @@ public class BusTrainingVideoUserServiceImpl implements IBusTrainingVideoUserSer
     @Override
     public List<BusTrainingVideoUser> selectBusTrainingVideoUserList(BusTrainingVideoUser busTrainingVideoUser)
     {
-        busTrainingVideoUser.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        busTrainingVideoUser.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        busTrainingVideoUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        busTrainingVideoUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return busTrainingVideoUserMapper.selectBusTrainingVideoUserList(busTrainingVideoUser);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectConfigServiceImpl.java

@@ -77,8 +77,8 @@ public class DevAiProjectConfigServiceImpl implements IDevAiProjectConfigService
     @Override
     public List<DevAiProjectConfig> selectDevAiProjectConfigList(DevAiProjectConfig devAiProjectConfig)
     {
-        devAiProjectConfig.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        devAiProjectConfig.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        devAiProjectConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        devAiProjectConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return devAiProjectConfigMapper.selectDevAiProjectConfigList(devAiProjectConfig);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectDataServiceImpl.java

@@ -65,8 +65,8 @@ public class DevAiProjectDataServiceImpl implements IDevAiProjectDataService
     @Override
     public List<DevAiProjectData> selectDevAiProjectDataList(DevAiProjectData devAiProjectData)
     {
-        devAiProjectData.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        devAiProjectData.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        devAiProjectData.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        devAiProjectData.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return devAiProjectDataMapper.selectDevAiProjectDataList(devAiProjectData);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java

@@ -34,6 +34,7 @@ import javax.annotation.PostConstruct;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 项目信息Service业务层处理
@@ -179,31 +180,38 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
             WxMenuConfig wxMenuConfigQuery = new WxMenuConfig();
             wxMenuConfigQuery.setActiveTags("sys");
             List<WxMenuConfig> wxMenuConfigList = wxMenuConfigMapper.selectWxMenuConfigList(wxMenuConfigQuery);
-            List<WxMenuConfig> myMenuConfigList = new ArrayList<>();
+            List<WxMenuConfigRole> myMenuConfigRoleList = new ArrayList<>();
             if(StringUtils.isNotEmpty(wxMenuConfigList)){
+                List<Long> smcIds = wxMenuConfigList.stream().map(WxMenuConfig::getId).collect(Collectors.toList());
+                myMenuConfigRoleList = wxMenuConfigRoleMapper.findgRoleListBySmcIds(smcIds);
                 for(WxMenuConfig wxMenuConfig:wxMenuConfigList){
+                    Long _oldId = wxMenuConfig.getId();
                     wxMenuConfig.setProjectId(proProjectInfo.getId());
                     wxMenuConfigMapper.insertWxMenuConfig(wxMenuConfig);
-                    myMenuConfigList.add(wxMenuConfig);
+                    for(WxMenuConfigRole role:myMenuConfigRoleList){
+                        if(_oldId==role.getSmcid()){
+                            role.setSmcid(wxMenuConfig.getId());
+                        }
+                    }
                 }
             }
 
             //初始化项目角色信息...
-            this.insertProRole(UserTypeEnums.FBWTDL.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.FBWTDL.getInfo(),proProjectInfo.getId(),myMenuConfigList);
-            this.insertProRole(UserTypeEnums.FBXMJL.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.FBXMJL.getInfo(),proProjectInfo.getId(),myMenuConfigList);
-            this.insertProRole(UserTypeEnums.FBBZZZ.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.FBBZZZ.getInfo(),proProjectInfo.getId(),myMenuConfigList);
-            this.insertProRole(UserTypeEnums.FBLWRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.FBLWRY.getInfo(),proProjectInfo.getId(),myMenuConfigList);
-            this.insertProRole(UserTypeEnums.FBCLRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.FBCLRY.getInfo(),proProjectInfo.getId(),myMenuConfigList);
-            this.insertProRole(UserTypeEnums.FBAQRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.FBAQRY.getInfo(),proProjectInfo.getId(),myMenuConfigList);
-            this.insertProRole(UserTypeEnums.JSDWRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.JSDWRY.getInfo(),proProjectInfo.getId(),myMenuConfigList);
-            this.insertProRole(UserTypeEnums.JLDWRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.JLDWRY.getInfo(),proProjectInfo.getId(),null);
-            this.insertProRole(UserTypeEnums.SGDWRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.SGDWRY.getInfo(),proProjectInfo.getId(),null);
-            this.insertProRole(UserTypeEnums.CLFBRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.CLFBRY.getInfo(),proProjectInfo.getId(),null);
-            this.insertProRole(UserTypeEnums.HQFBRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.HQFBRY.getInfo(),proProjectInfo.getId(),null);
-            this.insertProRole(UserTypeEnums.TSSBRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.TSSBRY.getInfo(),proProjectInfo.getId(),null);
-            this.insertProRole(UserTypeEnums.KTDWRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.KTDWRY.getInfo(),proProjectInfo.getId(),null);
-            this.insertProRole(UserTypeEnums.SJDWRY.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.SJDWRY.getInfo(),proProjectInfo.getId(),null);
-            this.insertProRole(UserTypeEnums.OTHERS.getKeys()+"_"+proProjectInfo.getId(),UserTypeEnums.OTHERS.getInfo(),proProjectInfo.getId(),null);
+            this.insertProRole(UserTypeEnums.FBWTDL.getKeys(),UserTypeEnums.FBWTDL.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.FBXMJL.getKeys(),UserTypeEnums.FBXMJL.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.FBBZZZ.getKeys(),UserTypeEnums.FBBZZZ.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.FBLWRY.getKeys(),UserTypeEnums.FBLWRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.FBCLRY.getKeys(),UserTypeEnums.FBCLRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.FBAQRY.getKeys(),UserTypeEnums.FBAQRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.JSDWRY.getKeys(),UserTypeEnums.JSDWRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.JLDWRY.getKeys(),UserTypeEnums.JLDWRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.SGDWRY.getKeys(),UserTypeEnums.SGDWRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.CLFBRY.getKeys(),UserTypeEnums.CLFBRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.HQFBRY.getKeys(),UserTypeEnums.HQFBRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.TSSBRY.getKeys(),UserTypeEnums.TSSBRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.KTDWRY.getKeys(),UserTypeEnums.KTDWRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.SJDWRY.getKeys(),UserTypeEnums.SJDWRY.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
+            this.insertProRole(UserTypeEnums.OTHERS.getKeys(),UserTypeEnums.OTHERS.getInfo(),proProjectInfo.getId(),myMenuConfigRoleList);
             loadingProjectsCache();
 
             return res;
@@ -218,10 +226,10 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
      * @param roleKey
      * @param deptId
      */
-    private void insertProRole(String roleKey,String roleName,Long deptId,List<WxMenuConfig> wxMenuConfigList){
+    private void insertProRole(String roleKey,String roleName,Long deptId,List<WxMenuConfigRole> wxMenuConfigRoleList){
         SysRole sysRole = new SysRole();
         sysRole.setRoleName(roleName);
-        sysRole.setRoleKey(roleKey);
+        sysRole.setRoleKey(roleKey+"_"+deptId);
         sysRole.setRoleSort(100);
         sysRole.setStatus(ShiFouEnums.FOU.getCodeStr());
         sysRole.setCreateBy("SYSTEM");
@@ -231,12 +239,12 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
         sysRoleDept.setRoleId(sysRole.getRoleId());
         sysRoleDept.setDeptId(deptId);
         proProjectInfoMapper.insertProRoleDept(sysRoleDept);
-        if(StringUtils.isNotEmpty(wxMenuConfigList)){
-            for(WxMenuConfig wxMenuConfig:wxMenuConfigList){
-                WxMenuConfigRole wxMenuConfigRole = new WxMenuConfigRole();
-                wxMenuConfigRole.setSmcid(wxMenuConfig.getId());
-                wxMenuConfigRole.setRoleId(sysRole.getRoleId());
-                wxMenuConfigRoleMapper.insertWxMenuConfigRole(wxMenuConfigRole);
+        if(StringUtils.isNotEmpty(wxMenuConfigRoleList)){
+            for(WxMenuConfigRole role:wxMenuConfigRoleList){
+                if(role.getUserType()!=null && role.getUserType().startsWith(roleKey)){
+                    role.setRoleId(sysRole.getRoleId());
+                    wxMenuConfigRoleMapper.insertWxMenuConfigRole(role);
+                }
             }
         }
     }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java

@@ -82,8 +82,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
     @Override
     public List<ProProjectInfoSubdeptsGroup> selectProProjectInfoSubdeptsGroupList(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup)
     {
-        proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        proProjectInfoSubdeptsGroup.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        proProjectInfoSubdeptsGroup.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(proProjectInfoSubdeptsGroup);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java

@@ -94,8 +94,8 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
     @Override
     public List<ProProjectInfoSubdepts> selectProProjectInfoSubdeptsList(ProProjectInfoSubdepts proProjectInfoSubdepts)
     {
-        proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getProjectDeptId());
-        proProjectInfoSubdepts.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        proProjectInfoSubdepts.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsList(proProjectInfoSubdepts);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java

@@ -1317,6 +1317,21 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
         return false;
     }
 
+    /**
+     * 修改花名册人员审核状态
+     * @param proUserId
+     */
+    @Override
+    public void updateApproveStatus(Long proUserId){
+        try {
+            ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(proUserId);
+            proProjectInfoSubdeptsUsers.setApproveStatus(ApproveStatus.refuse.getCode());
+            proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
     /**
      * 封装用户文件参数...
      * @param proSubdeptsUser 用户对象

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/WxMenuConfigServiceImpl.java

@@ -54,7 +54,8 @@ public class WxMenuConfigServiceImpl implements IWxMenuConfigService
     @Override
     public List<WxMenuConfig> selectWxMenuConfigList(WxMenuConfig wxMenuConfig)
     {
-        wxMenuConfig.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        wxMenuConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        wxMenuConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         List<WxMenuConfig> list = wxMenuConfigMapper.selectWxMenuConfigList(wxMenuConfig);
         if(StringUtils.isNotEmpty(list)){
             List<Long> smcIds = list.stream().map(WxMenuConfig::getId).collect(Collectors.toList());

yanzhu-ui-app/miniprogram/api/project.js

@@ -106,4 +106,13 @@ export function findProjectDeptUsers(proId) {
 		url: '/manage/proProjectInfoSubdeptsUsers/findAllSendUsers/' + proId,
 		method: 'get'
 	})
-}
+}
+
+// 修改人员审核状态
+export function editApproveStatus(proUserId) {
+	return request({
+		url: '/manage/proProjectInfoSubdeptsUsers/editApproveStatus/' + proUserId,
+		method: 'post',
+		data: {}
+	})
+}

yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js

@@ -8,6 +8,7 @@ import {
     findCommentByProcInsId
 } from '../../../api/flowable'
 import {
+    editApproveStatus,
     findProSubDeptsInfoById,
     findProSubDeptsUserInfoById
 } from '../../../api/project'
@@ -199,6 +200,7 @@ Page({
             comment
         }).then(res => {
             if (res.code == 200) {
+                editApproveStatus(this.data.options.businessKey);
                 app.toast("驳回申请成功!")
                 setTimeout(() => {
                     this.returnToPage();

yanzhu-ui-app/miniprogram/pages/project_qr/index.js

@@ -135,7 +135,7 @@ Page({
     }],
     illnessStatus: '',
     supIllnessStatus: '',
-    loadShow:false
+    loadShow: false
   },
 
   /**
@@ -506,7 +506,7 @@ Page({
     let videoSize = this.data.eduVideoItem.length;
     let currentVideo = this.data.videoIdx + 1;
     if (currentVideo >= videoSize) {
-      finishEduVideo(this.data.eduVideoItem[this.data.videoIdx].remark).then(res =>{
+      finishEduVideo(this.data.eduVideoItem[this.data.videoIdx].remark).then(res => {
         //视频学习完成...
         app.toast("学习完成，您可以开始考试了。", "none", 3000);
       });
@@ -2053,6 +2053,62 @@ Page({
     })
   },
 
+  /**
+   * 重新登记
+   */
+  wxSignBack() {
+    let title = "";
+    let _userPostList = [];
+    let sigId = this.data.form.userPost;
+    if (sigId == '1') {
+      title = "参建单位信息登记";
+      _userPostList.push({
+        "id": "1",
+        "text": "委托代理人"
+      });
+    } else if (sigId == '2' || sigId == '3') {
+      if (sigId == '2') {
+        _userPostList.push({
+          "id": "2",
+          "text": "项目经理"
+        });
+      } else {
+        _userPostList.push({
+          "id": "3",
+          "text": "班组长"
+        });
+        _userPostList.push({
+          "id": "5",
+          "text": "特殊工种"
+        });
+        _userPostList.push({
+          "id": "6",
+          "text": "材料员"
+        });
+        _userPostList.push({
+          "id": "8",
+          "text": "安全员"
+        });
+      }
+      title = "参建单位管理人员信息登记";
+    } else if (sigId == '4') {
+      title = "参建单位劳务人员信息登记";
+      _userPostList.push({
+        "id": "4",
+        "text": "劳务人员"
+      });
+      this.setData({
+        "form.craftType": '1'
+      });
+    }
+    this.setData({
+      title,
+      active: 0,
+      "parForm.subDeptName": this.data.form.subDeptName,
+      userPostList: _userPostList,
+    });
+  },
+
   /**
    * 查询
    * 用户详细信息

yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml

@@ -934,7 +934,7 @@
                     <view class="kaoshimianban_9">
                         <jyq-result wx:if="{{form.approveStatus!='100' && form.approveStatus!='11'}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/dd.png" title="信息审核中" description="您的信息已登记完成，相关人员正在审核您的信息，请耐心等待。" actionText="下 载 承 诺 书" bind:action="downloadSignetFiles" />
                         <jyq-result wx:if="{{form.approveStatus=='100'}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/cg.png" title="恭喜，审核通过" description="您的信息已登记完成。" actionText="下 载 承 诺 书" bind:action="downloadSignetFiles" descActionText="立 即 登 录" bind:descAction="wxSignLogin" />
-                        <jyq-result wx:if="{{busExamInfos.passMark>busExamInfos.userMark}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/sb.png" title="很遗憾！审核未通过" description="您的信息已登记完成，但未审核通过。" />
+                        <jyq-result wx:if="{{form.approveStatus=='11'}}" iconPath="https://xiangguan.sxyanzhu.com/profile/icon/sb.png" title="很遗憾！审核未通过" description="您的信息已登记完成，但未审核通过。" actionText="下 载 承 诺 书" bind:action="downloadSignetFiles" descActionText="重 新 登 记" bind:descAction="wxSignBack" />
                     </view>
                 </view>
             </view>

yanzhu-ui-vue3/src/api/manage/proProjectInfoSubdeptsUsers.js

@@ -53,6 +53,15 @@ export function editPhone(data) {
   })
 }
 
+// 修改人员审核状态
+export function editApproveStatus(proUserId) {
+  return request({
+    url: '/manage/proProjectInfoSubdeptsUsers/editApproveStatus/'+proUserId,
+    method: 'post'
+  })
+}
+
+
 // 删除分包单位工人
 export function delProProjectInfoSubdeptsUsers(id) {
   return request({

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

@@ -360,6 +360,7 @@
                     >驳回申请</el-button
                 >
                 <el-button
+                    v-if="false"
                     icon="WarningFilled"
                     type="warning"
                     size="small"
@@ -380,7 +381,7 @@
                 <strong style="color: #f56c6c">“驳回申请”</strong>
                 操作后，代表您对当前任务不满意，任务退回给申请人处理。
                 </p>
-                <p>
+                <p v-if="false">
                 <strong style="color: #e6a23c">“驳回上级”</strong>
                 操作后，代表您对当前任务不满意，任务退回到上一阶段继续处理。
                 </p>
@@ -404,7 +405,7 @@
     findCommentByProcInsId,
   } from "@/api/flowable/businessKey";
   import { getProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
-  import { getProProjectInfoSubdeptsUsers } from "@/api/manage/proProjectInfoSubdeptsUsers";
+  import { getProProjectInfoSubdeptsUsers, editApproveStatus } from "@/api/manage/proProjectInfoSubdeptsUsers";
   import { getBusExamUserLast } from "@/api/manage/busExamUser";
   import { getBusTrainingVideoUserLast } from "@/api/manage/busTrainingVideoUser";
   import useUserStore from '@/store/modules/user'
@@ -529,6 +530,7 @@
             proxy.$modal.confirm('是否确认审批驳回流程编号为"' + dataOptions.value.taskId + '"的数据项至申请人？').then(function() {
             return returnTask(form.value);
             }).then(() => {
+                editApproveStatus(dataOptions.value.businessKey);
                 doCanel();
                 emit('handle');
                 proxy.$modal.msgSuccess("审批成功");

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

@@ -147,7 +147,7 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改项目信息对话框 -->
-    <el-dialog :title="title" v-model="open" width="1080px" append-to-body :close-on-click-modal="false"
+    <el-dialog :title="title" v-model="open" v-loading="formLoading" width="1080px" append-to-body :close-on-click-modal="false"
       :close-on-press-escape="false" class="project-info-edit-dlg">
       <el-form ref="proProjectInfoRef" :model="form" :rules="rules" label-width="120px">
         <el-tabs v-model="activeTags" type="card" class="demo-tabs">
@@ -400,6 +400,7 @@ const mapRef = ref("");
 const proProjectInfoList = ref([]);
 const open = ref(false);
 const loading = ref(true);
+const formLoading = ref(false);
 const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
@@ -699,6 +700,7 @@ function getProjectDeptsList() {
 function submitForm() {
   proxy.$refs["proProjectInfoRef"].validate(valid => {
     if (valid) {
+      formLoading.value = true;
       form.value.projectDeptsList = getProjectDeptsList();
       let postData = {
         ...form.value
@@ -707,12 +709,14 @@ function submitForm() {
         updateProProjectInfo(postData).then(response => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
+          formLoading.value = false;
           getList();
         });
       } else {
         addProProjectInfo(postData).then(response => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
+          formLoading.value = false;
           getList();
         });
       }