diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a4230f5..99be687 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,42 +10,12 @@
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
@@ -110,65 +80,65 @@
- {
+ "keyToString": {
+ "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "Application.DivPassDataImpl.executor": "Run",
+ "Application.ImageUtils.executor": "Run",
+ "Application.OcrUtil.executor": "Debug",
+ "Application.PubTools.executor": "Run",
+ "Application.QCodeInfoServiceImpl.executor": "Debug",
+ "Application.SensitiveFilter.executor": "Run",
+ "Application.main.executor": "Run",
+ "Application.redisConfigUtil.executor": "Debug",
+ "Maven.IntegraManager [clean].executor": "Run",
+ "Maven.IntegraManager [install].executor": "Run",
+ "Maven.IntegralManager [clean].executor": "Run",
+ "Maven.IntegralManager [install].executor": "Run",
+ "Maven.IntegralManager [site].executor": "Run",
+ "Maven.IntegralManager [validate].executor": "Run",
+ "Maven.IntegralManager [verify].executor": "Run",
+ "Maven.IntegralManagerSys [clean].executor": "Run",
+ "Maven.IntegralManagerSys [install].executor": "Run",
+ "Maven.devProject [clean].executor": "Run",
+ "Maven.devProject [install].executor": "Run",
+ "Maven.dev_project [clean].executor": "Run",
+ "Maven.dev_project [install].executor": "Run",
+ "Maven.special_event [clean].executor": "Run",
+ "Maven.special_event [install].executor": "Run",
+ "Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run",
+ "Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run",
+ "Maven.special_event [package].executor": "Run",
+ "Maven.special_event [validate].executor": "Run",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.go.formatter.settings.were.checked": "true",
+ "RunOnceActivity.go.migrated.go.modules.settings": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "TomEE Server.special_event.executor": "Debug",
+ "Tomcat Server.Tomcat 9.0.80.executor": "Debug",
+ "deletionFromPopupRequiresConfirmation": "false",
+ "git-widget-placeholder": "master",
+ "go.import.settings.migrated": "true",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "D:/workspace/IntegralManager",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "project.structure.last.edited": "Artifacts",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.37169158",
+ "settings.editor.selected.configurable": "reference.settings.project.maven.importing",
+ "vue.rearranger.settings.migration": "true"
},
- "keyToStringList": {
- "DatabaseDriversLRU": [
- "oracle"
+ "keyToStringList": {
+ "DatabaseDriversLRU": [
+ "oracle"
]
}
-}]]>
+}
@@ -669,7 +639,11 @@
-
+
+
+
+
+
@@ -919,7 +893,23 @@
1756191074573
-
+
+
+ 1756797443062
+
+
+
+ 1756797443062
+
+
+
+ 1756797525902
+
+
+
+ 1756797525902
+
+
@@ -959,7 +949,8 @@
-
+
+
false
@@ -988,6 +979,11 @@
115
+
+ file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java
+ 221
+
+
diff --git a/src/main/java/com/nmgs/config/DBSrcBak.java b/src/main/java/com/nmgs/config/DBSrcBak.java
index 78bfbaa..d64f984 100644
--- a/src/main/java/com/nmgs/config/DBSrcBak.java
+++ b/src/main/java/com/nmgs/config/DBSrcBak.java
@@ -28,6 +28,7 @@ public class DBSrcBak {
sqlSessionFactory.setDataSource(dataSource);
MybatisConfiguration configuration = new MybatisConfiguration();
configuration.addInterceptor(mybatisPlusInterceptor);
+ configuration.setCallSettersOnNulls(true);
// 配置打印sql语句
if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
configuration.setLogImpl(StdOutImpl.class);
diff --git a/src/main/java/com/nmgs/config/DBSrcPetrol.java b/src/main/java/com/nmgs/config/DBSrcPetrol.java
index 47567af..6af737b 100644
--- a/src/main/java/com/nmgs/config/DBSrcPetrol.java
+++ b/src/main/java/com/nmgs/config/DBSrcPetrol.java
@@ -39,6 +39,7 @@ public class DBSrcPetrol {
if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
configuration.setLogImpl(StdOutImpl.class);
}
+ configuration.setCallSettersOnNulls(true);
sqlSessionFactory.setConfiguration(configuration);
// sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
// .getResources("classpath:mapper/petrol/**/*.xml"));
diff --git a/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java b/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java
index 41b1a6a..6798ed5 100644
--- a/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java
@@ -19,7 +19,7 @@ public class RotationServiceImpl {
@Autowired
public Mapper mapperI;
private static String DBType= PropertiesUtil.getValue("DBType");
- 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 ";
+ 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) {
List list=null;
diff --git a/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java b/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
index 088f858..b47a35d 100644
--- a/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
@@ -43,17 +43,17 @@ public class ServiceAreaServiceImpl implements IServiceAreaService {
"\tCOALESCE(area.LAT,'') as LAT,\n" +
"\tCOALESCE(area.LNG,'') as LNG,\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" +
- "\tarea.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 ( 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" +
+ "\tCOALESCE(area.SERVICEFEETYPE ,'') as SERVICEFEETYPE,\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,"+
"(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," +
"area.CODE AS CODE,"+
"area.ROADNO AS ROADNO,"+
- "sart.TEXT AS ROADNONAME,"+
+ "COALESCE(sart.TEXT,'') AS ROADNONAME,"+
"area.OPEN AS OPEN,"+
" case when area.OPEN=0 then '关闭' else '开放' END AS OPENNAME,"+
- "\tTYPE.TEXT AS SERVICETYPENAME \n" +
+ "\tCOALESCE(TYPE.TEXT,'') AS SERVICETYPENAME \n" +
"\t FROM\n" +
"\tservice_area_table area\n" +
"\tLEFT JOIN SERVICE_AREA_POSITION_TEXT sapt ON sapt.VALUE = area.POSITION\n" +
@@ -70,17 +70,17 @@ static{
"\tarea.SERVICEKIND,\n" +
"\tCOALESCE(area.LAT,'') as LAT,\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" +
- "\tarea.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 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" +
+ "\tCOALESCE(area.SERVICEFEETYPE ,'') as SERVICEFEETYPE,\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,"+
"(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," +
"area.CODE AS CODE,"+
"area.ROADNO AS ROADNO,"+
- "sart.TEXT AS ROADNONAME,"+
+ "COALESCE(sart.TEXT,'') AS ROADNONAME,"+
"area.OPEN AS OPEN,"+
" case when area.OPEN=0 then '关闭' else '开放' END AS OPENNAME,"+
- "\tTYPE.TEXT AS SERVICETYPENAME \n" +
+ "\tCOALESCE(TYPE.TEXT,'') AS SERVICETYPENAME \n" +
"\t FROM\n" +
"\tservice_area_table area\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" +
//" oper.PASSWORD,\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" +
" service_area_operators_table oper\n" +
" LEFT JOIN service_area_table area on area.ID = oper.SERVICEAREAID\n" +