|
@@ -70,7 +70,7 @@ public class ItdmGongdanShujuServiceImpl extends ServiceImpl<ItdmGongdanShujuMap
|
|
|
String ShijiWorkDate = itdmGongdanDto.getRiqi();
|
|
|
|
|
|
String startDateTime = ShijiWorkDate + " " + startTime + ":00";
|
|
|
- String endDateTime = ShijiWorkDate + " " + startTime + ":00";
|
|
|
+ String endDateTime = ShijiWorkDate + " " + endTime + ":00";
|
|
|
|
|
|
boolean b = itdmWenxiangMapper.exists(Wrappers.lambdaQuery(ItdmWenxiang.class).eq(ItdmWenxiang::getDeviceId, shijiShebeiId)
|
|
|
.between(ItdmWenxiang::getCreateTime, startDateTime, endDateTime));
|
|
@@ -81,7 +81,7 @@ public class ItdmGongdanShujuServiceImpl extends ServiceImpl<ItdmGongdanShujuMap
|
|
|
long betweenMinute = DateUtil.between(date1, date2, DateUnit.MINUTE);
|
|
|
// 频次
|
|
|
int l = (int) (betweenMinute / Integer.parseInt(itdmGongdanDto.getPinci()));
|
|
|
- for (int i = 1; i <= l; i++) {
|
|
|
+ for (int i = 0; i <= l; i++) {
|
|
|
ItdmGongdanShuju itdmGongdanShuju = new ItdmGongdanShuju();
|
|
|
itdmGongdanShuju.setShiyanType(itdmGongdanDto.getShiyanType());
|
|
|
itdmGongdanShuju.setPinci(itdmGongdanDto.getPinci());
|