|
@@ -130,21 +130,20 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
|
|
|
|
|
|
@Override
|
|
|
public boolean saveDrugEnts(WmDaDrugEnt entity) {
|
|
|
- Integer deptId = Integer.parseInt(System.currentTimeMillis() / 1000 + "");
|
|
|
- entity.setDeptId(deptId + "");
|
|
|
+
|
|
|
+ entity.setDeptId(String.valueOf(System.currentTimeMillis() / 1000));
|
|
|
entity.setCreateTime(LocalDateTime.now());
|
|
|
- boolean isSave = super.save(entity);
|
|
|
- if (isSave) {
|
|
|
+
|
|
|
+ if (super.save(entity)) {
|
|
|
SysDept sysDept = new SysDept();
|
|
|
-// sysDept.setDeptId(deptId);
|
|
|
sysDept.setName(entity.getEntname());
|
|
|
sysDept.setLevel(2);
|
|
|
-// return sysDeptService.saveDept(sysDept)>0?true:false;
|
|
|
sysDept.setSubjectType(entity.getSubjectType());
|
|
|
sysDept.setDeptPermissions(entity.getDeptPermissions());
|
|
|
sysDeptService.save(sysDept);
|
|
|
entity.setDeptId(String.valueOf(sysDept.getDeptId()));
|
|
|
wmDaDrugEntMapper.updateById(entity);
|
|
|
+
|
|
|
List<SysDeptRelation> newList = new ArrayList<>();
|
|
|
SysDeptRelation sysDeptRelation = new SysDeptRelation();
|
|
|
sysDeptRelation.setAncestor(SecurityUtils.getUser().getDeptId());
|
|
@@ -155,18 +154,18 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
|
|
|
sysDeptRelation1.setDescendant(Integer.valueOf(entity.getDeptId()));
|
|
|
newList.add(sysDeptRelation1);
|
|
|
sysDeptRelationService.saveBatch(newList);
|
|
|
- /**
|
|
|
- * @Modify: start
|
|
|
- * @Author: ryz
|
|
|
- * @Date: 2021/4/19
|
|
|
- */
|
|
|
- for (String subType : entity.getSubjectType()) {
|
|
|
+
|
|
|
+ // 创建结算渠道和通道
|
|
|
+ for (Map.Entry<String, Integer> entry : entity.getSubjectTypeAndChannel().entrySet()){
|
|
|
SysDeptSub deptSub = new SysDeptSub();
|
|
|
deptSub.setDeptId(sysDept.getDeptId());
|
|
|
- deptSub.setSubjectType(subType);
|
|
|
+ deptSub.setSubjectType(entry.getKey());
|
|
|
+ deptSub.setSubjectChannel(entry.getValue());
|
|
|
+ deptSub.setUpdateTime(LocalDateTime.now());
|
|
|
deptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
|
|
|
sysDeptSubMapper.insert(deptSub);
|
|
|
}
|
|
|
+
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|