src/main/java/com/kcim/controller/QualificationController.java

@@ -61,13 +61,14 @@ public class QualificationController {
     @GetMapping("getQualificationList")
     public Result getQualificationList(@RequestParam(value = "name", required = false) String name,
                                        @RequestParam(value = "qualificationTypeCode", required = false) String qualificationTypeCode,
+                                       @RequestParam(value = "qualificationTypeNameFilter", required = false) String qualificationTypeNameFilter,
                                        @RequestParam(value = "operationLevelCode", required = false) String operationLevelCode,
                                        @RequestParam(value = "techFlag", required = false) Integer techFlag,
                                        @RequestParam(value = "operationFlag", required = false) Integer operationFlag,
                                        @RequestParam(value = "enableFlag", required = false) Integer enableFlag,
                                        @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
                                        @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return Result.ok(qualificationService.getQualificationList(name, qualificationTypeCode, operationLevelCode, techFlag, operationFlag, enableFlag, current, pageSize));
+        return Result.ok(qualificationService.getQualificationList(name, qualificationTypeCode, qualificationTypeNameFilter,operationLevelCode, techFlag, operationFlag, enableFlag, current, pageSize));
     }
 
     @ApiOperation("资质字典-新增")

src/main/java/com/kcim/dao/model/DoctorAttachment.java

@@ -1,9 +1,6 @@
 package com.kcim.dao.model;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -58,12 +55,14 @@ public class DoctorAttachment implements Serializable {
 	 * 启用日期
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date activeDate;
 
 	/**
 	 * 到期日期
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date expireDate;
 
 	@TableField(exist = false)

src/main/java/com/kcim/service/QualificationService.java

@@ -37,7 +37,7 @@ public interface QualificationService extends IService<Qualification> {
      */
     QualificationType deleteQualificationType(Integer id);
 
-    PageUtils getQualificationList(String name, String qualificationTypeCode, String operationLevelCode, Integer techFlag, Integer operationFlag, Integer enableFlag, Integer current, Integer pageSize);
+    PageUtils getQualificationList(String name, String qualificationTypeCode, String qualificationTypeNameFilter,String operationLevelCode, Integer techFlag, Integer operationFlag, Integer enableFlag, Integer current, Integer pageSize);
 
     void addQualification(Qualification qualification);
 
@@ -45,5 +45,7 @@ public interface QualificationService extends IService<Qualification> {
 
     Qualification deleteQualification(Integer id);
 
+    List<String> getQualificationTypeCodeRecursion(List<QualificationType> typeList, String qualificationTypeCode, String qualificationTypeNameFilter);
+
     List<String> getQualificationTypeCodeRecursion(List<QualificationType> typeList, String qualificationCode);
 }

src/main/java/com/kcim/service/impl/QualificationApplyServiceImpl.java

@@ -135,13 +135,11 @@ public class QualificationApplyServiceImpl extends ServiceImpl<QualificationAppl
         qualificationApplyRepository.deleteById(id);
     }
 
-
-
     @Override
     public Object getQualificationList(String name, String qualificationTypeCode, String operationLevelCode, Integer techFlag, Integer operationFlag, Integer enableFlag, Integer current, Integer pageSize) {
 
         List<QualificationApply> myApplyList = qualificationApplyRepository.listByCurrentUser();
-        PageUtils page = qualificationService.getQualificationList(name,qualificationTypeCode,operationLevelCode,techFlag,operationFlag,enableFlag,current,pageSize);
+        PageUtils page = qualificationService.getQualificationList(name,qualificationTypeCode,operationLevelCode,"",techFlag,operationFlag,enableFlag,current,pageSize);
         for (Object record : page.getList()) {
             if(record instanceof Qualification){
                 Qualification qualification = (Qualification) record;

src/main/java/com/kcim/service/impl/QualificationServiceImpl.java

@@ -203,7 +203,7 @@ public class QualificationServiceImpl extends ServiceImpl<QualificationMapper, Q
      * 查询资质列表
      */
     @Override
-    public PageUtils getQualificationList(String name, String qualificationTypeCode, String operationLevelCode, Integer techFlag, Integer operationFlag, Integer enableFlag, Integer current, Integer pageSize) {
+    public PageUtils getQualificationList(String name, String qualificationTypeCode, String qualificationTypeNameFilter,String operationLevelCode, Integer techFlag, Integer operationFlag, Integer enableFlag, Integer current, Integer pageSize) {
         LambdaQueryWrapper<Qualification> queryWrapper = new LambdaQueryWrapper<>();
 
         //资质名称过滤
@@ -218,7 +218,7 @@ public class QualificationServiceImpl extends ServiceImpl<QualificationMapper, Q
             List<QualificationType> typeList = getQualificationTypeWithoutRecursion();
 
             //资质分类字典的下级所有递归根节点的code
-            List<String> list = getQualificationTypeCodeRecursion(typeList,qualificationTypeCode);
+            List<String> list = getQualificationTypeCodeRecursion(typeList,qualificationTypeCode,qualificationTypeNameFilter);
             queryWrapper.in(Qualification::getQualificationTypeCode, list);
         }
 
@@ -333,38 +333,52 @@ public class QualificationServiceImpl extends ServiceImpl<QualificationMapper, Q
         }
     }
 
-    /**
-     * 递归获取的资质分类编码的下级编码列表
-     */
     @Override
-    public List<String> getQualificationTypeCodeRecursion(List<QualificationType> typeList, String qualificationCode){
+    public List<String> getQualificationTypeCodeRecursion(List<QualificationType> typeList, String qualificationTypeCode, String qualificationTypeNameFilter){
 
         List<String> list = new ArrayList<>();
 
         //父节点为传入节点的节点数
-        long count = typeList.stream().filter(t -> t.getParentCode().equals(qualificationCode)).count();
+        long count = typeList.stream().filter(t -> t.getParentCode().equals(qualificationTypeCode)).count();
 
         //传入的是根节点
         if(count == 0){
-            list.add(qualificationCode);
+            list.add(qualificationTypeCode);
             return list;
         }
 
         //传入的不是根节点
         for(QualificationType type : typeList){
             //传入节点的直接下级
-            if(type.getParentCode().equals(qualificationCode)){
+            if(type.getParentCode().equals(qualificationTypeCode)){
                 long childCount = typeList.stream().filter(t -> t.getParentCode().equals(type.getCode())).count();
                 //是末级节点
                 if(childCount == 0 && !list.contains(type.getCode())){
-                    list.add(type.getCode());
+                    //没有过滤文本，直接添加
+                    if(qualificationTypeNameFilter.isEmpty()){
+                        list.add(type.getCode());
+                    }
+                    //有过滤文本，与文本匹配成功再添加
+                    else{
+                        if(type.getName().contains(qualificationTypeNameFilter)){
+                            list.add(type.getCode());
+                        }
+                    }
                 }
                 //递归
                 else{
-                    list.addAll(getQualificationTypeCodeRecursion(typeList,type.getCode()));
+                    list.addAll(getQualificationTypeCodeRecursion(typeList,type.getCode(),qualificationTypeNameFilter));
                 }
             }
         }
         return list;
     }
+
+    /**
+     * 递归获取的资质分类编码的下级编码列表
+     */
+    @Override
+    public List<String> getQualificationTypeCodeRecursion(List<QualificationType> typeList, String qualificationTypeCode){
+        return getQualificationTypeCodeRecursion(typeList,qualificationTypeCode,"");
+    }
 }