Merge branch 'feature/master' into master-old

# Conflicts:
#	Dockerfile

Dockerfile

@@ -17,3 +17,4 @@ EXPOSE 8044
 ENTRYPOINT ["java","-Xms128m","-Xmx256m","-Xmn64m","-Xss1024k","-jar","/home/old_server/jar/ezhizao_yzbh_financial.jar"]
 
 
+

src/main/java/cn/ezhizao/project/business/payment/controller/BizPaymentController.java

@@ -313,6 +313,12 @@ public class BizPaymentController extends BaseController {
                 List<BizPayment> payed = paymentService.getListByBean(payemntConditions);
 //                payment.setNonpayment(archiveInput.getAmount().subtract(BigDecimal.valueOf(collections.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum())).compareTo(BigDecimal.ZERO) > 0);
                 payment.setPayedAmount(BigDecimal.valueOf(payed.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum()));
+                BizCollection collection = new BizCollection();
+                collection.setContractId(archiveInput.getId());
+                List<BizCollection> collList = collectionService.getListByBean(collection);
+                if(!CollectionUtils.isEmpty(collList)) {
+                    payment.setCollection(collList.get(0));
+                }
             }
             SysFileStorage fileConditions = new SysFileStorage();
             fileConditions.setMasterId(payment.getId());

src/main/java/cn/ezhizao/project/business/payment/domain/BizPayment.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.payment.domain;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.collection.domain.BizCollection;
 import cn.ezhizao.project.system.domain.SysFileStorage;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -185,4 +186,8 @@ public class BizPayment extends BaseEntity {
     private String boss;
     @TableField(exist = false)
     private String party;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "收款信息")
+    private BizCollection collection;
 }

src/main/resources/application-local.yml

@@ -0,0 +1,92 @@
+# 数据源配置
+spring:
+    cloud:
+        nacos:
+            discovery:
+                server-addr: 120.46.59.90:19848 # Nacos服务器地址
+    application:
+        name: ezhizao-yzbh-financial      # 配置微服务名（服务名不能用下划线）
+    # redis 配置
+    redis:
+        # 地址
+        host: 120.46.59.90
+        # 端口，默认为6379
+        port: 16379
+        # 数据库索引
+        database: 8
+        # 密码
+        password: ezhizao.cn123456
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://120.46.59.90:3306/ezhizao_yzbh_v2_0327?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8&connectTimeout=360000&socketTimeout=360000
+                username: root
+                password: ezhizao.cn123456
+#                url: jdbc:mysql://localhost:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: 123456
+            # 从库数据源
+#            slave:
+#                # 从数据源开关/默认关闭
+#                enabled: true
+#                url: jdbc:mysql://116.204.99.126:3306/snms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+#                username: idis_user
+#                password: Teleinfo-88
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: admin
+                login-password: ezhizao.cn
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+            socket-timeout: 3600000
+# 文件上传
+ruoyi:
+    profile: /home/ruoyi/yzbh/

src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -302,7 +302,7 @@
     <sql id="getListSql">
         SELECT
         ai.boss,ai.party,
-        a.id, a.flow_no, a.subsidiary_id, a.subsidiary, a.subsidiary_name, a.subsidiary_bank_account, a.form_date
+        a.id, a.flow_no, a.subsidiary_id, a.subsidiary, a.subsidiary_name, a.subsidiary_bank_account, a.form_date, a.contract_id
         , a.subsidiary_bank_name, a.company_id, b.name as company_name
         , a.is_new, a.is_project, a.project_name, a.project_no, a.project_main_name
         , a.amount