diff --git a/src/main/java/org/energy/modules/smart/mapper/WorkOrderMapper.xml b/src/main/java/org/energy/modules/smart/mapper/WorkOrderMapper.xml
index ca5bdf9..7342261 100644
--- a/src/main/java/org/energy/modules/smart/mapper/WorkOrderMapper.xml
+++ b/src/main/java/org/energy/modules/smart/mapper/WorkOrderMapper.xml
@@ -55,10 +55,10 @@
and a.work_order_type = #{vo.workOrderType}
- and a.work_order_no = #{vo.workOrderNo}
+ and a.work_order_no LIKE CONCAT('%', #{vo.workOrderNo}, '%')
- and a.description = #{vo.description}
+ and a.description LIKE CONCAT('%', #{vo.description}, '%')
and a.maintenance_task_type = #{vo.maintenanceTaskType}
@@ -67,7 +67,7 @@
and a.user_status = #{vo.userStatus}
- and a.responsibility_team = #{vo.responsibilityTeam}
+ and a.responsibility_team LIKE CONCAT('%', #{vo.responsibilityTeam}, '%')
and b.station = ${vo.station}
@@ -109,7 +109,7 @@
and a.work_order_no LIKE CONCAT('%', #{vo.workOrderNo}, '%')
- and a.description = LIKE CONCAT('%', #{vo.description}, '%')
+ and a.description LIKE CONCAT('%', #{vo.description}, '%')
and a.maintenance_task_type = #{vo.maintenanceTaskType}
@@ -118,7 +118,7 @@
and a.user_status = #{vo.userStatus}
- and a.responsibility_team = LIKE CONCAT('%', #{vo.responsibilityTeam}, '%')
+ and a.responsibility_team LIKE CONCAT('%', #{vo.responsibilityTeam}, '%')
and b.station = ${vo.station}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b043da4..282a0c1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,10 +12,15 @@ spring:
# nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
# commandTimeout: 5000
datasource:
+# url: jdbc:postgresql://4s27589o64.vicp.fun:32355/om?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
url: jdbc:postgresql://192.168.10.102:5432/om?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
username: admin
password: 123456
driver-class-name: org.postgresql.Driver
+# url: jdbc:mysql://localhost:3306/sys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+# username: root
+# password: 123456
+# driver-class-name: com.mysql.cj.jdbc.Driver
#第三方登陆
social:
@@ -30,3 +35,13 @@ daf:
remote-path: /usr/share/nginx/html
remote-path-iis: D://iis/html
log-mode: true
+
+#存放路径
+file:
+ upload_path: c:\\data\\actual\\ #文件上传目录(不配置的话为java.io.tmpdir目录)
+
+#sso配置
+sso:
+ scada:
+ key: )O[WH]6,YF}+efcaj{+oESb9d8>Z'e9M
+ iv: L+\~f4,Wh)b$=pkf