bom无审批人时直接审核
This commit is contained in:
z
parent
a47557adb5
commit
6054051690
@ -1,590 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-dependencies</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
<packaging>pom</packaging>
|
|
||||||
<name>${project.artifactId}</name>
|
|
||||||
<description>基础 bom 文件，管理整个项目的依赖版本</description>
|
|
||||||
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
|
|
||||||
<properties>
|
|
||||||
<mybatis-plus-join.version>1.4.7</mybatis-plus-join.version>
|
|
||||||
<podam.version>7.2.11.RELEASE</podam.version>
|
|
||||||
<velocity.version>2.3</velocity.version>
|
|
||||||
<spring.boot.version>2.7.18</spring.boot.version>
|
|
||||||
<tika-core.version>2.7.0</tika-core.version>
|
|
||||||
<lock4j.version>2.2.5</lock4j.version>
|
|
||||||
<okio.version>3.5.0</okio.version>
|
|
||||||
<guice.version>5.1.0</guice.version>
|
|
||||||
<lombok.version>1.18.30</lombok.version>
|
|
||||||
<xercesImpl.version>2.12.2</xercesImpl.version>
|
|
||||||
<jsoup.version>1.16.2</jsoup.version>
|
|
||||||
<fastjson.version>1.2.83</fastjson.version>
|
|
||||||
<commons-net.version>3.10.0</commons-net.version>
|
|
||||||
<hutool.version>5.8.22</hutool.version>
|
|
||||||
<resilience4j.version>1.7.1</resilience4j.version>
|
|
||||||
<transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
|
|
||||||
<flowable.version>6.8.0</flowable.version>
|
|
||||||
<redisson.version>3.18.0</redisson.version>
|
|
||||||
<okhttp3.version>4.11.0</okhttp3.version>
|
|
||||||
<mybatis-plus.version>3.5.4</mybatis-plus.version>
|
|
||||||
<druid.version>1.2.20</druid.version>
|
|
||||||
<commons-io.version>2.11.0</commons-io.version>
|
|
||||||
<easyexcel.verion>3.3.2</easyexcel.verion>
|
|
||||||
<springdoc.version>1.6.15</springdoc.version>
|
|
||||||
<minio.version>8.5.6</minio.version>
|
|
||||||
<mockito-inline.version>4.11.0</mockito-inline.version>
|
|
||||||
<jedis-mock.version>1.0.7</jedis-mock.version>
|
|
||||||
<tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version>
|
|
||||||
<dm8.jdbc.version>8.1.3.62</dm8.jdbc.version>
|
|
||||||
<rocketmq-spring.version>2.2.3</rocketmq-spring.version>
|
|
||||||
<ip2region.version>2.7.0</ip2region.version>
|
|
||||||
<jsch.version>0.1.55</jsch.version>
|
|
||||||
<weixin-java.version>4.5.7.B</weixin-java.version>
|
|
||||||
<aliyun-java-sdk-core.version>4.6.4</aliyun-java-sdk-core.version>
|
|
||||||
<captcha-plus.version>1.0.10</captcha-plus.version>
|
|
||||||
<dynamic-datasource.version>3.6.1</dynamic-datasource.version>
|
|
||||||
<servlet.versoin>2.5</servlet.versoin>
|
|
||||||
<ureport2.version>2.2.9</ureport2.version>
|
|
||||||
<knife4j.version>4.3.0</knife4j.version>
|
|
||||||
<spring-boot-admin.version>2.7.11</spring-boot-admin.version>
|
|
||||||
<mapstruct.version>1.5.5.Final</mapstruct.version>
|
|
||||||
<jimureport.version>1.6.6</jimureport.version>
|
|
||||||
<aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
|
|
||||||
<justauth.version>1.0.8</justauth.version>
|
|
||||||
<screw.version>1.0.5</screw.version>
|
|
||||||
<guava.version>32.1.3-jre</guava.version>
|
|
||||||
<skywalking.version>8.12.0</skywalking.version>
|
|
||||||
<opentracing.version>0.33.0</opentracing.version>
|
|
||||||
<mybatis-plus-generator.version>3.5.4</mybatis-plus-generator.version>
|
|
||||||
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
|
|
||||||
<revision>2.0.0-jdk8-snapshot</revision>
|
|
||||||
</properties>
|
|
||||||
<dependencyManagement>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-dependencies</artifactId>
|
|
||||||
<version>${spring.boot.version}</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>import</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-banner</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-biz-operatelog</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-biz-dict</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-biz-sms</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-biz-pay</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-biz-tenant</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-biz-data-permission</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-biz-social</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-biz-error-code</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-biz-ip</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-captcha</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-desensitize</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-configuration-processor</artifactId>
|
|
||||||
<version>${spring.boot.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-web</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-security</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-websocket</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.xiaoymin</groupId>
|
|
||||||
<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
|
|
||||||
<version>${knife4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springdoc</groupId>
|
|
||||||
<artifactId>springdoc-openapi-ui</artifactId>
|
|
||||||
<version>${springdoc.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-mybatis</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>druid-spring-boot-starter</artifactId>
|
|
||||||
<version>${druid.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-boot-starter</artifactId>
|
|
||||||
<version>${mybatis-plus.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-generator</artifactId>
|
|
||||||
<version>${mybatis-plus-generator.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
|
|
||||||
<version>${dynamic-datasource.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.yulichang</groupId>
|
|
||||||
<artifactId>mybatis-plus-join-boot-starter</artifactId>
|
|
||||||
<version>${mybatis-plus-join.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-redis</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.redisson</groupId>
|
|
||||||
<artifactId>redisson-spring-boot-starter</artifactId>
|
|
||||||
<version>${redisson.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.dameng</groupId>
|
|
||||||
<artifactId>DmJdbcDriver18</artifactId>
|
|
||||||
<version>${dm8.jdbc.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-job</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-mq</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.rocketmq</groupId>
|
|
||||||
<artifactId>rocketmq-spring-boot-starter</artifactId>
|
|
||||||
<version>${rocketmq-spring.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-protection</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>lock4j-redisson-spring-boot-starter</artifactId>
|
|
||||||
<version>${lock4j.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.redisson</groupId>
|
|
||||||
<artifactId>redisson-spring-boot-starter</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.github.resilience4j</groupId>
|
|
||||||
<artifactId>resilience4j-ratelimiter</artifactId>
|
|
||||||
<version>${resilience4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.github.resilience4j</groupId>
|
|
||||||
<artifactId>resilience4j-spring-boot2</artifactId>
|
|
||||||
<version>${resilience4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-monitor</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.skywalking</groupId>
|
|
||||||
<artifactId>apm-toolkit-trace</artifactId>
|
|
||||||
<version>${skywalking.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.skywalking</groupId>
|
|
||||||
<artifactId>apm-toolkit-logback-1.x</artifactId>
|
|
||||||
<version>${skywalking.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.skywalking</groupId>
|
|
||||||
<artifactId>apm-toolkit-opentracing</artifactId>
|
|
||||||
<version>${skywalking.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.opentracing</groupId>
|
|
||||||
<artifactId>opentracing-api</artifactId>
|
|
||||||
<version>${opentracing.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.opentracing</groupId>
|
|
||||||
<artifactId>opentracing-util</artifactId>
|
|
||||||
<version>${opentracing.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.opentracing</groupId>
|
|
||||||
<artifactId>opentracing-noop</artifactId>
|
|
||||||
<version>${opentracing.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.codecentric</groupId>
|
|
||||||
<artifactId>spring-boot-admin-starter-server</artifactId>
|
|
||||||
<version>${spring-boot-admin.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>de.codecentric</groupId>
|
|
||||||
<artifactId>spring-boot-admin-server-cloud</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.codecentric</groupId>
|
|
||||||
<artifactId>spring-boot-admin-starter-client</artifactId>
|
|
||||||
<version>${spring-boot-admin.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mockito</groupId>
|
|
||||||
<artifactId>mockito-inline</artifactId>
|
|
||||||
<version>${mockito-inline.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<version>${spring.boot.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.ow2.asm</groupId>
|
|
||||||
<artifactId>asm</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.mockito</groupId>
|
|
||||||
<artifactId>mockito-core</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.fppt</groupId>
|
|
||||||
<artifactId>jedis-mock</artifactId>
|
|
||||||
<version>${jedis-mock.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>uk.co.jemos.podam</groupId>
|
|
||||||
<artifactId>podam</artifactId>
|
|
||||||
<version>${podam.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-flowable</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.flowable</groupId>
|
|
||||||
<artifactId>flowable-spring-boot-starter-process</artifactId>
|
|
||||||
<version>${flowable.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.flowable</groupId>
|
|
||||||
<artifactId>flowable-spring-boot-starter-actuator</artifactId>
|
|
||||||
<version>${flowable.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-common</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-excel</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
<version>${lombok.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mapstruct</groupId>
|
|
||||||
<artifactId>mapstruct</artifactId>
|
|
||||||
<version>${mapstruct.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mapstruct</groupId>
|
|
||||||
<artifactId>mapstruct-jdk8</artifactId>
|
|
||||||
<version>${mapstruct.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mapstruct</groupId>
|
|
||||||
<artifactId>mapstruct-processor</artifactId>
|
|
||||||
<version>${mapstruct.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.hutool</groupId>
|
|
||||||
<artifactId>hutool-all</artifactId>
|
|
||||||
<version>${hutool.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>easyexcel</artifactId>
|
|
||||||
<version>${easyexcel.verion}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-io</groupId>
|
|
||||||
<artifactId>commons-io</artifactId>
|
|
||||||
<version>${commons-io.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.tika</groupId>
|
|
||||||
<artifactId>tika-core</artifactId>
|
|
||||||
<version>${tika-core.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.velocity</groupId>
|
|
||||||
<artifactId>velocity-engine-core</artifactId>
|
|
||||||
<version>${velocity.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>fastjson</artifactId>
|
|
||||||
<version>${fastjson.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.smallbun.screw</groupId>
|
|
||||||
<artifactId>screw-core</artifactId>
|
|
||||||
<version>${screw.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.freemarker</groupId>
|
|
||||||
<artifactId>freemarker</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>fastjson</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.guava</groupId>
|
|
||||||
<artifactId>guava</artifactId>
|
|
||||||
<version>${guava.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.inject</groupId>
|
|
||||||
<artifactId>guice</artifactId>
|
|
||||||
<version>${guice.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>transmittable-thread-local</artifactId>
|
|
||||||
<version>${transmittable-thread-local.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-net</groupId>
|
|
||||||
<artifactId>commons-net</artifactId>
|
|
||||||
<version>${commons-net.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.jcraft</groupId>
|
|
||||||
<artifactId>jsch</artifactId>
|
|
||||||
<version>${jsch.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.xingyuv</groupId>
|
|
||||||
<artifactId>spring-boot-starter-captcha-plus</artifactId>
|
|
||||||
<version>${captcha-plus.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.lionsoul</groupId>
|
|
||||||
<artifactId>ip2region</artifactId>
|
|
||||||
<version>${ip2region.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jsoup</groupId>
|
|
||||||
<artifactId>jsoup</artifactId>
|
|
||||||
<version>${jsoup.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.squareup.okio</groupId>
|
|
||||||
<artifactId>okio</artifactId>
|
|
||||||
<version>${okio.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.squareup.okhttp3</groupId>
|
|
||||||
<artifactId>okhttp</artifactId>
|
|
||||||
<version>${okhttp3.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-spring-boot-starter-file</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.minio</groupId>
|
|
||||||
<artifactId>minio</artifactId>
|
|
||||||
<version>${minio.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.aliyun</groupId>
|
|
||||||
<artifactId>aliyun-java-sdk-core</artifactId>
|
|
||||||
<version>${aliyun-java-sdk-core.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>io.opentracing</groupId>
|
|
||||||
<artifactId>opentracing-api</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>io.opentracing</groupId>
|
|
||||||
<artifactId>opentracing-util</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.aliyun</groupId>
|
|
||||||
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
|
|
||||||
<version>${aliyun-java-sdk-dysmsapi.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.tencentcloudapi</groupId>
|
|
||||||
<artifactId>tencentcloud-sdk-java-sms</artifactId>
|
|
||||||
<version>${tencentcloud-sdk-java.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.xingyuv</groupId>
|
|
||||||
<artifactId>spring-boot-starter-justauth</artifactId>
|
|
||||||
<version>${justauth.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>cn.hutool</groupId>
|
|
||||||
<artifactId>hutool-core</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.binarywang</groupId>
|
|
||||||
<artifactId>weixin-java-pay</artifactId>
|
|
||||||
<version>${weixin-java.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.binarywang</groupId>
|
|
||||||
<artifactId>wx-java-mp-spring-boot-starter</artifactId>
|
|
||||||
<version>${weixin-java.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.binarywang</groupId>
|
|
||||||
<artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
|
|
||||||
<version>${weixin-java.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jeecgframework.jimureport</groupId>
|
|
||||||
<artifactId>jimureport-spring-boot-starter</artifactId>
|
|
||||||
<version>${jimureport.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>druid</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>xerces</groupId>
|
|
||||||
<artifactId>xercesImpl</artifactId>
|
|
||||||
<version>${xercesImpl.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.bstek.ureport</groupId>
|
|
||||||
<artifactId>ureport2-console</artifactId>
|
|
||||||
<version>${ureport2.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</dependencyManagement>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>flatten-maven-plugin</artifactId>
|
|
||||||
<version>${flatten-maven-plugin.version}</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>flatten</id>
|
|
||||||
<phase>process-resources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>flatten</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>flatten.clean</id>
|
|
||||||
<phase>clean</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>clean</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<configuration>
|
|
||||||
<flattenMode>resolveCiFriendliesOnly</flattenMode>
|
|
||||||
<updatePomFile>true</updatePomFile>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</parent>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-framework</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
<packaging>pom</packaging>
|
|
||||||
<description>该包是技术组件，每个子包，代表一个组件。每个组件包括两部分：
|
|
||||||
1. core 包：是该组件的核心封装
|
|
||||||
2. config 包：是该组件基于 Spring 的配置
|
|
||||||
|
|
||||||
技术组件，也分成两类：
|
|
||||||
1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展
|
|
||||||
2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。
|
|
||||||
如果是业务组件，Maven 名字会包含 biz</description>
|
|
||||||
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
|
|
||||||
<modules>
|
|
||||||
<module>mes-common</module>
|
|
||||||
<module>mes-spring-boot-starter-banner</module>
|
|
||||||
<module>mes-spring-boot-starter-mybatis</module>
|
|
||||||
<module>mes-spring-boot-starter-redis</module>
|
|
||||||
<module>mes-spring-boot-starter-web</module>
|
|
||||||
<module>mes-spring-boot-starter-security</module>
|
|
||||||
<module>mes-spring-boot-starter-file</module>
|
|
||||||
<module>mes-spring-boot-starter-monitor</module>
|
|
||||||
<module>mes-spring-boot-starter-protection</module>
|
|
||||||
<module>mes-spring-boot-starter-job</module>
|
|
||||||
<module>mes-spring-boot-starter-mq</module>
|
|
||||||
<module>mes-spring-boot-starter-excel</module>
|
|
||||||
<module>mes-spring-boot-starter-biz-operatelog</module>
|
|
||||||
<module>mes-spring-boot-starter-biz-dict</module>
|
|
||||||
<module>mes-spring-boot-starter-biz-sms</module>
|
|
||||||
<module>mes-spring-boot-starter-biz-tenant</module>
|
|
||||||
<module>mes-spring-boot-starter-biz-data-permission</module>
|
|
||||||
<module>mes-spring-boot-starter-biz-error-code</module>
|
|
||||||
<module>mes-spring-boot-starter-biz-ip</module>
|
|
||||||
<module>mes-spring-boot-starter-captcha</module>
|
|
||||||
<module>mes-spring-boot-starter-websocket</module>
|
|
||||||
<module>mes-spring-boot-starter-desensitize</module>
|
|
||||||
</modules>
|
|
||||||
</project>
|
|
||||||
@ -1,121 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-framework</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</parent>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-common</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
<name>${project.artifactId}</name>
|
|
||||||
<description>定义基础 pojo 类、枚举、工具类等等</description>
|
|
||||||
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-core</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-expression</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-aop</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.aspectj</groupId>
|
|
||||||
<artifactId>aspectjweaver</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-configuration-processor</artifactId>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-web</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>jakarta.servlet</groupId>
|
|
||||||
<artifactId>jakarta.servlet-api</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springdoc</groupId>
|
|
||||||
<artifactId>springdoc-openapi-ui</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.skywalking</groupId>
|
|
||||||
<artifactId>apm-toolkit-trace</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mapstruct</groupId>
|
|
||||||
<artifactId>mapstruct</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mapstruct</groupId>
|
|
||||||
<artifactId>mapstruct-jdk8</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mapstruct</groupId>
|
|
||||||
<artifactId>mapstruct-processor</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.guava</groupId>
|
|
||||||
<artifactId>guava</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
|
||||||
<artifactId>jackson-databind</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
|
||||||
<artifactId>jackson-core</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
|
||||||
<artifactId>jackson-datatype-jsr310</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-api</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>jakarta.validation</groupId>
|
|
||||||
<artifactId>jakarta.validation-api</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.hutool</groupId>
|
|
||||||
<artifactId>hutool-all</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>transmittable-thread-local</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</parent>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-module-heli</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
<packaging>pom</packaging>
|
|
||||||
<name>${project.artifactId}</name>
|
|
||||||
<description>合立业务模块</description>
|
|
||||||
<modules>
|
|
||||||
<module>mes-module-heli-api</module>
|
|
||||||
<module>mes-module-heli-biz</module>
|
|
||||||
</modules>
|
|
||||||
</project>
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-module-heli</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
</parent>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-module-heli-api</artifactId>
|
|
||||||
<version>2.0.0-jdk8-snapshot</version>
|
|
||||||
<name>${project.artifactId}</name>
|
|
||||||
<description>合立业务模块 API，暴露给其它模块调用</description>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.chanko.yunxi</groupId>
|
|
||||||
<artifactId>mes-common</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-validation</artifactId>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springdoc</groupId>
|
|
||||||
<artifactId>springdoc-openapi-ui</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
@ -765,24 +765,156 @@ public class ProcessBomServiceImpl implements ProcessBomService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 如提交版本+1
|
// 如提交版本+1
|
||||||
if(operateTypeEnum == OperateTypeEnum.SUBMIT){
|
if(operateTypeEnum == OperateTypeEnum.SUBMIT) {
|
||||||
updateObj.setVersion(updateObj.getVersion()+1);
|
updateObj.setVersion(updateObj.getVersion() + 1);
|
||||||
// bomEditStatus = BomEditStatusEnum.HAS_EDIT.getStatus();
|
// bomEditStatus = BomEditStatusEnum.HAS_EDIT.getStatus();
|
||||||
updateObj.setBomEditStatus(bomEditStatus);
|
updateObj.setBomEditStatus(bomEditStatus);
|
||||||
//确定为提交时查出审批人并插入到表中
|
//确定为提交时查出审批人并插入到表中
|
||||||
SerarchUser serarchUser = new SerarchUser();
|
SerarchUser serarchUser = new SerarchUser();
|
||||||
if(updateObj.getShenheUser() ==null){
|
if (updateObj.getShenheUser() == null) {
|
||||||
updateObj.setShenheUser(0L);
|
updateObj.setShenheUser(0L);
|
||||||
}
|
}
|
||||||
//第一次提交时获取审核人，
|
//第一次提交时获取审核人，
|
||||||
List<ShenheDO> shenheDOS = shenheMapper.serchShenHeRuser("2",updateObj.getShenheUser(),0);
|
List<ShenheDO> shenheDOS = shenheMapper.serchShenHeRuser("2", updateObj.getShenheUser(), 0);
|
||||||
if(shenheDOS.size()>0){
|
if (shenheDOS.size() > 0) {
|
||||||
updateObj.setBomStatus(6);
|
updateObj.setBomStatus(6);
|
||||||
//审核后设置状态为默认
|
//审核后设置状态为默认
|
||||||
ShenheDO shenheDO = shenheDOS.get(0);
|
ShenheDO shenheDO = shenheDOS.get(0);
|
||||||
|
if (ObjectUtil.isNotEmpty(shenheDO.getShenheUser())) {
|
||||||
updateObj.setShenheUser(shenheDO.getShenheUser());
|
updateObj.setShenheUser(shenheDO.getShenheUser());
|
||||||
}else{
|
} else {
|
||||||
|
updateObj.setBomStatus(7);
|
||||||
|
updateObj.setShenheTime(LocalDateTime.now());
|
||||||
|
|
||||||
|
updateObj.setShenheUser(null);
|
||||||
|
//bom审核通过,推送任务通知单
|
||||||
|
List<ProcessBomDetailDO> processBomDetailDOS = getProcessBomDetailListByBomId(updateObj.getId());
|
||||||
|
boolean hasBomType4 = processBomDetailDOS.stream()
|
||||||
|
.anyMatch(bomDetail -> bomDetail.getBomType() == 4);
|
||||||
|
if (hasBomType4) {
|
||||||
|
PlanDO getplanid = processBomMapper.getplanid(updateObj.getPlanId());
|
||||||
|
List<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(13);// 改
|
||||||
|
String nickname = userApi.getUser(SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
|
||||||
|
List<AttentiontodoDO> attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(13);
|
||||||
|
if (attentiontodook1.size() < 1) {
|
||||||
|
{
|
||||||
|
AttentiontodoDO attentiontodoDO = new AttentiontodoDO();
|
||||||
|
attentiontodoDO.setEvent("BOM变更审核通过后");
|
||||||
|
attentiontodoDO.setAttr5("1");
|
||||||
|
attentiontodoDO.setAttr4(nickname);
|
||||||
|
attentiontodoDO.setLevel("1");
|
||||||
|
attentiontodook.add(attentiontodoDO);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
for (AttentiontodoDO attentiontodoRespVO : attentiontodook) {
|
||||||
|
{
|
||||||
|
|
||||||
|
bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO();
|
||||||
|
BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称
|
||||||
|
BdgzsomthingDO.setThings(updateObj.getProjectSubCode() + "审核已通过,请推送任务通知单");//事件名称
|
||||||
|
BdgzsomthingDO.setAttr2(getplanid.getPlanNo());//跳转携带参数
|
||||||
|
BdgzsomthingDO.setAttr3(getplanid.getPlanNo());//独特标识
|
||||||
|
|
||||||
|
if (attentiontodoRespVO.getAttr5().equals("1")) {//提醒状态
|
||||||
|
BdgzsomthingDO.setDborgz("待办");
|
||||||
|
} else if (attentiontodoRespVO.getAttr5().equals("2")) {
|
||||||
|
BdgzsomthingDO.setDborgz("关注");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())) {
|
||||||
|
PlanDO planDO = planMapper.selectOne(new LambdaQueryWrapper<PlanDO>().eq(PlanDO::getPlanNo, getplanid.getPlanNo()));
|
||||||
|
if (ObjectUtil.isNotEmpty(planDO)) {
|
||||||
|
AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator()));
|
||||||
|
if (ObjectUtil.isNotEmpty(user)) {
|
||||||
|
BdgzsomthingDO.setClick(user.getNickname());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());
|
||||||
|
}
|
||||||
|
if (attentiontodoRespVO.getLevel().equals("1")) {
|
||||||
|
BdgzsomthingDO.setLevel("紧急");
|
||||||
|
} else if (attentiontodoRespVO.getLevel().equals("2")) {
|
||||||
|
BdgzsomthingDO.setLevel("一般");
|
||||||
|
} else if (attentiontodoRespVO.getLevel().equals("3")) {
|
||||||
|
BdgzsomthingDO.setLevel("非紧急");
|
||||||
|
}
|
||||||
|
BdgzsomthingDO.setYesorno("0");//是否点击
|
||||||
|
BdgzsomthingDO.setAttr4("0");//是否已处理
|
||||||
|
bdgzsomthingMapper.insert(BdgzsomthingDO);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
updateObj.setBomStatus(7);
|
||||||
|
updateObj.setShenheTime(LocalDateTime.now());
|
||||||
|
|
||||||
|
updateObj.setShenheUser(null);
|
||||||
|
//bom审核通过,推送任务通知单
|
||||||
|
List<ProcessBomDetailDO> processBomDetailDOS = getProcessBomDetailListByBomId(updateObj.getId());
|
||||||
|
boolean hasBomType4 = processBomDetailDOS.stream()
|
||||||
|
.anyMatch(bomDetail -> bomDetail.getBomType() == 4);
|
||||||
|
if (hasBomType4) {
|
||||||
|
PlanDO getplanid = processBomMapper.getplanid(updateObj.getPlanId());
|
||||||
|
List<AttentiontodoDO> attentiontodook = attentiontodoMapper.selectByIdlist(13);// 改
|
||||||
|
String nickname = userApi.getUser(SecurityFrameworkUtils.getLoginUser().getId()).getNickname();
|
||||||
|
List<AttentiontodoDO> attentiontodook1 = attentiontodoService.getAttentiontodolistdaiban(13);
|
||||||
|
if (attentiontodook1.size() < 1) {
|
||||||
|
{
|
||||||
|
AttentiontodoDO attentiontodoDO = new AttentiontodoDO();
|
||||||
|
attentiontodoDO.setEvent("BOM变更审核通过后");
|
||||||
|
attentiontodoDO.setAttr5("1");
|
||||||
|
attentiontodoDO.setAttr4(nickname);
|
||||||
|
attentiontodoDO.setLevel("1");
|
||||||
|
attentiontodook.add(attentiontodoDO);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
for (AttentiontodoDO attentiontodoRespVO : attentiontodook) {
|
||||||
|
{
|
||||||
|
|
||||||
|
bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO();
|
||||||
|
BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称
|
||||||
|
BdgzsomthingDO.setThings(updateObj.getProjectSubCode() + "审核已通过,请推送任务通知单");//事件名称
|
||||||
|
BdgzsomthingDO.setAttr2(getplanid.getPlanNo());//跳转携带参数
|
||||||
|
BdgzsomthingDO.setAttr3(getplanid.getPlanNo());//独特标识
|
||||||
|
|
||||||
|
if (attentiontodoRespVO.getAttr5().equals("1")) {//提醒状态
|
||||||
|
BdgzsomthingDO.setDborgz("待办");
|
||||||
|
} else if (attentiontodoRespVO.getAttr5().equals("2")) {
|
||||||
|
BdgzsomthingDO.setDborgz("关注");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())) {
|
||||||
|
PlanDO planDO = planMapper.selectOne(new LambdaQueryWrapper<PlanDO>().eq(PlanDO::getPlanNo, getplanid.getPlanNo()));
|
||||||
|
if (ObjectUtil.isNotEmpty(planDO)) {
|
||||||
|
AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator()));
|
||||||
|
if (ObjectUtil.isNotEmpty(user)) {
|
||||||
|
BdgzsomthingDO.setClick(user.getNickname());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4());
|
||||||
|
}
|
||||||
|
if (attentiontodoRespVO.getLevel().equals("1")) {
|
||||||
|
BdgzsomthingDO.setLevel("紧急");
|
||||||
|
} else if (attentiontodoRespVO.getLevel().equals("2")) {
|
||||||
|
BdgzsomthingDO.setLevel("一般");
|
||||||
|
} else if (attentiontodoRespVO.getLevel().equals("3")) {
|
||||||
|
BdgzsomthingDO.setLevel("非紧急");
|
||||||
|
}
|
||||||
|
BdgzsomthingDO.setYesorno("0");//是否点击
|
||||||
|
BdgzsomthingDO.setAttr4("0");//是否已处理
|
||||||
|
bdgzsomthingMapper.insert(BdgzsomthingDO);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(operateTypeEnum == OperateTypeEnum.AUDIT){
|
if(operateTypeEnum == OperateTypeEnum.AUDIT){
|
||||||
@ -878,7 +1010,7 @@ public class ProcessBomServiceImpl implements ProcessBomService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}else{
|
}else if (!(operateTypeEnum == OperateTypeEnum.SUBMIT)){
|
||||||
updateObj.setBomStatus(ProcessBomStatusEnum.valueOf(updateReqVO.getActive()).getCode());
|
updateObj.setBomStatus(ProcessBomStatusEnum.valueOf(updateReqVO.getActive()).getCode());
|
||||||
}
|
}
|
||||||
if (updateReqVO.getProjectSubCode() != null){
|
if (updateReqVO.getProjectSubCode() != null){
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user