切换分包商

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxPersistentManageService.java

@@ -5,9 +5,12 @@ import com.rongwei.bsentity.domain.ZhcxPersistentManageDo;
 import com.rongwei.rwcommon.base.R;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 import java.util.Map;
 
 public interface ZhcxPersistentManageService extends IService<ZhcxPersistentManageDo> {
 
     int wordExport(Map<String, Object> map, HttpServletResponse response);
+
+    void syncWzPlatform(List<String> ids);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxSubcontractorUserService.java

@@ -7,8 +7,6 @@ import com.rongwei.rwadmincommon.system.domain.SysUserDo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 
-import java.util.List;
-
 /**
  * @author zhuang
  */
@@ -17,4 +15,6 @@ public interface ZhcxSubcontractorUserService extends IService<SysUserDo> {
     void batchSaveList(SubcontractorUserVo subcontractorUserVo);
 
     R saveOrUpdate(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid,String opertionType);
+
+    void updateSubcontractUserRole(SubcontractorUserVo map);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPersistentManageServiceImpl.java

@@ -18,6 +18,7 @@ import com.rongwei.rwcommoncomponent.file.service.SysFileItemService;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
@@ -46,6 +47,9 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
     @Autowired
     private SysFileItemService sysFileItemService;
 
+    @Value("${wz-provider.syncWzDataUrl}")
+    private String syncWzDataUrl;
+
     @Override
     public int wordExport(Map<String, Object> map, HttpServletResponse response) {
         Object periodObj = map.get("period");
@@ -284,6 +288,11 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
         return 1;
     }
 
+    @Override
+    public void syncWzPlatform(List<String> ids) {
+        //zhcxPersistentManageDao.syncWzDataUrl
+    }
+
     private void initWeekWord(Document[] doc, List<ZhcxPersistentManageDo> rewardListData, String tempId) {
         if(rewardListData.size()>0){
             Map<String, List<ZhcxPersistentManageDo>> collect = rewardListData.stream()

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxSubcontractorUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.rongwei.bscommon.sys.dao.ZhcxSubcontractorUserDao;
 import com.rongwei.bscommon.sys.service.ZhcxSubcontractorUserService;
@@ -22,10 +23,9 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author zhuang
@@ -102,6 +102,44 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
         return R.ok();
     }
 
+    @Override
+    public void updateSubcontractUserRole(SubcontractorUserVo userVo) {
+        List<String> userIds = userVo.getUserIds();
+        LambdaQueryWrapper<SysUserRoleDo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SysUserRoleDo::getUserid,userIds);
+        wrapper.eq(SysUserRoleDo::getRoleid,userVo.getRoleid());
+        wrapper.eq(SysUserRoleDo::getDeleted,"0");
+        List<String> roleUserIds = sysUserRoleService.listObjs
+                (wrapper.select(SysUserRoleDo::getUserid),
+                        obj -> (String) obj);
+        String type = userVo.getType();
+        List<SysUserRoleDo> list = new ArrayList<>();
+        List<String> deletedIds = new ArrayList<>();
+        userIds.forEach(userId -> {
+            if (!roleUserIds.contains(userId) && "驻外分包商".equals(type)) {
+                SysUserRoleDo sysUserRoleDo = new SysUserRoleDo();
+                sysUserRoleDo.setUserid(userId);
+                sysUserRoleDo.setRoleid(userVo.getRoleid());
+                sysUserRoleDo.setId(SecurityUtil.getUUID());
+                list.add(sysUserRoleDo);
+            }else if(roleUserIds.contains(userId) && !"驻外分包商".equals(type)){
+                deletedIds.add(userId);
+            }
+        });
+        if("驻外分包商".equals(type)){
+            if (list.size() > 0 ) {
+                sysUserRoleService.saveBatch(list);
+            }
+        }else{
+            LambdaQueryWrapper<SysUserRoleDo> deleteWrapper = new LambdaQueryWrapper<>();
+            if (deletedIds.size() > 0 ) {
+                deleteWrapper.in(SysUserRoleDo::getUserid,deletedIds);
+                deleteWrapper.eq(SysUserRoleDo::getRoleid,userVo.getRoleid());
+                sysUserRoleService.remove(deleteWrapper);
+            }
+        }
+    }
+
     /**
      * 保存用户角色
      *

business-entity/src/main/java/com/rongwei/bsentity/vo/SubcontractorUserVo.java

@@ -9,8 +9,12 @@ import java.util.List;
 public class SubcontractorUserVo {
 
     @ApiModelProperty("监理信息")
-    List<SubContractorBySysUserVo> userList;
+    private List<SubContractorBySysUserVo> userList;
     @ApiModelProperty("角色id")
-    String roleid;
-
+    private String roleid;
+    @ApiModelProperty("pid")
+    private String pid;
+    //@ApiModelProperty("监理/分包商用户id")
+    private List<String> userIds;
+    private String type;
 }

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxSubcontractorUserController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zhuang
@@ -30,4 +31,9 @@ public class ZhcxSubcontractorUserController {
         zhcxSubcontractorUserService.batchSaveList(subcontractorUserVo);
         return R.ok();
     }
+
+    @PostMapping("/updateSubcontractUserRole")
+    public void updateSubcontractUserRole(@RequestBody SubcontractorUserVo userVo){
+        zhcxSubcontractorUserService.updateSubcontractUserRole(userVo);
+    }
 }