配置表

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/CustomSettingApiServiceImpl.java

@@ -204,10 +204,10 @@ public class CustomSettingApiServiceImpl implements CustomSettingApiService {
         map.forEach((k, v) -> {
             Criteria criteria = null;
             if(k.equals(PRIMARYKEY)){
-                criteria = new Criteria(k, MongoOperTypeEnum.EQ, v);
+                criteria = Criteria.where(k).eq(v);
             } else {
                 if(fieldDTOMap.get(k).getFieldType().equals(FieldTypeEnum.STRING.getType())){
-                    criteria = new Criteria(k, MongoOperTypeEnum.REGEX, v);
+                    criteria = Criteria.where(k).regex(v);
                 } else if(fieldDTOMap.get(k).getFieldType().equals(FieldTypeEnum.DATE.getType())){
                     String s = v+"";
                     if(StringUtils.isNotBlank(s)){
@@ -216,23 +216,21 @@ public class CustomSettingApiServiceImpl implements CustomSettingApiService {
                             Map<String, Object> json = new HashMap();
                             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                             try {
-                                json.put("start", sdf.parse(split[0]));
-                                json.put("end", sdf.parse(split[1]));
+                                criteria = Criteria.where(k).between(sdf.parse(split[0]), sdf.parse(split[1]));
                             } catch (ParseException e) {
                                 log.warn("日期转换异常：", e);
                             }
-                            criteria = new Criteria(k, MongoOperTypeEnum.BETWEEN, json);
                         }
                     }
                 } else {
-                    criteria = new Criteria(k, MongoOperTypeEnum.EQ, v);
+                    criteria = Criteria.where(k).eq(v);
                 }
             }
             if(criteria != null){
                 criteriaList.add(criteria);
             }
         });
-        Criteria criteria = new Criteria("delete_flag", MongoOperTypeEnum.EQ, 0);
+        Criteria criteria = Criteria.where("delete_flag").eq(0);
         criteriaList.add(criteria);
         return criteriaList;
     }