From 79a4be237e86f0e4e7f0259dbd93463b47de205d Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Mon, 17 Jun 2024 09:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=88=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java | 2 +- .../controller/jhgk/DmSygdController.java | 35 ++++++++++--------- .../jhgk/impl/DmSygdMxServiceImpl.java | 24 ++++++------- .../resources/mappers/jhgk/DmSygdMxMapper.xml | 6 ++-- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java index b38b405..dcb781b 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java @@ -80,7 +80,7 @@ public class DmYdjhxf implements Serializable { private String qkxcms; @ApiModelProperty(value = "型材面板") private String xcmb; - @ApiModelProperty(value = "分段需求") + @ApiModelProperty(value = "分段需求/小组配送结束") private String fdxq; @ApiModelProperty(value = "光电结束") private String gdjs; diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java index d0912b4..d9fbda1 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java @@ -9,16 +9,14 @@ import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.jcsj.EmGcrl; import com.dsic.gj_erp.bean.jcsj.EmSbcnp; -import com.dsic.gj_erp.bean.jhgk.DmDhqdp; -import com.dsic.gj_erp.bean.jhgk.DmQfxq; -import com.dsic.gj_erp.bean.jhgk.DmSygd; -import com.dsic.gj_erp.bean.jhgk.DmSygdMx; +import com.dsic.gj_erp.bean.jhgk.*; import com.dsic.gj_erp.bean.jhgk.excel.QfExcel; import com.dsic.gj_erp.bean.jhgk.excel.SyExcel; import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.listeners.ExcelQFListener; import com.dsic.gj_erp.listeners.ExcelSYListener; import com.dsic.gj_erp.service.jcsj.EmGcrlService; +import com.dsic.gj_erp.service.jhgk.DmSygdMxService; import com.dsic.gj_erp.service.jhgk.DmSygdService; import com.dsic.gj_erp.service.sy.SYService; import io.swagger.annotations.ApiOperation; @@ -47,25 +45,28 @@ public class DmSygdController { @Resource DmSygdService service; + @Resource + DmSygdMxService mxService; @Autowired private EmGcrlService gcrlService; @RequestMapping("/getList") @AuthFunction public ResultBean getList(@RequestBody DmSygd sygd){ - List list= service.list(new QueryWrapper() - .eq(StrUtil.isNotEmpty(sygd.getGdZt()),"gd_zt",sygd.getGdZt()) - .ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"gjjs_xz",sygd.getBeginTime()) - .le(StrUtil.isNotEmpty(sygd.getEndTime()),"gjjs_xz",sygd.getEndTime()) - .orderByAsc("sl_sj,dc_ch,dc_pl") - ); +// List list= service.list(new QueryWrapper() +// .eq(StrUtil.isNotEmpty(sygd.getGdZt()),"gd_zt",sygd.getGdZt()) +// .ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"gjjs_xz",sygd.getBeginTime()) +// .le(StrUtil.isNotEmpty(sygd.getEndTime()),"gjjs_xz",sygd.getEndTime()) +// .orderByAsc("sl_sj,dc_ch,dc_pl") +// ); + List list= mxService.tqSygd1(sygd.getBeginTime(),sygd.getEndTime()); Map map=new HashMap(); - if (list.size()>0){ - String beginTime=list.get(0).getGjjsXz(); - String endTime=list.get(list.size()-1).getGjjsXz(); - List emGcrls= gcrlService.list(new QueryWrapper().select("gl").between("gl",beginTime,endTime).eq("xxr","0")); - List gcrl = emGcrls.stream().map(EmGcrl::getGl).collect(Collectors.toList()); - map.put("gcrl",gcrl); - } +// if (list.size()>0){ +// String beginTime=list.get(0).getGjjsXz(); +// String endTime=list.get(list.size()-1).getGjjsXz(); +// List emGcrls= gcrlService.list(new QueryWrapper().select("gl").between("gl",beginTime,endTime).eq("xxr","0")); +// List gcrl = emGcrls.stream().map(EmGcrl::getGl).collect(Collectors.toList()); +// map.put("gcrl",gcrl); +// } map.put("list",list); return new ResultBean(map); } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java index ee619e1..d34385e 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java @@ -27,10 +27,7 @@ import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper; import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper; import com.dsic.gj_erp.service.jcsj.DmCzplpNewService; import com.dsic.gj_erp.service.jcsj.EmSbcnpService; -import com.dsic.gj_erp.service.jhgk.DmSygdMxService; -import com.dsic.gj_erp.service.jhgk.DmSygdService; -import com.dsic.gj_erp.service.jhgk.DmTzjhService; -import com.dsic.gj_erp.service.jhgk.DmXbjhService; +import com.dsic.gj_erp.service.jhgk.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -57,8 +54,6 @@ import java.util.stream.Collectors; @Service public class DmSygdMxServiceImpl extends ServiceImpl implements DmSygdMxService { - @Resource - private EmGcrlMapper gcrlMapper; @Resource private DmSygdService sygdService; @Resource @@ -740,7 +735,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl i return new ResultBean(null); } //根据船号+批量分组 - Map> map = list.stream().collect(Collectors.groupingBy(x -> x.getDcCh() + x.getDcPl())); + Map> map = list.stream().filter(mx -> Objects.nonNull(mx.getTzbh())) // group by 的字段不能有null值 + .collect(Collectors.groupingBy(x -> x.getDcCh() + x.getDcPl())); List sygdList = new ArrayList<>(); for (String key : map.keySet()) { DmSygd sygd = new DmSygd(); @@ -924,14 +920,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl i String[] fds= l.getDcFd().split(" "); double count= fds.length%2; int index; - if (count>0){ - index= (fds.length/2)+1; - - }else { + if (count>0){ + index= (fds.length/2)+1; + }else { index= fds.length/2; - } - String fd1= Arrays.toString(Arrays.copyOfRange(fds, 0, index)).replace(","," ");// 截取索引0（包括）到索引index（不包括）的元素 - String fd2= Arrays.toString(Arrays.copyOfRange(fds, index, fds.length)).replace(","," "); + } + String fd1= Arrays.toString(Arrays.copyOfRange(fds, 0, index)).replace(","," ");// 截取索引0（包括）到索引index（不包括）的元素 + String fd2= Arrays.toString(Arrays.copyOfRange(fds, index, fds.length)).replace(","," "); l.setDcFd(fd1.substring(1,fd1.lastIndexOf("]"))); ydjhxf1.setDcFd(fd2.substring(1,fd2.lastIndexOf("]"))); @@ -945,6 +940,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl i } ydjhxf1.setSkbs(l.getSkbs2()); ydjhxf1.setSkqgks(l.getSkqgks2()); + ydjhxf1.setFdxq(l.getFdxq()); list2.add(l); list2.add(ydjhxf1); } diff --git a/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml b/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml index 3f438aa..ab8ff6b 100644 --- a/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml +++ b/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml @@ -424,6 +424,7 @@