傅行帆 5 years ago
parent
commit
64d763e864

+ 10
- 6
src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java View File

235
                 QueryWrapper<TaPreselection> preselectionQueryWrapper = new QueryWrapper<>();
235
                 QueryWrapper<TaPreselection> preselectionQueryWrapper = new QueryWrapper<>();
236
                 preselectionQueryWrapper.eq("org_id", getOrgId(request));
236
                 preselectionQueryWrapper.eq("org_id", getOrgId(request));
237
                 preselectionQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
237
                 preselectionQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
238
-                preselectionQueryWrapper.eq("status", 1);
238
+                preselectionQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
239
                 TaPreselection preselection = taPreselectionService.getOne(preselectionQueryWrapper);
239
                 TaPreselection preselection = taPreselectionService.getOne(preselectionQueryWrapper);
240
                 if (preselection != null) {
240
                 if (preselection != null) {
241
-                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", taSalesBatch.getSalesBatchName()));
242
-                    return responseBean;
241
+//                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", taSalesBatch.getSalesBatchName()));
242
+//                    return responseBean;
243
+                    preselection.setStatus(CommConstant.STATUS_UNACCALIMED);
244
+                    taPreselectionService.updateById(preselection);
243
                 }
245
                 }
244
 
246
 
245
                 // 校验批次下是否有认筹
247
                 // 校验批次下是否有认筹
246
                 QueryWrapper<TaRaise> raiseQueryWrapper = new QueryWrapper<>();
248
                 QueryWrapper<TaRaise> raiseQueryWrapper = new QueryWrapper<>();
247
                 raiseQueryWrapper.eq("org_id", getOrgId(request));
249
                 raiseQueryWrapper.eq("org_id", getOrgId(request));
248
                 raiseQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
250
                 raiseQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
249
-                raiseQueryWrapper.eq("status", 1);
251
+                raiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
250
                 TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
252
                 TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
251
                 if (raise != null) {
253
                 if (raise != null) {
252
-                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的认筹模块", taSalesBatch.getSalesBatchName()));
253
-                    return responseBean;
254
+//                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的认筹模块", taSalesBatch.getSalesBatchName()));
255
+//                    return responseBean;
256
+                    raise.setStatus(CommConstant.STATUS_UNACCALIMED);
257
+                    taRaiseService.updateById(raise);
254
                 }
258
                 }
255
             }
259
             }
256
 
260