微调

src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java

@@ -14,6 +14,8 @@ import com.qs.serve.modules.baz.entity.bo.BazVisitInstanceFlowBo;
 import com.qs.serve.modules.baz.entity.so.BazVisitInstanceSo;
 import com.qs.serve.modules.baz.service.BazVisitInstanceService;
 import com.qs.serve.modules.baz.service.BazVisitService;
+import com.qs.serve.modules.sys.service.SysPostService;
+import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysUserSalesService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +41,7 @@ public class BazMyVisitInstanceController {
     private BazVisitInstanceService bazVisitInstanceService;
     private BazVisitService visitService;
     private SysUserSalesService sysUserSalesService;
+    private SysPostUserService postUserService;
 
 
     /**
@@ -78,6 +81,7 @@ public class BazMyVisitInstanceController {
         if(param.getQueryEndDate()!=null){
             lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate());
         }
+        //postUserService.listByUserId()
         List<String> userIds = sysUserSalesService.listByChildIds(AuthContextUtils.getSysUserId());
         if(userIds.size()<1){
             return R.byEmptyList();

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java

@@ -189,6 +189,9 @@ public class BmsChannelPointController {
             return R.error("活动含当前站点，删除失败");
         }
         BmsChannelPoint point = bmsChannelPointService.getById(id);
+        if(point==null){
+            return R.error("已删除");
+        }
         boolean result = bmsChannelPointService.removeById(id);
         //删除权限关联
         bmsMasterUserService.removeMgrUser(MasterUserType.Point,id+"");

src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java

@@ -17,7 +17,10 @@ import com.qs.serve.modules.bms.service.BmsMasterUserService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
 import com.qs.serve.modules.tbs.entity.TbsActivityCenter;
+import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.service.TbsActivityCenterService;
+import com.qs.serve.modules.tbs.service.TbsBudgetCostItemService;
+import com.qs.serve.modules.tbs.service.TbsBudgetService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -46,6 +49,7 @@ public class BmsCostCenterController {
     private BmsCostCenterService bmsCostCenterService;
     private BmsMasterUserService bmsMasterUserService;
     private TbsActivityCenterService activityCenterService;
+    private TbsBudgetService tbsBudgetService;
 
     /**
      * 树查询
@@ -77,6 +81,7 @@ public class BmsCostCenterController {
         lqw.eq(BmsMasterUser::getType, MasterUserType.Center);
         List<BmsMasterUser> masterUsers = bmsMasterUserService.list(lqw);
         List<String> centerIds = masterUsers.stream().map(BmsMasterUser::getTargetId).collect(Collectors.toList());
+
         if(centerIds.size()>0){
             List<BmsCostCenter> costCenters = bmsCostCenterService.listByIds(centerIds);
             Map<Integer,List<BmsCostCenter>> listMap = costCenters.stream().collect(Collectors.groupingBy(BmsCostCenter::getLevel));
@@ -172,12 +177,15 @@ public class BmsCostCenterController {
     private void commonEdit(BmsCostCenterBo param){
         BmsCostCenter costCenter = CopierUtil.copy(param,new BmsCostCenter());
         BmsCostCenter dbCostCenter = bmsCostCenterService.getById(costCenter.getId());
+        BmsCostCenter parent = bmsCostCenterService.getById(costCenter.getPid());
+        if(costCenter.getPid()==null||costCenter.getPid().equals(0L)){
+            costCenter.setPid(0L);
+            costCenter.setLevel(1);
+        }else {
+            costCenter.setLevel(parent.getLevel()+1);
+        }
         if(dbCostCenter!=null && !dbCostCenter.getPid().equals(costCenter.getPid())){
-            if(costCenter.getPid()==null||costCenter.getPid().equals(0L)){
+            if(!costCenter.getPid().equals(0L)) {
-                costCenter.setPid(0L);
-                costCenter.setLevel(1);
-            }else {
-                BmsCostCenter parent = bmsCostCenterService.getById(costCenter.getPid());
                 Integer level = parent.getLevel();
                 if(level>1){
                     checkRepeat(parent,dbCostCenter.getId());
@@ -221,6 +229,12 @@ public class BmsCostCenterController {
     @PreAuthorize("hasRole('bms:costCenter:delete')")
     public R<?> deleteById(@PathVariable("id") Long id){
         //未校验已用不能删，预算和费用申请
+        LambdaQueryWrapper<TbsBudget> budgetLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        budgetLambdaQueryWrapper.eq(TbsBudget::getCenterType,TbsCenterType.center);
+        budgetLambdaQueryWrapper.eq(TbsBudget::getCenterId,id);
+        if(0<tbsBudgetService.count(budgetLambdaQueryWrapper)){
+            return R.error("预算含当前成本中心，删除失败");
+        }
         LambdaQueryWrapper<TbsActivityCenter> lqw = new LambdaQueryWrapper<>();
         lqw.eq(TbsActivityCenter::getCenterId,id);
         lqw.eq(TbsActivityCenter::getCenterType, TbsCenterType.center.name());

src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java

@@ -15,6 +15,9 @@ import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.bo.BmsRegionBatchBo;
 import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.service.*;
+import com.qs.serve.modules.tbs.common.TbsCenterType;
+import com.qs.serve.modules.tbs.entity.TbsBudget;
+import com.qs.serve.modules.tbs.service.TbsBudgetService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
@@ -43,6 +46,7 @@ public class BmsRegion2Controller {
     private BmsRuleRegionService bmsRuleRegionService;
     private BmsChannelPointService bmsChannelPointService;
     private BmsRegionUserService bmsRegionUserService;
+    private TbsBudgetService tbsBudgetService;
 
     /**
      * 列表
@@ -322,6 +326,12 @@ public class BmsRegion2Controller {
         if(bmsChannelPointService.listBySaleRegionId(id).size()>0){
             return R.error("地区含有网点无法删除");
         }
+        LambdaQueryWrapper<TbsBudget> budgetLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        budgetLambdaQueryWrapper.eq(TbsBudget::getCenterType, TbsCenterType.bizRegion);
+        budgetLambdaQueryWrapper.eq(TbsBudget::getCenterId,id);
+        if(0<tbsBudgetService.count(budgetLambdaQueryWrapper)){
+            return R.error("预算含当前成本中心，删除失败");
+        }
         //删除商品限制
         bmsRuleRegionService.removeByRegionId(id);
         boolean result = bmsRegion2Service.removeById(id);

src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java

@@ -13,6 +13,9 @@ import com.qs.serve.modules.bms.entity.bo.BmsRegionBatchBo;
 import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.service.*;
 import com.qs.serve.modules.his.service.HisUserSupplierService;
+import com.qs.serve.modules.tbs.common.TbsCenterType;
+import com.qs.serve.modules.tbs.entity.TbsBudget;
+import com.qs.serve.modules.tbs.service.TbsBudgetService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
@@ -44,6 +47,7 @@ public class BmsRegionController {
     private BmsChannelPointService bmsChannelPointService;
     private BmsRegionUserService bmsRegionUserService;
     private HisUserSupplierService hisUserSupplierService;
+    private TbsBudgetService tbsBudgetService;
 
     /**
      * 列表
@@ -331,6 +335,12 @@ public class BmsRegionController {
         if(bmsChannelPointService.listByBizRegionId(id).size()>0){
             return R.error("地区含有网点无法删除");
         }
+        LambdaQueryWrapper<TbsBudget> budgetLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        budgetLambdaQueryWrapper.eq(TbsBudget::getCenterType, TbsCenterType.saleRegion);
+        budgetLambdaQueryWrapper.eq(TbsBudget::getCenterId,id);
+        if(0<tbsBudgetService.count(budgetLambdaQueryWrapper)){
+            return R.error("预算含当前成本中心，删除失败");
+        }
         //删除商品限制
         bmsRuleRegionService.removeByRegionId(id);
         boolean result = bmsRegionService.removeById(id);

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -24,6 +24,9 @@ import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam;
 import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam2;
 import com.qs.serve.modules.sys.entity.dto.SysUserSimpleVo;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.common.TbsCenterType;
+import com.qs.serve.modules.tbs.entity.TbsBudget;
+import com.qs.serve.modules.tbs.service.TbsBudgetService;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -56,6 +59,7 @@ public class BmsSupplierController {
     private BmsSupplierMapper bmsSupplierMapper;
     private HisUserSupplierService hisUserSupplierService;
     private RedisService redisService;
+    private TbsBudgetService tbsBudgetService;
 
     /**
      * 翻页查询
@@ -489,6 +493,12 @@ public class BmsSupplierController {
         if(bmsSupplierService.listChild(id).size()>0){
             return R.error("含有子客户无法删除");
         }
+        LambdaQueryWrapper<TbsBudget> budgetLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        budgetLambdaQueryWrapper.eq(TbsBudget::getCenterType, TbsCenterType.customer);
+        budgetLambdaQueryWrapper.eq(TbsBudget::getCenterId,id);
+        if(0<tbsBudgetService.count(budgetLambdaQueryWrapper)){
+            return R.error("预算含当前成本中心，删除失败");
+        }
         bmsSupplierService.removeById(id);
         //清空临时表
         hisUserSupplierService.cleanTable();

src/main/java/com/qs/serve/modules/bms/service/BmsCostCenterService.java

@@ -12,6 +12,11 @@ import java.util.List;
  */
 public interface BmsCostCenterService extends IService<BmsCostCenter> {
 
+    /**
+     * 定时更新level
+     */
+    void initCostLevel();
+
     BmsCostCenter getByCode(String code);
     BmsCostCenter getByName(String name);
     List<BmsCostCenter> listChild(Long pid);

src/main/java/com/qs/serve/modules/bms/service/impl/BmsCostCenterServiceImpl.java

@@ -22,6 +22,11 @@ import java.util.List;
 @AllArgsConstructor
 public class BmsCostCenterServiceImpl extends ServiceImpl<BmsCostCenterMapper,BmsCostCenter> implements BmsCostCenterService {
 
+    @Override
+    public void initCostLevel() {
+        //TODO
+    }
+
     @Override
     public BmsCostCenter getByCode(String code) {
         LambdaQueryWrapper<BmsCostCenter> lqw = new LambdaQueryWrapper<>();

src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java

@@ -81,6 +81,9 @@ public class SysPostController {
     @SysLog(title = "职务",biz = BizType.QUERY)
     public R<SysPost> getById(@PathVariable("id") String id){
         SysPost sysPost = sysPostService.getById(id);
+        if(!sysPost.getPid().equals("0")){
+            sysPost.setParentInfo(sysPostService.getById(id));
+        }
         return R.ok(sysPost);
     }
 

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -243,7 +243,6 @@ public class SysUserController {
         if(count>0L){
             return R.error("手机号已被注册");
         }
-        param.setAccount(param.getMobile());
         param.setPassword(SecureUtil.md5(GySysConst.DEFAULT_PASSWORD));
         if(param.getMobile()!=null){
             param.setAccount(param.getMobile());
@@ -254,6 +253,7 @@ public class SysUserController {
         if(param.getSyAccount()==null){
             param.setSyAccount("");
         }
+        param.setId("SU"+IdUtil.getSnowFlakeId());
         boolean result = sysUserService.save(param);
 //        if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
 //            sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
@@ -273,9 +273,6 @@ public class SysUserController {
     public R<?> updateById(@RequestBody SysUserBo userBo){
         SysUser param = CopierUtil.copy(userBo,new SysUser());
         param.setCode(null);
-        if(param.getMobile()!=null){
-            param.setAccount(param.getMobile());
-        }
         if(param.getLoginEnable()!=null){
             param.setServingState(param.getLoginEnable()==1?1:0);
         }

src/main/java/com/qs/serve/modules/sys/entity/SysPost.java

@@ -87,6 +87,8 @@ public class SysPost implements Serializable {
     @JsonProperty
     private Boolean delFlag;
 
+    @TableField(exist = false)
+    private Object parentInfo;
 
 }
 

src/main/java/com/qs/serve/modules/sys/entity/SysUser.java

@@ -195,6 +195,9 @@ public class SysUser implements Serializable {
     @TableField(exist = false)
     private Integer pageSize;
 
+    @TableField(exist = false)
+    private List<?> positionList;
+
     /**
      * 返回前端，过滤敏感信息
      * @return

src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java

@@ -46,8 +46,8 @@ public class SysUserBo {
     private String deptId;
 
     /** 职位ID */
-    @Length(max = 64,message = "部门ID长度不能超过64字")
+    //@Length(max = 64,message = "部门ID长度不能超过64字")
-    private String positionId;
+    //private String positionId;
 
     /** 身份证号码 */
     @Length(max = 45,message = "身份证号码长度不能超过45字")
@@ -62,11 +62,9 @@ public class SysUserBo {
     //private List<String> roleIds;
 
     /** 致远登陆账户 */
-    @NotNull
     private String syAccount;
 
     /** 致远用户id */
-    @NotNull
     private String syUserId;
 
     /** 登陆客户端标识：android，ios */

src/main/java/com/qs/serve/modules/sys/service/SysPostUserService.java

@@ -11,6 +11,8 @@ import java.util.List;
  */
 public interface SysPostUserService extends IService<SysPostUser> {
 
+    List<String> listByChildIds(String userId);
+
     List<SysPostUser> listByUserId(String userId);
 
     void updatePathIds(String orgPathIds,String newPathIds,String orgPathNames,String newPathNames);

src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java

@@ -39,6 +39,14 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
             if(parent==null){
                 Assert.throwEx("父级标签不存在");
             }
+            if(param.getId()!=null){
+                String[] pids = parent.getPathIds().split("_");
+                for (String pid : pids) {
+                    if(pid.equals(param.getId())){
+                        Assert.throwEx("出现循环节点");
+                    }
+                }
+            }
         }
         if(param.getId()==null){
             this.save(param);

src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java

@@ -19,7 +19,9 @@ import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.mapper.SysPostUserMapper;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 系统职务 服务实现类
@@ -34,6 +36,17 @@ public class SysPostUserServiceImpl extends ServiceImpl<SysPostUserMapper,SysPos
     SysPostMapper postMapper;
     SysUserMapper userMapper;
 
+
+    @Override
+    public List<String> listByChildIds(String userId) {
+        List<SysPostUser> postUserList = this.listByUserId(userId);
+        Set<String> userIdSet = new HashSet<>();
+        for (SysPostUser postUser : postUserList) {
+            
+        }
+        return null;
+    }
+
     @Override
     public List<SysPostUser> listByUserId(String userId) {
         LambdaQueryWrapper<SysPostUser> lqw = new LambdaQueryWrapper<>();

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java

@@ -42,6 +42,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private final SysRoleService sysRoleService;
     private final SysDeptMapper sysDeptMapper;
     private final SysMenuMapper sysMenuMapper;
+    private final SysPostMapper postMapper;
+    private final SysPostUserMapper postUserMapper;
 
 
     @Override
@@ -102,6 +104,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserLeave sysUserLeave = sysUserLeaveService.getOneByUserId(sysUser.getId());
             sysUser.setLeaveInfo(sysUserLeave);
         }
+        List<SysPostUser> postUserList = sysPostUserService.listByUserId(sysUser.getId());
+        if(CollectionUtil.isNotEmpty(postUserList)){
+            List<String> postIds = postUserList.stream().map(SysPostUser::getPostId).distinct().collect(Collectors.toList());
+            List<SysPost> postList = postMapper.selectBatchIds(postIds);
+            sysUser.setPositionList(postList);
+        }
     }
 
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@@ -78,6 +78,10 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
             if(budget.getBudgetState().equals(1)){
                 Assert.throwEx("已开启的预算无法编辑");
             }
+            //移除旧的条件数据
+            LambdaQueryWrapper<TbsBudgetCondition> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(TbsBudgetCondition::getBudgetId,budget.getId());
+            tbsBudgetConditionService.remove(lqw);
         }else {
             budget = CopierUtil.copy(budgetBo,new TbsBudget());
         }

src/main/resources/mapper/sys/SysUserMapper.xml

@@ -11,7 +11,6 @@
         <result property="password"  column="password"/>
         <result property="icon"  column="icon"/>
         <result property="deptId"  column="dept_id"/>
-        <result property="positionId"  column="position_id"/>
         <result property="superFlag"  column="super_flag"/>
         <result property="loginEnable"  column="login_enable"/>
         <result property="servingState"  column="serving_state"/>
@@ -37,7 +36,6 @@
         sys_user.password,
         sys_user.icon,
         sys_user.dept_id,
-        sys_user.position_id,
         sys_user.super_flag,
         sys_user.login_enable,
         sys_user.serving_state,
@@ -67,7 +65,6 @@
             <if test="query.password != null and query.password != ''"> and sys_user.password = #{query.password}</if>
             <if test="query.icon != null and query.icon != ''"> and sys_user.icon = #{query.icon}</if>
             <if test="query.deptId != null and query.deptId != ''"> and sys_user.dept_id = #{query.deptId}</if>
-            <if test="query.positionId != null and query.positionId != ''"> and sys_user.position_id = #{query.positionId}</if>
             <if test="query.superFlag != null"> and sys_user.super_flag = #{query.superFlag}</if>
             <if test="query.loginEnable != null"> and sys_user.login_enable = #{query.loginEnable}</if>
             <if test="query.servingState != null"> and sys_user.serving_state = #{query.servingState}</if>