chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日期查询修改

This commit is contained in:
mashuanghui 2024-08-16 16:14:40 +08:00
parent fa5bc082a5
commit 2a5d8a03b8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictTypeController.java
View File

@ -1,6 +1,7 @@
package com.chushang.system.controller; package com.chushang.system.controller;
import com.chushang.common.core.exception.utils.AssertUtil; import com.chushang.common.core.exception.utils.AssertUtil;
import com.chushang.common.core.util.DateUtils;
import com.chushang.common.core.web.AjaxResult; import com.chushang.common.core.web.AjaxResult;
import com.chushang.common.excel.utils.ExcelUtils; import com.chushang.common.excel.utils.ExcelUtils;
import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.annotation.SysLog;
@ -11,11 +12,15 @@ import com.chushang.security.annotation.RequiresPermissions;
import com.chushang.security.utils.SecurityUtils; import com.chushang.security.utils.SecurityUtils;
import com.chushang.system.entity.po.SysDictType; import com.chushang.system.entity.po.SysDictType;
import com.chushang.system.service.ISysDictTypeService; import com.chushang.system.service.ISysDictTypeService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -34,6 +39,11 @@ public class DictTypeController {
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(SysDictType dictType) public AjaxResult list(SysDictType dictType)
{ {
List<LocalDateTime> createTime = dictType.getCreateTimes();
if (!CollectionUtils.isEmpty(createTime)){
LocalDateTime disposeTimeEnd = createTime.get(1).withHour(23).withMinute(59).withSecond(59);
createTime.set(1, disposeTimeEnd);
}
CommonParam commonParam = CommonParam.buildPageRequest(); CommonParam commonParam = CommonParam.buildPageRequest();
PageResult pageResult = dictTypeService.pageDictTypeList(dictType, commonParam); PageResult pageResult = dictTypeService.pageDictTypeList(dictType, commonParam);
return AjaxResult.success(pageResult); return AjaxResult.success(pageResult);
@ -85,9 +95,7 @@ public class DictTypeController {
public AjaxResult edit(@Validated @RequestBody SysDictType dict) public AjaxResult edit(@Validated @RequestBody SysDictType dict)
{ {
CommonParam commonParam = CommonParam.buildAllRequest(); CommonParam commonParam = CommonParam.buildAllRequest();
AssertUtil.invalidate(dictTypeService.checkDictTypeUnique(dict, commonParam),"修改字典'" + dict.getDictName() + "'失败，字典类型已存在" ); AssertUtil.invalidate(dictTypeService.checkDictTypeUnique(dict, commonParam),"修改字典'" + dict.getDictName() + "'失败，字典类型已存在" );
dict.setUpdateBy(SecurityUtils.getUsername()); dict.setUpdateBy(SecurityUtils.getUsername());
dictTypeService.saveOrUpdate(dict); dictTypeService.saveOrUpdate(dict);
return AjaxResult.success(); return AjaxResult.success();