From 7d91bf31ceaa6c5ac50e70f1a1b47200f8de197b Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Tue, 4 Apr 2023 09:04:49 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=9E=AB=E8=B5=84=E9=87=91=E9=A2=9D=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linkage-admin/src/main/resources/application-dev.yml | 4 ++-- chuang.gitignore | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 chuang.gitignore diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml index b3705b04..5085a67d 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -44,9 +44,9 @@ spring: # 生产环境 # host: 222.71.165.188 # 测试环境 - host: 150.158.169.212 + host: localhost port: 6379 - password: qweasd,.123 +# password: qweasd,.123 timeout: 8000 #超时时间(单位：秒) lettuce: #Lettuce为Redis的Java驱动包 pool: diff --git a/chuang.gitignore b/chuang.gitignore new file mode 100644 index 00000000..247eb225 --- /dev/null +++ b/chuang.gitignore @@ -0,0 +1,8 @@ +#忽略java,python的编译文件 +application-dev.yml +application.yml +*.class +*.pyc +#忽略开发工具自己的配置文件 +.idea +*.iml From 347deb700ea255d585db8d9209afe87e807edb22 Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Tue, 4 Apr 2023 09:06:06 +0800 Subject: [PATCH 02/10] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=9E=AB=E8=B5=84=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7d91bf31ceaa6c5ac50e70f1a1b47200f8de197b. --- .../linkage-admin/src/main/resources/application-dev.yml | 4 ++-- chuang.gitignore | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 chuang.gitignore diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml index 5085a67d..b3705b04 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -44,9 +44,9 @@ spring: # 生产环境 # host: 222.71.165.188 # 测试环境 - host: localhost + host: 150.158.169.212 port: 6379 -# password: qweasd,.123 + password: qweasd,.123 timeout: 8000 #超时时间(单位：秒) lettuce: #Lettuce为Redis的Java驱动包 pool: diff --git a/chuang.gitignore b/chuang.gitignore deleted file mode 100644 index 247eb225..00000000 --- a/chuang.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -#忽略java,python的编译文件 -application-dev.yml -application.yml -*.class -*.pyc -#忽略开发工具自己的配置文件 -.idea -*.iml From 1f9569adcc42066e57786dc756d0aa0a0637b76d Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Tue, 4 Apr 2023 09:35:32 +0800 Subject: [PATCH 03/10] i :wq! --- SC-boot/.gitignore | 13 ++ .../src/main/resources/application-dev.yml | 115 ------------------ .../main/resources/application-preview.yml | 70 ----------- .../src/main/resources/application-pro.yml | 69 ----------- .../src/main/resources/application-test.yml | 69 ----------- .../src/main/resources/application.yml | 62 ---------- 6 files changed, 13 insertions(+), 385 deletions(-) delete mode 100644 SC-boot/linkage-admin/src/main/resources/application-dev.yml delete mode 100644 SC-boot/linkage-admin/src/main/resources/application-preview.yml delete mode 100644 SC-boot/linkage-admin/src/main/resources/application-pro.yml delete mode 100644 SC-boot/linkage-admin/src/main/resources/application-test.yml delete mode 100644 SC-boot/linkage-admin/src/main/resources/application.yml diff --git a/SC-boot/.gitignore b/SC-boot/.gitignore index 4b83fbdf..67f0a415 100644 --- a/SC-boot/.gitignore +++ b/SC-boot/.gitignore @@ -1,3 +1,7 @@ +#我的配置 +application-dev.yml +application.yml + # For Java *.lck target/ @@ -6,6 +10,7 @@ log/ logback-test.xml + # Compiled class file *.class @@ -74,3 +79,11 @@ config/base.yaml **/nacos/data/* **/nacos/logs/* **/seata/bin/* +### Example user template template +### Example user template + +# IntelliJ project files +.idea +*.iml +out +gen diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml deleted file mode 100644 index b3705b04..00000000 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ /dev/null @@ -1,115 +0,0 @@ -# 应用服务器 -server: - tomcat: - uri-encoding: UTF-8 #tomcat编码 - port: 30000 #tomcat端口 - -spring: - devtools: #spring开发者工具模块 - restart: - enabled: true #热部署开关 - freemarker: - cache: false #spring内置freemarker缓存 - thymeleaf: - cache: false #spring内置thymeleaf缓存 - - #===================== 数据源配置 ===================== - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid - datasource: - db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写) - host: 222.71.165.188 - port: 3309 - username: root - password: qawsed,.123 - db-name: sc-boot - db-schema: #金仓达梦选填 - prepare-url: #自定义url - - #===================== 动态多数据源 ===================== - dynamic: - enabled: true - seata: false #分布式事务开关 - primary: sc-boot #设置默认的数据源或者数据源组,默认值即为master - strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 -# datasource: -# master: -# url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC -# username: ${spring.datasource.username} -# password: ${spring.datasource.password} -# driver-class-name: com.mysql.cj.jdbc.Driver - - #===================== Redis配置 ===================== - redis: - database: 1 #缓存库编号 -# 生产环境 -# host: 222.71.165.188 -# 测试环境 - host: 150.158.169.212 - port: 6379 - password: qweasd,.123 - timeout: 8000 #超时时间(单位：秒) - lettuce: #Lettuce为Redis的Java驱动包 - pool: - max-active: 8 # 连接池最大连接数 - max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制） - min-idle: 0 # 连接池中的最小空闲连接 - max-idle: 8 # 连接池中的最大空闲连接 - -config: - #===================== 是否开启测试环境 ===================== - TestVersion: false - - #===================== 文件模板配置 ===================== - fileType: local #文件存储类型(local-本地存储，minio-网络存储) - # win - # Path: /usr/project/jnpf-resources/ #Windows配置（静态资源根目录和代码生成器临时目录） - - # Windows环境配置（静态资源根目录和代码生成器临时目录） - Path: D:\project\resources\ - ServiceDirectoryPath: TemporaryFile - - - # Linux、MacOS环境配置（静态资源根目录和代码生成器临时目录） - # Path: /www/wwwroot/JNPF.Admin.test/Resources/ - # ServiceDirectoryPath: /www/wwwroot/JNPF.Admin.test/Resources/CodeTemp/ - - - # Linux - #Path: /data/jnpf-resources/ #Linux配置（静态资源根目录和代码生成器临时目录） - minio: - endpoint: http://192.168.0.147:9000/ #服务端地址 - accessKey: minioadmin #账号 - secretKey: minioadmin #密码 - fileHost: http://192.168.0.147:9000/ #地址 -#knife4j: - # 开启增强配置，此配置可配置ignoreParameters忽略参数 -# enable: true -# # 开启生产环境屏蔽 -# production: false -# basic: -# enable: true -# # Basic认证用户名 -# username: test -# # Basic认证密码 -# password: 123456 - -#swagger文档开启/关闭 -springfox: - documentation: - auto-startup: true -#knife4j -knife4j: - production: false # 开启/屏蔽文档资源 - -#开启语句打印 -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:mapper/**/*.xml - global-config: - db-config: - logic-delete-field: delete_mark # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) - logic-delete-value: 1 # 逻辑已删除值(默认为 1) - logic-not-delete-value: 0d # 逻辑未删除值(默认为 0) - # @TableLogic //实体类配置这个，但前面配置了logic-delete-field于是可以不配置 - # private Integer deleted; diff --git a/SC-boot/linkage-admin/src/main/resources/application-preview.yml b/SC-boot/linkage-admin/src/main/resources/application-preview.yml deleted file mode 100644 index c6ca0a51..00000000 --- a/SC-boot/linkage-admin/src/main/resources/application-preview.yml +++ /dev/null @@ -1,70 +0,0 @@ -# 应用服务器 -server: - tomcat: - uri-encoding: UTF-8 #tomcat编码 - port: 30000 #tomcat端口 - -spring: - devtools: #spring开发者工具模块 - restart: - enabled: true #热部署开关 - freemarker: - cache: false #spring内置freemarker缓存 - thymeleaf: - cache: false #spring内置thymeleaf缓存 - - #===================== 数据源配置 ===================== - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid - datasource: - db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写) - host: 192.168.0.10 - port: 3306 - username: java_boot_test - password: pBx5HaW6WMGSTdDf - db-name: java_boot_test - db-schema: #金仓达梦选填 - prepare-url: #自定义url - - #===================== 动态多数据源 ===================== - dynamic: - enabled: true - seata: false #分布式事务开关 - primary: master #设置默认的数据源或者数据源组,默认值即为master - strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 - # datasource: - # master: - # url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC - # username: ${spring.datasource.username} - # password: ${spring.datasource.password} - # driver-class-name: com.mysql.cj.jdbc.Driver - - #===================== Redis配置 ===================== - redis: - database: 1 #缓存库编号 - host: 127.0.0.1 - port: 6379 - password: - timeout: 3000 #超时时间(单位：秒) - lettuce: #Lettuce为Redis的Java驱动包 - pool: - max-active: 8 # 连接池最大连接数 - max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制） - min-idle: 0 # 连接池中的最小空闲连接 - max-idle: 8 # 连接池中的最大空闲连接 - -config: - #===================== 是否开启测试环境 ===================== - TestVersion: false - - #===================== 文件模板配置 ===================== - fileType: local #文件存储类型(local-本地存储，minio-网络存储) - # win -# Path: F:\project\jnpf-resources\ #Windows配置（静态资源根目录和代码生成器临时目录） - Path: D:\jnpf-resources\ #Windows配置（静态资源根目录和代码生成器临时目录） - # Linux - #Path: /data/jnpf-resources/ #Linux配置（静态资源根目录和代码生成器临时目录） - minio: - endpoint: http://192.168.0.147:9000/ #服务端地址 - accessKey: minioadmin #账号 - secretKey: minioadmin #密码 - fileHost: http://192.168.0.147:9000/ #地址 diff --git a/SC-boot/linkage-admin/src/main/resources/application-pro.yml b/SC-boot/linkage-admin/src/main/resources/application-pro.yml deleted file mode 100644 index 75eb2bdd..00000000 --- a/SC-boot/linkage-admin/src/main/resources/application-pro.yml +++ /dev/null @@ -1,69 +0,0 @@ -# 应用服务器 -server: - tomcat: - uri-encoding: UTF-8 #tomcat编码 - port: 30000 #tomcat端口 - -spring: - devtools: #spring开发者工具模块 - restart: - enabled: true #热部署开关 - freemarker: - cache: false #spring内置freemarker缓存 - thymeleaf: - cache: false #spring内置thymeleaf缓存 - - #===================== 数据源配置 ===================== - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid - datasource: - db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写) - host: 222.71.165.188 - port: 3309 - username: root - password: qawsed,.123 - db-name: sc-product - db-schema: #金仓达梦选填 - prepare-url: #自定义url - - #===================== 动态多数据源 ===================== - dynamic: - enabled: true - seata: false #分布式事务开关 - primary: master #设置默认的数据源或者数据源组,默认值即为master - strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 - # datasource: - # master: - # url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC - # username: ${spring.datasource.username} - # password: ${spring.datasource.password} - # driver-class-name: com.mysql.cj.jdbc.Driver - - #===================== Redis配置 ===================== - redis: - database: 1 #缓存库编号 - host: 222.71.165.188 - port: 6379 - password: qweasd,.123 - timeout: 3000 #超时时间(单位：秒) - lettuce: #Lettuce为Redis的Java驱动包 - pool: - max-active: 8 # 连接池最大连接数 - max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制） - min-idle: 0 # 连接池中的最小空闲连接 - max-idle: 8 # 连接池中的最大空闲连接 - -config: - #===================== 是否开启测试环境 ===================== - TestVersion: false - - #===================== 文件模板配置 ===================== - fileType: local #文件存储类型(local-本地存储，minio-网络存储) - # win - Path: D:\project\resources\ #Windows配置（静态资源根目录和代码生成器临时目录） - # Linux - #Path: /data/jnpf-resources/ #Linux配置（静态资源根目录和代码生成器临时目录） - minio: - endpoint: http://192.168.0.147:9000/ #服务端地址 - accessKey: minioadmin #账号 - secretKey: minioadmin #密码 - fileHost: http://192.168.0.147:9000/ #地址 diff --git a/SC-boot/linkage-admin/src/main/resources/application-test.yml b/SC-boot/linkage-admin/src/main/resources/application-test.yml deleted file mode 100644 index d2997746..00000000 --- a/SC-boot/linkage-admin/src/main/resources/application-test.yml +++ /dev/null @@ -1,69 +0,0 @@ -# 应用服务器 -server: - tomcat: - uri-encoding: UTF-8 #tomcat编码 - port: 30000 #tomcat端口 - -spring: - devtools: #spring开发者工具模块 - restart: - enabled: true #热部署开关 - freemarker: - cache: false #spring内置freemarker缓存 - thymeleaf: - cache: false #spring内置thymeleaf缓存 - - #===================== 数据源配置 ===================== - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid - datasource: - db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写) - host: 192.168.0.10 - port: 3306 - username: java_boot_test - password: pBx5HaW6WMGSTdDf - db-name: java_boot_test - db-schema: #金仓达梦选填 - prepare-url: #自定义url - - #===================== 动态多数据源 ===================== - dynamic: - enabled: true - seata: false #分布式事务开关 - primary: master #设置默认的数据源或者数据源组,默认值即为master - strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 - # datasource: - # master: - # url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC - # username: ${spring.datasource.username} - # password: ${spring.datasource.password} - # driver-class-name: com.mysql.cj.jdbc.Driver - - #===================== Redis配置 ===================== - redis: - database: 1 #缓存库编号 - host: 127.0.0.1 - port: 6379 - password: - timeout: 3000 #超时时间(单位：秒) - lettuce: #Lettuce为Redis的Java驱动包 - pool: - max-active: 8 # 连接池最大连接数 - max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制） - min-idle: 0 # 连接池中的最小空闲连接 - max-idle: 8 # 连接池中的最大空闲连接 - -config: - #===================== 是否开启测试环境 ===================== - TestVersion: false - - #===================== 文件模板配置 ===================== - fileType: local #文件存储类型(local-本地存储，minio-网络存储) - # win - Path: D:\project\resources\ #Windows配置（静态资源根目录和代码生成器临时目录） - # Linux - #Path: /data/jnpf-resources/ #Linux配置（静态资源根目录和代码生成器临时目录） - minio: - endpoint: http://192.168.0.147:9000/ #服务端地址 - accessKey: minioadmin #账号 - secretKey: minioadmin #密码 - fileHost: http://192.168.0.147:9000/ #地址 diff --git a/SC-boot/linkage-admin/src/main/resources/application.yml b/SC-boot/linkage-admin/src/main/resources/application.yml deleted file mode 100644 index 3cde125b..00000000 --- a/SC-boot/linkage-admin/src/main/resources/application.yml +++ /dev/null @@ -1,62 +0,0 @@ -spring: #环境 dev|test|pro|preview - profiles: - active: dev - servlet: - multipart: #文件传输配置 - max-file-size: 1000MB #单个数据大小限制 - max-request-size: 1000MB #请求总数据大小限制 - enabled: true #是否启用分段上传支持 - mvc: - hiddenmethod: #隐式方法过滤器 - filter: - enabled: true #默认关闭。开启以支持：PUT,DELETE表单提交方法 - jackson: #序列化和反序列化json框架 - serialization: - write-dates-as-timestamps: true #是否写入日期时间时间戳格式 - time-zone: GMT+8 #指定日期格式化时区 - main: - allow-bean-definition-overriding: true #允许同名bean后者覆盖,默认：true - allow-circular-references: true #允许Bean相互引用,默认：false -config: - AllowUploadImageType: jpg,gif,png,bmp,jpeg,tiff,psd,swf,svg,pcx,dxf,wmf,emf,lic,eps,tga #允许上传图片类型 - AllowUploadFileType: jpg,gif,png,bmp,jpeg,doc,docx,ppt,pptx,xls,xlsx,pdf,txt,rar,zip,csv,mp3 #允许上传文件类型 - AllowPreviewFileType: doc,docx,xls,xlsx,ppt,pptx,pdf #允许预览文件类型 - PreviewType: kkfile #文件预览方式 （1.yozo 2.kkfile）默认使用kk - kkFileUrl: http://127.0.0.1:30090/FileServer/ #kk文件预览服务地址 - Domain: http://127.0.0.1:30000 #当前域名配置(文档预览中使用) - - CodeAreasName: example #代码生成器模块命名 - - #===================== 多租户 ===================== - MultiTenancy: false #是否开启 - MultiTenancyUrl: http://127.0.0.1:30006/api/tenant/DbName/ #多租户项目地址 - - #===================== 系统及错误报告反馈相关 ===================== - SoftName: linkage-java-boot #项目名 - SoftFullName: LINKAGE软件开发平台 #项目全名 - SoftVersion: V3.4.1 #版本号 - - RecordLog: true #系统日志启用 - ErrorReport: false #软件错误报告 - ErrorReportTo: surrpot@qq.com #软件错误报告接收者 - IgexinEnabled: true #推送启动 - - #===================== APP ===================== - AppVersion: V3.4.1 #APP版本号 - IgexinAppid: HLFY9T2d1z7MySY8hwGwh4 #APPID：应用的唯一标识 - IgexinAppkey: 6Uiduugq648YDChhCjAt59 #APPKEY：公匙（相当于账号） - IgexinMastersecret: pEyQm156SJ9iS7PbyjLCZ6 #Mastersecret：私匙（相当于密码） - AppUpdateContent: ; #APP更新内容 - - #===================== 永中office在线预览配置 ===================== - YozoDomain: //dcsapi.com/ #永中api域名 - YozoDomainKey: 57462250284462899305150 #域名key - YozoCloudDomain: //dmc.yozocloud.cn #云预览 - YozoAppId: yozoAgR41jgC0062 #appid - YozoAppKey: fc3134a9ba8bc6f4c69d635f9adf #app秘钥 - YozoEditDomain: //eic.yozocloud.cn #云编辑 - - #===================== 接口鉴权 ===================== - EnablePreAuth: false #是否开启 -fixedRateString: 5000 - From 95172699ccea4b1dadcefd860b8439b886cf879a Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Tue, 4 Apr 2023 09:42:34 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=9E=AB=E8=B5=84=E9=87=91=E9=A2=9D=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SC-boot/.gitignore | 89 ---------------------------------------------- 1 file changed, 89 deletions(-) delete mode 100644 SC-boot/.gitignore diff --git a/SC-boot/.gitignore b/SC-boot/.gitignore deleted file mode 100644 index 67f0a415..00000000 --- a/SC-boot/.gitignore +++ /dev/null @@ -1,89 +0,0 @@ -#我的配置 -application-dev.yml -application.yml - -# For Java -*.lck -target/ -*.json -log/ -logback-test.xml - - - -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -# Image snapshot diff -__diff_output__/ -/jest-stare - -*.iml -.idea/ -.ipr -.iws -*~ -~* -*.diff -*.patch -*.bak -.DS_Store -Thumbs.db -.project -.*proj -.svn/ -*.swp -*.swo -*.log -*.log.* -*.json.gzip -node_modules/ -.buildpath -.settings -dist -npm-debug.log -nohup.out -_site -_data -report.html -/lib -/es -elasticsearch-* -config/base.yaml -/.vscode/ -/coverage -/.history -*.tmp -!**/nacos/target -**/nacos/data/* -**/nacos/logs/* -**/seata/bin/* -### Example user template template -### Example user template - -# IntelliJ project files -.idea -*.iml -out -gen From 28fd9a2368ad27bb7016c82a618ad2b3bf1dddbc Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Tue, 4 Apr 2023 09:43:03 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=9E=AB=E8=B5=84=E9=87=91=E9=A2=9D=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SC-boot/.gitignore | 89 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 SC-boot/.gitignore diff --git a/SC-boot/.gitignore b/SC-boot/.gitignore new file mode 100644 index 00000000..58f8f750 --- /dev/null +++ b/SC-boot/.gitignore @@ -0,0 +1,89 @@ +#我的配置 +application-dev.yml +application.yml +*.yml +# For Java +*.lck +target/ +*.json +log/ +logback-test.xml + + + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# Image snapshot diff +__diff_output__/ +/jest-stare + +*.iml +.idea/ +.ipr +.iws +*~ +~* +*.diff +*.patch +*.bak +.DS_Store +Thumbs.db +.project +.*proj +.svn/ +*.swp +*.swo +*.log +*.log.* +*.json.gzip +node_modules/ +.buildpath +.settings +dist +npm-debug.log +nohup.out +_site +_data +report.html +/lib +/es +elasticsearch-* +config/base.yaml +/.vscode/ +/coverage +/.history +*.tmp +!**/nacos/target +**/nacos/data/* +**/nacos/logs/* +**/seata/bin/* +### Example user template template +### Example user template + +# IntelliJ project files +.idea +*.iml +out +gen From eb92043a321a812d0bdb950066ee907d467c70b4 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Thu, 6 Apr 2023 09:30:28 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=88=B7=E6=96=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicInformation/areasetting/index.vue | 8 +- .../scm/basicInformation/arinvoices/index.vue | 8 +- .../scm/basicInformation/collection/index.vue | 8 +- .../basicInformation/contractfile/index.vue | 8 +- .../scm/basicInformation/customer/index.vue | 8 +- .../basicInformation/inventoryOrd/index.vue | 8 +- .../inventoryOrdDetail/index.vue | 8 +- .../scm/basicInformation/invoices/index.vue | 8 +- .../basicInformation/jg_contract/index.vue | 8 +- .../basicInformation/jg_supplier/index.vue | 8 +- .../scm/basicInformation/material/index.vue | 8 +- .../basicInformation/messagecenter/index.vue | 8 +- .../basicInformation/monitormanage/index.vue | 8 +- .../scm/basicInformation/natural/index.vue | 8 +- .../scm/basicInformation/payment/index.vue | 8 +- .../scm/basicInformation/paymentdoc/index.vue | 18 +- .../scm/basicInformation/poundlist/index.vue | 1883 ++++++++++------- .../basicInformation/purchaseback/index.vue | 8 +- .../basicInformation/purchaseorder/index.vue | 8 +- .../scm/basicInformation/receiptin/index.vue | 8 +- .../scm/basicInformation/receiptout/index.vue | 8 +- .../basicInformation/reservoirarea/index.vue | 8 +- .../scm/basicInformation/saleback/index.vue | 8 +- .../scm/basicInformation/saleorder/index.vue | 8 +- .../scm/basicInformation/supplier/index.vue | 8 +- .../basicInformation/tradeupload/index.vue | 8 +- .../scm/basicInformation/vehicle/index.vue | 8 +- .../scm/basicInformation/warehouse/index.vue | 8 +- 28 files changed, 1345 insertions(+), 764 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/areasetting/index.vue b/SC-web/src/views/scm/basicInformation/areasetting/index.vue index ea900b05..de8d926f 100644 --- a/SC-web/src/views/scm/basicInformation/areasetting/index.vue +++ b/SC-web/src/views/scm/basicInformation/areasetting/index.vue @@ -12,7 +12,7 @@ 查询 - 重置 + 重置 @@ -277,6 +277,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue index 8ef1cdc5..20c34907 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue @@ -37,7 +37,7 @@ 查询 - 重置 + 重置 展开 @@ -313,6 +313,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue index 0f343ddc..64526295 100644 --- a/SC-web/src/views/scm/basicInformation/collection/index.vue +++ b/SC-web/src/views/scm/basicInformation/collection/index.vue @@ -22,7 +22,7 @@ 查询 - 重置 + 重置 @@ -515,6 +515,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/contractfile/index.vue b/SC-web/src/views/scm/basicInformation/contractfile/index.vue index d554555e..939e6310 100644 --- a/SC-web/src/views/scm/basicInformation/contractfile/index.vue +++ b/SC-web/src/views/scm/basicInformation/contractfile/index.vue @@ -33,7 +33,7 @@ 查询 - 重置 + 重置 展开 @@ -434,6 +434,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/customer/index.vue b/SC-web/src/views/scm/basicInformation/customer/index.vue index e79c23a9..caab5a89 100644 --- a/SC-web/src/views/scm/basicInformation/customer/index.vue +++ b/SC-web/src/views/scm/basicInformation/customer/index.vue @@ -29,7 +29,7 @@ 查询 - 重置 + 重置 展开 @@ -338,6 +338,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue index 0f6b824b..1861d973 100644 --- a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue +++ b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue @@ -17,7 +17,7 @@ 查询 - 重置 + 重置 @@ -213,6 +213,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue b/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue index c4aa4037..0c07332c 100644 --- a/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue +++ b/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue @@ -17,7 +17,7 @@ 查询 - 重置 + 重置 @@ -213,6 +213,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/invoices/index.vue b/SC-web/src/views/scm/basicInformation/invoices/index.vue index b98f981d..40c580db 100644 --- a/SC-web/src/views/scm/basicInformation/invoices/index.vue +++ b/SC-web/src/views/scm/basicInformation/invoices/index.vue @@ -37,7 +37,7 @@ 查询 - 重置 + 重置 展开 @@ -412,6 +412,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/jg_contract/index.vue b/SC-web/src/views/scm/basicInformation/jg_contract/index.vue index afff2fbc..ae2492c2 100644 --- a/SC-web/src/views/scm/basicInformation/jg_contract/index.vue +++ b/SC-web/src/views/scm/basicInformation/jg_contract/index.vue @@ -17,7 +17,7 @@ 查询 - 重置 + 重置 @@ -284,6 +284,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/jg_supplier/index.vue b/SC-web/src/views/scm/basicInformation/jg_supplier/index.vue index 64bc8758..25e67148 100644 --- a/SC-web/src/views/scm/basicInformation/jg_supplier/index.vue +++ b/SC-web/src/views/scm/basicInformation/jg_supplier/index.vue @@ -34,7 +34,7 @@ 查询 - 重置 + 重置 展开 @@ -369,6 +369,12 @@ width="150" > if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/material/index.vue b/SC-web/src/views/scm/basicInformation/material/index.vue index 90c3b9cf..c153188f 100644 --- a/SC-web/src/views/scm/basicInformation/material/index.vue +++ b/SC-web/src/views/scm/basicInformation/material/index.vue @@ -17,7 +17,7 @@ 查询 - 重置 + 重置 @@ -307,6 +307,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/messagecenter/index.vue b/SC-web/src/views/scm/basicInformation/messagecenter/index.vue index a9f6e4c9..0c62abff 100644 --- a/SC-web/src/views/scm/basicInformation/messagecenter/index.vue +++ b/SC-web/src/views/scm/basicInformation/messagecenter/index.vue @@ -32,7 +32,7 @@ 查询 - 重置 + 重置 展开 @@ -236,6 +236,12 @@ export default { if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue index ed7df5c6..9e6c6ea3 100644 --- a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue +++ b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue @@ -22,7 +22,7 @@ 查询 - 重置 + 重置 @@ -285,6 +285,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/natural/index.vue b/SC-web/src/views/scm/basicInformation/natural/index.vue index 901290ca..b1e971d6 100644 --- a/SC-web/src/views/scm/basicInformation/natural/index.vue +++ b/SC-web/src/views/scm/basicInformation/natural/index.vue @@ -29,7 +29,7 @@ 查询 - 重置 + 重置 展开 @@ -271,6 +271,12 @@ export default { if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/payment/index.vue b/SC-web/src/views/scm/basicInformation/payment/index.vue index 0106991a..71be6e63 100644 --- a/SC-web/src/views/scm/basicInformation/payment/index.vue +++ b/SC-web/src/views/scm/basicInformation/payment/index.vue @@ -26,7 +26,7 @@ 查询 - 重置 + 重置 @@ -513,6 +513,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue index 38e1aaec..6fa7a2e8 100644 --- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue +++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue @@ -16,7 +16,7 @@ 查询 - 重置 + 重置 @@ -534,9 +534,21 @@ if (isrRefresh) this.reset() }, reset() { - for (let key in this.query) { - this.query[key] = undefined + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.listQuery = { + currentPage: 1, + pageSize: 20, + sort: "desc", + sidx: "", } + this.initData() + }, + resetAll() { + // for (let key in this.query) { + // this.query[key] = undefined + // } this.listQuery = { currentPage: 1, pageSize: 20, diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue index 165fb63c..99cc318a 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue @@ -1,860 +1,1273 @@ + + + + + + - - - + + + diff --git a/SC-web/src/views/scm/basicInformation/purchaseback/index.vue b/SC-web/src/views/scm/basicInformation/purchaseback/index.vue index 2a5395f1..cfe1c5e8 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseback/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseback/index.vue @@ -12,7 +12,7 @@ 查询 - 重置 + 重置 @@ -356,6 +356,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index 947260ec..59e1a7ab 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -39,7 +39,7 @@ 查询 - 重置 + 重置 展开 @@ -908,6 +908,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/receiptin/index.vue b/SC-web/src/views/scm/basicInformation/receiptin/index.vue index c729c82a..ecd58b57 100644 --- a/SC-web/src/views/scm/basicInformation/receiptin/index.vue +++ b/SC-web/src/views/scm/basicInformation/receiptin/index.vue @@ -40,7 +40,7 @@ 查询 - 重置 + 重置 展开 @@ -409,6 +409,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/receiptout/index.vue b/SC-web/src/views/scm/basicInformation/receiptout/index.vue index e4830145..36e35fb6 100644 --- a/SC-web/src/views/scm/basicInformation/receiptout/index.vue +++ b/SC-web/src/views/scm/basicInformation/receiptout/index.vue @@ -42,7 +42,7 @@ 查询 - 重置 + 重置 展开 @@ -329,6 +329,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue index 8b3411a4..0dc4c533 100644 --- a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue +++ b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue @@ -17,7 +17,7 @@ 查询 - 重置 + 重置 @@ -267,6 +267,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/saleback/index.vue b/SC-web/src/views/scm/basicInformation/saleback/index.vue index 4a4942dc..f49df8ec 100644 --- a/SC-web/src/views/scm/basicInformation/saleback/index.vue +++ b/SC-web/src/views/scm/basicInformation/saleback/index.vue @@ -35,7 +35,7 @@ 查询 - 重置 + 重置 @@ -317,6 +317,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue index 21d4c603..7e4a6e81 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue @@ -42,7 +42,7 @@ 查询 - 重置 + 重置 展开 @@ -600,6 +600,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/supplier/index.vue b/SC-web/src/views/scm/basicInformation/supplier/index.vue index ced57ab2..6204ae40 100644 --- a/SC-web/src/views/scm/basicInformation/supplier/index.vue +++ b/SC-web/src/views/scm/basicInformation/supplier/index.vue @@ -34,7 +34,7 @@ 查询 - 重置 + 重置 展开 @@ -374,6 +374,12 @@ export default { if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue index 78470155..bde7d12a 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue @@ -47,7 +47,7 @@ 查询 - 重置 + 重置 展开 @@ -407,6 +407,12 @@ this.formVisible2 = false if (isrRefresh) this.reset() }, + reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, reset() { for (let key in this.query) { this.query[key] = undefined diff --git a/SC-web/src/views/scm/basicInformation/vehicle/index.vue b/SC-web/src/views/scm/basicInformation/vehicle/index.vue index 213eadd1..cdf160bc 100644 --- a/SC-web/src/views/scm/basicInformation/vehicle/index.vue +++ b/SC-web/src/views/scm/basicInformation/vehicle/index.vue @@ -17,7 +17,7 @@ 查询 - 重置 + 重置 @@ -294,6 +294,12 @@ if (isrRefresh) this.reset() }, reset() { + // for (let key in this.query) { + // this.query[key] = undefined + // } + this.search() + }, + resetAll() { for (let key in this.query) { this.query[key] = undefined } diff --git a/SC-web/src/views/scm/basicInformation/warehouse/index.vue b/SC-web/src/views/scm/basicInformation/warehouse/index.vue index 6cfdae1c..c890d7a2 100644 --- a/SC-web/src/views/scm/basicInformation/warehouse/index.vue +++ b/SC-web/src/views/scm/basicInformation/warehouse/index.vue @@ -17,7 +17,7 @@ 查询 - 重置 + 重置 @@ -289,6 +289,12 @@ this.query[key] = undefined } this.search() + }, + resetAll() { + for (let key in this.query) { + this.query[key] = undefined + } + this.search() } } } From a5cda68ee58b183832f6f5ab71bb86d58b7a636c Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Thu, 6 Apr 2023 10:34:10 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/jnpf/base/Pagination.java | 4 +-- .../arinvoices/mapper/ArinvoicesMapper.java | 3 +- .../service/impl/ArinvoicesServiceImpl.java | 24 +++------------- .../collection/mapper/CollectionMapper.java | 4 ++- .../service/impl/CollectionServiceImpl.java | 12 +++----- .../jnpf/invoices/mapper/InvoicesMapper.java | 4 ++- .../service/impl/InvoicesServiceImpl.java | 7 +++-- .../mapper/PurchasebackMapper.java | 4 ++- .../service/impl/PurchasebackServiceImpl.java | 7 +++-- .../receiptout/mapper/ReceiptoutMapper.java | 4 ++- .../service/impl/ReceiptoutServiceImpl.java | 11 ++++---- .../jnpf/saleback/mapper/SalebackMapper.java | 4 ++- .../service/impl/SalebackServiceImpl.java | 21 +++----------- .../saleorder/mapper/SaleorderitemMapper.java | 4 ++- .../impl/SaleorderitemServiceImpl.java | 28 +++---------------- .../tradeupload/mapper/TradeuploadMapper.java | 3 +- .../service/impl/TradeuploadServiceImpl.java | 10 +++---- .../mapper/arinvoices/ArinvoicesMapper.xml | 10 +------ .../mapper/collection/CollectionMapper.xml | 10 +------ .../mapper/invoices/InvoicesMapper.xml | 9 +----- .../purchaseback/PurchasebackMapper.xml | 11 +------- .../mapper/receiptout/ReceiptoutMapper.xml | 10 +------ .../mapper/saleback/SalebackMapper.xml | 10 +------ .../mapper/salesorderitem/SaleorderMapper.xml | 10 +------ .../mapper/tradeupload/TradeuploadMapper.xml | 9 +----- 25 files changed, 67 insertions(+), 166 deletions(-) diff --git a/SC-boot/linkage-common/src/main/java/jnpf/base/Pagination.java b/SC-boot/linkage-common/src/main/java/jnpf/base/Pagination.java index b26cfd7d..7fae107f 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/base/Pagination.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/base/Pagination.java @@ -23,8 +23,8 @@ public class Pagination extends Page{ private String sidx=""; @ApiModelProperty(value = "当前页数",example = "1") private long currentPage=1; - - + @ApiModelProperty(value = "菜单id") + private String menuId; @ApiModelProperty(hidden = true) @JsonIgnore diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java index 7fdcd7e8..8b48ef25 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java @@ -1,6 +1,7 @@ package jnpf.arinvoices.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.arinvoices.entity.ArinvoicesEntity; @@ -20,5 +21,5 @@ import org.apache.ibatis.annotations.Param; */ public interface ArinvoicesMapper extends BaseMapper { - IPage queryArinvoices(@Param("page") Page page, @Param("arinvoicesPagination") ArinvoicesPagination arinvoicesPagination); + IPage queryArinvoices(@Param("page") Page page, @Param("arinvoicesPagination") ArinvoicesPagination arinvoicesPagination, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java index cd55d48c..de97c5da 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java @@ -77,6 +77,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl arinvoicesQueryWrapper=new QueryWrapper<>(); + arinvoicesQueryWrapper.eq("a.delete_mark", "0"); int arinvoices_item0Num =0; QueryWrapper arinvoices_item0QueryWrapper=new QueryWrapper<>(); int arinvoices_item1Num =0; @@ -86,7 +87,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl(); } else { @@ -111,7 +112,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl(); } else { @@ -140,23 +141,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl BusinessDateList = arinvoicesPagination.getBusinessDate(); - Long fir = Long.valueOf(BusinessDateList.get(0)); - Long sec = Long.valueOf(BusinessDateList.get(1)); - arinvoicesPagination.setStartDate(new Date(fir)); - arinvoicesPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); -// arinvoicesQueryWrapper.lambda().ge(ArinvoicesEntity::getBusinessDate, new Date(fir)) -// .le(ArinvoicesEntity::getBusinessDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); - - } - if(AllIdList.size()>0){ arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList); } @@ -197,7 +181,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination); + IPage userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination, arinvoicesQueryWrapper); return arinvoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal()); } @Override diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java index 92c5e892..25fd7116 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java @@ -1,8 +1,10 @@ package jnpf.collection.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.arinvoices.entity.ArinvoicesEntity; import jnpf.collection.entity.CollectionEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.collection.model.collection.CollectionPagination; @@ -29,5 +31,5 @@ public interface CollectionMapper extends BaseMapper { List queryContract(String code); - IPage queryCollection(@Param("page") Page page, @Param("collectionPagination") CollectionPagination collectionPagination); + IPage queryCollection(@Param("page") Page page, @Param("collectionPagination") CollectionPagination collectionPagination, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java index 2760a031..80b89adf 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java @@ -85,6 +85,7 @@ public class CollectionServiceImpl extends ServiceImpl collectionQueryWrapper=new QueryWrapper<>(); + collectionQueryWrapper.eq("a.delete_mark", "0"); int collection_item0Num =0; QueryWrapper collection_item0QueryWrapper=new QueryWrapper<>(); boolean pcPermission = true; @@ -92,7 +93,7 @@ public class CollectionServiceImpl extends ServiceImpl(); } else { @@ -110,7 +111,7 @@ public class CollectionServiceImpl extends ServiceImpl(); } else { @@ -130,11 +131,6 @@ public class CollectionServiceImpl extends ServiceImpl0){ collectionQueryWrapper.lambda().in(CollectionEntity::getId, AllIdList); } @@ -176,7 +172,7 @@ public class CollectionServiceImpl extends ServiceImpl userIPage=collectionMapper.queryCollection(page, collectionPagination); + IPage userIPage=collectionMapper.queryCollection(page, collectionPagination, collectionQueryWrapper); return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal()); } @Override diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java index 56d619b0..8ef92f43 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java @@ -1,8 +1,10 @@ package jnpf.invoices.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.collection.entity.CollectionEntity; import jnpf.invoices.entity.InvoicesEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.invoices.model.invoices.InvoicesPagination; @@ -18,5 +20,5 @@ import org.apache.ibatis.annotations.Param; */ public interface InvoicesMapper extends BaseMapper { - IPage queryByKeyword(@Param("page") Page page, @Param("invoicesPagination") InvoicesPagination invoicesPagination); + IPage queryByKeyword(@Param("page") Page page, @Param("invoicesPagination") InvoicesPagination invoicesPagination, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java index 6ffc5dec..a45c6dc6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java @@ -84,6 +84,7 @@ public class InvoicesServiceImpl extends ServiceImpl invoicesQueryWrapper=new QueryWrapper<>(); + invoicesQueryWrapper.eq("a.delete_mark", "0"); int invoicesItem0Num =0; QueryWrapper invoicesItem0QueryWrapper=new QueryWrapper<>(); int invoicesItem1Num =0; @@ -93,7 +94,7 @@ public class InvoicesServiceImpl extends ServiceImpl(); } else { @@ -118,7 +119,7 @@ public class InvoicesServiceImpl extends ServiceImpl(); } else { @@ -189,7 +190,7 @@ public class InvoicesServiceImpl extends ServiceImpl userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination); + IPage userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination, invoicesQueryWrapper); return invoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal()); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java index 43141462..0e1c274d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java @@ -1,8 +1,10 @@ package jnpf.purchaseback.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.invoices.entity.InvoicesEntity; import jnpf.purchaseback.entity.PurchasebackEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.purchaseback.model.purchaseback.PurchasebackPagination; @@ -18,5 +20,5 @@ import org.apache.ibatis.annotations.Param; */ public interface PurchasebackMapper extends BaseMapper { - IPage queryByKeyword(@Param("page") Page page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination); + IPage queryByKeyword(@Param("page") Page page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java index 4c36bc68..f11bfff8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java @@ -76,6 +76,7 @@ public class PurchasebackServiceImpl extends ServiceImpl purchasebackQueryWrapper=new QueryWrapper<>(); + purchasebackQueryWrapper.eq("a.delete_mark", "0"); int purchaseback_item0Num =0; QueryWrapper purchaseback_item0QueryWrapper=new QueryWrapper<>(); int purchaseorderNum =0; @@ -85,7 +86,7 @@ public class PurchasebackServiceImpl extends ServiceImpl(); } else { @@ -110,7 +111,7 @@ public class PurchasebackServiceImpl extends ServiceImpl(); } else { @@ -174,7 +175,7 @@ public class PurchasebackServiceImpl extends ServiceImpl userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination); + IPage userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination, purchasebackQueryWrapper); return purchasebackPagination.setData(userIPage.getRecords(),userIPage.getTotal()); /*if(StringUtil.isNotEmpty(purchasebackPagination.getDocumentNo())){ purchasebackNum++; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java index 01b4f2fc..98ec749f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java @@ -1,8 +1,10 @@ package jnpf.receiptout.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.purchaseback.entity.PurchasebackEntity; import jnpf.receiptout.entity.ReceiptoutEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.receiptout.model.receiptout.ReceiptoutPagination; @@ -19,5 +21,5 @@ import org.apache.ibatis.annotations.Param; * 日期： 2023-02-24 */ public interface ReceiptoutMapper extends BaseMapper { - IPage queryReceiptout(@Param("page") Page page, @Param("receiptoutPagination") ReceiptoutPagination receiptoutPagination); + IPage queryReceiptout(@Param("page") Page page, @Param("receiptoutPagination") ReceiptoutPagination receiptoutPagination, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java index 3fb30eca..7d206419 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java @@ -74,6 +74,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl receiptoutQueryWrapper=new QueryWrapper<>(); + receiptoutQueryWrapper.eq("a.delete_mark", "0"); int receiptout_item0Num =0; QueryWrapper receiptout_item0QueryWrapper=new QueryWrapper<>(); boolean pcPermission = true; @@ -81,7 +82,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl(); } else { @@ -99,7 +100,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl(); } else { @@ -119,7 +120,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl0){ receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList); @@ -176,7 +177,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination); + IPage userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination, receiptoutQueryWrapper); return receiptoutPagination.setData(userIPage.getRecords(),userIPage.getTotal()); } @Override diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java index d2c76f11..ddd085a4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java @@ -1,8 +1,10 @@ package jnpf.saleback.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.receiptout.entity.ReceiptoutEntity; import jnpf.saleback.entity.SalebackEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.saleback.entity.Saleback_item0Entity; @@ -23,7 +25,7 @@ import java.util.List; * 日期： 2023-01-13 */ public interface SalebackMapper extends BaseMapper { - IPage querySaleBack(@Param("page") Page page, @Param("salebackPagination") SalebackPagination salebackPagination); + IPage querySaleBack(@Param("page") Page page, @Param("salebackPagination") SalebackPagination salebackPagination, @Param("ew") Wrapper queryWrapper); List querySaleBackItem(String id); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java index f257dd04..77946567 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java @@ -72,6 +72,7 @@ public class SalebackServiceImpl extends ServiceImpl salebackQueryWrapper=new QueryWrapper<>(); + salebackQueryWrapper.eq("a.delete_mark", "0"); int saleback_item0Num =0; QueryWrapper saleback_item0QueryWrapper=new QueryWrapper<>(); @@ -80,7 +81,7 @@ public class SalebackServiceImpl extends ServiceImpl(); } else { @@ -98,7 +99,7 @@ public class SalebackServiceImpl extends ServiceImpl(); } else { @@ -119,20 +120,6 @@ public class SalebackServiceImpl extends ServiceImpl creatorTime = salebackPagination.getCreatorTime(); - Long fir = Long.valueOf(creatorTime.get(0)); - Long sec = Long.valueOf(creatorTime.get(1)); - salebackPagination.setStartDate(new Date(fir)); - salebackPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); -// saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir)) -// .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); - - } if(AllIdList.size()>0){ salebackQueryWrapper.lambda().in(SalebackEntity::getId, AllIdList); @@ -174,7 +161,7 @@ public class SalebackServiceImpl extends ServiceImpl userIPage=salebackMapper.querySaleBack(page, salebackPagination); + IPage userIPage=salebackMapper.querySaleBack(page, salebackPagination, salebackQueryWrapper); return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal()); } @Override diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java index 3d6a7aa4..0ead4595 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java @@ -1,12 +1,14 @@ package jnpf.saleorder.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.arinvoices.entity.ArinvoicesEntity; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.model.poundlist.PoundlistPagination; import jnpf.receiptout.entity.Receiptout_item0Entity; +import jnpf.saleback.entity.SalebackEntity; import jnpf.saleorder.entity.SaleorderitemEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.saleorder.entity.Salesorder_item0Entity; @@ -24,7 +26,7 @@ import java.util.List; * 日期： 2023-02-22 */ public interface SaleorderitemMapper extends BaseMapper { - IPage querySalesOrder(@Param("page") Page page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination); + IPage querySalesOrder(@Param("page") Page page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination, @Param("ew") Wrapper queryWrapper); PoundlistEntity queryPoundlist(String poundlistId); List querySaleOrderItem(String id); List queryReceiptoutItem(String id); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java index b3c89a31..89cc105a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java @@ -93,6 +93,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl saleorderitemQueryWrapper=new QueryWrapper<>(); + saleorderitemQueryWrapper.eq("a.delete_mark","0"); int salesorder_item0Num =0; QueryWrapper salesorder_item0QueryWrapper=new QueryWrapper<>(); int receiptoutsoitemNum =0; @@ -110,7 +111,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -163,7 +164,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); } else { @@ -228,27 +229,6 @@ public class SaleorderitemServiceImpl extends ServiceImpl creatorTime = saleorderitemPagination.getCreatorTime(); - Long fir = Long.valueOf(creatorTime.get(0)); - Long sec = Long.valueOf(creatorTime.get(1)); - saleorderitemPagination.setStartDate(new Date(fir)); - saleorderitemPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); - saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir)) - .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); - - } - if(AllIdList.size()>0){ saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList); } @@ -291,7 +271,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination); + IPage userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination, saleorderitemQueryWrapper); return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); } @Override diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java index d15d5c73..7946928c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java @@ -4,6 +4,7 @@ package jnpf.tradeupload.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.saleorder.entity.SaleorderitemEntity; import jnpf.tradeupload.entity.TradeuploadEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.tradeupload.model.tradeupload.TradeuploadPagination; @@ -23,5 +24,5 @@ import java.util.List; public interface TradeuploadMapper extends BaseMapper { List queryVehicle(TradeuploadEntity tradeuploadEntity); - IPage queryByKeyword(@Param("page") Page page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination); + IPage queryByKeyword(@Param("page") Page page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java index ef5d66b7..400b3429 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java @@ -86,14 +86,14 @@ public class TradeuploadServiceImpl extends ServiceImpl tradeuploadQueryWrapper=new QueryWrapper<>(); - tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0"); - tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0"); + tradeuploadQueryWrapper.eq("a.is_examine","0"); + tradeuploadQueryWrapper.eq("a.delete_mark","0"); boolean pcPermission = true; boolean appPermission = true; boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); if(isPc && pcPermission){ if (!userProvider.get().getIsAdministrator()){ - Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist")); + Object tradeuploadObj=authorizeService.getCondition2(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist")); if (ObjectUtil.isEmpty(tradeuploadObj)){ return new ArrayList<>(); } else { @@ -104,7 +104,7 @@ public class TradeuploadServiceImpl extends ServiceImpl(); } else { @@ -165,7 +165,7 @@ public class TradeuploadServiceImpl extends ServiceImpl userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination); + IPage userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination, tradeuploadQueryWrapper); return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal()); /* diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml index c7a5505d..1115689a 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml @@ -13,15 +13,7 @@ LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0' LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0' LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id and d.delete_mark = '0' - WHERE 1=1 - and a.delete_mark = '0' - /*添加权限*/ - - AND a.department_id = #{arinvoicesPagination.departmentId} - - - AND a.orgnize_id = #{arinvoicesPagination.orgnizeId} - + ${ew.customSqlSegment} and a.document_no LIKE CONCAT('%',#{arinvoicesPagination.documentNo},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml index 34e4b5b2..9464d445 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml @@ -17,15 +17,7 @@ jg_collection a LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0' LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0' - where 1=1 - and a.delete_mark = '0' - /*添加权限*/ - - AND a.department_id = #{collectionPagination.departmentId} - - - AND a.orgnize_id = #{collectionPagination.orgnizeId} - + ${ew.customSqlSegment} and a.document_no LIKE CONCAT('%',#{collectionPagination.documentNo},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml index d4c44223..02ea8639 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml @@ -7,14 +7,7 @@ LEFT JOIN jg_purchaseorder b on a.purchaseorder_id = b.id LEFT JOIN jg_contract c on a.contract_id = c.id LEFT JOIN jg_supplier d on a.supplier_id = d.id - where 1=1 AND a.delete_mark = 0 AND b.delete_mark = 0 AND c.delete_mark = 0 AND d.delete_mark = 0 - /*添加权限*/ - - AND a.department_id = #{invoicesPagination.departmentId} - - - AND a.orgnize_id = #{invoicesPagination.orgnizeId} - + ${ew.customSqlSegment} AND b.delete_mark = 0 AND c.delete_mark = 0 AND d.delete_mark = 0 AND a.creator_time > #{invoicesPagination.startDate} AND a.creator_time <= #{invoicesPagination.endDate} diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml index 65b70a09..8def19d9 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml @@ -7,16 +7,7 @@ LEFT JOIN jg_purchaseorder b on a.purchase_order_id = b.id LEFT JOIN jg_contract c on b.contract_code = c.id LEFT JOIN jg_supplier d on b.supplier_id = d.id - where 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 - - /*添加权限*/ - - AND a.department_id = #{purchasebackPagination.departmentId} - - - AND a.orgnize_id = #{purchasebackPagination.orgnizeId} - - + ${ew.customSqlSegment} and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 AND a.document_no LIKE CONCAT('%',#{purchasebackPagination.documentNo},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml index 375bc289..151fda5e 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml @@ -11,15 +11,7 @@ jg_receiptout a LEFT JOIN jg_customer b on a.customer_id = b.id and b.delete_mark = '0' LEFT JOIN jg_salesorder c on a.source_no = c.id and c.delete_mark = '0' - where 1=1 - and a.delete_mark = '0' - /*添加权限*/ - - AND a.department_id = #{receiptoutPagination.departmentId} - - - AND a.orgnize_id = #{receiptoutPagination.orgnizeId} - + ${ew.customSqlSegment} and a.document_no LIKE CONCAT('%',#{receiptoutPagination.documentNo},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml index b7468ef1..823b80cc 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml @@ -12,15 +12,7 @@ LEFT JOIN jg_salesorder b on a.sales_order_id = b.id and b.delete_mark = '0' LEFT JOIN jg_contract c on b.contract_id = c.id and c.delete_mark = '0' LEFT JOIN jg_customer d on b.customer_id = d.id and d.delete_mark = '0' - where 1 = 1 - and a.delete_mark = '0' - /*添加权限*/ - - AND a.department_id = #{salebackPagination.departmentId} - - - AND a.orgnize_id = #{salebackPagination.orgnizeId} - + ${ew.customSqlSegment} and a.document_no LIKE CONCAT('%',#{salebackPagination.documentNo},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml index 18713691..a0ab44ba 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml @@ -11,15 +11,7 @@ jg_salesorder a left join jg_contract b on a.contract_id = b.id and b.delete_mark = '0' left join jg_customer c on a.customer_id = c.id and c.delete_mark = '0' - where 1=1 - and a.delete_mark = '0' - /*添加权限*/ - - AND a.department_id = #{saleorderitemPagination.departmentId} - - - AND a.orgnize_id = #{saleorderitemPagination.orgnizeId} - + ${ew.customSqlSegment} and a.document_no LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml index 125c552f..f1e6b70b 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml @@ -26,14 +26,7 @@ creator_time = DATE_SUB(NOW(),interval 15 day) LEFT JOIN jg_contract g on a.purchase_id = g.id LEFT JOIN base_user h on a.business_id = h.f_id LEFT JOIN jg_natural i on a.natural_id = i.id - where a.is_examine = '0' AND a.delete_mark = 0 - /*添加权限*/ - - AND a.department_id = #{tradeuploadPagination.departmentId} - - - AND a.orgnize_id = #{tradeuploadPagination.orgnizeId} - + ${ew.customSqlSegment} AND (b.ticketno LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%')) From d1ce844b6fd863f12ce481aab83351924d7602d9 Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Thu, 6 Apr 2023 10:47:33 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=94=B9=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SC-web/src/views/scm/basicInformation/tradeupload/Form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue index 16d382e4..99944471 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue @@ -191,7 +191,7 @@ 取 消 确 定 - 继续上传 + 继续上传 From c9821af91555af1b45c0a3c3d498f579362dff9c Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Thu, 6 Apr 2023 11:01:28 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=94=B9=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/basicInformation/tradeupload/Form.vue | 135 ++---------------- 1 file changed, 10 insertions(+), 125 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue index 17e5e53d..16d382e4 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue @@ -8,7 +8,7 @@ + @change="imgChange" ref="poundUpload"> @@ -25,7 +25,7 @@ + popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20"> @@ -35,7 +35,7 @@ + popupWidth="800px" hasPage :pageSize="20" @change="customerSelect"> @@ -50,31 +50,6 @@ - - - - - - - - - - - - - - - - - - - - + @@ -216,7 +191,7 @@ 取 消 确 定 - 继续上传 + 继续上传 @@ -451,13 +426,7 @@ "label": "业务员2地址", "value": "adress" }, ], - supplierIdcolumnOptions: [{ - "label": "供应商编码", - "value": "supplier_code" - }, { - "label": "供应商名称", - "value": "supplier_name" - }], + } }, computed: {}, @@ -602,104 +571,20 @@ this.dataInfo(res.data) this.dataForm.businessId = this.$store.state.user.userInfo.userId; this.dataForm.businessName = this.$store.state.user.userInfo.userName; - this.dataForm.poundDate = new Date().getTime(); + this.dataForm.poundDate = new Date(); this.loading = false }); } else { this.clearData(this.dataForm) this.dataForm.businessId = this.$store.state.user.userInfo.userId; this.dataForm.businessName = this.$store.state.user.userInfo.userName; - this.dataForm.poundDate = new Date().getTime(); + this.dataForm.poundDate = new Date(); } }); this.$store.commit('generator/UPDATE_RELATION_DATA', {}) }, // 表单提交 - dataFormSubmit() { - var tareWeight = this.dataForm.tareWeight;//皮重 - var grossWeight = this.dataForm.grossWeight;//毛重 - var buckleWeight = this.dataForm.buckleWeight;//扣重 - var netWeight = this.dataForm.netWeight;//净重 - this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0; - this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0; - this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0; - if(grossWeight < tareWeight + buckleWeight + netWeight){ - this.$message({ - message: '毛重不得小于皮重+扣重+净重', - type: 'success', - duration: 1000 - }) - return - } - if(buckleWeight >= netWeight){ - this.$message({ - message: '扣重不得大于净重', - type: 'success', - duration: 1000 - }) - return - } - if(buckleWeight >= grossWeight){ - this.$message({ - message: '扣重不得大于毛重', - type: 'success', - duration: 1000 - }) - return - } - this.$refs['elForm'].validate((valid) => { - if (valid) { - this.request2() - } - }) - }, - request2() { - this.submitDisabled = true; - this.dataForm; - var _data = this.dataList() - debugger - if (!this.dataForm.id) { - request({ - url: '/api/tradeupload/Tradeupload', - method: 'post', - data: _data - }).then((res) => { - this.$message({ - message: res.msg, - type: 'success', - duration: 3000, - onClose: () => { - this.submitDisabled = false; - this.visible = false - this.$emit('refresh', true) - } - }) - }).catch(() => { - this.submitDisabled = false - }) - } else { - debugger - request({ - url: '/api/tradeupload/Tradeupload/' + this.dataForm.id, - method: 'PUT', - data: _data - }).then((res) => { - this.$message({ - message: res.msg, - type: 'success', - duration: 3000, - onClose: () => { - this.submitDisabled = false; - this.visible = false - this.$emit('refresh', true) - } - }) - }).catch(() => { - this.submitDisabled = false - }) - } - }, -/* dataFormSubmit() { + dataFormSubmit() { var tareWeight = this.dataForm.tareWeight; //皮重 var grossWeight = this.dataForm.grossWeight; //毛重 var buckleWeight = this.dataForm.buckleWeight; //扣重 @@ -763,7 +648,7 @@ this.submitDisabled = false }) } - },*/ + }, request3() { this.submitDisabled = true; var _data = this.dataList() From 1556d856f634a765450a7f0cda7a9cad13dd3868 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Thu, 6 Apr 2023 11:27:53 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E5=8F=98?= =?UTF-8?q?=E7=B2=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SC-web/src/styles/index.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SC-web/src/styles/index.scss b/SC-web/src/styles/index.scss index 4dd01b11..4f9e13ce 100644 --- a/SC-web/src/styles/index.scss +++ b/SC-web/src/styles/index.scss @@ -222,8 +222,8 @@ aside { ::-webkit-scrollbar-track, ::-webkit-scrollbar-thumb { - border-radius: 999px; - border: 5px solid transparent; + border-radius: 1px; + border: 1px solid transparent; } ::-webkit-scrollbar-track {