审批流涉及到的人要展示出来，比如待部门审核，需要审批人

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/cost/CostCheckController.java

@@ -33,7 +33,6 @@ import java.util.Date;
 @RequestMapping("cost/check")
 public class CostCheckController {
 
-    private static Logger logger = LoggerFactory.getLogger(CostCheckController.class);
 
     @Autowired
     private CostService costService;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/dao/CostDao.java

@@ -56,7 +56,8 @@ public interface CostDao extends BaseMapper<CostDomain> {
                                              @Param("payUserId") Integer payUserId);
 
     //查询资产负债表相关费用单
-    List<CostDomain> selectBalanceSheetCost(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+    List<CostDomain> selectBalanceSheetCost(@Param("startDate") Date startDate,
+                                            @Param("endDate") Date endDate);
 
     //
     List<String> listCostNoAll(CostExportVo costExportVo);

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/model/CostDomain.java

@@ -228,6 +228,15 @@ public class CostDomain implements Serializable {
     @TableField(exist = false)
     private String primaryDepartmentName;
 
+    @ApiModelProperty("最终审核人")
+    private String finalReviewerUserName;
+    @ApiModelProperty("财务审核人")
+    private String financialFinalReviewerUserName;
+    @ApiModelProperty("部门审核人")
+    private String departmentReviewerUserName;
+    @ApiModelProperty("行政审核人")
+    private String hrReviewerUserName;
+
     public CostDto castToDto() {
 
         StatusMapper statusMapper = SpringContextUtil.getBean(StatusMapper.class);

bailuntec-cost-core/src/main/resources/mapper/Cost.xml

@@ -412,19 +412,30 @@
 
 
     <select id="checkCostList" resultMap="cost">
-        select t1.*
+        select t1.*,
+        group_concat(distinct t4.reviewer_user_name) as final_reviewer_user_name,
+        group_concat(distinct t5.reviewer_user_name) as financial_final_reviewer_user_name,
+        group_concat(distinct t7.reviewer_user_name) as department_reviewer_user_name,
+        group_concat(distinct t8.reviewer_user_name) as hr_reviewer_user_name
         from cost t1
         left join cost_log t2 on t1.cost_no = t2.cost_no
-        left join cost_company t3 on t1.company_no = t3.company_no
-        -- 最终审核人
-        LEFT JOIN cost_reviewer t4 on t3.id = t4.refer_id and t4.type = 3
-        -- 财务审核人
-        LEFT JOIN cost_reviewer t5 on t3.id = t5.refer_id and t5.type = 2
-        LEFT JOIN oa_user t6 on t1.create_userid = t6.oa_user_id
+<!--#         <if test="req.type == 1">-->
+            left join cost_company t3 on t1.company_no = t3.company_no
+            -- 最终审核人
+            left join cost_reviewer t4 on t3.id = t4.refer_id and t4.type = 3
+            -- 财务审核人
+            left join cost_reviewer t5 on t3.id = t5.refer_id and t5.type = 2
+<!--#         </if>-->
         -- 部门审核人
-        LEFT JOIN cost_reviewer t7 on t6.primary_department_id = t7.refer_id and t7.type = 1
+<!--#         <if test="req.type == 2">-->
+            left join oa_user t6 on t1.create_userid = t6.oa_user_id
+            left join cost_reviewer t7 on t6.primary_department_id = t7.refer_id and t7.type = 1
+<!--#         </if>-->
         -- 行政审核
-        LEFT JOIN cost_reviewer t8 on t3.id = t8.refer_id and t5.type = 4
+<!--#         <if test="req.type == 3">-->
+            left join cost_company t3 on t1.company_no = t3.company_no
+            left join cost_reviewer t8 on t3.id = t8.refer_id and t5.type = 4
+<!--#         </if>-->
         where true
         /*财务 或者 最终审核 只显示待审核的*/
         <if test="req.type == 1">