diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java index f8173c1..9297d5e 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java @@ -34,7 +34,7 @@ public interface DmYdjhMapper extends BaseMapper { List getTzjh1(@Param("begin") String begin, @Param("end") String end); -// List getDhjh1(@Param("begin") String begin, @Param("end") String end); + List getDhjh1(List ids); List getSljh1(@Param("begin") String begin, @Param("end") String end); List getPwjh1(@Param("begin") String begin, @Param("end") String end); List getQgjh1(@Param("begin") String begin, @Param("end") String end); diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java index 84ca794..5e39906 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java @@ -143,14 +143,14 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme dmYdjh.setColor("yellow"); } } - if(StringUtils.isBlank(pgdTzjh.getTltxfrq())||StringUtils.isBlank(dmYdjh.getHxrq()) ){ + if(StringUtils.isBlank(pgdTzjh.getTltxfrq())||StringUtils.isBlank(dmYdjh.getHxjhrq()) ){ // corlor yellow dmYdjh.setColor("red"); }else{ DateTime dateStr1 = DateUtil.parse(pgdTzjh.getTltxfrq(), "yyyy/MM/dd"); - DateTime dateStr2 = DateUtil.parse(dmYdjh.getHxrq(), "yyyy/MM/dd"); + DateTime dateStr2 = DateUtil.parse(dmYdjh.getHxjhrq(), "yyyy/MM/dd"); int result = DateUtil.compare(dateStr1, dateStr2); if (result > 0) { System.out.println(dateStr1 + " is after " + dateStr2); @@ -259,6 +259,14 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme List idList = ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList()); + + List dh= baseMapper.getDhjh1(idList); + if (dh.size()>0){ + + dhService.saveBatch(dh); + + } + if (idList.size() > 100) { List list = idList.subList(idList.size() / 100 * 100, idList.size()); AtomicInteger index = new AtomicInteger(idList.size() / 100 + 1); diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 39e5bf4..25af359 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -387,7 +387,71 @@ ORDER BY dm_ydjh.dc_ch, dm_ydjh.dc_pl - +