From 41a4a5ece1d3ac884c0eac695176dd9a59e378d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E7=BE=8E=E5=B9=B3?= <1102247926@qq.com>
Date: Wed, 22 Oct 2025 10:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=84=E4=BB=B6=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=A0=A1=E9=AA=8C=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E4=B8=8A=E4=BC=A0=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 167 +++++++++++-------
.../service/impl/IntegralSignServiceImpl.java | 4 +-
.../service/impl/ServiceAreaServiceImpl.java | 4 +-
3 files changed, 107 insertions(+), 68 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f488523..298c276 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,9 +10,10 @@
-
+
-
+
+
@@ -77,65 +78,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"
+
+}]]>
@@ -186,8 +187,7 @@
-
-
+
@@ -199,6 +199,7 @@
+
@@ -398,6 +399,9 @@
+
+ C:\Users\22814\AppData\Roaming\Subversion
+
@@ -644,7 +648,15 @@
-
+
+
+
+
+
+
+
+
+
@@ -918,7 +930,23 @@
1757320171471
-
+
+
+ 1757648724231
+
+
+
+ 1757648724231
+
+
+
+ 1760165539298
+
+
+
+ 1760165539298
+
+
@@ -936,7 +964,6 @@
-
@@ -960,7 +987,9 @@
-
+
+
+
false
@@ -994,6 +1023,16 @@
221
+
+ file://$PROJECT_DIR$/src/main/java/com/nmgs/util/ImageUtils.java
+ 57
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
+ 156
+
+
diff --git a/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java b/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java
index 2e7ca45..b6b30d4 100644
--- a/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java
@@ -152,7 +152,7 @@ public class IntegralSignServiceImpl implements IntegralSignService {
String date=signDate.substring(8);
String sqlExists=sql+" AND ist.USERID=(SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID='"+userId+"') AND ist.MONTH ='"+yM+"' ";
List list= this.mapperI.selectforlist(sqlExists);
- if(list.size()>0){//说明已经有签到记录
+ if(!list.isEmpty()){//说明已经有签到记录
Map paramsUpdate=new HashMap<>();
paramsUpdate.put("dayvalue",date);
paramsUpdate.put("openId",userId);
@@ -161,7 +161,7 @@ public class IntegralSignServiceImpl implements IntegralSignService {
if ("Y".equals(PropertiesUtil.getValue("BAKEnabled"))) {
String bakDBType = PropertiesUtil.getValue("BakDBType");
paramsUpdate.put("DBTYPEBAK",bakDBType);
- ret=integralSignMyMapper.updateIntegralSign(paramsUpdate);
+ integralSignMyMapper.updateIntegralSign(paramsUpdate);
}
}else{
Map paramsUpdate=new HashMap<>();
diff --git a/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java b/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
index b47a35d..e78b0cd 100644
--- a/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
@@ -95,7 +95,7 @@ static{
public List getServiceAreaList(String areaName,String areaScope,String showPic,int start,int end) {
List ret=null;
List retlist=new ArrayList();
- String sqlTemp=sqlStart;
+ String sqlTemp=sqlStart +" AND area.OPEN=1 and exists(select 1 from SERVICE_AREA_OPERATION_MEAL_TABLE tt3,SERVICE_AREA_OPERATORS_TABLE tt4 where tt3.JOBNUMBER = tt4.JOBNUMBER AND tt4.SERVICEAREAID = area.ID )";
try{
if("2".equals(DBType)){//oralce数据库
if(!PubTools.isNull(areaName)){
@@ -169,7 +169,7 @@ static{
ret= this.mapperI.selectforlist(startSql);
}
}else{}
- if(ret.size()>0 && start>0 && "Y".equals(showPic)){
+ if(!ret.isEmpty() && start>0 && "Y".equals(showPic)){
for(Object obj:ret){
Map obj1 = (Map) obj;
if(!PubTools.isEmpty(obj1.get("PICDATA")) ){