Browse Source

对账单列表-工商任务添加负责人

rainwer 6 months ago
parent
commit
d4c120fe79

+ 2 - 0
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{

+ 4 - 0
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;
 

+ 4 - 0
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;
 }

+ 3 - 0
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;
 }

+ 2 - 1
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>