From 327991834574bbb8bbd78f29382297aa13d001d6 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期一, 30 十二月 2024 14:25:06 +0800
Subject: [PATCH] commit
---
product-server-web/pom.xml | 15 +++
home-server-admin/pom.xml | 4 +
pom.xml | 43 ++++++----
home-server-admin/src/main/java/com/home/xining/service/ReceiptDocumentService.java | 105 ++++++++++++++++---------
product-server-web/src/main/resources/application-dev.properties | 23 +++--
5 files changed, 123 insertions(+), 67 deletions(-)
diff --git a/home-server-admin/pom.xml b/home-server-admin/pom.xml
index c2537c3..c855c9c 100644
--- a/home-server-admin/pom.xml
+++ b/home-server-admin/pom.xml
@@ -31,5 +31,9 @@
<groupId>com.lx</groupId>
<artifactId>product-server-admin</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-tool-flow</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/home-server-admin/src/main/java/com/home/xining/service/ReceiptDocumentService.java b/home-server-admin/src/main/java/com/home/xining/service/ReceiptDocumentService.java
index 4430697..1de0712 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/ReceiptDocumentService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/ReceiptDocumentService.java
@@ -1,5 +1,6 @@
package com.home.xining.service;
+import cn.hutool.core.collection.CollectionUtil;
import com.home.xining.config.CmnConst;
import com.home.xining.service.idel.IReceiptDocumentService;
import com.product.common.lang.StringUtils;
@@ -11,9 +12,13 @@
import com.product.core.service.support.AbstractBaseService;
import com.product.core.service.support.QueryFilterService;
import com.product.core.transfer.Transactional;
+import com.product.tool.flow.service.FlowService;
import com.product.util.BaseUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @ClassName: ReceiptDocumentService
@@ -24,45 +29,69 @@
@Component
public class ReceiptDocumentService extends AbstractBaseService implements IReceiptDocumentService {
- @Autowired
- public BaseDao baseDao;
- @Autowired
- PermissionService permissionService;
- @Autowired
- QueryFilterService queryFilterService;
+ @Autowired
+ public BaseDao baseDao;
+ @Autowired
+ PermissionService permissionService;
+ @Autowired
+ QueryFilterService queryFilterService;
+ @Autowired
+ FlowService flowService;
- public DataTableEntity getReciptDocList(FieldSetEntity fs) throws BaseException {
- String filter=fs.getString("filter");
- //鍒涘缓浜哄瓧娈�
- String dataFilter = "" ;
- String created_by_field = fs.getString(CmnConst.CREATED_BY_FIELD);
- if(!BaseUtil.strIsNull(created_by_field)){
- dataFilter = permissionService.getDataFilter(fs.getTableName(),created_by_field);
- }
+ public DataTableEntity getReciptDocList(FieldSetEntity fs) throws BaseException {
+ String filter = fs.getString("filter");
+ //鍒涘缓浜哄瓧娈�
+ String dataFilter = "";
+ String created_by_field = fs.getString(CmnConst.CREATED_BY_FIELD);
+ if (!BaseUtil.strIsNull(created_by_field)) {
+ dataFilter = permissionService.getDataFilter(fs.getTableName(), created_by_field);
+ }
// String dataFilter = permissionService.getDataFilter(fs.getTableName(), CmnConst.SF33);
- if(!StringUtils.isEmpty(dataFilter)){
- if(!StringUtils.isEmpty(filter)){
- filter += " and "+dataFilter;
- }else {
- filter = dataFilter;
- }
- }
- if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){
- filter = filter + " and " + queryFilterService.getQueryFilter(fs);
- }
- DataTableEntity dt = baseDao.listTable(CmnConst.SFGL,filter,null,null,"sf26 desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
- baseDao.loadPromptData(dt);
- return dt;
- }
+ if (!StringUtils.isEmpty(dataFilter)) {
+ if (!StringUtils.isEmpty(filter)) {
+ filter += " and " + dataFilter;
+ } else {
+ filter = dataFilter;
+ }
+ }
+ if (!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))) {
+ filter = filter + " and " + queryFilterService.getQueryFilter(fs);
+ }
+ DataTableEntity dt = baseDao.listTable(CmnConst.SFGL, filter, null, null, "sf26 desc", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
+ baseDao.loadPromptData(dt);
+ return dt;
+ }
- /**
- * 鏀舵枃绠＄悊 鐘舵�佹敼涓哄凡鎵撳嵃
- * @param fse
- * @return
- */
- @Override
- @Transactional
- public Boolean isPrint(FieldSetEntity fse) {
- return baseDao.update(fse);
- }
+ /**
+ * 鏀舵枃绠＄悊 鐘舵�佹敼涓哄凡鎵撳嵃
+ *
+ * @param fse
+ * @return
+ */
+ @Override
+ @Transactional
+ public Boolean isPrint(FieldSetEntity fse) {
+ return baseDao.update(fse);
+ }
+
+
+ //鏀舵枃鎶勯�佸眬闀�
+ public Boolean sendToLeader(FieldSetEntity record, String jobPostName) {
+ FieldSetEntity task = getBaseDao().getFieldSetByFilter(com.product.tool.flow.config.CmnConst.TABLE_FLOW_TASK, "table_name=? and record_uuid=?", new Object[]{record.getTableName(), record.getUUID()}, false);
+
+ if (!FieldSetEntity.isEmpty(task)) {
+// 鏍规嵁宀椾綅鍚嶇О妯＄硦鎼滅储浜哄憳
+ DataTableEntity dataTableEntity = getBaseDao().listTable("product_sys_staffs",
+ "job_post_uuid IN ( SELECT uuid FROM product_sys_job_posts WHERE job_post_name LIKE concat('%',?,'%') ) AND staff_status in(1,3)",
+ new Object[]{jobPostName});
+ if (!DataTableEntity.isEmpty(dataTableEntity)) {
+ List<String> collect = dataTableEntity.getData().stream().map(item -> item.getString("user_id")).collect(Collectors.toList());
+ task.setValue("accept_users", CollectionUtil.join(collect, ","));
+ task.setValue("circularize_type", "1");
+ flowService.circularize(task);
+ }
+ }
+
+ return true;
+ }
}
diff --git a/pom.xml b/pom.xml
index ae3d803..78f0cde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,16 +16,7 @@
<modules>
<module>home-server-admin</module>
<module>product-server-web</module>
- <module>product-server-util</module>
<module>product-server-admin</module>
- <module>product-server-org-admin</module>
- <module>product-server-file</module>
- <module>product-server-data-sync</module>
- <module>product-server-common</module>
- <module>product-server-print</module>
- <module>product-server-tool-face</module>
- <module>product-server-tool-table</module>
- <module>product-server-tool-flow</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -99,6 +90,26 @@
<!--瀛愭ā鍧楋細start-->
<dependency>
<groupId>com.lx</groupId>
+ <artifactId>product-server-task</artifactId>
+ <version>2.1.0-release</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-device</artifactId>
+ <version>2.1.0-release</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-mobile-core</artifactId>
+ <version>2.1.0-release</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-patch</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
<artifactId>product-server-xining</artifactId>
<version>${product-module-version}</version>
</dependency>
@@ -110,9 +121,8 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-core</artifactId>
- <version>2.0.1</version>
+ <version>2.1.2-release</version>
</dependency>
-
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-util</artifactId>
@@ -146,11 +156,6 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-text-message</artifactId>
- <version>${product-module-version}</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-task</artifactId>
<version>${product-module-version}</version>
</dependency>
<dependency>
@@ -251,7 +256,11 @@
<!--瀛愭ā鍧楋細end-->
<!--绗笁鏂逛緷璧栵細start-->
-
+ <dependency>
+ <groupId>e-iceblue</groupId>
+ <artifactId>spire.doc.free</artifactId>
+ <version>5.2.0</version>
+ </dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
diff --git a/product-server-web/pom.xml b/product-server-web/pom.xml
index 6c89e87..3b5652e 100644
--- a/product-server-web/pom.xml
+++ b/product-server-web/pom.xml
@@ -40,6 +40,14 @@
</profiles>
<dependencies>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-device</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-patch</artifactId>
+ </dependency>
<!--瑗垮畞鎴跨灞�涓氬姟妯″潡-->
<dependency>
<groupId>com.lx</groupId>
@@ -103,6 +111,11 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-report</artifactId>
+ </dependency>
+ <!--绉诲姩绔�-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-mobile-core</artifactId>
</dependency>
<!--鏁版嵁瀵煎叆瀵煎嚭-->
<dependency>
@@ -332,8 +345,6 @@
<copy todir="D:/product/workspace/product-server-install/resources/product-server/lib">
<fileset dir="${project.build.directory}/lib">
<include name="*.jar"/>
- <exclude name="product-server-core-1.0.0-SNAPSHOT.jar"/>
- <exclude name="product-server-core-2.0.0-SNAPSHOT.jar"/>
</fileset>
</copy>
<copy todir="D:/product/workspace/product-server-install/resources/product-server/resources">
diff --git a/product-server-web/src/main/resources/application-dev.properties b/product-server-web/src/main/resources/application-dev.properties
index e3261a5..1ce5ffa 100644
--- a/product-server-web/src/main/resources/application-dev.properties
+++ b/product-server-web/src/main/resources/application-dev.properties
@@ -13,7 +13,7 @@
#\u662F\u5426\u542F\u7528\u63A5\u53E3\u7B7E\u540D\u8BA4\u8BC1
signature.isEnable=true
#\u5728\u542F\u7528\u63A5\u53E3\u7B7E\u540D\u8BA4\u8BC1\u65F6\uFF0C\u6392\u9664\u6307\u5B9A\u63A5\u53E3\u65E0\u9700\u7B7E\u540D\u8BA4\u8BC1
-signature.exclude.path=/api/rsa/getKey/v1,/api/token/refresh/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/api/fileManager/get-static-file,/static/**,/api/system-user/avatar/v1/*,/api/office/save-office/v1
+signature.exclude.path=/api/rsa/getKey/v1,/api/token/refresh/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/api/fileManager/get-static-file,/static/**,/api/system-user/avatar/v1/*,/api/office/save-office/v1,/download-mobile-apk/v1
#\u7B7E\u540D\u8BA4\u8BC1Key
signature.key=299cb5bb4c9040a29c58304c25001d72
#\u63A5\u53E3\u7B7E\u540D\u8BA4\u8BC1\u6709\u6548\u671F\uFF0C\u5355\u4F4D\u79D2,0\u8868\u793A\u4E0D\u9A8C\u8BC1
@@ -25,13 +25,13 @@
#\u63A5\u53E3token\u8FC7\u671F\uFF0C\u5237\u65B0token\u7684\u63A5\u53E3\u4F7F\u7528\u7684Token\u8FC7\u671F\u65F6\u95F4
refresh.token.expiration=12
#token\u9A8C\u8BC1\u3001\u767B\u5F55\u9A8C\u8BC1\uFF0C\u6392\u9664URL,\u9017\u53F7\u5206\u9694
-token.exclude.path=/api/token/refresh/v1,/login,/login/v1,/api/personalcenter/send-updatePwdEmail/v1,/api/language/login-language/v1,/api/lable_internationalization/list_lable_internation/v1,/api/lable_internationalization/list-label-internation-web/v1,/api/personalcenter/check-token/v1,/api/rsa/getKey/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/api/fileManager/get-static-file,/static/**
+token.exclude.path=/api/token/refresh/v1,/login,/login/v1,/api/personalcenter/send-updatePwdEmail/v1,/api/language/login-language/v1,/api/lable_internationalization/list_lable_internation/v1,/api/lable_internationalization/list-label-internation-web/v1,/api/personalcenter/check-token/v1,/api/rsa/getKey/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/api/fileManager/get-static-file,/static/**,/download-mobile-apk/v1
#\u662F\u5426\u542F\u7528\u6570\u636E\u64CD\u4F5C\u6743\u9650\u9A8C\u8BC1!
data.handle.valid.isEnable=false
#\u662F\u5426\u542F\u7528\u529F\u80FD\u6743\u9650\u9A8C\u8BC1
url.valid.isEnable=false
#\u4E0D\u9700\u8981\u6743\u9650\u9A8C\u8BC1\u63A5\u53E3\u5730\u5740,\u4E0D\u80FD\u914D/v1\u3001v2\u7B49
-url.valid.pass=/api/prompt/business/findPrompt,/api/dictionary/list-dictionary-byname,/logout,/api/functions/onload-button,/api/language/login-language/v1,/api/fileManager/get-file-info,/api/language/list-international-fields,/api/user/language/update-language,/api/staff-manager/upload_staff_avatar,api/rsa/getKey,/api/mobile/network/check,/api/system/config/info,/api/fileManager/get-static-file,/static/**
+url.valid.pass=/api/prompt/business/findPrompt,/api/dictionary/list-dictionary-byname,/logout,/api/functions/onload-button,/api/language/login-language/v1,/api/fileManager/get-file-info,/api/language/list-international-fields,/api/user/language/update-language,/api/staff-manager/upload_staff_avatar,api/rsa/getKey,/api/mobile/network/check,/api/system/config/info,/api/fileManager/get-static-file,/static/**,/download-mobile-apk
#\u662F\u5426\u6253\u5370\u9519\u8BEF\u4FE1\u606F
info.print=true
error.info.print=true
@@ -76,10 +76,10 @@
#################local###############################
#data.source.url=jdbc:mysql://222.209.31.230:9092/ch_kt_mes_apply?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://127.0.0.1:3306/product_db_v2.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://127.0.0.1:3308/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+#data.source.url=jdbc:mysql://192.168.0.197:3308/product_db_xn_240807?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://localhost:3306/product_db_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://192.168.0.200:3306/product_db_xn2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-data.source.url=jdbc:mysql://10.0.0.21:3306/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+#data.source.url=jdbc:mysql://10.0.0.21:3306/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://127.0.0.1:3306/product_db?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://222.209.31.230:9092/product_db_v2.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://64.145.32.26:3306/product_db_picc?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
@@ -188,7 +188,7 @@
#\u6587\u4EF6\u4E0A\u4F20
source_domain=https://www.baidu.com
default_domain=https://lx.blob.core.windows.net
-allowed_file_type=doc,docx,xls,xlsx,ppt,pptx,jpg,png,gif,bmp,csv,pdf,txt,dat,wps,wpt,et,eet,p12,rar,zip,7z,gd
+allowed_file_type=doc,docx,xls,xlsx,ppt,pptx,jpg,png,gif,bmp,csv,pdf,txt,dat,wps,wpt,et,eet,p12,rar,zip,7z,gd,rar,rtf,dot
# \u662F\u5426\u9700\u8981\u4E0A\u4F20\u5230\u6587\u4EF6\u670D\u52A1\u5668
upload.server=false
# \u662F\u5426\u9700\u8981\u6587\u4EF6\u52A0\u5BC6
@@ -310,12 +310,15 @@
# \u529E\u516C\u5BA4\u7528\u54C1\u91C7\u8D2D\u5355,\u4EBA\u5458\u51FA\u5DEE\uFF08\u57F9\u8BAD\uFF09\u5BA1\u6279\u5355,\u516C\u52A1\u63A5\u5F85\u5BA1\u6279\u8868,\u884C\u653F\u6267\u6CD5\u5BA1\u6279\u8868,\u53D1\u6587\u5B50\u8868\u5355,\u516C\u544A\u7BA1\u7406,\u8003\u52E4,\u4F1A\u8BAE
#data.synchronism.function =
# \u534F\u540C\u529E\u516C
-#data.synchronism.function=019-025-000mvc
-#data.synchronism.function = 600-008-000mvc,600-010-000mvc,600-016-000mvc,600-013-000mvc,600-009-000mvc,600-011-000mvc,600-012-000mvc,001-011-000mvc,001-006-000mvc,001-012-000mvc,019-025-000mvc;019-021-000;600-014-000mvc,600-015-000mvc,019-017-000mvc,021-016-000mvc,019-018-000mvc,019-023-000mvc,021-012-000mvc,006-009-000mvc,601-001-000mvc,035-411-000mvc;003-006-000mvc
+data.synchronism.function=019-021-000,019-025-000
+#data.synchronism.function=600-008-000mvc,600-010-000mvc,600-016-000mvc,600-013-000mvc,600-009-000mvc,600-011-000mvc,600-012-000mvc,001-011-000mvc,001-006-000mvc,001-012-000mvc,019-025-000mvc;019-021-000;600-014-000mvc,600-015-000mvc,019-017-000mvc,021-016-000mvc,019-018-000mvc,019-023-000mvc,021-012-000mvc,006-009-000mvc,601-001-000mvc,035-411-000mvc;003-006-000mvc
# oracle\u6E90\u6570\u636E\u5E93\u94FE\u63A5
data.synchronism.function.jdbc.diver=oracle.jdbc.driver.OracleDriver
-data.synchronism.function.jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
+data.synchronism.function.jdbc.url=jdbc:oracle:thin:@192.168.0.197:1521:ORCL
data.synchronism.function.jdbc.name=FE_BASE5
data.synchronism.function.jdbc.password=fe123
# \u9644\u4EF6\u540C\u6B65\u4E34\u65F6\u6587\u4EF6\u5939\u4F4D\u7F6E
new.filePackage=D:/filePackage
+
+#\u79FB\u52A8\u7AEFapk\u7248\u672C\u53F7 \u4F8B\u5982 1.0.0
+mobile.apk.version=3.0.0
--
Gitblit v1.9.2