|
|
|
@ -9,11 +9,15 @@ import apelet.common.eas.service.impl.EASSyncService; |
|
|
|
import apelet.common.generator.dao.OnlCgreportHeadMapper; |
|
|
|
import apelet.common.generator.dao.OnlCgreportHeadMapper; |
|
|
|
import apelet.common.generator.dto.OnlCgreportHeadDto; |
|
|
|
import apelet.common.generator.dto.OnlCgreportHeadDto; |
|
|
|
import apelet.common.generator.dto.SQLParseDto; |
|
|
|
import apelet.common.generator.dto.SQLParseDto; |
|
|
|
import apelet.common.generator.model.*; |
|
|
|
import apelet.common.generator.model.OnlCgreportHead; |
|
|
|
import apelet.common.generator.service.*; |
|
|
|
import apelet.common.generator.model.OnlCgreportItem; |
|
|
|
|
|
|
|
import apelet.common.generator.model.OnlCgreportParam; |
|
|
|
|
|
|
|
import apelet.common.generator.service.IOnlCgreportHeadService; |
|
|
|
|
|
|
|
import apelet.common.generator.service.IOnlCgreportItemService; |
|
|
|
|
|
|
|
import apelet.common.generator.service.IOnlCgreportParamService; |
|
|
|
|
|
|
|
import apelet.common.generator.service.IOnlFormHeadService; |
|
|
|
import apelet.common.generator.utils.CompareType; |
|
|
|
import apelet.common.generator.utils.CompareType; |
|
|
|
import apelet.common.generator.vo.OnlFormHeadVo2; |
|
|
|
import apelet.common.generator.vo.OnlFormHeadVo2; |
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import com.alibaba.druid.sql.SQLUtils; |
|
|
|
import com.alibaba.druid.sql.SQLUtils; |
|
|
|
@ -424,7 +428,13 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe |
|
|
|
|
|
|
|
|
|
|
|
JSONObject f7Params = jsonObject.getJSONObject("self__f7Params"); |
|
|
|
JSONObject f7Params = jsonObject.getJSONObject("self__f7Params"); |
|
|
|
jsonObject.remove("self__f7Params");//移除
|
|
|
|
jsonObject.remove("self__f7Params");//移除
|
|
|
|
|
|
|
|
if (jsonObject.getBooleanValue("isSelectQuery") && jsonObject.containsKey("searchKeyword")) { |
|
|
|
|
|
|
|
List<OnlCgreportItem> selectQuery = all.stream().filter(f -> f.getIsSelectQuery().equals(1)).collect(Collectors.toList()); |
|
|
|
|
|
|
|
selectQuery.forEach(f -> { |
|
|
|
|
|
|
|
where.put(f.getFieldName(), jsonObject.get("searchKeyword")); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
jsonObject.remove("isSelectQuery");//移除
|
|
|
|
if (null != jsonObject) { |
|
|
|
if (null != jsonObject) { |
|
|
|
for (OnlCgreportItem item : queryList) { |
|
|
|
for (OnlCgreportItem item : queryList) { |
|
|
|
String fieldName = item.getFieldName(); |
|
|
|
String fieldName = item.getFieldName(); |
|
|
|
|