From ddae03ebb4297e78c69beab11bc8bd7e9c370913 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Wed, 24 Aug 2022 08:43:25 +0800
Subject: [PATCH] 保安公司查询修改，派遣单位字段属性修改
---
src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java | 2 +-
src/main/java/org/springblade/modules/FTP/monitor.java | 2 +-
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 1 +
src/main/resources/application-dev.yml | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/monitor.java b/src/main/java/org/springblade/modules/FTP/monitor.java
index 79d8a31..52f72be 100644
--- a/src/main/java/org/springblade/modules/FTP/monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/monitor.java
@@ -20,7 +20,7 @@
//private static String fileName = "nsql.json";
- @Scheduled(cron = "*/30 * * * * ?")
+// @Scheduled(cron = "*/30 * * * * ?")
public static boolean isFTPFileExist() {
FTPClient ftp = new FTPClient();
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
index f930a72..981af35 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -81,7 +81,7 @@
/**
* 行政区id
*/
- private Long jurisdiction;
+ private String jurisdiction;
/**
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 8e4cb0a..ea043db 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -102,6 +102,7 @@
<if test="information.departmentid!=null and information.departmentid!=''">
and i.departmentid=#{information.departmentid}
</if>
+ order by i.establishTime asc
</select>
<delete id="deleteIn">
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 39f5e5c..0128fe1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -22,7 +22,7 @@
# 内网版本
url: jdbc:mysql://47.49.36.191:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: zhba0728
+ password: NCzhba@2022
#ftp 设置
ftp:
--
Gitblit v1.9.3