diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 78e96367..80f2bea3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -154,7 +154,11 @@ public class QuaController extends BaseController { */ @GetMapping(value = "getCheckTaskList") public List getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome) { - + if("0".equals(qcCheckTaskIncome.getCheckStatus())){ + qcCheckTaskIncome.setDelFlag("0");//临时借用 + }else{ + qcCheckTaskIncome.setDelFlag("1"); + } if(StringUtils.isNotBlank(qcCheckTaskIncome.getCheckStatus())){ qcCheckTaskIncome.setCheckStatus("'"+ qcCheckTaskIncome.getCheckStatus().replace(",","','")+"'"); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index 08c3cebd..25f57833 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -128,11 +128,6 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Override public List getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome) { DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode()); - if("'0'".equals(qcCheckTaskIncome.getCheckStatus())){ - qcCheckTaskIncome.setDelFlag("0");//临时借用 - }else{ - qcCheckTaskIncome.setDelFlag("1"); - } List dtos = qcProCheckMapper.getCheckTaskList(qcCheckTaskIncome); for (QcCheckTaskIncome dto : dtos) { if (StringUtils.isEmpty(dto.getWorkorderCodeSap())) {