fzzy-igdss.git - Gitblit

			@@ -63,8 +63,12 @@
			queryWrapper.le("time", param.getEnd());
			}
			//事件名称
			// if (StringUtils.isNotBlank(param.getName())) {
			// queryWrapper.like("name", param.getName());
			// }
			//事件标签
			if (StringUtils.isNotBlank(param.getName())) {
			queryWrapper.like("name", param.getName());
			queryWrapper.like("tags", param.getName());
			}

			queryWrapper.orderByDesc("create_time");

			@@ -24,7 +24,6 @@
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang3.time.DateFormatUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.scheduling.annotation.Async;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			@@ -137,13 +136,13 @@
			queryWrapper.eq("settle_tag", param.getSettleTag());
			}
			if (null != param.getStart()) {
			queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
			queryWrapper.ge("complete_time", DateUtil.getCurZero(param.getStart()));
			}
			if (null != param.getEnd()) {
			queryWrapper.le("create_time", DateUtil.getNextZero(param.getEnd()));
			queryWrapper.le("complete_time", DateUtil.getNextZero(param.getEnd()));
			}
			queryWrapper.ne("record_status", Constant.RECORD_STATUS_DEL); //不是删除的单子，即正常的单子
			queryWrapper.orderByDesc("create_time");
			queryWrapper.orderByDesc("complete_time");

			return queryWrapper;
			}

			@@ -40,8 +40,8 @@
			</select>
			</li>
			<li th:if="${viewType == '1'}" style="display: flex">
			<label>事件名称：</label>
			<input class="form-control" type="text" name="name" placeholder="请输入事件名称">
			<label>事件标签：</label>
			<input class="form-control" type="text" name="name" placeholder="请输入事件标签">
			</li>
			<li class="select-time">
			<label style="width: 100px">事件时间： </label>

	fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史