|
|
@@ -10,8 +10,10 @@ import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.dao.SysAgencyFeeApprovalMapper;
|
|
|
import com.ydtech.modules.admin.dao.SysAgencyFeeApprovalRecordMapper;
|
|
|
+import com.ydtech.modules.admin.dao.SysDeptMapper;
|
|
|
import com.ydtech.modules.admin.model.SysAgencyFeeApproval;
|
|
|
import com.ydtech.modules.admin.model.SysAgencyFeeApprovalRecord;
|
|
|
+import com.ydtech.modules.admin.model.SysDept;
|
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
|
import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalAddDto;
|
|
|
import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalDto;
|
|
|
@@ -20,6 +22,7 @@ import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalPageDto;
|
|
|
import com.ydtech.modules.admin.model.vo.AgencyExtractFee;
|
|
|
import com.ydtech.modules.admin.service.SysAgencyFeeApprovalService;
|
|
|
import com.ydtech.modules.admin.service.SysAgencyLeaderService;
|
|
|
+import com.ydtech.modules.admin.service.SysDeptService;
|
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
|
import com.ydtech.modules.base.controller.BaseController;
|
|
|
import com.ydtech.modules.order.entity.BasePageResult;
|
|
|
@@ -52,6 +55,9 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
|
|
|
@Resource
|
|
|
private SysAgencyLeaderService sysAgencyLeaderService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private SysDeptMapper sysDeptMapper;
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
@@ -77,7 +83,10 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
|
|
|
sysAgencyFeeApproval.setUserId(user.getId());
|
|
|
sysAgencyFeeApproval.setUserName(user.getName());
|
|
|
sysAgencyFeeApproval.setDeptId(user.getDeptId());
|
|
|
- sysAgencyFeeApproval.setDeptName(user.getDeptName());
|
|
|
+ SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, user.getDeptId()).eq(SysDept::getDelFlag, 0));
|
|
|
+ if (sysDept != null) {
|
|
|
+ sysAgencyFeeApproval.setDeptName(sysDept.getName());
|
|
|
+ }
|
|
|
sysAgencyFeeApproval.setNumber(IdGenerate.nextId());
|
|
|
//总保费
|
|
|
sysAgencyFeeApproval.setSumpremium(agencyExtractFee.getSumpremium());
|
