From 4bfe03cf15914aee880056e3b2a80b1fea8d8ba3 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 11:50:30 +0800 Subject: [PATCH] =?UTF-8?q?AuditFile=E7=9B=B8=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/constant/BaseRequest.java | 43 ++++++++++++++----- .../desk/basic/pojo/vo/BaseEntityVO.java | 8 ++-- .../controller/AuditFileController.java | 14 ++++-- .../InspectionTemplateController.java | 12 +++--- .../LiquidTankTaskCopyController.java | 8 ++-- .../desk/quality/mapper/AuditFileMapper.java | 3 ++ .../desk/quality/mapper/AuditFileMapper.xml | 17 ++++++++ .../quality/pojo/request/AuditFileSearch.java | 14 ++++++ .../quality/service/IAuditFileService.java | 5 +++ .../service/impl/AuditFileServiceImpl.java | 8 ++++ .../impl/ProReTemplateServiceImpl.java | 2 +- 11 files changed, 104 insertions(+), 30 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java index b8e7a8e5..54168a1f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java @@ -2,15 +2,36 @@ package org.springblade.desk.basic.constant; public interface BaseRequest { - String CR_REAL_NAME = "createUserRealName"; - - String UP_REAL_NAME = "updateUserRealName"; - - String CR_TIME_START = "createTimeStart"; - - String CR_TIME_END = "createTimeEnd"; - - String UP_TIME_START = "updateTimeStart"; - - String UP_TIME_END = "updateTimeEnd"; + /** + * 创建[用户]-真名 + */ + String CREATE_USER_REAL_NAME = "createUserRealName"; + /** + * 创建[部门]-部门名 + */ + String CREATE_DEPT_NAME = "createDeptName"; + /** + * + */ + String CREATE_TIME_START = "createTimeStart"; + /** + * + */ + String CREATE_TIME_END = "createTimeEnd"; + /** + * 更新[用户]-真名 + */ + String UPDATE_USER_REAL_NAME = "updateUserRealName"; + /** + * + */ + String UPDATE_TIME_START = "updateTimeStart"; + /** + * + */ + String UPDATE_TIME_END = "updateTimeEnd"; + /** + * + */ + String KEEP_USER_REAL_NAME = "keepUserRealName"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java index f0e0ba7a..2739c5aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java @@ -17,7 +17,7 @@ public class BaseEntityVO { * 创建[用户]-真名 */ @Schema(description = "创建[用户]-真名") - private String createUserRealName = "创建[用户]-真名"; + private String createUserRealName = ""; /** * 创建[部门]-部门名 */ @@ -27,7 +27,7 @@ public class BaseEntityVO { * 更新[用户]-真名 */ @Schema(description = "更新用户-真名") - private String updateUserRealName = "更新用户-真名"; + private String updateUserRealName = ""; /** * 维护[用户]id */ @@ -37,7 +37,7 @@ public class BaseEntityVO { * 维护[用户]-真名 */ @Schema(description = "维护[用户]-真名") - private String keepUserRealName = "维护[用户]-真名"; + private String keepUserRealName = ""; /** * 维护时间 */ @@ -47,5 +47,5 @@ public class BaseEntityVO { * 业务状态 名称 */ @Schema(description = "业务状态 名称") - private String statusName = "statusName"; + private String statusName = ""; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index 96c258ef..af509792 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -24,9 +24,11 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; import org.springblade.desk.quality.wrapper.AuditFileWrapper; @@ -77,10 +79,15 @@ public class AuditFileController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 20) @Operation(summary = "list分页", description = "传入AuditFile Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map auditFile, + public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(auditFile, AuditFile.class); - IPage pages = service.page(Condition.getPage(query), qw); + QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); + AuditFileSearch search = new AuditFileSearch(); + // todo: Func 用法 + search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); + search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); + search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); + IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() @@ -89,7 +96,6 @@ public class AuditFileController extends BladeController { return R.data(pagesVO); } - /** * [工艺文件] page分页 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java index e286263e..7e3e0404 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java @@ -103,18 +103,18 @@ public class InspectionTemplateController extends BladeController { if (map.containsKey("processNum")) { search.setProcessNum(Integer.parseInt((String) map.get("processNum"))); } - if (map.containsKey(BaseRequest.UP_REAL_NAME)) { - search.setUpdateUserRealName((String) map.get(BaseRequest.UP_REAL_NAME)); + if (map.containsKey(BaseRequest.UPDATE_USER_REAL_NAME)) { + search.setUpdateUserRealName((String) map.get(BaseRequest.UPDATE_USER_REAL_NAME)); } if (map.containsKey(InspectionTemplate.COL_CATEGORY)) { search.setCategory((String) map.get(InspectionTemplate.COL_CATEGORY)); } - if (map.containsKey(BaseRequest.UP_REAL_NAME)) { - search.setUpdateUserRealName((String) map.get(BaseRequest.UP_REAL_NAME)); + if (map.containsKey(BaseRequest.UPDATE_USER_REAL_NAME)) { + search.setUpdateUserRealName((String) map.get(BaseRequest.UPDATE_USER_REAL_NAME)); } // if (map.containsKey(BaseRequest.UP_TIME_START) && map.containsKey(BaseRequest.UP_TIME_END)) { - Date upStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.UP_TIME_START); - Date upEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.UP_TIME_END); + Date upStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.UPDATE_TIME_START); + Date upEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.UPDATE_TIME_END); search.setUpdateTimeStart(upStart); search.setUpdateTimeEnd(upEnd); // } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java index 7d000f29..2e74e410 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java @@ -87,8 +87,8 @@ public class LiquidTankTaskCopyController extends BladeController { } ); // 范围日期 - Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CR_TIME_START); - Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CR_TIME_END); + Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); QueryWrapper qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class); // 完成的 qw.in(BaseCol.STATUS, Arrays.asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK)); @@ -119,8 +119,8 @@ public class LiquidTankTaskCopyController extends BladeController { } ); // 范围日期 - Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CR_TIME_START); - Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CR_TIME_END); + Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); QueryWrapper qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class); // 完成的 qw.in(BaseCol.STATUS, Arrays.asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java index a32d8129..0ab9c401 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import java.util.List; @@ -37,4 +38,6 @@ public interface AuditFileMapper extends BaseMapper { * @return List */ List exportAuditFile(@Param("ew") Wrapper queryWrapper); + + List listSearch(IPage page, @Param("q") AuditFileSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml index 6327b2f2..b481eb05 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml @@ -27,4 +27,21 @@ SELECT * FROM QA_AUDIT_FILE ${ew.customSqlSegment} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java new file mode 100644 index 00000000..8554b322 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.AuditFile; + +@Data +@EqualsAndHashCode(callSuper = true) +public class AuditFileSearch extends AuditFile { + + @Schema(description = "") + private String keepUserRealName; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java index bba72eb9..7ec3536f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java @@ -10,6 +10,9 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.entity.InspectionTemplate; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; +import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import java.util.List; @@ -44,5 +47,7 @@ public interface IAuditFileService extends EnBaseService { */ void setVOValue(AuditFileVO vo); + IPage listSearch(IPage page, AuditFileSearch search); + R upgradeVer(AuditFile find); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java index de5d0928..1c0154f5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java @@ -18,6 +18,9 @@ import org.springblade.desk.quality.constant.AuditFileConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.mapper.AuditFileMapper; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.entity.InspectionTemplate; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; +import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; import org.springblade.system.feign.IDictClient; @@ -67,6 +70,11 @@ public class AuditFileServiceImpl extends EnBaseServiceImpl listSearch(IPage page, AuditFileSearch search) { + return page.setRecords(baseMapper.listSearch(page, search)); + } + @Override public R upgradeVer(AuditFile find) { AuditFile create = new AuditFile(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index ca120e43..b4a1c764 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -96,7 +96,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl