diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java index 35036ca2..ee2647ae 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java @@ -78,7 +78,7 @@ public class CrmsCompanyPersonalController { @ApiOperation(value = "编辑个人/企业关联人") public ResponseResult updateCompanyPersonal(@RequestBody CrmsCompanyPersonal crmsCompanyPersonal){ boolean result = crmsCompanyPersonalService.updateById(crmsCompanyPersonal); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS(crmsCompanyPersonal) : ResponseResult.FAIL(); } /** diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index 32a1ed71..b61be868 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -396,6 +396,11 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl().eq("business_id",businessApplication.getBusinessId())); + + //同时往审核流程进程表新增一条记录 + String account = dgApplyAmountInfoController.getAccount(); + AuditProcessUtil.save(businessApplication.getBusinessId(),account,"担保业务员","",1,"","",""); + //附件新增 return dgEnclosureInfoMapper.insert(dgEnclosureInfo); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java index 8c1d701c..06b2a305 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java @@ -164,22 +164,23 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl() .eq("business_id", assetsResponse.getBusinessId()).eq("type", 1)); - String assetsAmounts=assetsInvestigation.getAssetsAmount(); - if(assetsAmounts != null){ - if(assetsAmounts.length()>0){ - String a = assetsAmounts.substring(1,assetsAmounts.length()-1); - String arry[]=a.split(","); - List demoList = Arrays.asList(arry); - assetsResponse.setAssetsAmountList(demoList); + if(assetsInvestigation != null){ + String assetsAmounts=assetsInvestigation.getAssetsAmount(); + if(assetsAmounts != null){ + if(assetsAmounts.length()>0){ + String a = assetsAmounts.substring(1,assetsAmounts.length()-1); + String arry[]=a.split(","); + List demoList = Arrays.asList(arry); + assetsResponse.setAssetsAmountList(demoList); + } } - } - AssetsInvestigationResponse assetsInvestigationRes = new AssetsInvestigationResponse(); - if(assetsInvestigation != null){ - BeanUtils.copyProperties(assetsInvestigation,assetsInvestigationRes); - BeanUtils.copyProperties(assetsInvestigationRes,assetsResponse); + AssetsInvestigationResponse assetsInvestigationRes = new AssetsInvestigationResponse(); + if(assetsInvestigation != null){ + BeanUtils.copyProperties(assetsInvestigation,assetsInvestigationRes); + BeanUtils.copyProperties(assetsInvestigationRes,assetsResponse); + } } - //根据业务id查询评估价值List /* List assessmentlist = dgAssetsAssessmentAssetsLogMapper.selectList( new QueryWrapper().eq("business_id",assetsResponse.getBusinessId())); @@ -423,8 +424,12 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl