傅行帆 5 年前
父节点
当前提交
64d763e864
共有 1 个文件被更改,包括 10 次插入6 次删除
  1. 10
    6
      src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java

+ 10
- 6
src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java 查看文件

@@ -235,22 +235,26 @@ public class TaSalesBatchController extends BaseController {
235 235
                 QueryWrapper<TaPreselection> preselectionQueryWrapper = new QueryWrapper<>();
236 236
                 preselectionQueryWrapper.eq("org_id", getOrgId(request));
237 237
                 preselectionQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
238
-                preselectionQueryWrapper.eq("status", 1);
238
+                preselectionQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
239 239
                 TaPreselection preselection = taPreselectionService.getOne(preselectionQueryWrapper);
240 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 248
                 QueryWrapper<TaRaise> raiseQueryWrapper = new QueryWrapper<>();
247 249
                 raiseQueryWrapper.eq("org_id", getOrgId(request));
248 250
                 raiseQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
249
-                raiseQueryWrapper.eq("status", 1);
251
+                raiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
250 252
                 TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
251 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