file

hx-account/src/main/java/com/fjhx/account/controller/account/AccountDeptRunningWaterController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDto;
 import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterSelectDto;
 import com.fjhx.account.entity.account.dto.DeptExpenseDto;
+import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
 import com.fjhx.account.entity.account.vo.DeptExpenseVo;
 import com.fjhx.account.service.account.AccountDeptRunningWaterService;
 import com.fjhx.common.constant.SourceConstant;
@@ -82,6 +83,14 @@ public class AccountDeptRunningWaterController {
     }
 
     /**
+     * 部门-资金流水关联表新增
+     */
+    @PostMapping("/bathAdd")
+    public void bathAdd(@RequestBody List<AccountDeptRunningWater> list) {
+        accountDeptRunningWaterService.saveBatch(list);
+    }
+
+    /**
      * 部门-资金流水报表
      *
      * @param dto

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -172,6 +172,10 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getAccountManagementId()), "arw.account_management_id", dto.getAccountManagementId());
         // 币种
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "arw.currency", dto.getCurrency());
+        //交易开始时间
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getStartTime()), "arw.transaction_time", dto.getStartTime());
+        //交易结束时间
+        wrapper.le(ObjectUtil.isNotEmpty(dto.getStopTime()), "arw.transaction_time", dto.getStopTime());
         wrapper.orderByDesc("arw.transaction_time");
 
         //获取当前分页之前的数据先处理余额

hx-account/src/main/resources/mapper/account/AccountDeptRunningWaterMapper.xml

@@ -50,6 +50,7 @@
         AND arfd.del_flag = 0
         AND d.del_flag = 0
         AND arf.STATUS = 30
+        AND arf.type != 3
         AND arfd.contract_id IS NULL
         AND arf.department_id IN
         <foreach item="item" collection="dto.deptIds" open="(" separator="," close=")">

hx-admin/src/main/resources/application-dev.yml

@@ -6,84 +6,76 @@ spring:
             primary: base
             datasource:
                 victoriatourist:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 common:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 oa:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 mes:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 wms:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 item:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 supply:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 base:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 iot:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 customer:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 purchase:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 account:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 sale:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 mail:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
                 kd100:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
-                ehsd:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
-                jxst:
-                    url: jdbc:mysql://121.37.194.75:30102/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: bytesailing_db_user
+                    password: kfG-A93-w7h-qX8
 
     # redis 配置
     redis:
         # 地址
-        host: 121.37.194.75
+        host: 139.9.102.170
         # 端口，默认为6379
-        port: 30103
+        port: 9673
         # 数据库索引
         database: 5
         # 密码
-        password: Fjhx@pwd123
+        password: ss34dsA3DdsF
         # 连接超时时间
         timeout: 10s
         lettuce:

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -295,12 +295,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
      * 客户来源统计
      */
     @Override
-    public Map<String,Object> sourceStatistics(CustomerSelectDto customerDto) {
-        if (ObjectUtil.isEmpty(customerDto) && ObjectUtil.isEmpty(customerDto.getStatisticsType())){
+    public Map<String, Object> sourceStatistics(CustomerSelectDto customerDto) {
+        if (ObjectUtil.isEmpty(customerDto) && ObjectUtil.isEmpty(customerDto.getStatisticsType())) {
             throw new ServiceException("参数异常：统计类型不能为null");
         }
         //存放统计数据
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         QueryWrapper<Customer> query = Wrappers.query();
         if (ObjectUtil.isNotEmpty(customerDto.getType())) {
             // 私海客户查询
@@ -344,6 +344,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     @Override
     public List<Long> getAuthIdList() {
         List<Long> authUserIdList = UserUtil.getAuthUserIdList();
+
+        // 如果是郑灵洁账号，给他添加翁琛账号权限
+        if (SecurityUtils.getUserId() == 1654759325866348573L) {
+            authUserIdList.add(1654759325866348572L);
+        }
+
         return listObject(Customer::getId, q -> q.in(Customer::getUserId, authUserIdList));
     }