工作室编辑

src/main/java/com/ydtech/modules/admin/controller/SysAgencyLeaderController.java

@@ -47,6 +47,17 @@ public class SysAgencyLeaderController extends BaseController {
         return HttpResult.ok("success", this.sysAgencyLeaderService.queryById(id));
     }
 
+    /**+
+     * 改版后的根据id查看信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/queryInfoById/{id}")
+    @ApiOperation(value = "根据id查询")
+    public HttpResult<SysAgencyLeaderDeptVo> queryInfoById(@PathVariable("id") Integer id) {
+        return HttpResult.ok("success", this.sysAgencyLeaderService.queryInfoById(id));
+    }
+
     /**
      * 五级机构下的合伙人
      * @param id
@@ -96,7 +107,7 @@ public class SysAgencyLeaderController extends BaseController {
     }
 
     /**
-     * 保存配置机构负责人的信息
+     * 修改比例配置
      *
      * @param sysAgencyLeaderDto 实体
      * @return 新增结果
@@ -107,6 +118,18 @@ public class SysAgencyLeaderController extends BaseController {
         return HttpResult.ok(this.sysAgencyLeaderService.edit(sysAgencyLeaderDto));
     }
 
+    /**
+     * 保存配置机构负责人的信息
+     *
+     * @param sysAgencyLeaderDeptDto 实体
+     * @return 新增结果
+     */
+    @PostMapping("/edit")
+    @ApiOperation(value = "编辑工作室信息的信息")
+    public HttpResult editInfo(@RequestBody SysAgencyLeaderDeptDto sysAgencyLeaderDeptDto) {
+        return HttpResult.ok(this.sysAgencyLeaderService.editInfo(sysAgencyLeaderDeptDto));
+    }
+
 
     @GetMapping("/del/{id}")
     @ApiOperation(value = "删除配置机构负责人的信息")

src/main/java/com/ydtech/modules/admin/model/dto/SysAgencyLeaderDeptDto.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.admin.model.dto;
+
+import com.ydtech.modules.admin.model.SysAgencyLeader;
+import com.ydtech.modules.admin.model.SysDept;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysAgencyLeaderDeptDto {
+
+    @ApiModelProperty(value = "工作室信息")
+    private SysDept sysDept;
+    @ApiModelProperty(value = "工作室管理员信息")
+    private SysAgencyLeader sysAgencyLeader;
+}

src/main/java/com/ydtech/modules/admin/model/vo/SysAgencyLeaderDeptVo.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.admin.model.vo;
+
+import com.ydtech.modules.admin.model.SysAgencyLeader;
+import com.ydtech.modules.admin.model.SysDept;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysAgencyLeaderDeptVo {
+
+    @ApiModelProperty(value = "工作室信息")
+    private SysDept sysDept;
+    @ApiModelProperty(value = "工作室管理员信息")
+    private SysAgencyLeader sysAgencyLeader;
+}

src/main/java/com/ydtech/modules/admin/service/SysAgencyLeaderService.java

@@ -31,6 +31,7 @@ public interface SysAgencyLeaderService extends IService<SysAgencyLeader> {
 
 
     boolean edit(SysAgencyLeaderDto sysAgencyLeaderDto);
+    boolean editInfo(SysAgencyLeaderDeptDto sysAgencyLeaderDeptDto);
 
     boolean delById(Integer id);
 
@@ -64,4 +65,6 @@ public interface SysAgencyLeaderService extends IService<SysAgencyLeader> {
     IPage<AgencyUserInsAreaVo> queryInsAreaPageById(AgencyUserInsAreaDto agencyUserInsAreaDto);
 
     HttpResult queryUserInsAreaExcel(AgencyUserInsAreaDto agencyUserInsAreaDto);
+
+    SysAgencyLeaderDeptVo queryInfoById(Integer id);
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyLeaderServiceImpl.java

@@ -215,136 +215,58 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean edit(SysAgencyLeaderDto sysAgencyLeaderDto) {
-//        //判断本月是否已修改比例
-//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-//        String format = simpleDateFormat.format(new Date());
-//        List<SysPartnerTime> sysPartnerTimes = sysPartnerTimeMapper.selectList(new LambdaQueryWrapper<SysPartnerTime>()
-//                .eq(SysPartnerTime::getCreateTime,format).eq(SysPartnerTime::getUserId,sysAgencyLeaderDto.getUserId()));
-//        if (sysPartnerTimes.size() > 0) {
-//            throw new DescribeException(format+"已设置过抽成比例,每月只能修改一次");
-//        }
-        //不修改负责人userId传null
-        String userId = sysAgencyLeaderDto.getUserId();
         String loginId = BaseController.getUserId();
-        boolean b = false;
-        SysAgencyLeader sysAgencyLeader1 = sysAgencyLeaderMapper.selectById(sysAgencyLeaderDto.getId());
-        if (!sysAgencyLeader1.getUserId().equals(userId)) {
-            //修改管理员
-            List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new QueryWrapper<SysAgencyLeader>().lambda().eq(SysAgencyLeader::getDelFlag, 1));
-            List<String> userIdList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
-            if (userIdList.contains(sysAgencyLeaderDto.getUserId())) {
-                throw new DescribeException(sysAgencyLeaderDto.getUserName() + "已是机构负责人，不可重复配置");
-            }
-            List<SysPartner> sysPartners = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1));
-            if (sysPartners.size() > 0) {
-                List<String> list = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
-                if (list.contains(sysAgencyLeaderDto.getUserId())) {
-                    throw new DescribeException(sysAgencyLeaderDto.getUserName() + "已是合伙人，不可设置为机构负责人");
-                }
-            }
-
-            //修改负责人时解除合伙人或者推荐人与机构负责人的关系
-            List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                    .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeader1.getUserId())
-                    .eq(SysRelationPerson::getDelFlag, 1)
-                    .eq(SysRelationPerson::getType, 1));
-            if (sysRelationPeople.size() > 0) {
-                throw new DescribeException(sysAgencyLeader1.getUserName() + "有推荐关系，不允许修改");
-            }
+        SysAgencyLeader sysAgencyLeader = new SysAgencyLeader();
+        sysAgencyLeader.setId(sysAgencyLeaderDto.getId());
+        sysAgencyLeader.setProportional(sysAgencyLeaderDto.getProportional());
+        sysAgencyLeader.setUpdateBy(loginId);
 
