Merge remote-tracking branch 'origin/developer' into developer

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

@@ -33,6 +33,8 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -142,6 +144,7 @@ public class CustomSettingApiServiceImpl implements CustomSettingApiService {
         queryDTO.setDataBaseName(DATABASENAME);
         queryDTO.setConllectionName(tableName);
         ServiceResponse<List<Map>> query = mongoOperApiService.query(queryDTO);
+        log.info("getDetail：{},{}", JSON.toJSONString(queryDTO), JSON.toJSONString(query));
         if(query.isSuccess()){
             if(CollectionUtils.isNotEmpty(query.getResult())){
                 return ServiceResponse.success(query.getResult().get(0));
@@ -207,11 +210,16 @@ public class CustomSettingApiServiceImpl implements CustomSettingApiService {
                 } else if(fieldDTOMap.get(k).getFieldType().equals(FieldTypeEnum.DATE.getType())){
                     String s = v+"";
                     if(StringUtils.isNotBlank(s)){
-                        String[] split = s.split("-");
+                        String[] split = s.split(",");
                         if(split.length == 2){
                             JSONObject json = new JSONObject();
-                            json.put("start", split[0]);
-                            json.put("end", split[1]);
+                            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]));
+                            } catch (ParseException e) {
+                                log.warn("日期转换异常：", e);
+                            }
                             criteria = new Criteria(k, MongoOperTypeEnum.BETWEEN, json);
                         }
                     }
@@ -223,7 +231,7 @@ public class CustomSettingApiServiceImpl implements CustomSettingApiService {
                 criteriaList.add(criteria);
             }
         });
-        Criteria criteria = new Criteria("delete_flag", MongoOperTypeEnum.EQ, 1);
+        Criteria criteria = new Criteria("delete_flag", MongoOperTypeEnum.EQ, 0);
         criteriaList.add(criteria);
         return criteriaList;
     }