AuditFile相关。

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";
 }

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 = "";
 }

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<IPage<AuditFileVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> auditFile,
+    public R<IPage<AuditFileVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> map,
                                       Query query) {
-        QueryWrapper<AuditFile> qw = Condition.getQueryWrapper(auditFile, AuditFile.class);
-        IPage<AuditFile> pages = service.page(Condition.getPage(query), qw);
+        QueryWrapper<AuditFile> 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<AuditFile> pages = service.listSearch(Condition.getPage(query), search);
         IPage<AuditFileVO> pagesVO = AuditFileWrapper.build().pageVO(pages);
         pagesVO.getRecords()
                 .stream()
@@ -89,7 +96,6 @@ public class AuditFileController extends BladeController {
         return R.data(pagesVO);
     }
 
-
     /**
      * [工艺文件] page分页
      */

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);
 //        }

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<LiquidTankTaskCopy> 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<LiquidTankTaskCopy> qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class);
         // 完成的
         qw.in(BaseCol.STATUS, Arrays.asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK));

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<AuditFile> {
 	 * @return List<AuditFileExcel>
 	 */
 	List<AuditFileExcel> exportAuditFile(@Param("ew") Wrapper<AuditFile> queryWrapper);
+
+    List<AuditFile> listSearch(IPage page, @Param("q") AuditFileSearch search);
 }

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}
     </select>
+
+    <select id="listSearch" resultMap="auditFileResultMap">
+        SELECT DISTINCT t.*
+        FROM QA_AUDIT_FILE f
+        LEFT JOIN BLADE_USER u
+        ON (f.CREATE_USER = u.ID OR f.UPDATE_USER = u.ID)
+        WHERE (t.IS_DELETED = 0 AND u.IS_DELETED = 0)
+        <if test="q.ppsId != null">
+            AND t.PPS_ID = #{q.ppsId}
+        </if>
+        <if test="q.pqId != null">
+            AND t.PQ_ID = #{q.pqId}
+        </if>
+        <if test="q.keepUserRealName != null and q.keepUserRealName != ''">
+            AND u.REAL_NAME LIKE '%' || #{q.keepUserRealName} || '%'
+        </if>
+    </select>
 </mapper>

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;
+}

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<AuditFile> {
      */
 	void setVOValue(AuditFileVO vo);
 
+    IPage<AuditFile> listSearch(IPage<AuditFile> page, AuditFileSearch search);
+
 	R upgradeVer(AuditFile find);
 }

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<AuditFileMapper, Aud
         vo.setBase(setBaseVOValue(userClient, sysClient, dictClient, vo, "AuditFile-Status"));
     }
 
+    @Override
+    public IPage<AuditFile> listSearch(IPage<AuditFile> page, AuditFileSearch search) {
+        return page.setRecords(baseMapper.listSearch(page, search));
+    }
+
     @Override
     public R upgradeVer(AuditFile find) {
         AuditFile create = new AuditFile();

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java

@@ -96,7 +96,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl<ProReTemplateMap
             tankVO.setChildrenList(detailVOList);
         }
     }
-    
+
     @Override
     public R updateDetail(ProReTemplateVO vo) {
         for (ProReTemplateTankVO tankOne : vo.getPreserveSlotList()) {