-            SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDto, SysAgencyLeader.class);
-            sysAgencyLeader.setUpdateTime(new Date());
-            sysAgencyLeader.setUpdateBy(loginId);
-            sysAgencyLeaderMapper.updateById(sysAgencyLeader);
-            if (!sysAgencyLeaderDto.getSuggestId().isEmpty()) {
-                //sysRelationPerson1为空是无上级
-                SysRelationPerson sysRelationPerson = new SysRelationPerson();
-                sysRelationPerson.setAgencyLeaderId(sysAgencyLeader.getUserId());
-                sysRelationPerson.setCreateBy(loginId);
-                sysRelationPerson.setCreateTime(new Date());
-                sysRelationPerson.setSuggestId(sysAgencyLeaderDto.getSuggestId());
-                sysRelationPerson.setSource(0);
-                sysRelationPerson.setType(1);
-                b = sysRelationPersonMapper.insert(sysRelationPerson) > 0;
-                //查询推荐人是否有上级 ：满足合伙人有多层关系
-                List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                        .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeaderDto.getSuggestId())
-                        .eq(SysRelationPerson::getType, 0));
-
-                if (sysRelationPersonList.size() > 0) {
-                    for (SysRelationPerson sysRelation : sysRelationPersonList) {
-                        SysRelationPerson sysRelationPerson1 = new SysRelationPerson();
-                        sysRelationPerson1.setAgencyLeaderId(sysAgencyLeader.getUserId());
-                        sysRelationPerson1.setCreateBy(loginId);
-                        sysRelationPerson1.setCreateTime(new Date());
-                        sysRelationPerson1.setSuggestId(sysRelation.getSuggestId());
-                        sysRelationPerson1.setSource(1);
-                        sysRelationPerson1.setType(1);
-                        b = sysRelationPersonMapper.insert(sysRelationPerson1) > 0;
-                    }
+        return sysAgencyLeaderMapper.updateById(sysAgencyLeader) > 0;
+    }
 
-                }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean editInfo(SysAgencyLeaderDeptDto sysAgencyLeaderDeptDto) {
+        SysDept sysDept = sysAgencyLeaderDeptDto.getSysDept();
+        SysDept byId = sysDeptService.getById(sysDept.getId());
+        if (sysDept.getManagementSource() != null){
+            if (!sysDept.getManagementSource().equals(byId.getManagementSource())) {
+                throw new DescribeException("机构已被设置来源无法修改");
             }
+        }
+        sysDeptService.updateDept(sysDept);
 
-
-        } else {
-            if (StringUtils.isNullOrEmpty(sysAgencyLeader1.getSuggestId()) && !sysAgencyLeaderDto.getSuggestId().isEmpty()) {
-                //之前推荐人为空。可以修改
-                SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDto, SysAgencyLeader.class);
-                sysAgencyLeader.setUpdateBy(loginId);
-                b = sysAgencyLeaderMapper.updateById(sysAgencyLeader) > 0;
-
-                //sysRelationPerson1为空是无上级
-                SysRelationPerson sysRelationPerson = new SysRelationPerson();
-                sysRelationPerson.setAgencyLeaderId(sysAgencyLeader.getUserId());
-                sysRelationPerson.setCreateBy(loginId);
-                sysRelationPerson.setCreateTime(new Date());
-                sysRelationPerson.setSuggestId(sysAgencyLeaderDto.getSuggestId());
-                sysRelationPerson.setSource(0);
-                sysRelationPerson.setType(1);
-                b = sysRelationPersonMapper.insert(sysRelationPerson) > 0;
-                //查询推荐人是否有上级 ：满足合伙人有多层关系
-                List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                        .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeaderDto.getSuggestId())
-                        .eq(SysRelationPerson::getType, 0));
-
-                if (sysRelationPersonList.size() > 0) {
-                    for (SysRelationPerson sysRelation : sysRelationPersonList) {
-                        SysRelationPerson sysRelationPerson1 = new SysRelationPerson();
-                        sysRelationPerson1.setAgencyLeaderId(sysAgencyLeader.getUserId());
-                        sysRelationPerson1.setCreateBy(loginId);
-                        sysRelationPerson1.setCreateTime(new Date());
-                        sysRelationPerson1.setSuggestId(sysRelation.getSuggestId());
-                        sysRelationPerson1.setSource(1);
-                        sysRelationPerson1.setType(1);
-                        b = sysRelationPersonMapper.insert(sysRelationPerson1) > 0;
-                    }
-
-                }
-
-            } else {
-
-                SysAgencyLeader sysAgencyLeader = new SysAgencyLeader();
-                sysAgencyLeader.setId(sysAgencyLeaderDto.getId());
-                sysAgencyLeader.setProportional(sysAgencyLeaderDto.getProportional());
-                sysAgencyLeader.setUpdateBy(loginId);
-                b = sysAgencyLeaderMapper.updateById(sysAgencyLeader) > 0;
+        //不修改负责人userId传null
+        String userId = sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserId();
+        String loginId = BaseController.getUserId();
+        SysAgencyLeader sysAgencyLeader1 = sysAgencyLeaderMapper.selectById(sysAgencyLeaderDeptDto.getSysAgencyLeader().getId());
+        //修改管理员
+        List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new QueryWrapper<SysAgencyLeader>().lambda().eq(SysAgencyLeader::getDelFlag, 1));
+        List<String> userIdList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
+        if (userIdList.contains(userId)) {
+            throw new DescribeException(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserName() + "已是工作室管理员，不可重复配置");
+        }
+        List<SysPartner> sysPartners = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1));
+        if (sysPartners.size() > 0) {
+            List<String> list = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
+            if (list.contains(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserId())) {
+                throw new DescribeException(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserName() + "已是合伙人，不可设置为机构负责人");
             }
-
         }
 
-//        //修改抽成比例记录改变过程
-//        SysPartnerTime sysPartnerTime = new SysPartnerTime();
-//        sysPartnerTime.setType(2);
-//        sysPartnerTime.setCreateTime(format);
-//        sysPartnerTime.setUserId(sysAgencyLeaderDto.getUserId());
-//        sysPartnerTime.setUserName(sysAgencyLeaderDto.getUserName());
-//        sysPartnerTime.setNewProportional(sysAgencyLeaderDto.getProportional());
-//        sysPartnerTime.setOldProportional(sysAgencyLeader1.getProportional());
-//
-//        sysPartnerTimeMapper.insert(sysPartnerTime);
+        //修改负责人时解除合伙人或者推荐人与机构负责人的关系
+        List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeader1.getUserId())
+                .eq(SysRelationPerson::getDelFlag, 1)
+                .eq(SysRelationPerson::getType, 1));
+        if (sysRelationPeople.size() > 0) {
+            throw new DescribeException(sysAgencyLeader1.getUserName() + "有推荐关系，不允许修改");
+        }
 
-        return b;
+        SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDeptDto.getSysAgencyLeader(), SysAgencyLeader.class);
+        sysAgencyLeader.setUpdateTime(new Date());
+        sysAgencyLeader.setUpdateBy(loginId);
+        return sysAgencyLeaderMapper.updateById(sysAgencyLeader) > 0;
     }
 
     @Override
@@ -1049,5 +971,17 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
 
     }
 
+    @Override
+    public SysAgencyLeaderDeptVo queryInfoById(Integer id) {
+        SysAgencyLeaderDeptVo sysAgencyLeaderDeptVo = new SysAgencyLeaderDeptVo();
+        SysAgencyLeader sysAgencyLeader = baseMapper.selectById(id);
+        sysAgencyLeaderDeptVo.setSysAgencyLeader(sysAgencyLeader);
+
+        SysDept sysDept = sysDeptMapper.selectById(sysAgencyLeader.getDeptId());
+        sysAgencyLeaderDeptVo.setSysDept(sysDept);
+
+        return sysAgencyLeaderDeptVo;
+    }
+
 
 }