修改P2P文件标识配置导入模板批注

This commit is contained in:
zhangwenqing
2019-01-14 12:02:35 +08:00
parent 4e41bfcf79
commit a2a6884c3b

View File

@@ -495,16 +495,21 @@ public class ExportExcel {
commentStr=""; commentStr="";
List<SysDataDictionaryItem> dict=DictUtils.getDictList("DO_LOG"); List<SysDataDictionaryItem> dict=DictUtils.getDictList("DO_LOG");
if(dict !=null && dict.size()>0){ if(dict !=null && dict.size()>0){
String configDoLog = service.getConfigDoLog(); if(StringUtil.isEmpty(service.getConfigDoLog())){
String doLogOption = configDoLog.substring(configDoLog.indexOf(";"), configDoLog.lastIndexOf(";")); headerStr="";
for (SysDataDictionaryItem sysDataDictionaryItem : dict) { commentStr="";
String itemCode = sysDataDictionaryItem.getItemCode(); }else{
if(doLogOption.contains(itemCode)) { String configDoLog = service.getConfigDoLog();
commentStr=commentStr+itemCode+""+msgProp.getProperty(sysDataDictionaryItem.getItemValue(),sysDataDictionaryItem.getItemValue())+"\n"; String doLogOption = configDoLog.substring(configDoLog.indexOf(";"), configDoLog.lastIndexOf(";"));
index++; for (SysDataDictionaryItem sysDataDictionaryItem : dict) {
String itemCode = sysDataDictionaryItem.getItemCode();
if(doLogOption.contains(itemCode)) {
commentStr=commentStr+itemCode+""+msgProp.getProperty(sysDataDictionaryItem.getItemValue(),sysDataDictionaryItem.getItemValue())+"\n";
index++;
}
} }
defaultValue = configDoLog.substring(configDoLog.lastIndexOf(";")+1);
} }
defaultValue = configDoLog.substring(configDoLog.lastIndexOf(";")+1);
} }
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
@@ -1288,7 +1293,11 @@ public class ExportExcel {
commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n"; commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
index++; index++;
//2、默认值说明 //2、默认值说明
commentStr=commentStr+""+msgProp.getProperty("default_value")+":0\n"; if(region.getDictId().equals(159)) { // P2P文件标识配置
commentStr=commentStr+""+msgProp.getProperty("default_value")+":1\n";
}else {
commentStr=commentStr+""+msgProp.getProperty("default_value")+":0\n";
}
index++; index++;
} }
} }
@@ -1318,10 +1327,19 @@ public class ExportExcel {
} }
}else{ }else{
for (SysDataDictionaryItem sysDataDictionaryItem : isCaseSenstive) { for (SysDataDictionaryItem sysDataDictionaryItem : isCaseSenstive) {
if(sysDataDictionaryItem.getItemCode().equals("1")){ if(region.getDictId().equals(159)) { // P2P文件标识配置
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+""+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+""+"\n"; if(sysDataDictionaryItem.getItemCode().equals("0")){
list.add(sysDataDictionaryItem.getItemCode()); commentStr=commentStr+sysDataDictionaryItem.getItemCode()+""+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+""+"\n";
index++; list.add(sysDataDictionaryItem.getItemCode());
index++;
}
}else {
if(sysDataDictionaryItem.getItemCode().equals("1")){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+""+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+""+"\n";
list.add(sysDataDictionaryItem.getItemCode());
index++;
}
} }
} }
} }