傅行帆 5 jaren geleden
bovenliggende
commit
988853ab0b

+ 5
- 5
src/main/java/com/huiju/estateagents/service/impl/TaRaiseRecordServiceImpl.java Bestand weergeven

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
             QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
417
             QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
418
-            taContractBusinessQueryWrapper.eq("target_id", raiseRecordId);
418
+            taContractBusinessQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
419
             taContractBusinessQueryWrapper.eq("org_id", orgId);
419
             taContractBusinessQueryWrapper.eq("org_id", orgId);
420
             taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
420
             taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
421
             TaContractBusiness taContractBusiness = iTaContractBusinessService.getOne(taContractBusinessQueryWrapper);
421
             TaContractBusiness taContractBusiness = iTaContractBusinessService.getOne(taContractBusinessQueryWrapper);
425
                 taContractQueryWrapper.eq("org_id", orgId);
425
                 taContractQueryWrapper.eq("org_id", orgId);
426
                 taContractQueryWrapper.eq("target_type", "raise");
426
                 taContractQueryWrapper.eq("target_type", "raise");
427
                 taContractQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
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
                 taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
430
                 taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
431
-                taContractQueryWrapper.eq("building_id",taRaiseRecord.getBuildingId());
431
+                taContractQueryWrapper.eq("building_id", taRaiseRecord.getBuildingId());
432
                 taContractQueryWrapper.eq("person_id", personId);
432
                 taContractQueryWrapper.eq("person_id", personId);
433
                 TaContract taContract = iTaContractService.getOne(taContractQueryWrapper);
433
                 TaContract taContract = iTaContractService.getOne(taContractQueryWrapper);
434
                 if (taContract != null) {
434
                 if (taContract != null) {