|
@@ -135,21 +135,40 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void firstReview(SupplierInfo supplierInfo) {
|
|
|
- //保存企业审核信息
|
|
|
- Enterprise enterprise = supplierInfo.getEnterprise();
|
|
|
- saveInfo(enterprise,supplierInfo.getId());
|
|
|
- //保存担保企业审核信息
|
|
|
+ //保存第一步审核结论
|
|
|
+ SupplierApprovalFirst supplierApprovalFirst = lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, supplierInfo.getId()).eq(SupplierApprovalFirst::getVisible, false).one();
|
|
|
+ if(supplierApprovalFirst == null){
|
|
|
+ supplierApprovalFirst = new SupplierApprovalFirst();
|
|
|
+ }
|
|
|
+ supplierApprovalFirst.setVisible(supplierInfo.getVisible());
|
|
|
+ supplierApprovalFirst.setApprovalComment(supplierInfo.getApprovalComment());
|
|
|
+ supplierApprovalFirst.setApprovalConclusion(supplierInfo.getApprovalConclusion());
|
|
|
+ save(supplierApprovalFirst);
|
|
|
Enterprise guaranteeEnterprise = supplierInfo.getGuaranteeEnterprise();
|
|
|
- if(guaranteeEnterprise != null){
|
|
|
- saveInfo(guaranteeEnterprise, supplierInfo.getId());
|
|
|
+ Enterprise enterprise = supplierInfo.getEnterprise();
|
|
|
+ if(supplierInfo.getApprovalConclusion().equals(ConstantConversionUtil.APPROVAL_RESULT_PASS)){
|
|
|
+ supplierInfo.setSupplierApprovalFirst(supplierApprovalFirst);
|
|
|
+ //保存企业审核信息
|
|
|
+ saveInfo(enterprise,supplierApprovalFirst.getId());
|
|
|
+ //保存担保企业审核信息
|
|
|
+ if(guaranteeEnterprise != null){
|
|
|
+ saveInfo(guaranteeEnterprise, supplierApprovalFirst.getId());
|
|
|
+ }
|
|
|
}
|
|
|
//流程处理
|
|
|
if(supplierInfo.getVisible()){
|
|
|
//保存第一步审核结论
|
|
|
- SupplierApprovalFirst supplierApprovalFirst = measurement(supplierInfo);
|
|
|
- save(supplierApprovalFirst);
|
|
|
+ supplierApprovalFirst = measurement(supplierInfo);
|
|
|
+ updateById(supplierApprovalFirst);
|
|
|
String taskId = supplierInfo.getTaskId();
|
|
|
- String result = "通过";
|
|
|
+ String result ;
|
|
|
+ if(supplierInfo.getApprovalConclusion().equals(ConstantConversionUtil.APPROVAL_RESULT_BACK)){
|
|
|
+ result = "退回";
|
|
|
+ }else if(supplierInfo.getApprovalConclusion().equals(ConstantConversionUtil.APPROVAL_RESULT_PASS)){
|
|
|
+ result = "通过";
|
|
|
+ }else {
|
|
|
+ throw new ServiceException(CodeUtil.FAIL,"审批结论出错!");
|
|
|
+ }
|
|
|
Long mainEnterpriseCount = supplierApprovalFirst.getMainEnterpriseCount();
|
|
|
if(mainEnterpriseCount > 0){
|
|
|
result = "红否";
|
|
@@ -169,7 +188,13 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
|
|
|
"供应商名称为“" + enterprise.getCorporateName() + "”的供应商已进入“"
|
|
|
+ ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.SUPPLIER_INFO) + "—供应商审核第二步,"
|
|
|
+ ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
|
|
|
+ }else if(result.equals("退回")){
|
|
|
+ msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
|
|
|
+ "供应商名称为“" + enterprise.getCorporateName() + "”的供应商已进入“"
|
|
|
+ + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.SUPPLIER_INFO) + "—C端供应商录入,"
|
|
|
+ + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
|
|
|
}else {
|
|
|
+ supplierApprovalFirst.setApprovalConclusion(ConstantConversionUtil.APPROVAL_RESULT_VETO);
|
|
|
supplierInfoService.lambdaUpdate().eq(SupplierInfo::getId,supplierInfo.getId()).set(SupplierInfo::getStatusStr, SupplierStatusEnums.VOTE.getCode()).update();
|
|
|
msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
|
|
|
"供应商名称为“" + enterprise.getCorporateName() + "”的供应商审核已被否决");
|
|
@@ -185,8 +210,8 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
|
|
|
for (CreditSituation creditSituation : creditSituations) {
|
|
|
creditSituationService.lambdaUpdate()
|
|
|
.eq(CreditSituation::getcCreditInvestigationInfoHistoryId,creditSituation.getcCreditInvestigationInfoHistoryId())
|
|
|
- .eq(CreditSituation::getcSupplierInfoId,id).remove();
|
|
|
- creditSituation.setcSupplierInfoId(id);
|
|
|
+ .eq(CreditSituation::getSupplierApprovalFirstId,id).remove();
|
|
|
+ creditSituation.setSupplierApprovalFirstId(id);
|
|
|
creditSituationService.save(creditSituation);
|
|
|
}
|
|
|
}else {
|
|
@@ -280,29 +305,31 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
|
|
|
User riskManager = userService.get(dueDiligenceAllocation.getRiskManagerId());
|
|
|
dueDiligenceAllocation.setRiskManager(riskManager);
|
|
|
supplierInfo.setDueDiligenceAllocation(dueDiligenceAllocation);
|
|
|
-
|
|
|
- SupplierApprovalFirst supplierApprovalFirst = lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, id).one();
|
|
|
+ SupplierApprovalFirst supplierApprovalFirst = lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, id).eq(SupplierApprovalFirst::getVisible,false)
|
|
|
+ .orderByDesc(SupplierApprovalFirst::getGmtCreate).list().get(0);
|
|
|
supplierInfo.setHistoryId(supplierInfoHistory.getId());
|
|
|
supplierInfo.setSupplierApprovalFirst(supplierApprovalFirst);
|
|
|
|
|
|
CEnterpriseHistory enterpriseHistory = enterpriseHistoryService.getById(supplierInfoHistory.getcEnterpriseHistoryId());
|
|
|
Enterprise enterprise = enterpriseService.getById(supplierInfo.getcEnterpriseId());
|
|
|
- autoFirstReview(id,enterprise,enterpriseHistory);
|
|
|
+ autoFirstReview(supplierInfo,enterprise,enterpriseHistory);
|
|
|
supplierInfo.setEnterprise(enterprise);
|
|
|
supplierInfo.setHasGuaranteeEnterprise(false);
|
|
|
if(supplierInfo.getGuaranteeEnterpriseId() != null){
|
|
|
supplierInfo.setHasGuaranteeEnterprise(true);
|
|
|
CEnterpriseHistory enteguaranteeHistory = enterpriseHistoryService.getById(supplierInfoHistory.getGuaranteeEnterpriseHistoryId());
|
|
|
Enterprise guaranteeEnterprise = enterpriseService.getById(supplierInfo.getGuaranteeEnterpriseId());
|
|
|
- autoFirstReview(id,guaranteeEnterprise, enteguaranteeHistory);
|
|
|
+ autoFirstReview(supplierInfo,guaranteeEnterprise, enteguaranteeHistory);
|
|
|
supplierInfo.setGuaranteeEnterprise(guaranteeEnterprise);
|
|
|
}
|
|
|
return supplierInfo;
|
|
|
}
|
|
|
|
|
|
- private void autoFirstReview(Long id,Enterprise enterprise, CEnterpriseHistory enterpriseHistory) {
|
|
|
+ private void autoFirstReview(SupplierInfo supplierInfo,Enterprise enterprise, CEnterpriseHistory enterpriseHistory) {
|
|
|
+ Long firstReviewId = supplierInfo.getSupplierApprovalFirst().getId();
|
|
|
+ Long id = supplierInfo.getId();
|
|
|
//企业负责人征信情况
|
|
|
- List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getcSupplierInfoId, id).list();
|
|
|
+ List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getSupplierApprovalFirstId, firstReviewId).list();
|
|
|
List<CreditSituation> creditSituationsResult = new ArrayList<>();
|
|
|
if(CollectionUtil.isNotEmpty(creditSituations)){
|
|
|
for (CreditSituation creditSituation : creditSituations) {
|
|
@@ -349,7 +376,7 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
|
|
|
creditInvestigationInfoHistory.setTypeStr(dictionaryService.getByCode(creditInvestigationInfoHistory.getType()).getName());
|
|
|
creditInvestigationInfoHistory.setCardFiles(cardFiles);
|
|
|
CreditSituation creditSituation = new CreditSituation();
|
|
|
- creditSituation.setcSupplierInfoId(id);
|
|
|
+ creditSituation.setSupplierApprovalFirstId(firstReviewId);
|
|
|
creditSituation.setcCreditInvestigationInfoHistoryId(creditInvestigationInfoHistory.getId());
|
|
|
//todo 填充征信报告
|
|
|
CreditInfo creditInfo = creditService.lambdaQuery().eq(CreditInfo::getCardNo, creditInvestigationInfoHistory.getSocialCreditCode()).one();
|
|
@@ -611,14 +638,14 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
|
|
|
supplierInfo.setSupplierApprovalFirst(supplierApprovalFirst);
|
|
|
CEnterpriseHistory enterpriseHistory = enterpriseHistoryService.getById(supplierInfoHistory.getcEnterpriseHistoryId());
|
|
|
Enterprise enterprise = enterpriseService.getById(supplierInfo.getcEnterpriseId());
|
|
|
- autoView(supplierInfo.getId(),enterprise,enterpriseHistory);
|
|
|
+ autoView(supplierInfo,enterprise,enterpriseHistory);
|
|
|
supplierInfo.setEnterprise(enterprise);
|
|
|
supplierInfo.setHasGuaranteeEnterprise(false);
|
|
|
if(supplierInfo.getGuaranteeEnterpriseId() != null){
|
|
|
supplierInfo.setHasGuaranteeEnterprise(true);
|
|
|
CEnterpriseHistory guaranteeHistory = enterpriseHistoryService.getById(supplierInfoHistory.getGuaranteeEnterpriseHistoryId());
|
|
|
Enterprise guarantee = enterpriseService.getById(supplierInfo.getGuaranteeEnterpriseId());
|
|
|
- autoView(supplierInfo.getId(),guarantee,guaranteeHistory);
|
|
|
+ autoView(supplierInfo,guarantee,guaranteeHistory);
|
|
|
supplierInfo.setGuaranteeEnterprise(guarantee);
|
|
|
}
|
|
|
return supplierInfo;
|
|
@@ -626,7 +653,7 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
|
|
|
|
|
|
@Override
|
|
|
public SupplierApprovalFirst measurement(SupplierInfo supplierInfo) {
|
|
|
- SupplierApprovalFirst supplierApprovalFirst = new SupplierApprovalFirst();
|
|
|
+ SupplierApprovalFirst supplierApprovalFirst = supplierInfo.getSupplierApprovalFirst();
|
|
|
supplierApprovalFirst.setcSupplierInfoId(supplierInfo.getId());
|
|
|
supplierApprovalFirst.setcSupplierInfoHistoryId(supplierInfo.getHistoryId());
|
|
|
//企业审核信息
|
|
@@ -645,10 +672,10 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
|
|
|
List<CreditSituation> creditSituations = enterprise.getCreditSituations();
|
|
|
if(CollectionUtil.isNotEmpty(creditSituations)){
|
|
|
for (CreditSituation creditSituation : creditSituations) {
|
|
|
- creditSituation.setcSupplierInfoId(supplierApprovalFirst.getcSupplierInfoId());
|
|
|
+ creditSituation.setSupplierApprovalFirstId(supplierApprovalFirst.getId());
|
|
|
creditSituationService.lambdaUpdate()
|
|
|
.eq(CreditSituation::getcCreditInvestigationInfoHistoryId,creditSituation.getcCreditInvestigationInfoHistoryId())
|
|
|
- .eq(CreditSituation::getcSupplierInfoId,supplierApprovalFirst.getcSupplierInfoId()).remove();
|
|
|
+ .eq(CreditSituation::getSupplierApprovalFirstId,supplierApprovalFirst.getId()).remove();
|
|
|
creditSituationService.save(creditSituation);
|
|
|
//近两年发生过逾期的账户数≥3且合计金额≥5000元
|
|
|
if(creditSituation.getNumberOfOverdueAccounts() >= 3 && creditSituation.getTotalOverdueAmount().compareTo(new BigDecimal(5000)) > -1){
|
|
@@ -790,9 +817,11 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private void autoView(Long id, Enterprise enterprise,CEnterpriseHistory enterpriseHistory) {
|
|
|
+ private void autoView(SupplierInfo supplierInfo, Enterprise enterprise,CEnterpriseHistory enterpriseHistory) {
|
|
|
+ Long id = supplierInfo.getId();
|
|
|
+ Long firstReviewId = supplierInfo.getSupplierApprovalFirst().getId();
|
|
|
//企业负责人征信情况
|
|
|
- List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getcSupplierInfoId, id).list();
|
|
|
+ List<CreditSituation> creditSituations = creditSituationService.lambdaQuery().eq(CreditSituation::getSupplierApprovalFirstId, firstReviewId).list();
|
|
|
List<CreditSituation> creditSituationsResult = new ArrayList<>();
|
|
|
if(CollectionUtil.isNotEmpty(creditSituations)){
|
|
|
for (CreditSituation creditSituation : creditSituations) {
|