From 755d46171738957a98942b84399db50ee559fe9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Fri, 2 Jul 2021 09:30:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8=E6=8F=90?= =?UTF-8?q?=E6=8A=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 40 +++-- .../controller/AbnormalCauseController.java | 2 + .../controller/AbnormalDutyController.java | 2 + .../anomaly/mapper/AbnormalDutyMapper.java | 2 +- .../anomaly/service/AbnormalBillService.java | 13 +- .../anomaly/service/AbnormalDutyService.java | 1 + .../service/AbnormalNcCodeService.java | 1 + .../service/impl/AbnormalBillServiceImpl.java | 169 ++++++++++++++++-- .../service/impl/AbnormalDutyServiceImpl.java | 2 + .../resources/mapper/AbnormalDutyMapper.xml | 1 - .../meapi/controller/NcCodeController.java | 2 + .../meapi/controller/NcGroupController.java | 2 + .../main/resources/mapper/NcCodeMapper.xml | 4 +- .../main/resources/mapper/NcGroupMapper.xml | 4 +- 14 files changed, 208 insertions(+), 37 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index 3b16a333..043b1896 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -6,13 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.mesnac.anomaly.service.AbnormalBillService; -import com.foreverwin.mesnac.meapi.controller.NcCodeController; -import com.foreverwin.mesnac.meapi.controller.WorkCenterController; import com.foreverwin.mesnac.meapi.model.DataField; import com.foreverwin.mesnac.meapi.model.NcCode; import com.foreverwin.mesnac.meapi.model.WorkCenter; import com.foreverwin.mesnac.meapi.service.DataFieldListService; import com.foreverwin.mesnac.meapi.service.NcCodeService; +import com.foreverwin.mesnac.meapi.service.WorkCenterService; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.R; @@ -38,10 +37,7 @@ public class AbnormalBillController { private NcCodeService ncCodeService; @Autowired - private WorkCenterController workCenterController; - - @Autowired - private NcCodeController ncCodeController; + private WorkCenterService workCenterService; @Autowired private DataFieldListService dataFieldListService; @@ -181,14 +177,15 @@ public class AbnormalBillController { //工作中心 WorkCenter workCenter = new WorkCenter(); workCenter.setWcCategory("LEVEL4"); - R workCenterList = workCenterController.getWorkCenterList(workCenter); + workCenter.setSite(site); + List workCenterList = workCenterService.selectList(workCenter); hashMap.put("workCenter",workCenterList); //原因分类 NcCode ncCode = new NcCode(); ncCode.setSite(site); ncCode.setNcCategory("REPAIR"); - R causeType = ncCodeController.getNcCodeList(ncCode); - hashMap.put("causeType",causeType); + List ncCodeList = ncCodeService.selectList(ncCode); + hashMap.put("causeType",ncCodeList); //责任部门 DataField dataField = new DataField(); dataField.setSite(site); @@ -208,15 +205,34 @@ public class AbnormalBillController { // } /** - * 异常提报 + * 其他异常提报 * @param abnormalBill * @return */ @GetMapping("/anomalyReportOther") - public R anomalyReportOther(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose){ - return R.ok(abnormalBillService.anomalyReportOther(abnormalBill, abnormalBillDispose)); + public R anomalyReportOther(AbnormalBill abnormalBill, + AbnormalBillDispose abnormalBillDispose, + @RequestParam List dutyCauseType, + @RequestParam List dutyType){ + return R.ok(abnormalBillService.anomalyReportOther(abnormalBill, abnormalBillDispose,dutyCauseType,dutyType)); } + /** + * 质量异常提报 + * @param abnormalBill + * @param abnormalBillDispose + * @return + */ + @GetMapping("/anomalyReport") + public R anomalyReport(AbnormalBill abnormalBill, + AbnormalBillDispose abnormalBillDispose, + @RequestParam List ncGroupAndNcCodes, + @RequestParam List dutyCauseType, + @RequestParam List dutyType){ + return R.ok(abnormalBillService.anomalyReport(abnormalBill, abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType)); + } + + /** * 取消原因 * @param handle diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalCauseController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalCauseController.java index 3900a99c..a0fc3211 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalCauseController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalCauseController.java @@ -46,6 +46,8 @@ public class AbnormalCauseController { @GetMapping("") public R getAbnormalCauseList(AbnormalCause abnormalCause){ List result; + String site = CommonMethods.getSite(); + abnormalCause.setSite(site); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(abnormalCause); result = abnormalCauseService.list(queryWrapper); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalDutyController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalDutyController.java index 1541d4c6..27cf504d 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalDutyController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalDutyController.java @@ -46,6 +46,8 @@ public class AbnormalDutyController { @GetMapping("") public R getAbnormalDutyList(AbnormalDuty abnormalDuty){ List result; + String site = CommonMethods.getSite(); + abnormalDuty.setSite(site); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(abnormalDuty); result = abnormalDutyService.list(queryWrapper); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalDutyMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalDutyMapper.java index e74e22e1..6665d474 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalDutyMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalDutyMapper.java @@ -1,7 +1,7 @@ package com.foreverwin.mesnac.anomaly.mapper; -import com.foreverwin.mesnac.anomaly.model.AbnormalDuty; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.anomaly.model.AbnormalDuty; import org.springframework.stereotype.Repository; /** diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java index 96a51eb7..f5e6f937 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java @@ -27,14 +27,23 @@ public interface AbnormalBillService extends IService { List selectList(AbnormalBill abnormalBill); - String anomalyReportOther(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose); + String anomalyReportOther(AbnormalBill abnormalBill, + AbnormalBillDispose abnormalBillDispose, + List dutyCauseType, + List dutyType); + + String anomalyReport(AbnormalBill abnormalBill, + AbnormalBillDispose abnormalBillDispose, + List ncGroupAndNcCodes, + List dutyCauseType, + List dutyType); /** * 生成异常单号、创建时间和更新时间 * @param abnormalBill * @param abnormalBillDispose */ - void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose); + void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List dutyCauseType,List dutyType); void cancelBrowse(String handle,String cancelBrowse); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalDutyService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalDutyService.java index 969d89b3..becbc7ef 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalDutyService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalDutyService.java @@ -25,4 +25,5 @@ public interface AbnormalDutyService extends IService { IPage selectPage(FrontPage frontPage, AbnormalDuty abnormalDuty); List selectList(AbnormalDuty abnormalDuty); + } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalNcCodeService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalNcCodeService.java index aab4746b..2547aca7 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalNcCodeService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalNcCodeService.java @@ -25,4 +25,5 @@ public interface AbnormalNcCodeService extends IService { IPage selectPage(FrontPage frontPage, AbnormalNcCode abnormalNcCode); List selectList(AbnormalNcCode abnormalNcCode); + } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index 9c1bfb51..d86f7e49 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper; -import com.foreverwin.mesnac.anomaly.model.AbnormalBill; -import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; -import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService; -import com.foreverwin.mesnac.anomaly.service.AbnormalBillService; +import com.foreverwin.mesnac.anomaly.model.*; +import com.foreverwin.mesnac.anomaly.service.*; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.helper.NextNumberHelper; import com.foreverwin.mesnac.common.util.StringUtil; @@ -24,7 +22,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.List; +import java.util.*; + /** *

* 异常单 服务实现类 @@ -56,6 +55,15 @@ public class AbnormalBillServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalBill abnormalBill) { @@ -72,40 +80,147 @@ public class AbnormalBillServiceImpl extends ServiceImpl dutyCauseType, + List dutyType) { + this.generateAbnormalBill(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType); this.saveOrUpdate(abnormalBill); abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); return abnormalBill.getAbnormalNo(); } @Override - public void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose) { + public String anomalyReport(AbnormalBill abnormalBill, + AbnormalBillDispose abnormalBillDispose, + List ncGroupAndNcCodes, + List dutyCauseType, + List dutyType) { + this.generateAbnormalBill(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType); + //获取当前时间 + LocalDateTime now = LocalDateTime.now(); + //生成不良代码和不良代码组,并把它放到hashMap里面，ncCode是存放在异常单里面的ncCode + + List ncCode = new ArrayList<>(); + List ncGroup = new ArrayList<>(); + StringBuilder ncCodes = new StringBuilder(); + for(String ncGroupAndNcCode:ncGroupAndNcCodes){ + String[] split = ncGroupAndNcCode.split("/"); + ncGroup.add(split[0]); + ncCode.add(split[1]); + ncCodes.append(split[1]).append(","); + } + + ArrayList abnormalNcCodes = new ArrayList<>(); + for(int i = 0; i < ncGroup.size(); i ++){ + AbnormalNcCode abnormalNcCode = new AbnormalNcCode(); + //设置异常单BO + abnormalNcCode.setAbnormalBillBo(abnormalBill.getHandle()); + List abnormalNcCodes1 = abnormalNcCodeService.selectList(abnormalNcCode); + if(abnormalNcCodes1.size() != 0){ + QueryWrapper abnormalNcCodeQueryWrapper = new QueryWrapper<>(); + abnormalNcCodeQueryWrapper.setEntity(abnormalNcCode); + abnormalNcCodeService.remove(abnormalNcCodeQueryWrapper); + } + abnormalNcCode.setModifiedUser(CommonMethods.getUser()); + abnormalNcCode.setModifiedDateTime(now); + abnormalNcCode.setCreatedUser(CommonMethods.getUser()); + abnormalNcCode.setCreatedDateTime(now); + //设置HANDLE + abnormalNcCode.setHandle(UUID.randomUUID().toString()); + //设置站点 + abnormalNcCode.setSite(CommonMethods.getSite()); + //设置不合格代码组 + abnormalNcCode.setNcCodeGroup(ncGroup.get(i)); + abnormalNcCode.setNcCode(ncCode.get(i)); + abnormalNcCodes.add(abnormalNcCode); + } + abnormalNcCodeService.saveOrUpdateBatch(abnormalNcCodes); + abnormalBill.setNcCode(ncCodes.substring(0,ncCodes.length() - 1)); + this.saveOrUpdate(abnormalBill); + abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); + return abnormalBill.getAbnormalNo(); + } + + + @Override + public void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List dutyCauseType,List dutyType) { + String site = CommonMethods.getSite(); + LocalDateTime currentTime = LocalDateTime.now(); + String user = CommonMethods.getUser(); if(StringUtil.isBlank(abnormalBill.getAbnormalNo())){ String abnormalNo = null; //生成异常单号 if("Q".equals(abnormalBill.getType())){//其他异常 - abnormalNo = nextNumberHelper.getNextNumber(abnormalBill.getSite(), "ABNORMAL_OTHER", 1, null).get(0); + abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_OTHER", 1, null).get(0); }else if("Z".equals(abnormalBill.getType())){//质量异常 - abnormalNo = nextNumberHelper.getNextNumber(abnormalBill.getSite(), "ABNORMAL_QUALITY", 1, null).get(0); + abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_QUALITY", 1, null).get(0); }else if("S".equals(abnormalBill.getType())){//设备异常 - abnormalNo = nextNumberHelper.getNextNumber(abnormalBill.getSite(), "ABNORMAL_DEVICE", 1, null).get(0); + abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_DEVICE", 1, null).get(0); } abnormalBill.setAbnormalNo(abnormalNo); } - abnormalBill.setHandle(HandleEnum.Z_ABNORMAL_BILL.getHandle(abnormalBill.getSite(),abnormalBill.getAbnormalNo())); + abnormalBill.setHandle(HandleEnum.Z_ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo())); abnormalBillDispose.setAbnormalBillBo(abnormalBill.getHandle()); - abnormalBillDispose.setHandle(HandleEnum.Z_ABNORMAL_BILL_DISPOSE.getHandle(abnormalBill.getSite(),abnormalBill.getAbnormalNo())); + abnormalBillDispose.setHandle(HandleEnum.Z_ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo())); + - LocalDateTime currentTime = LocalDateTime.now(); - String user = CommonMethods.getUser(); //设置责任划分填报人和填报时间 abnormalBillDispose.setDutyUser(user); abnormalBillDispose.setDutyDateTime(currentTime); + ArrayList causeTypes = new ArrayList<>(); + //判断原因分类是否为空 + if(dutyCauseType.size() >= 1){ + for(String cause:dutyCauseType){ + AbnormalCause abnormalCause = new AbnormalCause(); + String uuid = UUID.randomUUID().toString(); + abnormalCause.setSite(site); + abnormalCause.setAbnormalBillBo(abnormalBill.getHandle()); + abnormalCause.setAbnormalBillDisposeBo(abnormalBillDispose.getHandle()); + List abnormalCauses = abnormalCauseService.selectList(abnormalCause); + if(abnormalCauses.size() != 0){ + QueryWrapper abnormalCauseQueryWrapper = new QueryWrapper<>(); + abnormalCauseQueryWrapper.setEntity(abnormalCause); + abnormalCauseService.remove(abnormalCauseQueryWrapper); + } + abnormalCause.setHandle(uuid); + abnormalCause.setAbnormalCauseNo(cause); + abnormalCause.setCreatedDateTime(currentTime); + abnormalCause.setCreatedUser(user); + abnormalCause.setModifiedUser(user); + abnormalCause.setModifiedDateTime(currentTime); + causeTypes.add(abnormalCause); + } + } + ArrayList dutyTypes = new ArrayList<>(); + //判断责任分类是否为空 + if(dutyType.size() >= 1){ + for(String duty:dutyType){ + AbnormalDuty abnormalDuty = new AbnormalDuty(); + String uuid = UUID.randomUUID().toString(); + abnormalDuty.setSite(site); + abnormalDuty.setAbnormalBillBo(abnormalBill.getHandle()); + abnormalDuty.setAbnormalBillDisposeBo(abnormalBillDispose.getHandle()); + List abnormalDuties = abnormalDutyService.selectList(abnormalDuty); + if(abnormalDuties.size() != 0){ + QueryWrapper abnormalDutyQueryWrapper = new QueryWrapper<>(); + abnormalDutyQueryWrapper.setEntity(abnormalDuty); + abnormalDutyService.remove(abnormalDutyQueryWrapper); + } + abnormalDuty.setHandle(uuid); + abnormalDuty.setAbnormalDutyNo(duty); + abnormalDuty.setModifiedUser(user); + abnormalDuty.setModifiedDateTime(currentTime); + abnormalDuty.setCreatedDateTime(currentTime); + abnormalDuty.setCreatedUser(user); + dutyTypes.add(abnormalDuty); + } + } + //设置创建时间和更新时间 if(abnormalBillMapper.selectById(abnormalBill.getHandle()) == null){ abnormalBill.setCreatedDataTime(currentTime); @@ -126,17 +241,37 @@ public class AbnormalBillServiceImpl extends ServiceImpl 0){ + abnormalDutyService.saveOrUpdateBatch(dutyTypes); + } + if(causeTypes.size() > 0){ + abnormalCauseService.saveOrUpdateBatch(causeTypes); + } + } @Override diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalDutyServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalDutyServiceImpl.java index 1ed8b77b..3352485a 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalDutyServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalDutyServiceImpl.java @@ -43,4 +43,6 @@ public class AbnormalDutyServiceImpl extends ServiceImpl) - diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java index 76049349..c93c7c9c 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java @@ -46,6 +46,8 @@ public class NcCodeController { public R getNcCodeList(NcCode ncCode){ List result; QueryWrapper queryWrapper = new QueryWrapper<>(); + String site = CommonMethods.getSite(); + ncCode.setSite(site); queryWrapper.setEntity(ncCode); result = ncCodeService.list(queryWrapper); return R.ok(result); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java index 6cc7e6ba..0c2672ab 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java @@ -46,6 +46,8 @@ public class NcGroupController { public R getNcGroupList(NcGroup ncGroup){ List result; QueryWrapper queryWrapper = new QueryWrapper<>(); + String site = CommonMethods.getSite(); + ncGroup.setSite(site); queryWrapper.setEntity(ncGroup); result = ncGroupService.list(queryWrapper); return R.ok(result); diff --git a/meapi/src/main/resources/mapper/NcCodeMapper.xml b/meapi/src/main/resources/mapper/NcCodeMapper.xml index cc3dc449..c68db60d 100644 --- a/meapi/src/main/resources/mapper/NcCodeMapper.xml +++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml @@ -183,12 +183,12 @@ AND DPMO_CATEGORY_BO=#{ew.entity.dpmoCategoryBo} - ${ew.sqlSegment} + AND ${ew.sqlSegment} - ${ew.sqlSegment} + AND ${ew.sqlSegment} diff --git a/meapi/src/main/resources/mapper/NcGroupMapper.xml b/meapi/src/main/resources/mapper/NcGroupMapper.xml index 8307268b..9ce975bc 100644 --- a/meapi/src/main/resources/mapper/NcGroupMapper.xml +++ b/meapi/src/main/resources/mapper/NcGroupMapper.xml @@ -180,12 +180,12 @@ AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} - ${ew.sqlSegment} + AND ${ew.sqlSegment} - ${ew.sqlSegment} + AND ${ew.sqlSegment}