解决轮播图查询报错的问题

master
白美平 2 months ago
parent cd4dd07136
commit 890f4c03cb

@ -10,42 +10,12 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="数据同步"> <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="数据同步功能修改">
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/AtomikosConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcBak.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcPetrol.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/Mapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/Mapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcBak.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcBak.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/IntegralManagerApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/IntegralManagerApplication.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcPetrol.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcPetrol.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DataSourceConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DataSourceConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/MybatisConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/MybatisConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/CommonServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/CommonServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralAppServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralAppServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralLevelMessageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralLevelMessageServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralRebatSolveServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralRebatSolveServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralStarSetupServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralStarSetupServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/MessagePushServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/MessagePushServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/OperatorsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/OperatorsServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SelectDataImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SelectDataImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/VehicleScoreServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/VehicleScoreServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/static/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/application.properties" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -110,65 +80,65 @@
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true", &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
"Application.DivPassDataImpl.executor": "Run", &quot;Application.DivPassDataImpl.executor&quot;: &quot;Run&quot;,
"Application.ImageUtils.executor": "Run", &quot;Application.ImageUtils.executor&quot;: &quot;Run&quot;,
"Application.OcrUtil.executor": "Debug", &quot;Application.OcrUtil.executor&quot;: &quot;Debug&quot;,
"Application.PubTools.executor": "Run", &quot;Application.PubTools.executor&quot;: &quot;Run&quot;,
"Application.QCodeInfoServiceImpl.executor": "Debug", &quot;Application.QCodeInfoServiceImpl.executor&quot;: &quot;Debug&quot;,
"Application.SensitiveFilter.executor": "Run", &quot;Application.SensitiveFilter.executor&quot;: &quot;Run&quot;,
"Application.main.executor": "Run", &quot;Application.main.executor&quot;: &quot;Run&quot;,
"Application.redisConfigUtil.executor": "Debug", &quot;Application.redisConfigUtil.executor&quot;: &quot;Debug&quot;,
"Maven.IntegraManager [clean].executor": "Run", &quot;Maven.IntegraManager [clean].executor&quot;: &quot;Run&quot;,
"Maven.IntegraManager [install].executor": "Run", &quot;Maven.IntegraManager [install].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManager [clean].executor": "Run", &quot;Maven.IntegralManager [clean].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManager [install].executor": "Run", &quot;Maven.IntegralManager [install].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManager [site].executor": "Run", &quot;Maven.IntegralManager [site].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManager [validate].executor": "Run", &quot;Maven.IntegralManager [validate].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManager [verify].executor": "Run", &quot;Maven.IntegralManager [verify].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManagerSys [clean].executor": "Run", &quot;Maven.IntegralManagerSys [clean].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManagerSys [install].executor": "Run", &quot;Maven.IntegralManagerSys [install].executor&quot;: &quot;Run&quot;,
"Maven.devProject [clean].executor": "Run", &quot;Maven.devProject [clean].executor&quot;: &quot;Run&quot;,
"Maven.devProject [install].executor": "Run", &quot;Maven.devProject [install].executor&quot;: &quot;Run&quot;,
"Maven.dev_project [clean].executor": "Run", &quot;Maven.dev_project [clean].executor&quot;: &quot;Run&quot;,
"Maven.dev_project [install].executor": "Run", &quot;Maven.dev_project [install].executor&quot;: &quot;Run&quot;,
"Maven.special_event [clean].executor": "Run", &quot;Maven.special_event [clean].executor&quot;: &quot;Run&quot;,
"Maven.special_event [install].executor": "Run", &quot;Maven.special_event [install].executor&quot;: &quot;Run&quot;,
"Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run", &quot;Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor&quot;: &quot;Run&quot;,
"Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run", &quot;Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor&quot;: &quot;Run&quot;,
"Maven.special_event [package].executor": "Run", &quot;Maven.special_event [package].executor&quot;: &quot;Run&quot;,
"Maven.special_event [validate].executor": "Run", &quot;Maven.special_event [validate].executor&quot;: &quot;Run&quot;,
"RunOnceActivity.OpenProjectViewOnStart": "true", &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.go.formatter.settings.were.checked": "true", &quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;,
"RunOnceActivity.go.migrated.go.modules.settings": "true", &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
"SHARE_PROJECT_CONFIGURATION_FILES": "true", &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
"TomEE Server.special_event.executor": "Debug", &quot;TomEE Server.special_event.executor&quot;: &quot;Debug&quot;,
"Tomcat Server.Tomcat 9.0.80.executor": "Debug", &quot;Tomcat Server.Tomcat 9.0.80.executor&quot;: &quot;Debug&quot;,
"deletionFromPopupRequiresConfirmation": "false", &quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
"git-widget-placeholder": "master", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"go.import.settings.migrated": "true", &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
"kotlin-language-version-configured": "true", &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
"last_opened_file_path": "D:/workspace/DivDataProject", &quot;last_opened_file_path&quot;: &quot;D:/workspace/IntegralManager&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"nodejs_package_manager_path": "npm", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"project.structure.last.edited": "Artifacts", &quot;project.structure.last.edited&quot;: &quot;Artifacts&quot;,
"project.structure.proportion": "0.15", &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
"project.structure.side.proportion": "0.37169158", &quot;project.structure.side.proportion&quot;: &quot;0.37169158&quot;,
"settings.editor.selected.configurable": "reference.settings.project.maven.importing", &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.importing&quot;,
"vue.rearranger.settings.migration": "true" &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}, },
"keyToStringList": { &quot;keyToStringList&quot;: {
"DatabaseDriversLRU": [ &quot;DatabaseDriversLRU&quot;: [
"oracle" &quot;oracle&quot;
] ]
} }
}]]></component> }</component>
<component name="ReactorSettings"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
</component> </component>
@ -669,7 +639,11 @@
<workItem from="1755767987191" duration="488000" /> <workItem from="1755767987191" duration="488000" />
<workItem from="1756173838376" duration="4099000" /> <workItem from="1756173838376" duration="4099000" />
<workItem from="1756363038283" duration="33354000" /> <workItem from="1756363038283" duration="33354000" />
<workItem from="1756685986672" duration="20841000" /> <workItem from="1756685986672" duration="23195000" />
<workItem from="1757035222265" duration="949000" />
<workItem from="1757037212634" duration="6713000" />
<workItem from="1757314801573" duration="3854000" />
<workItem from="1757319421832" duration="713000" />
</task> </task>
<task id="LOCAL-00001" summary="特请处理"> <task id="LOCAL-00001" summary="特请处理">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -919,7 +893,23 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1756191074573</updated> <updated>1756191074573</updated>
</task> </task>
<option name="localTasksCounter" value="32" /> <task id="LOCAL-00032" summary="数据同步功能修改">
<option name="closed" value="true" />
<created>1756797443062</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1756797443062</updated>
</task>
<task id="LOCAL-00033" summary="数据同步功能修改">
<option name="closed" value="true" />
<created>1756797525902</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1756797525902</updated>
</task>
<option name="localTasksCounter" value="34" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -959,7 +949,8 @@
<MESSAGE value="修改积分核销不显示核销的积分数" /> <MESSAGE value="修改积分核销不显示核销的积分数" />
<MESSAGE value="修改积分核销失败的问题" /> <MESSAGE value="修改积分核销失败的问题" />
<MESSAGE value="数据同步" /> <MESSAGE value="数据同步" />
<option name="LAST_COMMIT_MESSAGE" value="数据同步" /> <MESSAGE value="数据同步功能修改" />
<option name="LAST_COMMIT_MESSAGE" value="数据同步功能修改" />
</component> </component>
<component name="VgoProject"> <component name="VgoProject">
<integration-enabled>false</integration-enabled> <integration-enabled>false</integration-enabled>
@ -988,6 +979,11 @@
<line>115</line> <line>115</line>
<option name="timeStamp" value="43" /> <option name="timeStamp" value="43" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java</url>
<line>221</line>
<option name="timeStamp" value="44" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>

