|
|
|
|
@ -26,6 +26,7 @@ import org.springblade.modules.business.pojo.vo.workorder.WorkOrderVO; |
|
|
|
|
import org.springblade.modules.business.service.IWorkOrderApprovalService; |
|
|
|
|
import org.springblade.modules.business.service.IWorkOrderFlowService; |
|
|
|
|
import org.springblade.modules.business.service.IWorkOrderService; |
|
|
|
|
import org.springblade.modules.system.pojo.entity.Dept; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
|
import java.io.BufferedReader; |
|
|
|
|
@ -143,10 +144,10 @@ public class WorkOrderController extends BladeController { |
|
|
|
|
// 执行分页查询
|
|
|
|
|
IPage<WorkOrder> pages = workOrderService.page(Condition.getPage(query), wrapper); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pages.getRecords().forEach(order -> { |
|
|
|
|
if (Func.isNotEmpty(order.getReportUnit())) { |
|
|
|
|
order.setReportUnitName(DeptCache.getDept(Long.parseLong(order.getReportUnit())).getDeptName()); |
|
|
|
|
Dept dept = DeptCache.getDept(order.getReportUnit()); |
|
|
|
|
if (Func.isNotEmpty(dept)) { |
|
|
|
|
order.setReportUnitName(dept.getDeptName()); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|