|
@@ -123,7 +123,7 @@ public class PersonalProductionServiceImpl extends ServiceImpl<PersonalProductio
|
|
@Override
|
|
@Override
|
|
public Boolean genFile(Long personalId, Integer tag) {
|
|
public Boolean genFile(Long personalId, Integer tag) {
|
|
//获取提供的证件信息
|
|
//获取提供的证件信息
|
|
- Personal personal = personalService.getOne(new LambdaQueryWrapper<Personal>().select(Personal::getCredentials).eq(BaseEntity::getId, personalId).eq(BaseEntity::getDeleted, Boolean.FALSE));
|
|
|
|
|
|
+ Personal personal = personalService.getOne(new LambdaQueryWrapper<Personal>().select(Personal::getCredentials,Personal::getEvaluateAim).eq(BaseEntity::getId, personalId).eq(BaseEntity::getDeleted, Boolean.FALSE));
|
|
String orderId = personalService.getOne(new LambdaQueryWrapper<Personal>().eq(BaseEntity::getId, personalId).select(Personal::getOrderId).eq(BaseEntity::getDeleted, Boolean.FALSE)).getOrderId();
|
|
String orderId = personalService.getOne(new LambdaQueryWrapper<Personal>().eq(BaseEntity::getId, personalId).select(Personal::getOrderId).eq(BaseEntity::getDeleted, Boolean.FALSE)).getOrderId();
|
|
PersonalTarget target = personalTargetService.getOne(new LambdaQueryWrapper<PersonalTarget>().eq(PersonalTarget::getPersonalId, personalId).eq(BaseEntity::getDeleted, Boolean.FALSE));
|
|
PersonalTarget target = personalTargetService.getOne(new LambdaQueryWrapper<PersonalTarget>().eq(PersonalTarget::getPersonalId, personalId).eq(BaseEntity::getDeleted, Boolean.FALSE));
|
|
List<CertificateEnum> certificates = JSON.parseArray(personal.getCredentials(), CertificateEnum.class);
|
|
List<CertificateEnum> certificates = JSON.parseArray(personal.getCredentials(), CertificateEnum.class);
|
|
@@ -151,8 +151,11 @@ public class PersonalProductionServiceImpl extends ServiceImpl<PersonalProductio
|
|
textMap.put("nPrice",((BigDecimal)target.getPrice()).setScale(0, RoundingMode.HALF_UP));
|
|
textMap.put("nPrice",((BigDecimal)target.getPrice()).setScale(0, RoundingMode.HALF_UP));
|
|
textMap.put("nAmount",target.getAmount());
|
|
textMap.put("nAmount",target.getAmount());
|
|
textMap.put("validateCode",target.getValidateCode());
|
|
textMap.put("validateCode",target.getValidateCode());
|
|
|
|
+ textMap.put("evaluateAim","");
|
|
|
|
+ if ("抵押".equals(personal.getEvaluateAim())){
|
|
|
|
+ textMap.put("evaluateAim","5.我们具备房地产抵押相关金融专业知识,并对本报告中的估价对象具有相应的房地产市场分析能力。");
|
|
|
|
+ }
|
|
addEnvironment(bg,textMap);
|
|
addEnvironment(bg,textMap);
|
|
-
|
|
|
|
PersonalCalculate calculate = personalCalculateMapper.getByTargetId(target.getId());
|
|
PersonalCalculate calculate = personalCalculateMapper.getByTargetId(target.getId());
|
|
textMap.put("rightsType",calculate.getRightsType());
|
|
textMap.put("rightsType",calculate.getRightsType());
|
|
if (tag == 1){
|
|
if (tag == 1){
|