Commit 7cb40eb0 authored by fangxinjiang's avatar fangxinjiang

商险自动化限制:新增、批增、替换-fxj

parent 541caeab
...@@ -104,7 +104,11 @@ ...@@ -104,7 +104,11 @@
<artifactId>yifu-common-ekp</artifactId> <artifactId>yifu-common-ekp</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-cp</artifactId>
<version>4.7.0</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -132,7 +132,7 @@ public class TInsuranceDetailController { ...@@ -132,7 +132,7 @@ public class TInsuranceDetailController {
@PostMapping("/addInsurance") @PostMapping("/addInsurance")
@PreAuthorize("@pms.hasPermission('insurance_custserve_insure_add')") @PreAuthorize("@pms.hasPermission('insurance_custserve_insure_add')")
public R<List<InsuranceAddParam>> addInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceAddParam> paramList){ public R<List<InsuranceAddParam>> addInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceAddParam> paramList){
return tInsuranceDetailService.addInsurance(paramList,null); return tInsuranceDetailService.addInsurance(paramList,null,false);
} }
/** /**
...@@ -146,7 +146,7 @@ public class TInsuranceDetailController { ...@@ -146,7 +146,7 @@ public class TInsuranceDetailController {
@PostMapping("/batchInsurance") @PostMapping("/batchInsurance")
@PreAuthorize("@pms.hasPermission('insurance_custserve_insure_batch_add')") @PreAuthorize("@pms.hasPermission('insurance_custserve_insure_batch_add')")
public R<List<InsuranceBatchParam>> batchInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceBatchParam> paramList){ public R<List<InsuranceBatchParam>> batchInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceBatchParam> paramList){
return tInsuranceDetailService.batchInsurance(paramList,null); return tInsuranceDetailService.batchInsurance(paramList,null,false);
} }
/** /**
...@@ -160,7 +160,7 @@ public class TInsuranceDetailController { ...@@ -160,7 +160,7 @@ public class TInsuranceDetailController {
@PostMapping("/replaceInsurance") @PostMapping("/replaceInsurance")
@PreAuthorize("@pms.hasPermission('insurance_custserve_insure_update')") @PreAuthorize("@pms.hasPermission('insurance_custserve_insure_update')")
public R<List<InsuranceReplaceParam>> replaceInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceReplaceParam> paramList){ public R<List<InsuranceReplaceParam>> replaceInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceReplaceParam> paramList){
return tInsuranceDetailService.replaceInsurance(paramList,null); return tInsuranceDetailService.replaceInsurance(paramList,null,false);
} }
/** /**
......
...@@ -82,7 +82,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> { ...@@ -82,7 +82,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param paramList * @param paramList
* @return {@link R<List<InsuranceAddParam>>} * @return {@link R<List<InsuranceAddParam>>}
*/ */
R<List<InsuranceAddParam>> addInsurance(List<InsuranceAddParam> paramList,String orderNo); R<List<InsuranceAddParam>> addInsurance(List<InsuranceAddParam> paramList,String orderNo,boolean autoFlag);
/** /**
* 商险批增 * 商险批增
...@@ -91,7 +91,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> { ...@@ -91,7 +91,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param paramList * @param paramList
* @return {@link R<List<InsuranceBatchParam>>} * @return {@link R<List<InsuranceBatchParam>>}
*/ */
R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList,String orderNo); R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList,String orderNo,boolean autoFlag);
/** /**
* 商险替换 * 商险替换
* *
...@@ -99,7 +99,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> { ...@@ -99,7 +99,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param paramList * @param paramList
* @return {@link R<List<InsuranceReplaceParam>>} * @return {@link R<List<InsuranceReplaceParam>>}
*/ */
R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList,String orderNo); R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList,String orderNo,boolean autoFlag);
/** /**
* 通过id删除 * 通过id删除
......
...@@ -269,19 +269,19 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -269,19 +269,19 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
List<InsuranceBatchParam> batchParamList = new ArrayList<>(); List<InsuranceBatchParam> batchParamList = new ArrayList<>();
List<InsuranceReplaceParam> replaceParamList = new ArrayList<>(); List<InsuranceReplaceParam> replaceParamList = new ArrayList<>();
if (!addParamList.isEmpty()) { if (!addParamList.isEmpty()) {
R<List<InsuranceAddParam>> listR = detailService.addInsurance(addParamList,null); R<List<InsuranceAddParam>> listR = detailService.addInsurance(addParamList,null,true);
if (Common.isNotNull(listR) && Common.isNotNull(listR.getData()) && !listR.getData().isEmpty()) { if (Common.isNotNull(listR) && Common.isNotNull(listR.getData()) && !listR.getData().isEmpty()) {
paramList = listR.getData(); paramList = listR.getData();
} }
} }
if (!batchAddParamList.isEmpty()) { if (!batchAddParamList.isEmpty()) {
R<List<InsuranceBatchParam>> listR = detailService.batchInsurance(batchAddParamList,null); R<List<InsuranceBatchParam>> listR = detailService.batchInsurance(batchAddParamList,null,true);
if (Common.isNotNull(listR) && Common.isNotNull(listR.getData()) && !listR.getData().isEmpty()) { if (Common.isNotNull(listR) && Common.isNotNull(listR.getData()) && !listR.getData().isEmpty()) {
batchParamList = listR.getData(); batchParamList = listR.getData();
} }
} }
if (!replaceAddParamList.isEmpty()) { if (!replaceAddParamList.isEmpty()) {
R<List<InsuranceReplaceParam>> listR = detailService.replaceInsurance(replaceAddParamList,null); R<List<InsuranceReplaceParam>> listR = detailService.replaceInsurance(replaceAddParamList,null,true);
if (Common.isNotNull(listR) && Common.isNotNull(listR.getData()) && !listR.getData().isEmpty()) { if (Common.isNotNull(listR) && Common.isNotNull(listR.getData()) && !listR.getData().isEmpty()) {
replaceParamList = listR.getData(); replaceParamList = listR.getData();
} }
......
...@@ -334,12 +334,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -334,12 +334,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* 商险新增 * 商险新增
* *
* @param paramList * @param paramList
* @param autoFlag true 自动化 false 非自动还
* @return {@link R <List<InsuranceAddParam>>} * @return {@link R <List<InsuranceAddParam>>}
* @author licancan * @author licancan
*/ */
@Override @Override
@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class}) @Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
public R<List<InsuranceAddParam>> addInsurance(List<InsuranceAddParam> paramList,String orderNo) { public R<List<InsuranceAddParam>> addInsurance(List<InsuranceAddParam> paramList,String orderNo,boolean autoFlag) {
if (CollectionUtils.isEmpty(paramList)){ if (CollectionUtils.isEmpty(paramList)){
return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY); return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
} }
...@@ -347,7 +348,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -347,7 +348,7 @@ 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();
Map<String, List<InsuranceAddParam>> map = addInsuranceCheck(paramList,user); Map<String, List<InsuranceAddParam>> map = addInsuranceCheck(paramList,user,autoFlag);
//返回给前端的结果 //返回给前端的结果
List<InsuranceAddParam> listResult = map.get("listResult"); List<InsuranceAddParam> listResult = map.get("listResult");
//保存到数据库中的结果 //保存到数据库中的结果
...@@ -413,12 +414,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -413,12 +414,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* 商险批增 * 商险批增
* *
* @param paramList * @param paramList
* @param autoFlag true 自动化 false 非自动还
* @return {@link R<List<InsuranceBatchParam>>} * @return {@link R<List<InsuranceBatchParam>>}
* @author licancan * @author licancan
*/ */
@Override @Override
@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class}) @Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
public R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList,String orderNo) { public R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList,String orderNo,boolean autoFlag) {
if (CollectionUtils.isEmpty(paramList)){ if (CollectionUtils.isEmpty(paramList)){
return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY); return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
} }
...@@ -426,7 +428,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -426,7 +428,7 @@ 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();
Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList,user); Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList,user,autoFlag);
//返回给前端的结果 //返回给前端的结果
List<InsuranceBatchParam> listResult = map.get("listResult"); List<InsuranceBatchParam> listResult = map.get("listResult");
//保存到数据库中的结果 //保存到数据库中的结果
...@@ -489,12 +491,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -489,12 +491,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* 商险替换 * 商险替换
* *
* @param paramList * @param paramList
* @param autoFlag true 自动化 false 非自动还
* @return {@link R<List<InsuranceReplaceParam>>} * @return {@link R<List<InsuranceReplaceParam>>}
* @author licancan * @author licancan
*/ */
@Override @Override
@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class}) @Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
public R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList,String orderNo) { public R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList,String orderNo,boolean autoFlag) {
if (CollectionUtils.isEmpty(paramList)){ if (CollectionUtils.isEmpty(paramList)){
return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY); return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
} }
...@@ -502,7 +505,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -502,7 +505,7 @@ 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();
Map<String, List<InsuranceReplaceParam>> map = replaceInsuranceCheck(paramList,user); Map<String, List<InsuranceReplaceParam>> map = replaceInsuranceCheck(paramList,user,autoFlag);
//返回给前端的结果 //返回给前端的结果
List<InsuranceReplaceParam> listResult = map.get("listResult"); List<InsuranceReplaceParam> listResult = map.get("listResult");
//保存到数据库中的结果 //保存到数据库中的结果
...@@ -2665,7 +2668,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2665,7 +2668,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @param paramList * @param paramList
* @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,boolean autoFlag){
//1.9.11超管无需校验项目权限 //1.9.11超管无需校验项目权限
List<String> deptNoList = new ArrayList<>(); List<String> deptNoList = new ArrayList<>();
if (Common.isNotNull(user) && !CommonConstants.ZERO_STRING.equals(user.getSystemFlag())) { if (Common.isNotNull(user) && !CommonConstants.ZERO_STRING.equals(user.getSystemFlag())) {
...@@ -2782,7 +2785,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2782,7 +2785,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
continue; continue;
} }
// 存在自动化配置且是启用的直接限制MVPV1.7.15 fxj 2025-09-17 // 存在自动化配置且是启用的直接限制MVPV1.7.15 fxj 2025-09-17
if (null != insurAutoMap.get(param.getDeptNo())){ if (!autoFlag && null != insurAutoMap.get(param.getDeptNo())){
param.setErrorMessage(InsurancesConstants.INSURANCE_AUTO_FLAG_IS_ENABLE); param.setErrorMessage(InsurancesConstants.INSURANCE_AUTO_FLAG_IS_ENABLE);
listResult.add(param); listResult.add(param);
continue; continue;
...@@ -3131,7 +3134,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3131,7 +3134,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @param paramList * @param paramList
* @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,boolean autoFlag){
//1.9.11超管无需校验项目权限 //1.9.11超管无需校验项目权限
List<String> deptNoList = new ArrayList<>(); List<String> deptNoList = new ArrayList<>();
if (Common.isNotNull(user) && !CommonConstants.ZERO_STRING.equals(user.getSystemFlag())) { if (Common.isNotNull(user) && !CommonConstants.ZERO_STRING.equals(user.getSystemFlag())) {
...@@ -3229,7 +3232,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3229,7 +3232,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
continue; continue;
} }
// 存在自动化配置且是启用的直接限制MVPV1.7.15 fxj 2025-09-17 // 存在自动化配置且是启用的直接限制MVPV1.7.15 fxj 2025-09-17
if (null != insurAutoMap.get(param.getDeptNo())){ if (!autoFlag && null != insurAutoMap.get(param.getDeptNo())){
param.setErrorMessage(InsurancesConstants.INSURANCE_AUTO_FLAG_IS_ENABLE); param.setErrorMessage(InsurancesConstants.INSURANCE_AUTO_FLAG_IS_ENABLE);
listResult.add(param); listResult.add(param);
continue; continue;
...@@ -3549,7 +3552,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3549,7 +3552,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @param paramList * @param paramList
* @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,boolean autoFlag){
//1.9.11超管无需校验项目权限 //1.9.11超管无需校验项目权限
List<String> deptNoList = new ArrayList<>(); List<String> deptNoList = new ArrayList<>();
if (Common.isNotNull(user) && !CommonConstants.ZERO_STRING.equals(user.getSystemFlag())) { if (Common.isNotNull(user) && !CommonConstants.ZERO_STRING.equals(user.getSystemFlag())) {
...@@ -3839,7 +3842,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3839,7 +3842,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
continue; continue;
} }
// 存在自动化配置且是启用的直接限制MVPV1.7.15 fxj 2025-09-17 // 存在自动化配置且是启用的直接限制MVPV1.7.15 fxj 2025-09-17
if (null != insurAutoMap.get(param.getReplaceDeptNo())){ if (!autoFlag && null != insurAutoMap.get(param.getReplaceDeptNo())){
param.setErrorMessage(InsurancesConstants.INSURANCE_AUTO_FLAG_IS_ENABLE); param.setErrorMessage(InsurancesConstants.INSURANCE_AUTO_FLAG_IS_ENABLE);
listResult.add(param); listResult.add(param);
continue; continue;
...@@ -7497,7 +7500,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7497,7 +7500,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (StringUtils.isBlank(orderNo)) { if (StringUtils.isBlank(orderNo)) {
return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY); return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY);
} }
return addInsurance(paramList.getData(),paramList.getOrderNo()); return addInsurance(paramList.getData(),paramList.getOrderNo(),false);
} }
@Override @Override
...@@ -7507,7 +7510,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7507,7 +7510,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (StringUtils.isBlank(orderNo)) { if (StringUtils.isBlank(orderNo)) {
return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY); return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY);
} }
return batchInsurance(paramList.getData(),paramList.getOrderNo()); return batchInsurance(paramList.getData(),paramList.getOrderNo(),false);
} }
@Override @Override
...@@ -7517,7 +7520,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7517,7 +7520,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (StringUtils.isBlank(orderNo)) { if (StringUtils.isBlank(orderNo)) {
return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY); return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY);
} }
return replaceInsurance(paramList.getData(),paramList.getOrderNo()); return replaceInsurance(paramList.getData(),paramList.getOrderNo(),false);
} }
@Override @Override
......
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