事项申请列表查询条件增加复核关键字查询

single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyVo.java

@@ -20,4 +20,6 @@ public class MatterApplyVo extends BaseEntityLong {
     private List<MatterApplyDatumEntity> applyDatumList;
     /** 用户id */
     private Long userId;
+
+    private String keywords;
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java

@@ -4,19 +4,23 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.module.apply.dao.MatterApplyDao;
 import com.mortals.xhx.module.apply.model.MatterApplyDatumEntity;
 import com.mortals.xhx.module.apply.model.MatterApplyDatumQuery;
 import com.mortals.xhx.module.apply.model.MatterApplyEntity;
+import com.mortals.xhx.module.apply.model.MatterApplyQuery;
 import com.mortals.xhx.module.apply.service.ApproverService;
 import com.mortals.xhx.module.apply.service.MatterApplyDatumService;
 import com.mortals.xhx.module.apply.service.MatterApplyService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -71,7 +75,24 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
             String deptCode = approverService.getDeptCodeByUser(params.getUserId());
             params.setDeptCode(deptCode);
         }
-        return params;
+        MatterApplyQuery query = new MatterApplyQuery();
+        BeanUtils.copyProperties(params,query);
+        if(StringUtils.isNotEmpty(params.getKeywords())){
+            StringBuffer condition = new StringBuffer("%");
+            condition.append(params.getKeywords()).append("%");
+            MatterApplyQuery condition1 = new MatterApplyQuery();
+            condition1.setApplyPerson(condition.toString());
+            MatterApplyQuery condition2 = new MatterApplyQuery();
+            condition2.setMatterName(condition.toString());
+            MatterApplyQuery condition3 = new MatterApplyQuery();
+            condition3.setAddress(condition.toString());
+            List<MatterApplyQuery> orConditionList = new ArrayList<>();
+            orConditionList.add(condition1);
+            orConditionList.add(condition2);
+            orConditionList.add(condition3);
+            query.setOrConditionList(orConditionList);
+        }
+        return query;
     }
     @Override
     protected MatterApplyEntity findBefore(MatterApplyEntity params, PageInfo pageInfo, Context context) throws AppException {
@@ -79,7 +100,24 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
             String deptCode = approverService.getDeptCodeByUser(params.getUserId());
             params.setDeptCode(deptCode);
         }
-        return params;
+        MatterApplyQuery query = new MatterApplyQuery();
+        BeanUtils.copyProperties(params,query);
+        if(StringUtils.isNotEmpty(params.getKeywords())){
+            StringBuffer condition = new StringBuffer("%");
+            condition.append(params.getKeywords()).append("%");
+            MatterApplyQuery condition1 = new MatterApplyQuery();
+            condition1.setApplyPerson(condition.toString());
+            MatterApplyQuery condition2 = new MatterApplyQuery();
+            condition2.setMatterName(condition.toString());
+            MatterApplyQuery condition3 = new MatterApplyQuery();
+            condition3.setAddress(condition.toString());
+            List<MatterApplyQuery> orConditionList = new ArrayList<>();
+            orConditionList.add(condition1);
+            orConditionList.add(condition2);
+            orConditionList.add(condition3);
+            query.setOrConditionList(orConditionList);
+        }
+        return query;
     }
 
     @Override