hzya
/
kangarooDataCenterV3
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、正式环境切换数据库。 

2、新增客商同步插件。
3、验收收入申报单：112201科目金额取一次。
4、合同收款单：业务大类为三方运营/分期收款时，业务细分对接直接默认为"无"显示。
5、合同收款单：银行实际收到的只有一笔，我们需要和银行流水对应上，1002的科目，不按项目汇总，按单据汇总
This commit is contained in:
zhengyf 2025-09-10 09:46:44 +08:00
parent 21ca2a6e48
commit 0b16eaa8a2
18 changed files with 1331 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

277
.flattened-pom.xml
View File

@ -2,103 +2,52 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.18</version>
<relativePath></relativePath>
</parent>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>kangarooDataCenterV3</artifactId> <artifactId>kangarooDataCenterV3</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>kangarooDataCenterV3</name>
<description>kangarooDataCenterV3</description>
<licenses> <licenses>
<license> <license>
<name>Apache License, Version 2.0</name> <name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url> <url>https://www.apache.org/licenses/LICENSE-2.0</url>
</license> </license>
</licenses> </licenses>
<modules>
<module>base-buildpackage</module>
<module>base-service</module>
<module>base-common</module>
<module>base-webapp</module>
<module>base-core</module>
</modules>
<properties>
<quartz.version>2.3.0</quartz.version>
<maven.compiler.target>1.8</maven.compiler.target>
<spring-boot-starter-cache.version>2.7.18</spring-boot-starter-cache.version>
<junit.version>4.12</junit.version>
<gson.version>2.8.5</gson.version>
<beanutils.version>1.9.4</beanutils.version>
<p6spy.version>3.9.1</p6spy.version>
<pdfbox.version>2.0.20</pdfbox.version>
<zxing.version>3.3.0</zxing.version>
<lombok.version>1.18.22</lombok.version>
<fastjson.version>2.0.33</fastjson.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot-starter-aop.version>2.7.18</spring-boot-starter-aop.version>
<httpclient.version>4.5.13</httpclient.version>
<spring-boot.version>2.7.18</spring-boot.version>
<sa-token-jwt.version>1.30.0</sa-token-jwt.version>
<pagehelper-spring-boot-starter.version>1.4.6</pagehelper-spring-boot-starter.version>
<hutool.version>5.8.19</hutool.version>
<mybatis-plus-boot-starter.version>3.5.6</mybatis-plus-boot-starter.version>
<maven.compiler.source>1.8</maven.compiler.source>
<dynamic-datasource-spring-boot-starter.version>3.5.2</dynamic-datasource-spring-boot-starter.version>
<commons.lang3.version>2.6</commons.lang3.version>
<druid.version>1.1.22</druid.version>
<mysql-connector-java>8.0.13</mysql-connector-java>
<sa.token.version>1.30.0</sa.token.version>
<minio.version>8.0.3</minio.version>
<lang3.version>3.13.0</lang3.version>
<postgresql.version>42.2.6</postgresql.version>
<net.sourceforge.jtds.version>1.3.1</net.sourceforge.jtds.version>
<druid-spring-boot-starter.version>1.2.18</druid-spring-boot-starter.version>
<dingtalk-sdk.version>2.1.46</dingtalk-sdk.version>
<spring-boot-starter-test.version>2.7.18</spring-boot-starter-test.version>
<spring-boot-starter-tomcat.version>2.7.18</spring-boot-starter-tomcat.version>
<unit.version>4.12</unit.version>
<jimureport.version>1.7.4</jimureport.version>
<sa-token-oauth2.version>1.30.0</sa-token-oauth2.version>
<spring-boot-starter-web.version>2.7.18</spring-boot-starter-web.version>
<commons.pool2.version>2.6.0</commons.pool2.version>
<dingtalk-stream-sdk.version>1.3.7</dingtalk-stream-sdk.version>
<guava.version>32.0.1-jre</guava.version>
<sqlserver.version>6.1.0.jre8</sqlserver.version>
<org.springframework.version>5.3.23</org.springframework.version>
<commons.io.version>2.6</commons.io.version>
<ojdbc6.version>11.2.0.4</ojdbc6.version>
<revision>0.0.1-SNAPSHOT</revision>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>net.sourceforge.jtds</groupId> <groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId> <artifactId>jtds</artifactId>
<version>${net.sourceforge.jtds.version}</version> <version>1.3.1</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId> <artifactId>spring-boot-starter-aop</artifactId>
<version>${spring-boot-starter-aop.version}</version> <version>2.7.18</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${httpclient.version}</version> <version>4.5.13</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId> <artifactId>spring-boot-starter-cache</artifactId>
<version>${spring-boot-starter-cache.version}</version> <version>2.7.18</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot-starter-test.version}</version> <version>2.7.18</version>
<scope>compile</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
@ -109,46 +58,56 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${unit.version}</version> <version>4.12</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>${fastjson.version}</version> <version>2.0.33</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>p6spy</groupId> <groupId>p6spy</groupId>
<artifactId>p6spy</artifactId> <artifactId>p6spy</artifactId>
<version>${p6spy.version}</version> <version>3.9.1</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${gson.version}</version> <version>2.8.5</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>${zxing.version}</version> <version>3.3.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>${guava.version}</version> <version>32.0.1-jre</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector-java}</version> <version>8.0.13</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jdbc</artifactId> <artifactId>spring-boot-starter-data-jdbc</artifactId>
<version>2.7.18</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId> <artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper-spring-boot-starter.version}</version> <version>1.4.6</version>
<scope>compile</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
@ -167,37 +126,44 @@
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus-boot-starter.version}</version> <version>3.5.6</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
<version>${hutool.version}</version> <version>5.8.19</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.dev33</groupId> <groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId> <artifactId>sa-token-spring-boot-starter</artifactId>
<version>${sa.token.version}</version> <version>1.30.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.dev33</groupId> <groupId>cn.dev33</groupId>
<artifactId>sa-token-oauth2</artifactId> <artifactId>sa-token-oauth2</artifactId>
<version>${sa-token-oauth2.version}</version> <version>1.30.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.dev33</groupId> <groupId>cn.dev33</groupId>
<artifactId>sa-token-jwt</artifactId> <artifactId>sa-token-jwt</artifactId>
<version>${sa-token-jwt.version}</version> <version>1.30.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId> <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>${dynamic-datasource-spring-boot-starter.version}</version> <version>3.5.2</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId> <artifactId>druid-spring-boot-starter</artifactId>
<version>${druid-spring-boot-starter.version}</version> <version>1.2.18</version>
<scope>compile</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>spring-boot-autoconfigure</artifactId> <artifactId>spring-boot-autoconfigure</artifactId>
@ -209,67 +175,89 @@
<groupId>com.dameng</groupId> <groupId>com.dameng</groupId>
<artifactId>Dm8JdbcDriver18</artifactId> <artifactId>Dm8JdbcDriver18</artifactId>
<version>8.1.1.49</version> <version>8.1.1.49</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
<version>${beanutils.version}</version> <version>1.9.4</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId> <artifactId>commons-pool2</artifactId>
<version>${commons.pool2.version}</version> <version>2.6.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>${lang3.version}</version> <version>3.13.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${lombok.version}</version> <version>1.18.22</version>
<scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.microsoft.sqlserver</groupId> <groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId> <artifactId>mssql-jdbc</artifactId>
<version>6.4.0.jre8</version> <version>6.4.0.jre8</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId> <artifactId>pdfbox</artifactId>
<version>${pdfbox.version}</version> <version>2.0.20</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.oracle.database.jdbc</groupId> <groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc6</artifactId> <artifactId>ojdbc6</artifactId>
<version>${ojdbc6.version}</version> <version>11.2.0.4</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.quartz-scheduler</groupId> <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId> <artifactId>quartz</artifactId>
<version>${quartz.version}</version> <version>2.3.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>c3p0</artifactId>
<groupId>com.mchange</groupId>
</exclusion>
<exclusion>
<artifactId>*</artifactId>
<groupId>com.zaxxer</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-context-support</artifactId>
<version>${org.springframework.version}</version> <version>5.3.23</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${commons.io.version}</version> <version>2.6</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dom4j</groupId> <groupId>dom4j</groupId>
<artifactId>dom4j</artifactId> <artifactId>dom4j</artifactId>
<version>1.6.1</version> <version>1.6.1</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>${postgresql.version}</version> <version>42.2.6</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -277,50 +265,61 @@
<artifactId>groovy-all</artifactId> <artifactId>groovy-all</artifactId>
<version>4.0.21</version> <version>4.0.21</version>
<type>pom</type> <type>pom</type>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.flywaydb</groupId> <groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId> <artifactId>flyway-core</artifactId>
<version>8.5.13</version> <version>8.5.13</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.flywaydb</groupId> <groupId>org.flywaydb</groupId>
<artifactId>flyway-mysql</artifactId> <artifactId>flyway-mysql</artifactId>
<version>8.5.13</version> <version>8.5.13</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yomahub</groupId> <groupId>com.yomahub</groupId>
<artifactId>tlog-all-spring-boot-starter</artifactId> <artifactId>tlog-all-spring-boot-starter</artifactId>
<version>1.5.2</version> <version>1.5.2</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId> <artifactId>spring-boot-starter-data-mongodb</artifactId>
<version>2.7.18</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dingtalk.open</groupId> <groupId>com.dingtalk.open</groupId>
<artifactId>app-stream-client</artifactId> <artifactId>app-stream-client</artifactId>
<version>${dingtalk-stream-sdk.version}</version> <version>1.3.7</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
<artifactId>dingtalk</artifactId> <artifactId>dingtalk</artifactId>
<version>${dingtalk-sdk.version}</version> <version>2.1.46</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
<artifactId>alibaba-dingtalk-service-sdk</artifactId> <artifactId>alibaba-dingtalk-service-sdk</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-net</groupId> <groupId>commons-net</groupId>
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
<version>3.8.0</version> <version>3.8.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId> <artifactId>jsch</artifactId>
<version>0.1.53</version> <version>0.1.53</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
@ -341,94 +340,4 @@
<url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url> <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
</repository> </repository>
</repositories> </repositories>
<build>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
<includes>
<include>**/*.yml</include>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.xmreport</include>
<include>**/*.xlsx</include>
<include>**/*.json</include>
<include>**/*.xdb</include>
<include>**/*.txt</include>
<include>**/*.sql</include>
</includes>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/</directory>
<includes>
<include>**/*.yml</include>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.json</include>
<include>**/*.txt</include>
<include>**/*.sql</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
</executions>
<configuration>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.7.18</version>
<configuration>
<finalName>${project.artifactId}</finalName>
<mainClass>none</mainClass>
<classifier>execute</classifier>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

47
base-buildpackage/.flattened-pom.xml
View File

@ -2,11 +2,6 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzya.frame</groupId>
<artifactId>kangarooDataCenterV3</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>base-buildpackage</artifactId> <artifactId>base-buildpackage</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
@ -21,28 +16,26 @@
<dependency> <dependency>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>base-webapp</artifactId> <artifactId>base-webapp</artifactId>
<version>${revision}</version> <version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <repositories>
<finalName>kangarooDataCenterV3</finalName> <repository>
<plugins> <snapshots>
<plugin> <enabled>false</enabled>
<artifactId>maven-war-plugin</artifactId> </snapshots>
<version>3.3.2</version> <id>aliyun</id>
<configuration></configuration> <name>aliyun Repository</name>
</plugin> <url>https://maven.aliyun.com/repository/public</url>
</plugins> </repository>
</build> <repository>
<profiles> <snapshots>
<profile> <enabled>false</enabled>
<id>dev</id> </snapshots>
<activation> <id>jeecg</id>
<activeByDefault>true</activeByDefault> <name>jeecg Repository</name>
</activation> <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
<properties> </repository>
<profile.active>dev</profile.active> </repositories>
</properties>
</profile>
</profiles>
</project> </project>

209
base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/U8C_plugin_bd_cumandoc_ks.java Normal file
View File

@ -0,0 +1,209 @@
package com.hzya.frame.plugin.gm;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.hzya.frame.base.PluginBaseEntity;
import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
import com.hzya.frame.plugin.gm.dao.IMdmBfCumandocKsDao;
import com.hzya.frame.plugin.gm.dao.IMdmBfJobmngfilDao;
import com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity;
import com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity;
import com.hzya.frame.plugin.gm.utils.SaveOrUpdateBusinessLogUtil;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
/**
* Created by zydd on 2025-09-09 23:55
*/
public class U8C_plugin_bd_cumandoc_ks extends PluginBaseEntity {
Logger logger = LoggerFactory.getLogger(U8C_plugin_bd_cumandoc_ks.class);
private static final ReentrantLock LOCK = new ReentrantLock(true);
// 创建格式化器
public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
List<MdmBfCumandocKsEntity> U8C_LIST_SAVE = new ArrayList<>();
List<MdmBfCumandocKsEntity> U8C_LIST_UPDATE = new ArrayList<>();
@Override
public void initialize() {
logger.info(getPluginLabel() + "执行初始化方法initialize()");
}
@Override
public void destroy() {
logger.info(getPluginLabel() + "执行销毁方法destroy()");
}
@Override
public String getPluginId() {
return "gm.U8C_plugin_bd_cumandoc_ks";
}
@Override
public String getPluginName() {
return "广脉：U8C客商档案同步";
}
@Override
public String getPluginLabel() {
return "广脉：U8C客商档案同步";
}
@Override
public String getPluginType() {
return "1";
}
@Override
public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
try {
logger.info("调用：" + getPluginName() + "-插件");
String prod = "prod";
String param = String.valueOf(requestJson.get("param"));
if (requestJson != null && ProfilesActiveConstant.TYPE_DATE.equals(requestJson.get("type"))) {
//按日期
if (param != null && !"".equals(param)) {
String[] split = param.split("/");
if (!(split.length == 2)) {
Assert.state(false, "时间格式传递不正确");
}
Assert.notNull(split[0], "开始时间不能为空");
Assert.notNull(split[1], "结束时间不能为空");
start(split[0], split[1]);
}
} else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) {
//默认
start();
}
} catch (Exception e) {
e.printStackTrace();
logger.error("executeBusiness方法抛出异常", e);
}
return BaseResult.getSuccessMessageEntity("插件执行成功");
}
@Autowired
private IIntegrationTaskLivingDetailsDao iIntegrationTaskLivingDetailsDao;
@Autowired
private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil;
@Autowired
private IMdmBfCumandocKsDao mdmBfCumandocKsDao;
public void start() {
U8C_LIST_SAVE.clear();
U8C_LIST_UPDATE.clear();
try {
// 获取当前日期和时间,时间偏移6分钟
LocalDateTime now = LocalDateTime.now();
String end = now.format(formatter);
String start = now.minusMinutes(6L).format(formatter);
logger.info("自动同步==> U8C项目管理档案同步 时间区间：[{}]-[{}]", start, end);
//查询数据
List<MdmBfCumandocKsEntity> allOAList = queryData(start, end);
//过滤，生成凭证的报错
filterData(allOAList);
//保存
saveData(U8C_LIST_SAVE);
//更新
updateData(U8C_LIST_UPDATE);
} catch (Exception e) {
e.printStackTrace();
}
}
public void start(String startTime, String endTime) {
U8C_LIST_SAVE.clear();
U8C_LIST_UPDATE.clear();
startTime += " 00:00:00";
endTime += " 23:59:59";
try {
//查询数据
List<MdmBfCumandocKsEntity> allU8CList = queryData(startTime, endTime);
//过滤
filterData(allU8CList);
//保存
saveData(U8C_LIST_SAVE);
//更新
updateData(U8C_LIST_UPDATE);
} catch (Exception e) {
e.printStackTrace();
}
}
private void saveData(List<MdmBfCumandocKsEntity> u8CListSave) {
u8CListSave.forEach(index -> {
index.setSts("Y");
index.setDataStatus("Y");
index.setId(index.getPkCumandoc());
});
List<List<MdmBfCumandocKsEntity>> partition = Lists.partition(u8CListSave, 500);
for (List<MdmBfCumandocKsEntity> mdmBfCumandocKsEntities : partition) {
mdmBfCumandocKsDao.saveList(mdmBfCumandocKsEntities);
}
}
private void updateData(List<MdmBfCumandocKsEntity> u8CListUpdate) {
List<MdmBfCumandocKsEntity> list = new ArrayList<>();
for (MdmBfCumandocKsEntity mdmBfCumandocKsEntity : u8CListUpdate) {
String pkCumandoc = mdmBfCumandocKsEntity.getPkCumandoc();
MdmBfCumandocKsEntity mdmBfCumandocKs = new MdmBfCumandocKsEntity();
mdmBfCumandocKs.setPkCumandoc(pkCumandoc);
mdmBfCumandocKsDao.delete("com.hzya.frame.plugin.gm.dao.impl.MdmBfCumandocKsDaoImpl.entity_delete",mdmBfCumandocKs);
list.add(mdmBfCumandocKsEntity);
}
saveData(list);
}
private void filterData(List<MdmBfCumandocKsEntity> allOAList) {
for (MdmBfCumandocKsEntity mdmBfCumandocKsEntity : allOAList) {
String pkCumandoc = mdmBfCumandocKsEntity.getPkCumandoc();
MdmBfCumandocKsEntity mdmBfJobmngfil = new MdmBfCumandocKsEntity();
mdmBfJobmngfil.setPkCumandoc(pkCumandoc);
List<MdmBfCumandocKsEntity> query = mdmBfCumandocKsDao.query(mdmBfJobmngfil);
if (query.size() == 0) {
U8C_LIST_SAVE.add(mdmBfCumandocKsEntity);
} else {
U8C_LIST_UPDATE.add(mdmBfCumandocKsEntity);
}
}
}
private List<MdmBfCumandocKsEntity> queryData(String start, String end) {
MdmBfCumandocKsEntity entity = new MdmBfCumandocKsEntity();
entity.setStartTime(start);
entity.setEndTime(end);
List<MdmBfCumandocKsEntity> list = mdmBfCumandocKsDao.queryU8CAll(entity);
return list;
}
}

