|
@@ -10,13 +10,11 @@ import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.core.page.PageRequest;
|
|
import com.ydtech.core.page.PageRequest;
|
|
|
import com.ydtech.core.page.PageResult;
|
|
import com.ydtech.core.page.PageResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
import com.ydtech.exception.SystemException;
|
|
|
-import com.ydtech.modules.admin.dao.SysAreaMapper;
|
|
|
|
|
-import com.ydtech.modules.admin.dao.SysDeptMapper;
|
|
|
|
|
-import com.ydtech.modules.admin.dao.SysUserDeptRelationshipMapper;
|
|
|
|
|
-import com.ydtech.modules.admin.dao.SysUserMapper;
|
|
|
|
|
|
|
+import com.ydtech.modules.admin.dao.*;
|
|
|
import com.ydtech.modules.admin.model.SysArea;
|
|
import com.ydtech.modules.admin.model.SysArea;
|
|
|
import com.ydtech.modules.admin.model.SysDept;
|
|
import com.ydtech.modules.admin.model.SysDept;
|
|
|
import com.ydtech.modules.admin.model.dto.QxFrontlineAgentDto;
|
|
import com.ydtech.modules.admin.model.dto.QxFrontlineAgentDto;
|
|
|
|
|
+import com.ydtech.modules.admin.model.po.InsDeptDistributionProportion;
|
|
|
import com.ydtech.modules.admin.model.po.SysUserDeptRelationship;
|
|
import com.ydtech.modules.admin.model.po.SysUserDeptRelationship;
|
|
|
import com.ydtech.modules.admin.model.report.financialReceivables.FinancialReceivablesMonthVo;
|
|
import com.ydtech.modules.admin.model.report.financialReceivables.FinancialReceivablesMonthVo;
|
|
|
import com.ydtech.modules.admin.model.vo.*;
|
|
import com.ydtech.modules.admin.model.vo.*;
|
|
@@ -26,8 +24,11 @@ import com.ydtech.modules.admin.service.SysAreaService;
|
|
|
import com.ydtech.modules.admin.service.SysDeptService;
|
|
import com.ydtech.modules.admin.service.SysDeptService;
|
|
|
import com.ydtech.modules.admin.service.SysUserTreeShowLevelService;
|
|
import com.ydtech.modules.admin.service.SysUserTreeShowLevelService;
|
|
|
import com.ydtech.modules.base.controller.BaseController;
|
|
import com.ydtech.modules.base.controller.BaseController;
|
|
|
|
|
+import com.ydtech.modules.esm.model.EsmRetail;
|
|
|
|
|
+import com.ydtech.modules.esm.service.EsmRetailService;
|
|
|
import com.ydtech.modules.protocol.utils.AssertionUtils;
|
|
import com.ydtech.modules.protocol.utils.AssertionUtils;
|
|
|
import com.ydtech.utils.StringUtils;
|
|
import com.ydtech.utils.StringUtils;
|
|
|
|
|
+import com.ydtech.utils.idgen.IdGenerate;
|
|
|
import io.lettuce.core.ScriptOutputType;
|
|
import io.lettuce.core.ScriptOutputType;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -36,6 +37,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
import org.springframework.util.ObjectUtils;
|
|
|
|
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.function.Function;
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -63,8 +65,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private SysUserDeptRelationshipMapper sysUserDeptRelationshipMapper;
|
|
private SysUserDeptRelationshipMapper sysUserDeptRelationshipMapper;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private InsDeptDistributionProportionMapper insDeptDistributionProportionMapper;
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private EsmRetailService esmRetailService;
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -302,6 +307,29 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
boolean b = save(sysDept);
|
|
boolean b = save(sysDept);
|
|
|
|
|
+
|
|
|
|
|
+ //如果是团队并且个代 初始化分销比例
|
|
|
|
|
+ if("D".equals(sysDeptVo.getDeptType()) && "2".equals(sysDept.getManagementSource())){
|
|
|
|
|
+ List<InsDeptDistributionProportion> insDeptDistributionProportions = insDeptDistributionProportionMapper.selectList(new LambdaQueryWrapper<>());
|
|
|
|
|
+ BigDecimal oneProportion = new BigDecimal(0);
|
|
|
|
|
+ BigDecimal twoProportion = new BigDecimal(0);
|
|
|
|
|
+ BigDecimal threeProportion = new BigDecimal(0);
|
|
|
|
|
+
|
|
|
|
|
+ for(int i=1;i<=insDeptDistributionProportions.size();i++){
|
|
|
|
|
+ InsDeptDistributionProportion insDeptDistributionProportion = insDeptDistributionProportions.get(i-1);
|
|
|
|
|
+ if(i==1){
|
|
|
|
|
+ oneProportion = insDeptDistributionProportion.getProportion();
|
|
|
|
|
+ }else if(i==2){
|
|
|
|
|
+ twoProportion = insDeptDistributionProportion.getProportion();
|
|
|
|
|
+ }else if(i==3){
|
|
|
|
|
+ threeProportion = insDeptDistributionProportion.getProportion();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ EsmRetail esmRetail = new EsmRetail(sysDept.getId(),sysDept.getName(),String.valueOf(insDeptDistributionProportions.size()),oneProportion.doubleValue(),twoProportion.doubleValue(),threeProportion.doubleValue());
|
|
|
|
|
+ esmRetail.setId(IdGenerate.nextId());
|
|
|
|
|
+ esmRetailService.insert(esmRetail);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
log.info("------------------添加部门成功-----------------------");
|
|
log.info("------------------添加部门成功-----------------------");
|
|
|
AssertionUtils.isSucceed(b, "删除失败");
|
|
AssertionUtils.isSucceed(b, "删除失败");
|
|
|
sysDeptVo.setId(sysDept.getId());
|
|
sysDeptVo.setId(sysDept.getId());
|