|
@@ -412,10 +412,10 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
|
412
|
412
|
}
|
413
|
413
|
|
414
|
414
|
// 是否展示签署合同入口
|
415
|
|
- if (CommConstant.STATUS_NORMAL == taRaiseRecord.getStatus() && CommConstant.PAY_STATUS_PAID == taRaiseRecord.getPayStatus()) {
|
|
415
|
+ if (CommConstant.STATUS_NORMAL == taRaiseRecord.getStatus() && CommConstant.PAY_STATUS_PAID.equals(taRaiseRecord.getPayStatus())) {
|
416
|
416
|
// 是否有认筹业务合同配置
|
417
|
417
|
QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
|
418
|
|
- taContractBusinessQueryWrapper.eq("target_id", raiseRecordId);
|
|
418
|
+ taContractBusinessQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
|
419
|
419
|
taContractBusinessQueryWrapper.eq("org_id", orgId);
|
420
|
420
|
taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
|
421
|
421
|
TaContractBusiness taContractBusiness = iTaContractBusinessService.getOne(taContractBusinessQueryWrapper);
|
|
@@ -425,10 +425,10 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
|
425
|
425
|
taContractQueryWrapper.eq("org_id", orgId);
|
426
|
426
|
taContractQueryWrapper.eq("target_type", "raise");
|
427
|
427
|
taContractQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
|
428
|
|
- taContractQueryWrapper.eq("invoice_target_type","raise_record");
|
429
|
|
- taContractQueryWrapper.eq("invoice_target_id",taRaiseRecord.getRaiseRecordId());
|
|
428
|
+ taContractQueryWrapper.eq("invoice_target_type", "raise_record");
|
|
429
|
+ taContractQueryWrapper.eq("invoice_target_id", taRaiseRecord.getRaiseRecordId());
|
430
|
430
|
taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
|
431
|
|
- taContractQueryWrapper.eq("building_id",taRaiseRecord.getBuildingId());
|
|
431
|
+ taContractQueryWrapper.eq("building_id", taRaiseRecord.getBuildingId());
|
432
|
432
|
taContractQueryWrapper.eq("person_id", personId);
|
433
|
433
|
TaContract taContract = iTaContractService.getOne(taContractQueryWrapper);
|
434
|
434
|
if (taContract != null) {
|