|
@@ -208,9 +208,14 @@ public class MaterialInfoController {
|
|
|
|
|
|
Result<IPage<MaterialInfo>> result = new Result<>();
|
|
|
String materialName = materialInfo.getMaterialName();
|
|
|
+ String startDate = materialInfo.getStartDate();
|
|
|
+ String endDate = materialInfo.getEndDate();
|
|
|
+ materialInfo.setStartDate(null);
|
|
|
+ materialInfo.setEndDate(null);
|
|
|
+
|
|
|
+
|
|
|
materialInfo.setMaterialName(null);
|
|
|
QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
|
|
|
- Object createTime = materialInfo.getCreateTime();
|
|
|
materialInfo.setCreateTime(null);
|
|
|
if (!Check.isNull(materialInfo.getUserId())) {
|
|
|
String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
|
|
@@ -234,12 +239,11 @@ public class MaterialInfoController {
|
|
|
} else {
|
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
|
}
|
|
|
- if (!Check.isNull(createTime)) {
|
|
|
+ if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
|
|
|
try {
|
|
|
- String dateString = DateUtils.getDateString(String.valueOf(createTime));
|
|
|
- Map<String, Object> map = DateUtils.getStartEndTime(dateString);
|
|
|
- queryWrapper.ge("create_time", map.get("start"));
|
|
|
- queryWrapper.lt("create_time", map.get("end"));
|
|
|
+ String startDateStr = DateUtils.getDateString(startDate);
|
|
|
+ String endDateStr = DateUtils.getDateString(endDate);
|
|
|
+ queryWrapper.between("create_time", startDateStr, DateUtils.getEndTime(endDateStr));
|
|
|
} catch (ParseException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -326,9 +330,13 @@ public class MaterialInfoController {
|
|
|
Result<IPage<MaterialInfo>> result = new Result<>();
|
|
|
String materialName = materialInfo.getMaterialName();
|
|
|
materialInfo.setMaterialName(null);
|
|
|
+ String startDate = materialInfo.getStartDate();
|
|
|
+ String endDate = materialInfo.getEndDate();
|
|
|
+ materialInfo.setStartDate(null);
|
|
|
+ materialInfo.setEndDate(null);
|
|
|
+
|
|
|
QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
|
|
|
- Object createTime = materialInfo.getCreateTime();
|
|
|
- materialInfo.setCreateTime(null);
|
|
|
+
|
|
|
if (!Check.isNull(materialInfo.getUserId())) {
|
|
|
String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
|
|
|
if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)) {
|
|
@@ -340,12 +348,11 @@ public class MaterialInfoController {
|
|
|
|
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
|
|
|
|
- if (!Check.isNull(createTime)) {
|
|
|
+ if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
|
|
|
try {
|
|
|
- String dateString = DateUtils.getDateString(String.valueOf(createTime));
|
|
|
- Map<String, Object> map = DateUtils.getStartEndTime(dateString);
|
|
|
- queryWrapper.ge("create_time", map.get("start"));
|
|
|
- queryWrapper.lt("create_time", map.get("end"));
|
|
|
+ String startDateStr = DateUtils.getDateString(startDate);
|
|
|
+ String endDateStr = DateUtils.getDateString(endDate);
|
|
|
+ queryWrapper.between("create_time", startDateStr, DateUtils.getEndTime(endDateStr));
|
|
|
} catch (ParseException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|