Merge branch 'feature/management' into feature/develop

src/main/java/cn/ezhizao/framework/web/controller/BaseController.java

@@ -22,6 +22,7 @@ import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 
@@ -235,7 +236,11 @@ public class BaseController
     protected Long getTenantId() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         if(!user.isAdmin()){
-            return user.getTenantId();
+            if(!CollectionUtils.isEmpty(user.getRoles()) && user.getRoles().stream().filter(role -> role.getRoleId() == 2).findAny().isPresent()) {
+                return Long.parseLong(request.getHeader("tenantId"));
+            } else {
+                return user.getTenantId();
+            }
         } else {
             return Long.parseLong(request.getHeader("tenantId"));
         }
@@ -244,9 +249,16 @@ public class BaseController
     protected <T> void setTenantId(T t) throws NoSuchFieldException, IllegalAccessException {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         if(!user.isAdmin()){
-            Field field =  t.getClass().getDeclaredField("tenantId");
-            field.setAccessible(true);
-            field.set(t, user.getTenantId());
+            if(!CollectionUtils.isEmpty(user.getRoles()) && user.getRoles().stream().filter(role -> role.getRoleId() == 2).findAny().isPresent()) {
+                Long tenantId = Long.parseLong(request.getHeader("tenantId"));
+                Field field =  t.getClass().getDeclaredField("tenantId");
+                field.setAccessible(true);
+                field.set(t, tenantId);
+            } else {
+                Field field =  t.getClass().getDeclaredField("tenantId");
+                field.setAccessible(true);
+                field.set(t, user.getTenantId());
+            }
         } else {
             Long tenantId = Long.parseLong(request.getHeader("tenantId"));
 //            Long tenantId = SecurityUtils.getLoginUser().getTenantId();

src/main/java/cn/ezhizao/project/business/deduct/controller/BizDeductController.java

@@ -333,6 +333,7 @@ public class BizDeductController extends BaseController {
                 item.setCompanyName(l.getCompanyName());
                 item.setTaskTypeName(l.getTaskTypeName());
                 item.setTaskTypeDetailName(l.getTaskTypeDetailName());
+                item.setLeaderName(l.getLeaderName());
                 BizWorkOrder workOrder = workOrders.stream().filter(v -> v.getId().equals(l.getWorkOrderId())).findFirst().orElse(null);
                 if (workOrder != null) {
                     item.setDescription(workOrder.getRemark());
@@ -838,6 +839,7 @@ public class BizDeductController extends BaseController {
                 bizStatementAccountOnceExport.setFinishedDate(bizStatementAccountOnce.getFinishedDate());
                 bizStatementAccountOnceExport.setAmount(bizStatementAccountOnce.getAmount());
                 bizStatementAccountOnceExport.setDescription(bizStatementAccountOnce.getDescription());
+                bizStatementAccountOnceExport.setLeaderName(bizStatementAccountOnce.getLeaderName());
                 list3.add(bizStatementAccountOnceExport);
             }
         }else{

src/main/java/cn/ezhizao/project/business/entrust/domain/BizEntrust.java

@@ -73,6 +73,10 @@ public class BizEntrust extends BaseEntity
     @Excel(name = "公司名称")
     private String companyName;
 
+    @TableField(exist = false)
+    @Excel(name = "负责人")
+    private String leaderName;
+
     @TableField(exist = false)
     private String taskTypeName;
 

src/main/java/cn/ezhizao/project/business/statementAccount/domain/BizStatementAccountOnce.java

@@ -111,4 +111,8 @@ public class BizStatementAccountOnce extends BaseEntity
     @Excel(name = "注册行政区编码")
     @ApiModelProperty(value = "注册行政区编码")
     private String districtCode;
+
+    @Excel(name = "负责人")
+    @ApiModelProperty(value = "负责人")
+    private String leaderName;
 }

src/main/java/cn/ezhizao/project/business/statementAccount/domain/BizStatementAccountOnceExport.java

@@ -43,4 +43,7 @@ public class BizStatementAccountOnceExport
 
     @Excel(name = "说明")
     private String description;
+
+    @Excel(name = "负责人")
+    private String leaderName;
 }

src/main/resources/application-linux.yml

@@ -33,7 +33,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://172.18.0.1:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8&connectTimeout=360000&socketTimeout=360000
+                url: jdbc:mysql://172.18.0.1:3306/ezhizao_yzbh_v3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8&connectTimeout=360000&socketTimeout=360000
                 username: root
                 password: ezhizao.cn123456
             # 从库数据源

src/main/resources/application-local.yml

@@ -0,0 +1,92 @@
+# 数据源配置
+spring:
+    cloud:
+        nacos:
+            discovery:
+                server-addr: 120.46.59.90:19848
+    application:
+        name: ezhizao-yzbh-entrust
+    # 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/BizEntrustMapper.xml

@@ -11,13 +11,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getList" parameterType="BizEntrust" resultMap="BizEntrustResult">
         SELECT t1.*, t2.account_name as to_account_name, t3.name as task_type_name, t4.name as company_name
-        , t5.name as task_type_detail_name
+        , t5.name as task_type_detail_name, su.nick_name as leader_name
         FROM biz_entrust t1
         left join biz_tenant t2 on t2.id = t1.to_tenant_id
         left join biz_company t4 on t4.id = t1.company_id
         left join biz_task_type t3 on t3.id = t1.task_type_id
         left join biz_task_type_detail t5 on t5.id = t1.task_type_detail_id
         LEFT JOIN biz_work_order t6 on t6.id = t1.work_order_id
+        LEFT JOIN sys_user su on su.user_id = t4.leader_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 and t6.deleted = 0
             <if test="id != null "> AND t1.id = #{id}</if>