feature(权限申请bug修改): 权限申请bug修改

权限申请bug修改

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/business/impl/AuthApplyBusiness.java

@@ -214,19 +214,33 @@ public class AuthApplyBusiness implements IAuthApplyBusiness
         int pageSize = page.getPageSize();
         Map<String, SearchParam> filters = new HashMap<>();
         ApiSearchReq apiSearchReq = new ApiSearchReq();
+
         if(flowTitle != null) {
             SearchParam searchParam = new SearchParam();
             searchParam.setOperator(SearchOperator.like.name());
             searchParam.setValue(flowTitle.getValue());
             filters.put("processTitle", searchParam);
         }
+
         if(applyType != null) {
             SearchParam searchParam = new SearchParam();
             searchParam.setOperator(SearchOperator.eq.name());
             searchParam.setValue(applyType.getValue());
             filters.put("flowType", searchParam);
         }
-        if(createTimeGe != null) {
+
+        if(createTimeGe != null && createTimeLe != null) {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SearchParam searchParam = new SearchParam();
+            searchParam.setOperator(SearchOperator.rangeDate.name());
+            Object geValue = createTimeGe.getValue();
+            String geTimeStr = format.format(geValue);
+            Object leValue = createTimeLe.getValue();
+            String leTimeStr = format.format(leValue);
+            String[] arr = new String[]{geTimeStr, leTimeStr};
+            searchParam.setValue(arr);
+            filters.put("createTime", searchParam);
+        } else if(createTimeGe != null) {
             SearchParam searchParam = new SearchParam();
             searchParam.setOperator(SearchOperator.ge.name());
             Object value = createTimeGe.getValue();
@@ -234,8 +248,7 @@ public class AuthApplyBusiness implements IAuthApplyBusiness
             String timeStr = format.format(value);
             searchParam.setValue(timeStr);
             filters.put("createTime", searchParam);
-        }
-        if(createTimeLe != null) {
+        } else if(createTimeLe != null) {
             SearchParam searchParam = new SearchParam();
             searchParam.setOperator(SearchOperator.le.name());
             Object value = createTimeLe.getValue();