From db13d846510525ddd4d5c48ee0c549c62cf93efa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 20 三月 2025 19:01:42 +0800
Subject: [PATCH] 代码提交
---
/dev/null | 321 --------------------------
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 4
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 46 ++-
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 2
ruoyi-admin/src/main/resources/application-druid.yml | 26 +-
smartor/smartor.iml | 228 ------------------
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 9
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 27 +
smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml | 23 +
smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java | 2
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 8
11 files changed, 92 insertions(+), 604 deletions(-)
diff --git a/ruoyi-admin/smartor-admin.iml b/ruoyi-admin/smartor-admin.iml
deleted file mode 100644
index f2e9e06..0000000
--- a/ruoyi-admin/smartor-admin.iml
+++ /dev/null
@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- </configuration>
- </facet>
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
- <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
- <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.15.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.15.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
- <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
- <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.29" level="project" />
- <orderEntry type="library" name="Maven: com.microsoft.sqlserver:mssql-jdbc:9.2.1.jre8" level="project" />
- <orderEntry type="module" module-name="ruoyi-framework" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.63" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.63" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.63" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.15" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.15" level="project" />
- <orderEntry type="library" name="Maven: pro.fessional:kaptcha:2.3.3" level="project" />
- <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
- <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
- <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.4.0" level="project" />
- <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.12.1" level="project" />
- <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.12.1" level="project" />
- <orderEntry type="module" module-name="ruoyi-system" />
- <orderEntry type="module" module-name="ruoyi-quartz" />
- <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
- <orderEntry type="module" module-name="ruoyi-common" />
- <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.15.3" level="project" />
- <orderEntry type="library" name="Maven: io.minio:minio:7.1.0" level="project" />
- <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:25.1-jre" level="project" />
- <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.0.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
- <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.github.spotbugs:spotbugs-annotations:4.0.0" level="project" />
- <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.5.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.5.8" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
- <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.5.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.23" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" level="project" />
- <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
- <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
- <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
- <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.11" level="project" />
- <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.18" level="project" />
- <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" />
- <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
- <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:alibaba-dingtalk-service-sdk:2.0.0" level="project" />
- <orderEntry type="library" name="Maven: log4j:log4j:1.2.15" level="project" />
- <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
- <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.20" level="project" />
- <orderEntry type="module" module-name="ruoyi-generator" />
- <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
- <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
- <orderEntry type="module" module-name="smartor" />
- <orderEntry type="library" name="Maven: com.aliyun:ecs20140526:3.1.12" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.16" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
- <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.8" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
- <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.2.1" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.70" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.70" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.24" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.6.3" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" />
- <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.70" level="project" />
- <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.8" level="project" />
- <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
- <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
- <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
- <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.24.59" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-spring-boot-starter:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
- <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
- <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-wps:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.9.4" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util-ajax:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: com.sparkjava:spark-template-freemarker:2.7.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.zxing:core:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.zxing:javase:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.beust:jcommander:1.82" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jai-imageio:jai-imageio-core:1.4.0" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-recognizer:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-tts:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: ca.uhn.hapi:hapi-base:2.3" level="project" />
- <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" />
- <orderEntry type="library" name="Maven: ca.uhn.hapi:hapi-structures-v24:2.3" level="project" />
- <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" />
- <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
- <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.16" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.16" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.3" level="project" />
- <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.12.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
- <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" />
- <orderEntry type="library" name="Maven: net.glxn.qrgen:javase:2.0" level="project" />
- <orderEntry type="library" name="Maven: org.jfree:jfreesvg:2.1" level="project" />
- <orderEntry type="library" name="Maven: net.glxn.qrgen:core:2.0" level="project" />
- <orderEntry type="library" name="Maven: org.json:json:20210307" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web-services:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.messaging.saaj:saaj-impl:1.5.3" level="project" />
- <orderEntry type="library" name="Maven: jakarta.xml.soap:jakarta.xml.soap-api:1.4.2" level="project" />
- <orderEntry type="library" name="Maven: org.jvnet.staxex:stax-ex:1.8.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
- <orderEntry type="library" name="Maven: jakarta.xml.ws:jakarta.xml.ws-api:2.3.3" level="project" />
- <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: jakarta.jws:jakarta.jws-api:2.1.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.ws:spring-ws-core:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.ws:spring-xml:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.1" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
- <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:1.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.ssssssss:magic-api:1.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
- <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
- <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.4.5" level="project" />
- <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:1.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-common:2.1.6" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi:5.2.3" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:5.2.3" level="project" />
- <orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.0" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.2.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
- <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.1.0" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index e7600ff..8fefd43 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -13,21 +13,21 @@
# 鍏徃
# url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# 涓芥按
- # url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- # username: smartor
- # password: Smartor.2023
- # driverClassName: com.mysql.cj.jdbc.Driver
- # # # 鏂板崕
- # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- # username: smartor
- # password: Smartor.2023
- # driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: smartor
+# password: Smartor.2023
+# driverClassName: com.mysql.cj.jdbc.Driver
+ # # 鏂板崕
+ url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: smartor
+ password: Smartor.2023
+ driverClassName: com.mysql.cj.jdbc.Driver
# # 鍏徃浜�
- url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: hxsoft
- password: Hxerp2000
- driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: hxsoft
+# password: Hxerp2000
+# driverClassName: com.mysql.cj.jdbc.Driver
# 浠庡簱鏁版嵁婧�
diff --git a/smartor/smartor.iml b/smartor/smartor.iml
index 6014cad..ecab3f5 100644
--- a/smartor/smartor.iml
+++ b/smartor/smartor.iml
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
<component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- </configuration>
- </facet>
<facet type="Spring" name="Spring">
<configuration>
<fileset id="fileset" name="Spring 搴旂敤绋嬪簭涓婁笅鏂�" removed="false">
@@ -13,226 +8,5 @@
</fileset>
</configuration>
</facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.aliyun:ecs20140526:3.1.12" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.16" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
- <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.8" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
- <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.2.1" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.70" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.70" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.24" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.6.3" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" />
- <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" />
- <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.70" level="project" />
- <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.8" level="project" />
- <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
- <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
- <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
- <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.24.59" level="project" />
- <orderEntry type="module" module-name="ruoyi-common" />
- <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.15.3" level="project" />
- <orderEntry type="library" name="Maven: io.minio:minio:7.1.0" level="project" />
- <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:25.1-jre" level="project" />
- <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.0.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
- <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.github.spotbugs:spotbugs-annotations:4.0.0" level="project" />
- <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.5.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.5.8" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.63" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
- <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.5.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.23" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" level="project" />
- <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
- <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
- <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
- <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
- <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.18" level="project" />
- <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" />
- <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
- <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:alibaba-dingtalk-service-sdk:2.0.0" level="project" />
- <orderEntry type="library" name="Maven: log4j:log4j:1.2.15" level="project" />
- <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.63" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.63" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-spring-boot-starter:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
- <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
- <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: cn.afterturn:easypoi-wps:4.4.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.9.4" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util-ajax:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.46.v20220331" level="project" />
- <orderEntry type="library" name="Maven: com.sparkjava:spark-template-freemarker:2.7.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.zxing:core:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.zxing:javase:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.beust:jcommander:1.82" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jai-imageio:jai-imageio-core:1.4.0" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-recognizer:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-common:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.77.Final" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-tts:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: ca.uhn.hapi:hapi-base:2.3" level="project" />
- <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" />
- <orderEntry type="library" name="Maven: ca.uhn.hapi:hapi-structures-v24:2.3" level="project" />
- <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" />
- <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
- <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.14" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
- <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.16" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.16" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.3" level="project" />
- <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.12.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.20" level="project" />
- <orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
- <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index 3ad94c2..b93a8df 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -387,4 +387,6 @@
@ApiModelProperty(value = "鎿嶄綔浜篒D")
private String operatorId;
+
+ private String tagname;
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index fe52710..9b6df31 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -234,8 +234,8 @@
/**
* 鍙戦�佺姸鎬�
*/
- @Excel(name = " 鍙戦�佺姸鎬� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
+ @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
private Long sendstate;
/**
diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
index e199f8d..333713d 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -35,6 +35,8 @@
public List<ServiceSubtask> selectServiceSubtaskListByCreateTime(ServiceSubtaskVO serviceSubtaskVO);
+ public Integer selectSendstateByCondition(ServiceSubtask serviceSubtask);
+
/**
* 鏂板鍗曚竴浠诲姟锛堥殢璁匡級
*
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 1557d47..bb2faa7 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -390,11 +390,17 @@
public Boolean addFinshJZInfo(Map dataMap) {
log.error("ServiceExternalServiceImpl---addFinshJZInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
+ Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
+ String FaSongJGID = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGID")) ? XiaoXiTou.get("FaSongJGID").toString() : null;
+
Map<String, Object> BingRenXX = (Map<String, Object>) yeWuXX.get("BingRenXX");
Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX");
List<HashMap<String, Object>> ZhenDuanList = (List<HashMap<String, Object>>) yeWuXX.get("ZhenDuanList");
List<HashMap<String, Object>> externalWZInfos = (List<HashMap<String, Object>>) yeWuXX.get("WenZhenList");
ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+ //鐥呬汉淇℃伅閲屾病鏈夌粍缁囨満鏋処D
+ externalInHospPatientInfo.setZuZhiJGID(FaSongJGID);
+
ExternalJZInfo externalJZInfo = BeanUtil.mapToBean(JiuZhenXX, ExternalJZInfo.class, true);
List<ExternalDiagnosisInfo> externalDiagnosisInfoList = ZhenDuanList.stream().map(map -> {
ExternalDiagnosisInfo info = new ExternalDiagnosisInfo();
@@ -426,9 +432,6 @@
patMedOuthosp.setDeptname(externalJZInfo.getJiuZhenKSMC());
patMedOuthosp.setDeptcode(externalJZInfo.getJiuZhenKSID());
patMedOuthosp.setAdmitdate(externalJZInfo.getJiuZhenRQ());
-
- Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
- String FaSongJGID = XiaoXiTou.get("FaSongJGID").toString();
patMedOuthosp.setOrgid(FaSongJGID);
for (ExternalDiagnosisInfo externalDiagnosisInfo : externalDiagnosisInfoList) {
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index e8fe8b5..9192e8f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -201,10 +201,13 @@
ServiceSubtask ss = new ServiceSubtask();
ss.setTaskid(taskid);
ss.setPatid(patid);
- ss.setSendstate(1L);
- ss.setResult("success");
- ss.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
+ Integer integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
+ if (integer != null && integer != 6) {
+ ss.setSendstate(1L);
+ ss.setResult("success");
+ ss.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
+ }
}
}
@@ -301,9 +304,9 @@
serviceSubtaskVO.setPatid(patid);
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(serviceSubtaskList) && serviceSubtaskList.size() == 1) {
- if (serviceSubtaskList.get(0).getSendstate() != 6 && isFinish == true) {
+ if (serviceSubtaskList.get(0).getSendstate() == 3 && isFinish == true) {
ServiceSubtask serviceSubtask = new ServiceSubtask();
- serviceSubtask.setSendstate(7L);
+ serviceSubtask.setSendstate(1L);
serviceSubtask.setPatid(patid);
serviceSubtask.setTaskid(serviceTask.getTaskid());
serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
@@ -375,11 +378,13 @@
ServiceSubtask serviceSubtask = new ServiceSubtask();
serviceSubtask.setTaskid(taskid);
serviceSubtask.setPatid(patid);
- serviceSubtask.setResult("瀹屾垚");
- serviceSubtask.setFinishtime(new Date());
- serviceSubtask.setUpdateTime(new Date());
- log.error("serviceSubtask---xjInfo-鐨勪慨鏀规暟鎹細{}", serviceSubtask);
- serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ Integer integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
+ if (integer == 3) {
+ serviceSubtask.setResult("瀹屾垚");
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setSendstate(6L);
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ }
}
HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
List list = new ArrayList();
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 1282926..332b6ca 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -60,6 +60,7 @@
<result property="operator" column="operator"/>
<result property="operatorId" column="operator_id"/>
<result property="remark" column="remark"/>
+ <result property="tagname" column="tagname"/>
</resultMap>
<sql id="selectPatMedInhospVo">
@@ -122,10 +123,6 @@
select CONCAT( a.age, a.age_unit ) AS age,
a.telcode as telcode,
a.sex,
- b.guid,
- b.operator,
- b.remark,
- b.operator_id,
b.inhospid,
b.nurse_id,
b.nurse_name,
@@ -173,28 +170,37 @@
b.deptid,
b.leaveldeptid,
b.long_task_reason,
- b.schemetime
+ b.schemetime,
+ COALESCE (
+ (
+ SELECT string_agg(d.tagname, ', ')
+ FROM pat_archivetag d
+ WHERE d.patid = a.id
+ AND d.del_flag = 0
+ ), '') AS tagname
FROM
- pat_med_inhosp b,
- pat_archive a
+ pat_med_inhosp b
+ JOIN
+ pat_archive a ON a.id = b.patid
+ LEFT JOIN
+ pat_archivetag c ON c.patid = a.id AND (C.del_flag = 0 OR C.del_flag IS NULL)
<where>
- a.del_flag=0
- and b.del_flag=0
- and a.id = b.patid
- AND a.idcardno != ''
+ a.del_flag = 0
+ AND b.del_flag = 0
+ AND a.idcardno IS NOT NULL
<if test="startOutHospTime != null">
- AND date_format(b.endtime,'%y%m%d') >= date_format(#{startOutHospTime},'%y%m%d')
+ AND TO_DATE(b.endtime,'YYYY-MM-DD') >= TO_DATE(#{startOutHospTime},'YYYY-MM-DD')
</if>
<if test="endOutHospTime != null">
- AND date_format(b.endtime,'%y%m%d') <= date_format(#{endOutHospTime},'%y%m%d')
+ AND TO_DATE(b.endtime,'YYYY-MM-DD') <= TO_DATE(#{endOutHospTime},'YYYY-MM-DD')
</if>
-
+ <if test="tagname != null and tagname != ''">and c.tagname like concat('%', #{tagname}, '%')</if>
<if test="startInHospTime != null">
- AND date_format(b.starttime,'%y%m%d') >= date_format(#{startInHospTime},'%y%m%d')
+ AND TO_DATE(b.starttime, 'YYYY-MM-DD') >= TO_DATE(#{startInHospTime}, 'YYYY-MM-DD')
</if>
<if test="endInHospTime != null">
- AND date_format(b.starttime,'%y%m%d') <= date_format(#{endInHospTime},'%y%m%d')
+ AND TO_DATE(b.starttime, 'YYYY-MM-DD') <= TO_DATE(#{startInHospTime}, 'YYYY-MM-DD')
</if>
<if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
'%')
@@ -245,9 +251,15 @@
</foreach>
</if>
</where>
+ GROUP BY
+ b.inhospid,
+ a.age,
+ a.age_unit,
+ a.telcode,
+ a.id,
+ a.sex
order by b.inhospid desc
</select>
-
<select id="selectPatMedInhospListByCondition" parameterType="com.smartor.domain.PatMedInhospVO"
resultMap="PatMedInhospResult">
select CONCAT( a.age, a.age_unit ) AS age,
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
index fdb1fa6..761ca97 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
@@ -402,17 +402,20 @@
</delete>
<select id="countPatByTarget" parameterType="Long" resultMap="ServiceSubtaskDetailTargetResult">
- SELECT
- service_task.taskid,
- service_subtask_detail.targetid,
- ivr_liba_target.targetname,
- service_subtask_detail.matchedtext,
- count(service_subtask_detail.matchedtext) count
+ SELECT service_task.taskid,
+ service_subtask_detail.targetid,
+ ivr_liba_target.targetname,
+ service_subtask_detail.matchedtext,
+ count(service_subtask_detail.matchedtext) count
FROM service_subtask_detail
- JOIN service_task ON service_task.taskid = service_subtask_detail.taskid
- JOIN ivr_liba_target ON ivr_liba_target.id = service_subtask_detail.targetid
+ JOIN service_task
+ ON service_task.taskid = service_subtask_detail.taskid
+ JOIN ivr_liba_target ON ivr_liba_target.id = service_subtask_detail.targetid
WHERE
- targetid = #{targetid}
- GROUP BY matchedtext
+ targetid = #{targetid}
+ GROUP BY service_task.taskid,
+ service_subtask_detail.targetid,
+ ivr_liba_target.targetname,
+ service_subtask_detail.matchedtext
</select>
</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 63960a3..dc05e19 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -307,6 +307,14 @@
</select>
+ <select id="selectSendstateByCondition" parameterType="com.smartor.domain.ServiceSubtask" resultType="Integer">
+ SELECT b.sendstate
+ from service_task a
+ JOIN service_subtask b on a.taskid = b.taskid and a.pat_cycle = 0 and b.del_flag = 0
+ where b.taskid = #{taskid}
+ and b.patid = #{patid}
+ </select>
+
<select id="selectServiceSubtaskById" parameterType="Long" resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where id = #{id}
--
Gitblit v1.9.3