22
base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IMdmBfCumandocKsDao.java Normal file
View File

@ -0,0 +1,22 @@
package com.hzya.frame.plugin.gm.dao;
import com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity;
import java.util.List;
/**
* 基础档案：客商管理档案-ks(mdm_bf_cumandoc_ks: table)表数据库访问层
*
* @author zydd
* @since 2025-09-09 23:51:36
*/
public interface IMdmBfCumandocKsDao extends IBaseDao<MdmBfCumandocKsEntity, String> {
List<MdmBfCumandocKsEntity> queryU8CAll(MdmBfCumandocKsEntity entity);
void saveList(List<MdmBfCumandocKsEntity> list);
}

35
base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmBfCumandocKsDaoImpl.java Normal file
View File

@ -0,0 +1,35 @@
package com.hzya.frame.plugin.gm.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant;
import com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity;
import com.hzya.frame.plugin.gm.dao.IMdmBfCumandocKsDao;
import com.hzya.frame.plugin.gm.entity.MdmBfJobmngfilEntity;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import java.util.List;
/**
* 基础档案：客商管理档案-ks(MdmBfCumandocKs)表数据库访问层
*
* @author zydd
* @since 2025-09-09 23:51:36
*/
public class MdmBfCumandocKsDaoImpl extends MybatisGenericDao<MdmBfCumandocKsEntity, String> implements IMdmBfCumandocKsDao{
@DS(ProfilesActiveConstant.GM_U8C_DATE_SOURCE)
@Override
public List<MdmBfCumandocKsEntity> queryU8CAll(MdmBfCumandocKsEntity entity) {
List<MdmBfCumandocKsEntity> all = (List<MdmBfCumandocKsEntity>)
selectList("com.hzya.frame.plugin.gm.dao.impl.MdmBfCumandocKsDaoImpl.queryU8CAll", entity);
return all;
}
@Override
public void saveList(List<MdmBfCumandocKsEntity> list) {
insert("com.hzya.frame.plugin.gm.dao.impl.MdmBfCumandocKsDaoImpl.saveList", list);
}
}

