Commit da9bc2ad authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9

parents 344af6bf 47e08556
...@@ -346,9 +346,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -346,9 +346,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return R.failed(InsurancesConstants.IMPORT_TOO_LONG); return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
} }
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
Map<String, List<InsuranceAddParam>> map = addInsuranceCheck(paramList,user); Map<String, List<InsuranceAddParam>> map = addInsuranceCheck(paramList,user);
//返回给前端的结果 //返回给前端的结果
List<InsuranceAddParam> listResult = map.get("listResult"); List<InsuranceAddParam> listResult = map.get("listResult");
...@@ -363,8 +360,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -363,8 +360,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//购买类型,默认为「新增」 //购买类型,默认为「新增」
detail.setOrderNo(orderNo); detail.setOrderNo(orderNo);
detail.setBuyType(CommonConstants.ONE_INT); detail.setBuyType(CommonConstants.ONE_INT);
detail.setCreateUserDeptId(user.getDeptId().toString()); if (Common.isNotNull(user)) {
detail.setCreateUserDeptName(user.getDeptName()); detail.setCreateUserDeptId(user.getDeptId().toString());
detail.setCreateUserDeptName(user.getDeptName());
}
//投保状态:待投保 //投保状态:待投保
detail.setBuyHandleStatus(CommonConstants.ONE_INT); detail.setBuyHandleStatus(CommonConstants.ONE_INT);
detail.setPolicyStart(LocalDateUtil.parseLocalDate(success.getPolicyStart())); detail.setPolicyStart(LocalDateUtil.parseLocalDate(success.getPolicyStart()));
...@@ -372,8 +371,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -372,8 +371,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//保费都默认是0 //保费都默认是0
detail.setActualPremium(new BigDecimal("0.00")); detail.setActualPremium(new BigDecimal("0.00"));
detail.setEstimatePremium(new BigDecimal("0.00")); detail.setEstimatePremium(new BigDecimal("0.00"));
detail.setCreateBy(user.getId()); detail.setCreateBy(null == user ? "1" : user.getId());
detail.setCreateName(user.getNickname()); detail.setCreateName(null == user ? "自动化派单" : user.getNickname());
detailList.add(detail); detailList.add(detail);
sourceIdCardList.add(detail.getEmpIdcardNo()); sourceIdCardList.add(detail.getEmpIdcardNo());
baseMapper.insert(detail); baseMapper.insert(detail);
...@@ -420,9 +419,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -420,9 +419,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return R.failed(InsurancesConstants.IMPORT_TOO_LONG); return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
} }
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList,user); Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList,user);
//返回给前端的结果 //返回给前端的结果
List<InsuranceBatchParam> listResult = map.get("listResult"); List<InsuranceBatchParam> listResult = map.get("listResult");
...@@ -442,12 +438,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -442,12 +438,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail.setBuyHandleStatus(CommonConstants.ONE_INT); detail.setBuyHandleStatus(CommonConstants.ONE_INT);
//保费都默认是0 //保费都默认是0
detail.setOrderNo(orderNo); detail.setOrderNo(orderNo);
detail.setCreateUserDeptId(user.getDeptId().toString()); if (Common.isNotNull(user)) {
detail.setCreateUserDeptName(user.getDeptName()); detail.setCreateUserDeptId(user.getDeptId().toString());
detail.setCreateUserDeptName(user.getDeptName());
}
detail.setActualPremium(new BigDecimal("0.00")); detail.setActualPremium(new BigDecimal("0.00"));
detail.setEstimatePremium(new BigDecimal("0.00")); detail.setEstimatePremium(new BigDecimal("0.00"));
detail.setCreateBy(user.getId()); detail.setCreateBy(null == user ? "1" : user.getId());
detail.setCreateName(user.getNickname()); detail.setCreateName(null == user ? "自动化派单" : user.getNickname());
detailList.add(detail); detailList.add(detail);
sourceIdCardList.add(detail.getEmpIdcardNo()); sourceIdCardList.add(detail.getEmpIdcardNo());
replaceIdList.add(detail.getId()); replaceIdList.add(detail.getId());
...@@ -491,9 +489,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -491,9 +489,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return R.failed(InsurancesConstants.IMPORT_TOO_LONG); return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
} }
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
Map<String, List<InsuranceReplaceParam>> map = replaceInsuranceCheck(paramList,user); Map<String, List<InsuranceReplaceParam>> map = replaceInsuranceCheck(paramList,user);
//返回给前端的结果 //返回给前端的结果
List<InsuranceReplaceParam> listResult = map.get("listResult"); List<InsuranceReplaceParam> listResult = map.get("listResult");
...@@ -553,13 +548,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -553,13 +548,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
newDetail.setIsUse(null); newDetail.setIsUse(null);
newDetail.setIsEffect(null); newDetail.setIsEffect(null);
newDetail.setReduceHandleStatus(null); newDetail.setReduceHandleStatus(null);
newDetail.setCreateUserDeptId(user.getDeptId().toString()); if (Common.isNotNull(user)) {
newDetail.setCreateUserDeptName(user.getDeptName()); newDetail.setCreateUserDeptId(user.getDeptId().toString());
newDetail.setCreateUserDeptName(user.getDeptName());
}
newDetail.setSignFlag(CommonConstants.ZERO_INT); newDetail.setSignFlag(CommonConstants.ZERO_INT);
//创建时间是新数据插入时间 //创建时间是新数据插入时间
newDetail.setCreateTime(LocalDateTime.now()); newDetail.setCreateTime(LocalDateTime.now());
newDetail.setCreateBy(user.getId()); newDetail.setCreateBy(null == user ? "1" : user.getId());
newDetail.setCreateName(user.getNickname()); newDetail.setCreateName(null == user ? "自动化派单" : user.getNickname());
//替换不参与结算 //替换不参与结算
newDetail.setDefaultSettleId(null); newDetail.setDefaultSettleId(null);
//替换不继承备注 20250331 fxj 替换模板新增备注字段不用清空 //替换不继承备注 20250331 fxj 替换模板新增备注字段不用清空
...@@ -586,8 +583,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -586,8 +583,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
replace.setReplaceStatus(CommonConstants.ONE_INT); replace.setReplaceStatus(CommonConstants.ONE_INT);
replace.setReplaceTime(LocalDateTime.now()); replace.setReplaceTime(LocalDateTime.now());
replace.setCreateBy(user.getId()); replace.setCreateBy(null == user ? "1" : user.getId());
replace.setCreateName(user.getNickname()); replace.setCreateName(null == user ? "自动化派单" : user.getNickname());
replace.setCreateTime(LocalDateTime.now()); replace.setCreateTime(LocalDateTime.now());
tInsuranceReplaceService.save(replace); tInsuranceReplaceService.save(replace);
updateEmployeeInsurancePre(success.getInsurancePreId(),newDetail,CommonConstants.THREE_STRING); updateEmployeeInsurancePre(success.getInsurancePreId(),newDetail,CommonConstants.THREE_STRING);
...@@ -2673,7 +2670,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2673,7 +2670,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link Map<String, List<InsuranceAddParam>>} * @return {@link Map<String, List<InsuranceAddParam>>}
*/ */
private Map<String,List<InsuranceAddParam>> addInsuranceCheck(List<InsuranceAddParam> paramList,YifuUser user){ private Map<String,List<InsuranceAddParam>> addInsuranceCheck(List<InsuranceAddParam> paramList,YifuUser user){
List<String> deptNoList = getDeptNoList(user); List<String> deptNoList = getDeptNoList(null == user ? "1" : user.getId());
Map<String,List<InsuranceAddParam>> map = new HashMap<>(); Map<String,List<InsuranceAddParam>> map = new HashMap<>();
List<InsuranceAddParam> listResult = new ArrayList<>(); List<InsuranceAddParam> listResult = new ArrayList<>();
List<InsuranceAddParam> listSuccess = new ArrayList<>(); List<InsuranceAddParam> listSuccess = new ArrayList<>();
...@@ -3041,7 +3038,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3041,7 +3038,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link Map< String, List< InsuranceBatchParam>>} * @return {@link Map< String, List< InsuranceBatchParam>>}
*/ */
private Map<String,List<InsuranceBatchParam>> batchInsuranceCheck(List<InsuranceBatchParam> paramList,YifuUser user){ private Map<String,List<InsuranceBatchParam>> batchInsuranceCheck(List<InsuranceBatchParam> paramList,YifuUser user){
List<String> deptNoList = getDeptNoList(user); List<String> deptNoList = getDeptNoList(null == user ? "1" : user.getId());
Map<String,List<InsuranceBatchParam>> map = new HashMap<>(); Map<String,List<InsuranceBatchParam>> map = new HashMap<>();
List<InsuranceBatchParam> listResult = new ArrayList<>(); List<InsuranceBatchParam> listResult = new ArrayList<>();
List<InsuranceBatchParam> listSuccess = new ArrayList<>(); List<InsuranceBatchParam> listSuccess = new ArrayList<>();
...@@ -3409,7 +3406,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3409,7 +3406,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link Map< String, List<InsuranceReplaceParam>>} * @return {@link Map< String, List<InsuranceReplaceParam>>}
*/ */
private Map<String,List<InsuranceReplaceParam>> replaceInsuranceCheck(List<InsuranceReplaceParam> paramList,YifuUser user){ private Map<String,List<InsuranceReplaceParam>> replaceInsuranceCheck(List<InsuranceReplaceParam> paramList,YifuUser user){
List<String> deptNoList = getDeptNoList(user); List<String> deptNoList = getDeptNoList(null == user ? "1" : user.getId());
Map<String,List<InsuranceReplaceParam>> map = new HashMap<>(); Map<String,List<InsuranceReplaceParam>> map = new HashMap<>();
List<InsuranceReplaceParam> listResult = new ArrayList<>(); List<InsuranceReplaceParam> listResult = new ArrayList<>();
List<InsuranceReplaceParam> listSuccess = new ArrayList<>(); List<InsuranceReplaceParam> listSuccess = new ArrayList<>();
...@@ -4289,8 +4286,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -4289,8 +4286,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
operate.setDisplayFlag(displayFlag); operate.setDisplayFlag(displayFlag);
operate.setInsuranceDetailId(detail.getId()); operate.setInsuranceDetailId(detail.getId());
operate.setOperateDesc(operateDesc); operate.setOperateDesc(operateDesc);
operate.setCreateBy(user.getId()); if (Common.isNotNull(user)) {
operate.setCreateName(user.getNickname()); operate.setCreateBy(user.getId());
operate.setCreateName(user.getNickname());
}else {
operate.setCreateBy("1");
operate.setCreateName("自动化派单");
}
operate.setCreateTime(LocalDateTime.now()); operate.setCreateTime(LocalDateTime.now());
operateList.add(operate); operateList.add(operate);
} }
...@@ -6070,7 +6072,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -6070,7 +6072,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link R} * @return {@link R}
*/ */
public Map<String,List<InsuranceRefundCheck>> checkInsuranceRefundList(List<InsuranceRefundCheck> insuranceRefundCheckList,YifuUser user){ public Map<String,List<InsuranceRefundCheck>> checkInsuranceRefundList(List<InsuranceRefundCheck> insuranceRefundCheckList,YifuUser user){
List<String> deptNoList = getDeptNoList(user); List<String> deptNoList = getDeptNoList(null == user ? "1" : user.getId());
List<InsuranceRefundCheck> errorList = new ArrayList<>(128); List<InsuranceRefundCheck> errorList = new ArrayList<>(128);
List<InsuranceRefundCheck> successList = new ArrayList<>(); List<InsuranceRefundCheck> successList = new ArrayList<>();
Map<String,List<InsuranceRefundCheck>> map = new HashMap<>(); Map<String,List<InsuranceRefundCheck>> map = new HashMap<>();
...@@ -6387,7 +6389,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -6387,7 +6389,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link R} * @return {@link R}
*/ */
private Map<String,List<SettleMonthChangeCheckParam>> settleMonthChangeCheck(List<SettleMonthChangeCheckParam> settleMonthCheckList,YifuUser user) { private Map<String,List<SettleMonthChangeCheckParam>> settleMonthChangeCheck(List<SettleMonthChangeCheckParam> settleMonthCheckList,YifuUser user) {
List<String> deptNoList = getDeptNoList(user); List<String> deptNoList = getDeptNoList(null == user ? "1" : user.getId());
Map<String,List<SettleMonthChangeCheckParam>> map = new HashMap<>(16); Map<String,List<SettleMonthChangeCheckParam>> map = new HashMap<>(16);
List<SettleMonthChangeCheckParam> errorList = new ArrayList<>(); List<SettleMonthChangeCheckParam> errorList = new ArrayList<>();
List<SettleMonthChangeCheckParam> successList = new ArrayList<>(); List<SettleMonthChangeCheckParam> successList = new ArrayList<>();
...@@ -6832,7 +6834,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -6832,7 +6834,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link R} * @return {@link R}
*/ */
public Map<String,List<DeptChangeCheckParam>> deptChangeCheck(List<DeptChangeCheckParam> deptChangeCheckList,YifuUser user) { public Map<String,List<DeptChangeCheckParam>> deptChangeCheck(List<DeptChangeCheckParam> deptChangeCheckList,YifuUser user) {
List<String> deptNoList = getDeptNoList(user); List<String> deptNoList = getDeptNoList(null == user ? "1" : user.getId());
Map<String,List<DeptChangeCheckParam>> map = new HashMap<>(16); Map<String,List<DeptChangeCheckParam>> map = new HashMap<>(16);
List<DeptChangeCheckParam> errorList = new ArrayList<>(); List<DeptChangeCheckParam> errorList = new ArrayList<>();
List<DeptChangeCheckParam> successList = new ArrayList<>(); List<DeptChangeCheckParam> successList = new ArrayList<>();
...@@ -7163,7 +7165,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7163,7 +7165,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
public R getDeptListByUser(){ public R getDeptListByUser(){
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
//根据当前登录人获取其拥有的项目列表权限 //根据当前登录人获取其拥有的项目列表权限
List<String> deptNoList = getDeptNoList(user); List<String> deptNoList = getDeptNoList(null == user ? "1" : user.getId());
List<Dept> deptList = new ArrayList<>(16); List<Dept> deptList = new ArrayList<>(16);
if (CollectionUtils.isNotEmpty(deptNoList)){ if (CollectionUtils.isNotEmpty(deptNoList)){
R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(deptNoList); R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(deptNoList);
...@@ -7368,13 +7370,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7368,13 +7370,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* 获取项目权限 * 获取项目权限
* *
* @author zhaji * @author zhaji
* @param user * @param userId
* @return {@link List< String>} * @return {@link List< String>}
*/ */
public List<String> getDeptNoList(YifuUser user){ public List<String> getDeptNoList(String userId){
List<String> deptList = new ArrayList<>(16); List<String> deptList = new ArrayList<>(16);
try{ try{
R<TSettleDomainListVo> settleDomainList = archivesDaprUtil.getSettleDomainIdsByUserId(user.getId()); R<TSettleDomainListVo> settleDomainList = archivesDaprUtil.getSettleDomainIdsByUserId(userId);
if(Common.isNotNull(settleDomainList) && settleDomainList.getCode() == CommonConstants.SUCCESS){ if(Common.isNotNull(settleDomainList) && settleDomainList.getCode() == CommonConstants.SUCCESS){
TSettleDomainListVo data = settleDomainList.getData(); TSettleDomainListVo data = settleDomainList.getData();
if (Optional.ofNullable(data).isPresent()){ if (Optional.ofNullable(data).isPresent()){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment