jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1f469ae8e42c67306adf420ccb91a847a514ac82

Authored by liquanyu
1 parent 794e17faaa
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

导出添加高危因素

Showing 2 changed files with 5 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java View file @ 1f469ae
... ... @@ -290,7 +290,7 @@
290 290  
291 291 if (null != createdStart) {
292 292 if (neStart) {
293   - c = Criteria.where("dueDate1").gte(createdStart);
  293 + c = Criteria.where("dueDate1").gt(createdStart);
294 294 } else {
295 295 c = Criteria.where("dueDate1").gte(createdStart);
296 296 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 1f469ae
... ... @@ -1680,18 +1680,18 @@
1680 1680 }
1681 1681 if (matdeliverFollowRequest.getStartDay() != null && matdeliverFollowRequest.getEndDay() != null )
1682 1682 {
1683   - matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay())));
1684   - matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay())));
  1683 + matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()-1)));
  1684 + matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()+1)));
1685 1685 }
1686 1686 else if (matdeliverFollowRequest.getStartDay() != null)
1687 1687 {
1688 1688 matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()-1)));
1689   - matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay())));
  1689 + matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()+1)));
1690 1690 }
1691 1691 else if(matdeliverFollowRequest.getEndDay() != null)
1692 1692 {
1693 1693 matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()-1)));
1694   - matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay())));
  1694 + matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()+1)));
1695 1695 }
1696 1696  
1697 1697 System.out.println(DateUtil.getyyyy_MM_dd(matDeliverQuery.getCreatedStart()));