@ -28,6 +28,7 @@ public class DBSrcBak {
sqlSessionFactory.setDataSource(dataSource); sqlSessionFactory.setDataSource(dataSource);
MybatisConfiguration configuration = new MybatisConfiguration(); MybatisConfiguration configuration = new MybatisConfiguration();
configuration.addInterceptor(mybatisPlusInterceptor); configuration.addInterceptor(mybatisPlusInterceptor);
configuration.setCallSettersOnNulls(true);
// 配置打印sql语句 // 配置打印sql语句
if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){ if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
configuration.setLogImpl(StdOutImpl.class); configuration.setLogImpl(StdOutImpl.class);

@ -39,6 +39,7 @@ public class DBSrcPetrol {
if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){ if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
configuration.setLogImpl(StdOutImpl.class); configuration.setLogImpl(StdOutImpl.class);
} }
configuration.setCallSettersOnNulls(true);
sqlSessionFactory.setConfiguration(configuration); sqlSessionFactory.setConfiguration(configuration);
// sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver() // sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
// .getResources("classpath:mapper/petrol/**/*.xml")); // .getResources("classpath:mapper/petrol/**/*.xml"));

@ -19,7 +19,7 @@ public class RotationServiceImpl {
@Autowired @Autowired
public Mapper mapperI; public Mapper mapperI;
private static String DBType= PropertiesUtil.getValue("DBType"); private static String DBType= PropertiesUtil.getValue("DBType");
private String sql = "select pic.ID,pic.RETATIONPIC,pic.JUMPURL,pic.ORDERNOpic.RETATIONPICNAME,(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL from INTEGRAL_ROTATION pic where 1=1 "; private String sql = "select pic.ID,pic.RETATIONPIC,pic.JUMPURL,pic.ORDERNO,pic.RETATIONPICNAME,(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL from INTEGRAL_ROTATION pic where 1=1 ";
public List getRotationList(String picType) { public List getRotationList(String picType) {
List list=null; List list=null;

@ -43,17 +43,17 @@ public class ServiceAreaServiceImpl implements IServiceAreaService {
"\tCOALESCE(area.LAT,'') as LAT,\n" + "\tCOALESCE(area.LAT,'') as LAT,\n" +
"\tCOALESCE(area.LNG,'') as LNG,\n" + "\tCOALESCE(area.LNG,'') as LNG,\n" +
"\tarea.SERVICEKIND,\n" + "\tarea.SERVICEKIND,\n" +
" (select LISTAGG ( kind.TEXT, ', ' ) WITHIN GROUP ( ORDER BY kind.VALUE ) from service_area_kind_text kind where INSTR( area.SERVICEKIND, kind.VALUE ) > 0 GROUP BY area.SERVICEKIND) AS SERVICEKINDNAME,\n" + " COALESCE((select LISTAGG ( kind.TEXT, ', ' ) WITHIN GROUP ( ORDER BY kind.VALUE ) from service_area_kind_text kind where INSTR( area.SERVICEKIND, kind.VALUE ) > 0 GROUP BY area.SERVICEKIND),'') AS SERVICEKINDNAME,\n" +
"\tarea.SERVICEFEETYPE,\n" + "\tCOALESCE(area.SERVICEFEETYPE ,'') as SERVICEFEETYPE,\n" +
" (select LISTAGG ( kind2.TEXT, ', ' ) WITHIN GROUP ( ORDER BY kind2.VALUE ) from service_area_kind_text kind2 where INSTR( area.SERVICEFEETYPE, kind2.VALUE ) > 0 AND kind2.VALUE >=50 GROUP BY area.SERVICEFEETYPE) AS SERVICEFEETYPENAME,\n" + " COALESCE( (select LISTAGG ( kind2.TEXT, ', ' ) WITHIN GROUP ( ORDER BY kind2.VALUE ) from service_area_kind_text kind2 where INSTR( area.SERVICEFEETYPE, kind2.VALUE ) > 0 AND kind2.VALUE >=50 GROUP BY area.SERVICEFEETYPE),'') AS SERVICEFEETYPENAME,\n" +
"@PICPARAM AS PICDATA,"+ "@PICPARAM AS PICDATA,"+
"(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," + "(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," +
"area.CODE AS CODE,"+ "area.CODE AS CODE,"+
"area.ROADNO AS ROADNO,"+ "area.ROADNO AS ROADNO,"+
"sart.TEXT AS ROADNONAME,"+ "COALESCE(sart.TEXT,'') AS ROADNONAME,"+
"area.OPEN AS OPEN,"+ "area.OPEN AS OPEN,"+
" case when area.OPEN=0 then '关闭' else '开放' END AS OPENNAME,"+ " case when area.OPEN=0 then '关闭' else '开放' END AS OPENNAME,"+
"\tTYPE.TEXT AS SERVICETYPENAME \n" + "\tCOALESCE(TYPE.TEXT,'') AS SERVICETYPENAME \n" +
"\t FROM\n" + "\t FROM\n" +
"\tservice_area_table area\n" + "\tservice_area_table area\n" +
"\tLEFT JOIN SERVICE_AREA_POSITION_TEXT sapt ON sapt.VALUE = area.POSITION\n" + "\tLEFT JOIN SERVICE_AREA_POSITION_TEXT sapt ON sapt.VALUE = area.POSITION\n" +
@ -70,17 +70,17 @@ static{
"\tarea.SERVICEKIND,\n" + "\tarea.SERVICEKIND,\n" +
"\tCOALESCE(area.LAT,'') as LAT,\n" + "\tCOALESCE(area.LAT,'') as LAT,\n" +
"\tCOALESCE(area.LNG,'') as LNG,\n" + "\tCOALESCE(area.LNG,'') as LNG,\n" +
" (select GROUP_CONCAT(DISTINCT kind.TEXT ORDER BY kind.VALUE Separator ',') from service_area_kind_text kind where INSTR( area.SERVICEKIND, kind.VALUE ) > 0 GROUP BY area.SERVICEKIND) AS SERVICEKINDNAME,\n" + " COALESCE((select GROUP_CONCAT(DISTINCT kind.TEXT ORDER BY kind.VALUE Separator ',') from service_area_kind_text kind where INSTR( area.SERVICEKIND, kind.VALUE ) > 0 GROUP BY area.SERVICEKIND),'') AS SERVICEKINDNAME,\n" +
"\tarea.SERVICEFEETYPE,\n" + "\tCOALESCE(area.SERVICEFEETYPE ,'') as SERVICEFEETYPE,\n" +
"(select GROUP_CONCAT(DISTINCT kind2.TEXT ORDER BY kind2.VALUE Separator ',') from service_area_kind_text kind2 where INSTR( area.SERVICEFEETYPE, kind2.VALUE ) > 0 AND kind2.VALUE >=50 GROUP BY area.SERVICEFEETYPE) AS SERVICEFEETYPENAME,\n" + "COALESCE((select GROUP_CONCAT(DISTINCT kind2.TEXT ORDER BY kind2.VALUE Separator ',') from service_area_kind_text kind2 where INSTR( area.SERVICEFEETYPE, kind2.VALUE ) > 0 AND kind2.VALUE >=50 GROUP BY area.SERVICEFEETYPE),'') AS SERVICEFEETYPENAME,\n" +
"@PICPARAM AS PICDATA,"+ "@PICPARAM AS PICDATA,"+
"(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," + "(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," +
"area.CODE AS CODE,"+ "area.CODE AS CODE,"+
"area.ROADNO AS ROADNO,"+ "area.ROADNO AS ROADNO,"+
"sart.TEXT AS ROADNONAME,"+ "COALESCE(sart.TEXT,'') AS ROADNONAME,"+
"area.OPEN AS OPEN,"+ "area.OPEN AS OPEN,"+
" case when area.OPEN=0 then '关闭' else '开放' END AS OPENNAME,"+ " case when area.OPEN=0 then '关闭' else '开放' END AS OPENNAME,"+
"\tTYPE.TEXT AS SERVICETYPENAME \n" + "\tCOALESCE(TYPE.TEXT,'') AS SERVICETYPENAME \n" +
"\t FROM\n" + "\t FROM\n" +
"\tservice_area_table area\n" + "\tservice_area_table area\n" +
"\tLEFT JOIN SERVICE_AREA_POSITION_TEXT sapt ON sapt.VALUE = area.POSITION\n" + "\tLEFT JOIN SERVICE_AREA_POSITION_TEXT sapt ON sapt.VALUE = area.POSITION\n" +
@ -240,7 +240,9 @@ static{
" case when oper.OPEN=0 then '暂停服务' else '营业中' end AS OPENNAME,\n" + " case when oper.OPEN=0 then '暂停服务' else '营业中' end AS OPENNAME,\n" +
//" oper.PASSWORD,\n" + //" oper.PASSWORD,\n" +
// " r.VALUE as roleName,\n" + // " r.VALUE as roleName,\n" +
" area.AREANAME as SERVICEAREANAME" + " area.AREANAME as SERVICEAREANAME," +
" COALESCE(area.LAT,'') as LAT," +
" COALESCE(area.LAT,'') as LNG " +
" FROM\n" + " FROM\n" +
" service_area_operators_table oper\n" + " service_area_operators_table oper\n" +
" LEFT JOIN service_area_table area on area.ID = oper.SERVICEAREAID\n" + " LEFT JOIN service_area_table area on area.ID = oper.SERVICEAREAID\n" +

Loading…
Cancel
Save