204
base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmBfCumandocKsEntity.java Normal file
View File

@ -0,0 +1,204 @@
package com.hzya.frame.plugin.gm.entity;
import java.util.Date;
import com.hzya.frame.web.entity.BaseEntity;
/**
* 基础档案：客商管理档案-ks(MdmBfCumandocKs)实体类
*
* @author zydd
* @since 2025-09-09 23:51:36
*/
public class MdmBfCumandocKsEntity extends BaseEntity {
/** 单据规则 */
private String documentRule;
/** 单据规则流水号 */
private Long documentRuleNum;
/** 数据状态 Y正常 N删除 F修改 */
private String dataStatus;
/** 新增数据状态 0待下发 1已下发 */
private String addStatus;
/** 修改数据状态 0待下发 1已下发 */
private String updateStatus;
/** 删除数据状态 0待下发 1已下发 */
private String deleteStatus;
/** 公司id */
private String companyId;
/** data_id */
private String dataId;
/** mdm_up_id */
private String mdmUpId;
/** 客商管理档案主键 */
private String pkCumandoc;
/** 客商档案主键 */
private String pkCubasdoc;
/** 公司主键 */
private String pkCorp;
/** 客商属性 */
private String custflag;
/** 更新时间 */
private Date ts;
/** 删除标识 */
private String dr;
/** 客商编码 */
private String code;
/** 客商名称 */
private String name;
public String getDocumentRule() {
return documentRule;
}
public void setDocumentRule(String documentRule) {
this.documentRule = documentRule;
}
public Long getDocumentRuleNum() {
return documentRuleNum;
}
public void setDocumentRuleNum(Long documentRuleNum) {
this.documentRuleNum = documentRuleNum;
}
public String getDataStatus() {
return dataStatus;
}
public void setDataStatus(String dataStatus) {
this.dataStatus = dataStatus;
}
public String getAddStatus() {
return addStatus;
}
public void setAddStatus(String addStatus) {
this.addStatus = addStatus;
}
public String getUpdateStatus() {
return updateStatus;
}
public void setUpdateStatus(String updateStatus) {
this.updateStatus = updateStatus;
}
public String getDeleteStatus() {
return deleteStatus;
}
public void setDeleteStatus(String deleteStatus) {
this.deleteStatus = deleteStatus;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getDataId() {
return dataId;
}
public void setDataId(String dataId) {
this.dataId = dataId;
}
public String getMdmUpId() {
return mdmUpId;
}
public void setMdmUpId(String mdmUpId) {
this.mdmUpId = mdmUpId;
}
public String getPkCumandoc() {
return pkCumandoc;
}
public void setPkCumandoc(String pkCumandoc) {
this.pkCumandoc = pkCumandoc;
}
public String getPkCubasdoc() {
return pkCubasdoc;
}
public void setPkCubasdoc(String pkCubasdoc) {
this.pkCubasdoc = pkCubasdoc;
}
public String getPkCorp() {
return pkCorp;
}
public void setPkCorp(String pkCorp) {
this.pkCorp = pkCorp;
}
public String getCustflag() {
return custflag;
}
public void setCustflag(String custflag) {
this.custflag = custflag;
}
public Date getTs() {
return ts;
}
public void setTs(Date ts) {
this.ts = ts;
}
public String getDr() {
return dr;
}
public void setDr(String dr) {
this.dr = dr;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
private String startTime;
private String endTime;
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
}

468
base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmBfCumandocKsEntity.xml Normal file
View File

@ -0,0 +1,468 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.plugin.gm.dao.impl.MdmBfCumandocKsDaoImpl">
<resultMap id="get-MdmBfCumandocKsEntity-result" type="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity">
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
<result property="documentRuleNum" column="document_rule_num" jdbcType="INTEGER"/>
<result property="dataStatus" column="data_status" jdbcType="VARCHAR"/>
<result property="addStatus" column="add_status" jdbcType="VARCHAR"/>
<result property="updateStatus" column="update_status" jdbcType="VARCHAR"/>
<result property="deleteStatus" column="delete_status" jdbcType="VARCHAR"/>
<result property="sorts" column="sorts" jdbcType="INTEGER"/>
<result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
<result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
<result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
<result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
<result property="sts" column="sts" jdbcType="VARCHAR"/>
<result property="org_id" column="org_id" jdbcType="VARCHAR"/>
<result property="companyId" column="company_id" jdbcType="VARCHAR"/>
<result property="dataId" column="data_id" jdbcType="VARCHAR"/>
<result property="mdmUpId" column="mdm_up_id" jdbcType="VARCHAR"/>
<result property="pkCumandoc" column="pk_cumandoc" jdbcType="VARCHAR"/>
<result property="pkCubasdoc" column="pk_cubasdoc" jdbcType="VARCHAR"/>
<result property="pkCorp" column="pk_corp" jdbcType="VARCHAR"/>
<result property="custflag" column="custflag" jdbcType="VARCHAR"/>
<result property="ts" column="ts" jdbcType="TIMESTAMP"/>
<result property="dr" column="dr" jdbcType="VARCHAR"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
</resultMap>
<!-- 查询的字段-->
<sql id="MdmBfCumandocKsEntity_Base_Column_List">
id
,document_rule
,document_rule_num
,data_status
,add_status
,update_status
,delete_status
,sorts
,create_user_id
,create_time
,modify_user_id
,modify_time
,sts
,org_id
,company_id
,data_id
,mdm_up_id
,pk_cumandoc
,pk_cubasdoc
,pk_corp
,custflag
,ts
,dr
,code
,name
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-MdmBfCumandocKsEntity-result"
parameterType="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity">
select
<include refid="MdmBfCumandocKsEntity_Base_Column_List"/>
from mdm_bf_cumandoc_ks
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id = #{id}</if>
<if test="documentRule != null and documentRule != ''">and document_rule = #{documentRule}</if>
<if test="documentRuleNum != null">and document_rule_num = #{documentRuleNum}</if>
<if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
<if test="addStatus != null and addStatus != ''">and add_status = #{addStatus}</if>
<if test="updateStatus != null and updateStatus != ''">and update_status = #{updateStatus}</if>
<if test="deleteStatus != null and deleteStatus != ''">and delete_status = #{deleteStatus}</if>
<if test="sorts != null">and sorts = #{sorts}</if>
<if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
<if test="create_time != null">and create_time = #{create_time}</if>
<if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
<if test="modify_time != null">and modify_time = #{modify_time}</if>
<if test="sts != null and sts != ''">and sts = #{sts}</if>
<if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
<if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
<if test="dataId != null and dataId != ''">and data_id = #{dataId}</if>
<if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id = #{mdmUpId}</if>
<if test="pkCumandoc != null and pkCumandoc != ''">and pk_cumandoc = #{pkCumandoc}</if>
<if test="pkCubasdoc != null and pkCubasdoc != ''">and pk_cubasdoc = #{pkCubasdoc}</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
<if test="custflag != null and custflag != ''">and custflag = #{custflag}</if>
<if test="ts != null">and ts = #{ts}</if>
<if test="dr != null and dr != ''">and dr = #{dr}</if>
<if test="code != null and code != ''">and code = #{code}</if>
<if test="name != null and name != ''">and name = #{name}</if>
and sts='Y'
</trim>
<if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer"
parameterType="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity">
select count(1) from mdm_bf_cumandoc_ks
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id = #{id}</if>
<if test="documentRule != null and documentRule != ''">and document_rule = #{documentRule}</if>
<if test="documentRuleNum != null">and document_rule_num = #{documentRuleNum}</if>
<if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
<if test="addStatus != null and addStatus != ''">and add_status = #{addStatus}</if>
<if test="updateStatus != null and updateStatus != ''">and update_status = #{updateStatus}</if>
<if test="deleteStatus != null and deleteStatus != ''">and delete_status = #{deleteStatus}</if>
<if test="sorts != null">and sorts = #{sorts}</if>
<if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
<if test="create_time != null">and create_time = #{create_time}</if>
<if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
<if test="modify_time != null">and modify_time = #{modify_time}</if>
<if test="sts != null and sts != ''">and sts = #{sts}</if>
<if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
<if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
<if test="dataId != null and dataId != ''">and data_id = #{dataId}</if>
<if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id = #{mdmUpId}</if>
<if test="pkCumandoc != null and pkCumandoc != ''">and pk_cumandoc = #{pkCumandoc}</if>
<if test="pkCubasdoc != null and pkCubasdoc != ''">and pk_cubasdoc = #{pkCubasdoc}</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
<if test="custflag != null and custflag != ''">and custflag = #{custflag}</if>
<if test="ts != null">and ts = #{ts}</if>
<if test="dr != null and dr != ''">and dr = #{dr}</if>
<if test="code != null and code != ''">and code = #{code}</if>
<if test="name != null and name != ''">and name = #{name}</if>
and sts='Y'
</trim>
<if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-MdmBfCumandocKsEntity-result"
parameterType="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity">
select
<include refid="MdmBfCumandocKsEntity_Base_Column_List"/>
from mdm_bf_cumandoc_ks
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
<if test="documentRule != null and documentRule != ''">and document_rule like
concat('%',#{documentRule},'%')
</if>
<if test="documentRuleNum != null">and document_rule_num like concat('%',#{documentRuleNum},'%')</if>
<if test="dataStatus != null and dataStatus != ''">and data_status like concat('%',#{dataStatus},'%')</if>
<if test="addStatus != null and addStatus != ''">and add_status like concat('%',#{addStatus},'%')</if>
<if test="updateStatus != null and updateStatus != ''">and update_status like
concat('%',#{updateStatus},'%')
</if>
<if test="deleteStatus != null and deleteStatus != ''">and delete_status like
concat('%',#{deleteStatus},'%')
</if>
<if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
<if test="create_user_id != null and create_user_id != ''">and create_user_id like
concat('%',#{create_user_id},'%')
</if>
<if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
<if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
concat('%',#{modify_user_id},'%')
</if>
<if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
<if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
<if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
<if test="companyId != null and companyId != ''">and company_id like concat('%',#{companyId},'%')</if>
<if test="dataId != null and dataId != ''">and data_id like concat('%',#{dataId},'%')</if>
<if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id like concat('%',#{mdmUpId},'%')</if>
<if test="pkCumandoc != null and pkCumandoc != ''">and pk_cumandoc like concat('%',#{pkCumandoc},'%')</if>
<if test="pkCubasdoc != null and pkCubasdoc != ''">and pk_cubasdoc like concat('%',#{pkCubasdoc},'%')</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp like concat('%',#{pkCorp},'%')</if>
<if test="custflag != null and custflag != ''">and custflag like concat('%',#{custflag},'%')</if>
<if test="ts != null">and ts like concat('%',#{ts},'%')</if>
<if test="dr != null and dr != ''">and dr like concat('%',#{dr},'%')</if>
<if test="code != null and code != ''">and code like concat('%',#{code},'%')</if>
<if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
and sts='Y'
</trim>
<if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="MdmBfCumandocKsentity_list_or" resultMap="get-MdmBfCumandocKsEntity-result"
parameterType="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity">
select
<include refid="MdmBfCumandocKsEntity_Base_Column_List"/>
from mdm_bf_cumandoc_ks
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">or id = #{id}</if>
<if test="documentRule != null and documentRule != ''">or document_rule = #{documentRule}</if>
<if test="documentRuleNum != null">or document_rule_num = #{documentRuleNum}</if>
<if test="dataStatus != null and dataStatus != ''">or data_status = #{dataStatus}</if>
<if test="addStatus != null and addStatus != ''">or add_status = #{addStatus}</if>
<if test="updateStatus != null and updateStatus != ''">or update_status = #{updateStatus}</if>
<if test="deleteStatus != null and deleteStatus != ''">or delete_status = #{deleteStatus}</if>
<if test="sorts != null">or sorts = #{sorts}</if>
<if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
<if test="create_time != null">or create_time = #{create_time}</if>
<if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
<if test="modify_time != null">or modify_time = #{modify_time}</if>
<if test="sts != null and sts != ''">or sts = #{sts}</if>
<if test="org_id != null and org_id != ''">or org_id = #{org_id}</if>
<if test="companyId != null and companyId != ''">or company_id = #{companyId}</if>
<if test="dataId != null and dataId != ''">or data_id = #{dataId}</if>
<if test="mdmUpId != null and mdmUpId != ''">or mdm_up_id = #{mdmUpId}</if>
<if test="pkCumandoc != null and pkCumandoc != ''">or pk_cumandoc = #{pkCumandoc}</if>
<if test="pkCubasdoc != null and pkCubasdoc != ''">or pk_cubasdoc = #{pkCubasdoc}</if>
<if test="pkCorp != null and pkCorp != ''">or pk_corp = #{pkCorp}</if>
<if test="custflag != null and custflag != ''">or custflag = #{custflag}</if>
<if test="ts != null">or ts = #{ts}</if>
<if test="dr != null and dr != ''">or dr = #{dr}</if>
<if test="code != null and code != ''">or code = #{code}</if>
<if test="name != null and name != ''">or name = #{name}</if>
and sts='Y'
</trim>
<if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity" keyProperty="id"
useGeneratedKeys="true">
insert into mdm_bf_cumandoc_ks(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''">id ,</if>
<if test="documentRule != null and documentRule != ''">document_rule ,</if>
<if test="documentRuleNum != null">document_rule_num ,</if>
<if test="dataStatus != null and dataStatus != ''">data_status ,</if>
<if test="addStatus != null and addStatus != ''">add_status ,</if>
<if test="updateStatus != null and updateStatus != ''">update_status ,</if>
<if test="deleteStatus != null and deleteStatus != ''">delete_status ,</if>
<if test="sorts != null">sorts ,</if>
<if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
<if test="create_time != null">create_time ,</if>
<if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="companyId != null and companyId != ''">company_id ,</if>
<if test="dataId != null and dataId != ''">data_id ,</if>
<if test="mdmUpId != null and mdmUpId != ''">mdm_up_id ,</if>
<if test="pkCumandoc != null and pkCumandoc != ''">pk_cumandoc ,</if>
<if test="pkCubasdoc != null and pkCubasdoc != ''">pk_cubasdoc ,</if>
<if test="pkCorp != null and pkCorp != ''">pk_corp ,</if>
<if test="custflag != null and custflag != ''">custflag ,</if>
<if test="ts != null">ts ,</if>
<if test="dr != null and dr != ''">dr ,</if>
<if test="code != null and code != ''">code ,</if>
<if test="name != null and name != ''">name ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''">#{id} ,</if>
<if test="documentRule != null and documentRule != ''">#{documentRule} ,</if>
<if test="documentRuleNum != null">#{documentRuleNum} ,</if>
<if test="dataStatus != null and dataStatus != ''">#{dataStatus} ,</if>
<if test="addStatus != null and addStatus != ''">#{addStatus} ,</if>
<if test="updateStatus != null and updateStatus != ''">#{updateStatus} ,</if>
<if test="deleteStatus != null and deleteStatus != ''">#{deleteStatus} ,</if>
<if test="sorts != null">#{sorts} ,</if>
<if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
<if test="create_time != null">#{create_time} ,</if>
<if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="companyId != null and companyId != ''">#{companyId} ,</if>
<if test="dataId != null and dataId != ''">#{dataId} ,</if>
<if test="mdmUpId != null and mdmUpId != ''">#{mdmUpId} ,</if>
<if test="pkCumandoc != null and pkCumandoc != ''">#{pkCumandoc} ,</if>
<if test="pkCubasdoc != null and pkCubasdoc != ''">#{pkCubasdoc} ,</if>
<if test="pkCorp != null and pkCorp != ''">#{pkCorp} ,</if>
<if test="custflag != null and custflag != ''">#{custflag} ,</if>
<if test="ts != null">#{ts} ,</if>
<if test="dr != null and dr != ''">#{dr} ,</if>
<if test="code != null and code != ''">#{code} ,</if>
<if test="name != null and name != ''">#{name} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_bf_cumandoc_ks a WHERE
a.sts = 'Y' ),
</if>
<if test="sts == null ">'Y',</if>
</trim>
)
</insert>
<!-- 批量新增 -->
<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
insert into mdm_bf_cumandoc_ks(document_rule, document_rule_num, data_status, add_status, update_status,
delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, data_id,
mdm_up_id, pk_cumandoc, pk_cubasdoc, pk_corp, custflag, ts, dr, code, name, sts)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.pkCumandoc},#{entity.pkCubasdoc},#{entity.pkCorp},#{entity.custflag},#{entity.ts},#{entity.dr},#{entity.code},#{entity.name},
'Y')
</foreach>
</insert>
<!-- 批量新增或者修改-->
<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into mdm_bf_cumandoc_ks(document_rule, document_rule_num, data_status, add_status, update_status,
delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, data_id,
mdm_up_id, pk_cumandoc, pk_cubasdoc, pk_corp, custflag, ts, dr, code, name)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.pkCumandoc},#{entity.pkCubasdoc},#{entity.pkCorp},#{entity.custflag},#{entity.ts},#{entity.dr},#{entity.code},#{entity.name})
</foreach>
on duplicate key update
document_rule = values(document_rule),
document_rule_num = values(document_rule_num),
data_status = values(data_status),
add_status = values(add_status),
update_status = values(update_status),
delete_status = values(delete_status),
create_user_id = values(create_user_id),
create_time = values(create_time),
modify_user_id = values(modify_user_id),
modify_time = values(modify_time),
sts = values(sts),
org_id = values(org_id),
company_id = values(company_id),
data_id = values(data_id),
mdm_up_id = values(mdm_up_id),
pk_cumandoc = values(pk_cumandoc),
pk_cubasdoc = values(pk_cubasdoc),
pk_corp = values(pk_corp),
custflag = values(custflag),
ts = values(ts),
dr = values(dr),
code = values(code),
name = values(name)
</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity">
update mdm_bf_cumandoc_ks set
<trim suffix="" suffixOverrides=",">
<if test="documentRule != null and documentRule != ''">document_rule = #{documentRule},</if>
<if test="documentRuleNum != null">document_rule_num = #{documentRuleNum},</if>
<if test="dataStatus != null and dataStatus != ''">data_status = #{dataStatus},</if>
<if test="addStatus != null and addStatus != ''">add_status = #{addStatus},</if>
<if test="updateStatus != null and updateStatus != ''">update_status = #{updateStatus},</if>
<if test="deleteStatus != null and deleteStatus != ''">delete_status = #{deleteStatus},</if>
<if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
<if test="create_time != null">create_time = #{create_time},</if>
<if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
<if test="modify_time != null">modify_time = #{modify_time},</if>
<if test="sts != null and sts != ''">sts = #{sts},</if>
<if test="org_id != null and org_id != ''">org_id = #{org_id},</if>
<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
<if test="dataId != null and dataId != ''">data_id = #{dataId},</if>
<if test="mdmUpId != null and mdmUpId != ''">mdm_up_id = #{mdmUpId},</if>
<if test="pkCumandoc != null and pkCumandoc != ''">pk_cumandoc = #{pkCumandoc},</if>
<if test="pkCubasdoc != null and pkCubasdoc != ''">pk_cubasdoc = #{pkCubasdoc},</if>
<if test="pkCorp != null and pkCorp != ''">pk_corp = #{pkCorp},</if>
<if test="custflag != null and custflag != ''">custflag = #{custflag},</if>
<if test="ts != null">ts = #{ts},</if>
<if test="dr != null and dr != ''">dr = #{dr},</if>
<if test="code != null and code != ''">code = #{code},</if>
<if test="name != null and name != ''">name = #{name},</if>
</trim>
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity">
update mdm_bf_cumandoc_ks
set sts= 'N',
modify_time = #{modify_time},
modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition"
parameterType="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity">
update mdm_bf_cumandoc_ks set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id = #{id}</if>
<if test="documentRule != null and documentRule != ''">and document_rule = #{documentRule}</if>
<if test="documentRuleNum != null">and document_rule_num = #{documentRuleNum}</if>
<if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
<if test="addStatus != null and addStatus != ''">and add_status = #{addStatus}</if>
<if test="updateStatus != null and updateStatus != ''">and update_status = #{updateStatus}</if>
<if test="deleteStatus != null and deleteStatus != ''">and delete_status = #{deleteStatus}</if>
<if test="sorts != null">and sorts = #{sorts}</if>
<if test="sts != null and sts != ''">and sts = #{sts}</if>
<if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
<if test="dataId != null and dataId != ''">and data_id = #{dataId}</if>
<if test="mdmUpId != null and mdmUpId != ''">and mdm_up_id = #{mdmUpId}</if>
<if test="pkCumandoc != null and pkCumandoc != ''">and pk_cumandoc = #{pkCumandoc}</if>
<if test="pkCubasdoc != null and pkCubasdoc != ''">and pk_cubasdoc = #{pkCubasdoc}</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
<if test="custflag != null and custflag != ''">and custflag = #{custflag}</if>
<if test="ts != null">and ts = #{ts}</if>
<if test="dr != null and dr != ''">and dr = #{dr}</if>
<if test="code != null and code != ''">and code = #{code}</if>
<if test="name != null and name != ''">and name = #{name}</if>
and sts='Y'
</trim>
</update>
<!--通过主键删除-->
<delete id="entity_delete">
delete
from mdm_bf_cumandoc_ks
where
1=1
<if test="id != null and id != ''">and id = #{id}</if>
<if test="pkCumandoc != null and pkCumandoc != ''">and pk_cumandoc = #{pkCumandoc}</if>
</delete>
<select id="queryU8CAll" parameterType="com.hzya.frame.plugin.gm.entity.MdmBfCumandocKsEntity">
SELECT
mandoc.pk_cumandoc,
mandoc.pk_cubasdoc,
basdoc.custcode as code,
basdoc.custname as name,
mandoc.pk_corp,
mandoc.custflag,
mandoc.ts,
mandoc.dr
FROM
bd_cumandoc mandoc
LEFT JOIN bd_cubasdoc basdoc on basdoc.pk_cubasdoc=mandoc.pk_cubasdoc
WHERE
1=1
and custflag in(0,1,2)
and mandoc.ts &gt;= #{startTime}
and mandoc.ts &lt;= #{endTime}
</select>
<insert id="saveList" parameterType="java.util.List">
insert into mdm_bf_cumandoc_ks(
id,
data_status,
create_time,
sts,
pk_cumandoc,
pk_cubasdoc,
code,
name,
pk_corp,
custflag,
ts,
dr
)values
<foreach collection="list" item="item" separator=",">
(
#{item.id},
#{item.dataStatus},
now(),
#{item.sts},
#{item.pkCumandoc},
#{item.pkCubasdoc},
#{item.code},
#{item.name},
#{item.pkCorp},
#{item.custflag},
#{item.ts},
#{item.dr}
)
</foreach>
</insert>
</mapper>

12
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java
View File

@ -508,6 +508,18 @@ public class BdController extends DefaultController {
return getFailureMessageEntity(e.getMessage()); return getFailureMessageEntity(e.getMessage());
} }
} }
@Autowired
private U8C_plugin_bd_cumandoc_ks u8CPluginBdCumandocKs;
@RequestMapping(value = "/u8CPluginBdCumandocKs", method = RequestMethod.POST)
public JsonResultEntity u8CPluginBdCumandocKs (String start,String end) {
try {
u8CPluginBdCumandocKs.start(start,end);
return getSuccessMessageEntity("请求成功");
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}

1
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/controller/CoreController.java
View File

@ -100,6 +100,7 @@ public class CoreController extends DefaultController {
StringBuffer sbsb = new StringBuffer(); StringBuffer sbsb = new StringBuffer();
for (String s : uniqueArray) { for (String s : uniqueArray) {
try { try {
Thread.sleep(500);
createVoucherVO.setBill_code(s); createVoucherVO.setBill_code(s);
coreService.backVoucher(createVoucherVO); coreService.backVoucher(createVoucherVO);
j++; j++;

179
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/generate/core/service/impl/ICoreServiceImpl.java
View File

@ -54,6 +54,7 @@ import com.hzya.frame.voucher.utils.ZTResult;
import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -587,6 +588,13 @@ public class ICoreServiceImpl implements ICoreService {
List<VoucherData.Voucher.Detail.Ass> assList = new ArrayList<>(); List<VoucherData.Voucher.Detail.Ass> assList = new ArrayList<>();
//根据科目的辅助核算匹配模板的配置 //根据科目的辅助核算匹配模板的配置
//专门记录 业务大类 D0003
//合同收款单：业务大类 D0003 为三方运营 06 /分期收款 07 时，业务细分 D0004 对接直接默认为"无"显示。 202509091500 add by zydd
VoucherData.Voucher.Detail.Ass ass_D0003 = null;
boolean flat_D0004=false;
for (Map.Entry<String, String> assByBdCodeEntry : AssByBdCodeMap.entrySet()) { for (Map.Entry<String, String> assByBdCodeEntry : AssByBdCodeMap.entrySet()) {
String key = assByBdCodeEntry.getKey(); String key = assByBdCodeEntry.getKey();
@ -598,6 +606,12 @@ public class ICoreServiceImpl implements ICoreService {
//辅助核算取值 //辅助核算取值
Map<String, String> assValue = new HashMap<>(); Map<String, String> assValue = new HashMap<>();
if("350499bebe41426eaf29c603ca54fd88".equals(createVoucherVO.getMdmId()) && "D0004".equals(value) && ass_D0003==null){
flat_D0004=true;
continue;
}
try{ try{
assValue = getAssValue(templateAssistEntity, dataValue, orgBookVO); assValue = getAssValue(templateAssistEntity, dataValue, orgBookVO);
}catch (Exception e){ }catch (Exception e){
@ -610,6 +624,7 @@ public class ICoreServiceImpl implements ICoreService {
} }
} }
System.out.println(assValue); System.out.println(assValue);
if (assValue.size() != 0) { if (assValue.size() != 0) {
VoucherData.Voucher.Detail.Ass assEntity = new VoucherData.Voucher.Detail.Ass(); VoucherData.Voucher.Detail.Ass assEntity = new VoucherData.Voucher.Detail.Ass();
assEntity.setChecktypecode(value); assEntity.setChecktypecode(value);
@ -623,8 +638,27 @@ public class ICoreServiceImpl implements ICoreService {
break; break;
} }
} }
//合同收款单：业务细分赋值
if("350499bebe41426eaf29c603ca54fd88".equals(createVoucherVO.getMdmId())&&"D0003".equals(value)){
ass_D0003=assEntity;
}
assList.add(assEntity); assList.add(assEntity);
} }
//合同收款单：业务细分赋值
if("350499bebe41426eaf29c603ca54fd88".equals(createVoucherVO.getMdmId())&&"D0003".equals(value)&&ass_D0003!=null){
if("06".equals(ass_D0003.getCheckvaluecode())||"07".equals(ass_D0003.getCheckvaluecode())){
VoucherData.Voucher.Detail.Ass assEntity = new VoucherData.Voucher.Detail.Ass();
assEntity.setChecktypecode("D0004");
assEntity.setChecktypename("业务细分");
assEntity.setCheckvalueid("0001A110000000000MJ2");
assEntity.setCheckvaluecode("17");
assEntity.setCheckvaluename("无");
assList.add(assEntity);
}
}
} }
if (assList.size() != 0) { if (assList.size() != 0) {
detail.setAss(assList); detail.setAss(assList);
@ -681,7 +715,7 @@ public class ICoreServiceImpl implements ICoreService {
voucher.add(vouche); voucher.add(vouche);
//重新组装参数 //重新组装参数
List<VoucherData.Voucher> resultVoucher = reassemblyParam(voucher); List<VoucherData.Voucher> resultVoucher = reassemblyParam(voucher,createVoucherVO.getMdmId());
String data="{\"voucher\":"; String data="{\"voucher\":";
data+=JSONUtil.toJsonStr(resultVoucher)+"}"; data+=JSONUtil.toJsonStr(resultVoucher)+"}";
@ -2367,8 +2401,65 @@ public class ICoreServiceImpl implements ICoreService {
deleteDetails.setVoucherId(Long.valueOf(HId)); deleteDetails.setVoucherId(Long.valueOf(HId));
logDetailsDao.logicRemove(deleteDetails); logDetailsDao.logicRemove(deleteDetails);
//分录保存
for (VoucherData.Voucher.Detail detail : voucher.getDetails()) { List<VoucherData.Voucher.Detail> all = new ArrayList<>();
all.addAll(voucher.getDetails());
if ("350499bebe41426eaf29c603ca54fd88".equals(mdmId)) {
List<VoucherData.Voucher.Detail> details_1002 =new LinkedList<>();
List<VoucherData.Voucher.Detail> details_otehr =new LinkedList<>();
for (VoucherData.Voucher.Detail detail : all) {
if("1002".equals(detail.getPk_accsubj())){
details_1002.add(detail);
continue;
}
details_otehr.add(detail);
}
//汇总1002
VoucherData.Voucher.Detail detail1 = new VoucherData.Voucher.Detail();
if(details_1002.size()!=0) {
all.clear();
BigDecimal debitamount_1002 = new BigDecimal(0);
BigDecimal localdebitamount_1002 = new BigDecimal(0);
for (VoucherData.Voucher.Detail detail : details_1002) {
debitamount_1002 = debitamount_1002.add(new BigDecimal(detail.getDebitamount()));
localdebitamount_1002 = localdebitamount_1002.add(new BigDecimal(detail.getLocaldebitamount()));
}
BeanUtils.copyProperties(details_1002.get(0), detail1);
detail1.setDebitamount(debitamount_1002.toString());//借方金额 debitamount
detail1.setLocaldebitamount(localdebitamount_1002.toString());//借方金额 debitamount
//现金流分析
List<VoucherData.Voucher.Detail.Cashflow> cashflow = detail1.getCashflow();
for (VoucherData.Voucher.Detail.Cashflow cashflow1 : cashflow) {
cashflow1.setMoney(debitamount_1002.toString());//金额 money
}
}
all.add(detail1);
all.addAll(details_otehr);
}
// 验收收入申报单：112201 科目金额取一次。
if ("26ea58c724014177bea26d185beb7795".equals(mdmId)) {
List<VoucherData.Voucher.Detail> details_112201 =new LinkedList<>();
List<VoucherData.Voucher.Detail> details_other =new LinkedList<>();
boolean flag=true;
for (VoucherData.Voucher.Detail detail : all) {
if("112201".equals(detail.getPk_accsubj())&&flag){
details_112201.add(detail);
flag=false;
}
if(!"112201".equals(detail.getPk_accsubj())){
details_other.add(detail);
}
}
all.clear();
all.addAll(details_112201);
all.addAll(details_other);
}
//分录保存
for (VoucherData.Voucher.Detail detail : all) {
AePushVoucherLogDetailsEntity logDetail = new AePushVoucherLogDetailsEntity(); AePushVoucherLogDetailsEntity logDetail = new AePushVoucherLogDetailsEntity();
logDetail.setVoucherId(Long.valueOf(HId)); logDetail.setVoucherId(Long.valueOf(HId));
logDetail.setAbstractStr(detail.getExplanation());//摘要 logDetail.setAbstractStr(detail.getExplanation());//摘要
@ -2568,7 +2659,7 @@ public class ICoreServiceImpl implements ICoreService {
* @param voucher * @param voucher
* @return * @return
*/ */
private List<VoucherData.Voucher> reassemblyParam(List<VoucherData.Voucher> voucher) { private List<VoucherData.Voucher> reassemblyParam(List<VoucherData.Voucher> voucher,String mdmId) {
List<VoucherData.Voucher> resultVoucher =new LinkedList<>(); List<VoucherData.Voucher> resultVoucher =new LinkedList<>();
for (VoucherData.Voucher vou : voucher) { for (VoucherData.Voucher vou : voucher) {
VoucherData.Voucher resuVoucher = new VoucherData.Voucher(); VoucherData.Voucher resuVoucher = new VoucherData.Voucher();
@ -2603,6 +2694,28 @@ public class ICoreServiceImpl implements ICoreService {
} }
} }
//合同收款单：业务大类 D0003 为三方运营 06 /分期收款 07 时，业务细分 D0004 对接直接默认为"无"显示。 202509091500 add by zydd
if ("350499bebe41426eaf29c603ca54fd88".equals(mdmId)) {
boolean flag=false;
//判断 业务大类 D0003 为三方运营/分期收款
for (VoucherData.Voucher.Detail.Ass ass1 : ass) {
if("D0003".equals(ass1.getChecktypecode())&&("06".equals(ass1.getCheckvaluecode())||"07".equals(ass1.getCheckvaluecode()))){
flag=true;
break;
}
}
if(flag) {
for (VoucherData.Voucher.Detail.Ass ass1 : ass) {
if ("D0004".equals(ass1.getChecktypecode())) {
//业务细分 D0004 对接直接默认为"无"显示
ass1.setCheckvaluecode("17");//辅助核算的值编码 checkvaluecode
}
}
}
}
List<VoucherData.Voucher.Detail.Cashflow> cashflow =new LinkedList<>(); List<VoucherData.Voucher.Detail.Cashflow> cashflow =new LinkedList<>();
if(detail.getCashflow()!=null){ if(detail.getCashflow()!=null){
//现金流映射 //现金流映射
@ -2620,6 +2733,64 @@ public class ICoreServiceImpl implements ICoreService {
det.setCashflow(cashflow); det.setCashflow(cashflow);
details.add(det); details.add(det);
} }
//合同收款单：银行实际收到的只有一笔，我们需要和银行流水对应上，1002的科目，不按项目汇总，按单据汇总 202509091541 add by zydd
if ("350499bebe41426eaf29c603ca54fd88".equals(mdmId)) {
List<VoucherData.Voucher.Detail> details_1002 =new LinkedList<>();
List<VoucherData.Voucher.Detail> details_other =new LinkedList<>();
for (VoucherData.Voucher.Detail detail : details) {
if("1002".equals(detail.getPk_accsubj())){
details_1002.add(detail);
continue;
}
details_other.add(detail);
}
//汇总1002
VoucherData.Voucher.Detail detail1 = new VoucherData.Voucher.Detail();
if(details_1002.size()!=0) {
details.clear();
BigDecimal debitamount_1002 = new BigDecimal(0);
BigDecimal localdebitamount_1002 = new BigDecimal(0);
for (VoucherData.Voucher.Detail detail : details_1002) {
debitamount_1002 = debitamount_1002.add(new BigDecimal(detail.getDebitamount()));
localdebitamount_1002 = localdebitamount_1002.add(new BigDecimal(detail.getLocaldebitamount()));
}
BeanUtils.copyProperties(details_1002.get(0), detail1);
detail1.setDebitamount(debitamount_1002.toString());//借方金额 debitamount
detail1.setLocaldebitamount(localdebitamount_1002.toString());//借方金额 debitamount
//现金流分析
List<VoucherData.Voucher.Detail.Cashflow> cashflow = detail1.getCashflow();
for (VoucherData.Voucher.Detail.Cashflow cashflow1 : cashflow) {
cashflow1.setMoney(debitamount_1002.toString());//金额 money
}
}
details.add(detail1);
details.addAll(details_other);
}
// 验收收入申报单：112201 科目金额取一次。
if("26ea58c724014177bea26d185beb7795".equals(mdmId)){
System.out.println(details);
List<VoucherData.Voucher.Detail> details_112201 =new LinkedList<>();
List<VoucherData.Voucher.Detail> details_other =new LinkedList<>();
boolean flag=true;
for (VoucherData.Voucher.Detail detail : details) {
if("112201".equals(detail.getPk_accsubj())&&flag){
details_112201.add(detail);
flag=false;
}
if(!"112201".equals(detail.getPk_accsubj())){
details_other.add(detail);
}
}
details.clear();
details.addAll(details_112201);
details.addAll(details_other);
}
resuVoucher.setDetails(details); resuVoucher.setDetails(details);
resultVoucher.add(resuVoucher); resultVoucher.add(resuVoucher);
} }

1
base-buildpackage/src/main/resources/application-gmprod.yml
View File

@ -13,6 +13,7 @@ spring:
datasource: datasource:
master: master:
url: jdbc:mysql://127.0.0.1:3306/businesscenter_voucher_gm_250907?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true url: jdbc:mysql://127.0.0.1:3306/businesscenter_voucher_gm_250907?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true
# url: jdbc:mysql://8.136.10.42:3306/businesscenter_voucher_gm_250907?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true
username: root username: root
password: bd993088e8a7c3dc5f44441617f9b4bf password: bd993088e8a7c3dc5f44441617f9b4bf
driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置

1
base-buildpackage/src/main/resources/application.yml
View File

@ -36,6 +36,7 @@ spring:
# use-suffix-pattern: true # use-suffix-pattern: true
profiles: profiles:
# active: @profileActive@ # active: @profileActive@
# active: gmprod
active: gmdev active: gmdev
# active: dev # active: dev
servlet: servlet:

1
base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-dao.xml
View File

@ -14,4 +14,5 @@
<bean name="mdmBfJobmngfilDao" class="com.hzya.frame.plugin.gm.dao.impl.MdmBfJobmngfilDaoImpl"/> <bean name="mdmBfJobmngfilDao" class="com.hzya.frame.plugin.gm.dao.impl.MdmBfJobmngfilDaoImpl"/>
<bean name="mdmBfCumandocKsDao" class="com.hzya.frame.plugin.gm.dao.impl.MdmBfCumandocKsDaoImpl"/>
</beans> </beans>

2
base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-plugin.xml
View File

@ -19,4 +19,6 @@
<!--U8C-项目管理档案--> <!--U8C-项目管理档案-->
<bean name="u8c_plugin_bd_jobmngfil" class="com.hzya.frame.plugin.gm.U8C_plugin_bd_jobmngfil"/> <bean name="u8c_plugin_bd_jobmngfil" class="com.hzya.frame.plugin.gm.U8C_plugin_bd_jobmngfil"/>
<!--U8C-客商档案-->
<bean name="u8c_plugin_bd_cumandoc_ks" class="com.hzya.frame.plugin.gm.U8C_plugin_bd_cumandoc_ks"/>
</beans> </beans>

43
base-common/.flattened-pom.xml
View File

@ -2,11 +2,6 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzya.frame</groupId>
<artifactId>kangarooDataCenterV3</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>base-common</artifactId> <artifactId>base-common</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
@ -16,24 +11,22 @@
<url>https://www.apache.org/licenses/LICENSE-2.0</url> <url>https://www.apache.org/licenses/LICENSE-2.0</url>
</license> </license>
</licenses> </licenses>
<build> <repositories>
<plugins> <repository>
<plugin> <snapshots>
<groupId>org.springframework.boot</groupId> <enabled>false</enabled>
<artifactId>spring-boot-maven-plugin</artifactId> </snapshots>
<executions> <id>aliyun</id>
<execution> <name>aliyun Repository</name>
<goals> <url>https://maven.aliyun.com/repository/public</url>
<goal>repackage</goal> </repository>
</goals> <repository>
</execution> <snapshots>
</executions> <enabled>false</enabled>
<configuration> </snapshots>
<mainClass>none</mainClass> <id>jeecg</id>
<classifier>execute</classifier> <name>jeecg Repository</name>
<skip>true</skip> <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
</configuration> </repository>
</plugin> </repositories>
</plugins>
</build>
</project> </project>

46
base-core/.flattened-pom.xml
View File

@ -2,11 +2,6 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzya.frame</groupId>
<artifactId>kangarooDataCenterV3</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>base-core</artifactId> <artifactId>base-core</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
@ -20,27 +15,26 @@
<dependency> <dependency>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>base-common</artifactId> <artifactId>base-common</artifactId>
<version>${revision}</version> <version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <repositories>
<plugins> <repository>
<plugin> <snapshots>
<groupId>org.springframework.boot</groupId> <enabled>false</enabled>
<artifactId>spring-boot-maven-plugin</artifactId> </snapshots>
<executions> <id>aliyun</id>
<execution> <name>aliyun Repository</name>
<goals> <url>https://maven.aliyun.com/repository/public</url>
<goal>repackage</goal> </repository>
</goals> <repository>
</execution> <snapshots>
</executions> <enabled>false</enabled>
<configuration> </snapshots>
<mainClass>none</mainClass> <id>jeecg</id>
<classifier>execute</classifier> <name>jeecg Repository</name>
<skip>true</skip> <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
</configuration> </repository>
</plugin> </repositories>
</plugins>
</build>
</project> </project>

55
base-service/.flattened-pom.xml
View File

@ -2,11 +2,6 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzya.frame</groupId>
<artifactId>kangarooDataCenterV3</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>base-service</artifactId> <artifactId>base-service</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
@ -20,32 +15,38 @@
<dependency> <dependency>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>base-core</artifactId> <artifactId>base-core</artifactId>
<version>${revision}</version> <version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector-java}</version> <version>8.0.13</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>3.0.5</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <repositories>
<plugins> <repository>
<plugin> <snapshots>
<groupId>org.springframework.boot</groupId> <enabled>false</enabled>
<artifactId>spring-boot-maven-plugin</artifactId> </snapshots>
<executions> <id>aliyun</id>
<execution> <name>aliyun Repository</name>
<goals> <url>https://maven.aliyun.com/repository/public</url>
<goal>repackage</goal> </repository>
</goals> <repository>
</execution> <snapshots>
</executions> <enabled>false</enabled>
<configuration> </snapshots>
<mainClass>none</mainClass> <id>jeecg</id>
<classifier>execute</classifier> <name>jeecg Repository</name>
<skip>true</skip> <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
</configuration> </repository>
</plugin> </repositories>
</plugins>
</build>
</project> </project>

45
base-webapp/.flattened-pom.xml
View File

@ -2,11 +2,6 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzya.frame</groupId>
<artifactId>kangarooDataCenterV3</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>base-webapp</artifactId> <artifactId>base-webapp</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
@ -20,26 +15,26 @@
<dependency> <dependency>
<groupId>com.hzya.frame</groupId> <groupId>com.hzya.frame</groupId>
<artifactId>base-service</artifactId> <artifactId>base-service</artifactId>
<version>${revision}</version> <version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <repositories>
<plugins> <repository>
<plugin> <snapshots>
<groupId>org.springframework.boot</groupId> <enabled>false</enabled>
<artifactId>spring-boot-maven-plugin</artifactId> </snapshots>
<executions> <id>aliyun</id>
<execution> <name>aliyun Repository</name>
<goals> <url>https://maven.aliyun.com/repository/public</url>
<goal>repackage</goal> </repository>
</goals> <repository>
</execution> <snapshots>
</executions> <enabled>false</enabled>
<configuration> </snapshots>
<mainClass>none</mainClass> <id>jeecg</id>
<classifier>execute</classifier> <name>jeecg Repository</name>
</configuration> <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
</plugin> </repository>
</plugins> </repositories>
</build>
</project> </project>