From 29a79dcb41e10b5b61cd75fa65dd8ad384f27f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E7=BE=8E=E5=B9=B3?= <1102247926@qq.com>
Date: Thu, 20 Nov 2025 15:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=EF=BC=8C=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E7=A7=AF=E5=88=86=20=E6=8E=A5=E5=8F=A3=E9=87=8C=E9=9D=A2?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 20 ++++++--
.../service/impl/IntegralSignServiceImpl.java | 2 +-
.../impl/IntegrationListServiceImpl.java | 50 ++++++++++++++++---
3 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 298c276..3bed126 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -13,7 +13,7 @@
-
+
@@ -119,7 +119,7 @@
"git-widget-placeholder": "master",
"go.import.settings.migrated": "true",
"kotlin-language-version-configured": "true",
- "last_opened_file_path": "D:/workspace/IntegralManager",
+ "last_opened_file_path": "D:/workspace/bak/IntegralManager",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -128,7 +128,7 @@
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.37169158",
- "settings.editor.selected.configurable": "vcs.Subversion",
+ "settings.editor.selected.configurable": "MavenSettings",
"vue.rearranger.settings.migration": "true"
},
"keyToStringList": {
@@ -656,7 +656,9 @@
-
+
+
+
@@ -946,7 +948,15 @@
1760165539298
-
+
+
+ 1761099787015
+
+
+
+ 1761099787015
+
+
diff --git a/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java b/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java
index b6b30d4..115fb20 100644
--- a/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java
@@ -269,7 +269,7 @@ public class IntegralSignServiceImpl implements IntegralSignService {
this.userTableMapper.updateUserById(userTableParams);
if ("Y".equals(PropertiesUtil.getValue("BAKEnabled"))) {
String bakDBType = PropertiesUtil.getValue("BakDBType");
- integralListParams.put("DBTYPEBAK",bakDBType);
+ integralListParams.put("DBTYPEBAK",bakDBType);0
ret=this.userTableMysqlMapper.updateUserById(userTableParams);
}
LogUtil.WriteLog_Info("用户更新可用积分完成","QCodeInfoServiceImpl");
diff --git a/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java b/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java
index e895de2..e03d880 100644
--- a/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java
@@ -22,10 +22,27 @@ public class IntegrationListServiceImpl implements IntegrationListService {
" ROUND((ilt.RESTINTEGRATION/100),1) AS RESTINTEGRATION," +
" TO_CHAR(ilt.PAYTIME, 'YYYY-MM-DD HH24:MI:SS') AS PAYTIME," +
" ilt.BAK1,ilt.BAK2,ilt.BAK3," +
- " pt.TEXT as PAYTYPENAME" +
+ " pt.TEXT as PAYTYPENAME," +
+ " saot.USERNAME as USERNAME," +
+ " sat.AREANAME as AREANAME," +
+ " saoct.COMPANYNAME as COMPANYNAME, " +
+ " vsc.ENNAME as ENNAME, " +
+ " vsc.EXNAME as EXNAME, " +
+ " to_char(vsc.ENTIME,'yyyy-MM-dd HH24:mi:ss') as ENTIME, " +
+ " to_char(vsc.EXTIME,'yyyy-MM-dd HH24:mi:ss') as EXTIME, " +
+ " SUBSTR(vsc.VEHICLEID,1,INSTR(vsc.VEHICLEID,'_')-1) as VEHICLEID, " +
+ " color.TEXT as COLOR, " +
+ " ROUND(vsc.LENGTH/1000,2) as LENGTH, " +
+ " case when sat.POSITION =1 then '东' when sat.POSITION =2 then '南' when sat.POSITION =3 then '西' when sat.POSITION =4 then '北' else '' end as POSITION " +
" from integration_list_table ilt " +
" left join peytype_text pt on(ilt.PAYTYPE = pt.value)" +
" left join WEIXN_USER_TABLE ut on(ilt.USERID = ut.ID)" +
+ " left join cafter_table ct on(ilt.ID = ct.INTEGRATIONLISTID)" +
+ " left join service_area_operators_table saot on(saot.JOBNUMBER = ct.USERJOBNUMBER)" +
+ " left join service_area_table sat on(sat.ID = saot.SERVICEAREAID)" +
+ " left join service_area_operators_company_text saoct on(saoct.ID = saot.COMPANYID)" +
+ " left join vehicle_score vsc on(vsc.INTEGRATIONLISTID = ilt.ID)" +
+ " left join platecolor_text color on color.VALUE = SUBSTR(vsc.VEHICLEID,INSTR(vsc.VEHICLEID,'_')+1)" +
" where 1=1 ";
static{
if("4".equals(DBType)){
@@ -36,10 +53,27 @@ public class IntegrationListServiceImpl implements IntegrationListService {
" ROUND((ilt.RESTINTEGRATION/100),1) AS RESTINTEGRATION," +
" date_format(ilt.PAYTIME, '%Y-%m-%d %H:%i:%s') AS PAYTIME," +
" ilt.BAK1,ilt.BAK2,ilt.BAK3," +
- " pt.TEXT as PAYTYPENAME" +
+ " pt.TEXT as PAYTYPENAME," +
+ " saot.USERNAME as USERNAME," +
+ " sat.AREANAME as AREANAME," +
+ " saoct.COMPANYNAME as COMPANYNAME, " +
+ " vsc.ENNAME as ENNAME, " +
+ " vsc.EXNAME as EXNAME, " +
+ " DATE_FORMAT(vsc.ENTIME,'%Y-%m-%d %H:%i:%S') as ENTIME, " +
+ " DATE_FORMAT(vsc.EXTIME,'%Y-%m-%d %H:%i:%S') as EXTIME, " +
+ " SUBSTR(vsc.VEHICLEID,1,INSTR(vsc.VEHICLEID,'_')-1) as VEHICLEID, " +
+ " color.TEXT as COLOR, " +
+ " ROUND(vsc.LENGTH/1000,2) as LENGTH, " +
+ " case when sat.POSITION =1 then '东' when sat.POSITION =2 then '南' when sat.POSITION =3 then '西' when sat.POSITION =4 then '北' else '' end as POSITION " +
" from integration_list_table ilt " +
" left join peytype_text pt on(ilt.PAYTYPE = pt.value)" +
" left join WEIXN_USER_TABLE ut on(ilt.USERID = ut.ID)" +
+ " left join cafter_table ct on(ilt.ID = ct.INTEGRATIONLISTID)" +
+ " left join service_area_operators_table saot on(saot.JOBNUMBER = ct.USERJOBNUMBER)" +
+ " left join service_area_table sat on(sat.ID = saot.SERVICEAREAID)" +
+ " left join service_area_operators_company_text saoct on(saoct.ID = saot.COMPANYID)" +
+ " left join vehicle_score vsc on(vsc.INTEGRATIONLISTID = ilt.ID)" +
+ " left join platecolor_text color on color.VALUE = SUBSTR(vsc.VEHICLEID,INSTR(vsc.VEHICLEID,'_')+1)" +
" where 1=1 ";
}
}
@@ -47,6 +81,11 @@ public class IntegrationListServiceImpl implements IntegrationListService {
public List getIntegrationList(String userId, String aCarNo,String payType,int start,int end) {
List list=null;
String sqlTemp=sql;
+ String sqlResult="SELECT ID,USERID,COALESCE(ACARNO,'') as ACARNO,LASTINTEGRATION,PAYINTEGRATION,RESTINTEGRATION,PAYTIME," +
+ "PAYTYPENAME,COALESCE(BAK1,'') as BAK1,COALESCE(BAK2,'') as BAK2,COALESCE(BAK3,'') as BAK3,COALESCE(PAYTYPENAME,'') as PAYTYPENAME," +
+ "COALESCE(USERNAME,'') as USERNAME,COALESCE(AREANAME,'') as AREANAME,COALESCE(COMPANYNAME,'') as COMPANYNAME,COALESCE(ENNAME,'') as ENNAME," +
+ "COALESCE(EXNAME,'') as EXNAME,COALESCE(ENTIME,'') as ENTIME,COALESCE(EXTIME,'') as EXTIME," +
+ "COALESCE(VEHICLEID,'') as VEHICLEID,COALESCE(COLOR,'') as COLOR,COALESCE(LENGTH,'') as LENGTH,COALESCE(POSITION,'') as POSITION ";
try{
if("2".equals(DBType)){
sqlTemp += " and ut.OPENID = '"+userId+"'";
@@ -65,8 +104,8 @@ public class IntegrationListServiceImpl implements IntegrationListService {
if(start==0 && end==0){
list= this.mapperI.selectforlist(sqlTemp);
}else{
- String startSql="SELECT ID,USERID,ACARNO,LASTINTEGRATION,PAYINTEGRATION,RESTINTEGRATION,PAYTIME," +
- "PAYTYPENAME,BAK1,BAK2,BAK3 FROM("+sqlTemp+")tt where tt.num <= "+end;
+ String startSql=sqlResult +
+ "FROM("+sqlTemp+")tt where tt.num <= "+end;
list= this.mapperI.selectforlist(startSql);
}
}else if("4".equals(DBType)){//mysql数据库
@@ -86,8 +125,7 @@ public class IntegrationListServiceImpl implements IntegrationListService {
if(start==0 && end==0){
list= this.mapperI.selectforlist(sqlTemp);
}else{
- String startSql="SELECT ID,USERID,ACARNO,LASTINTEGRATION,PAYINTEGRATION,RESTINTEGRATION,PAYTIME," +
- "PAYTYPENAME,BAK1,BAK2,BAK3 FROM("+sqlTemp+")tt";
+ String startSql=sqlResult+" FROM("+sqlTemp+")tt";
list= this.mapperI.selectforlist(startSql);
}
}else{}