|
@@ -1,6 +1,7 @@
|
|
|
package cn.ezhizao.project.business.workOrder.controller;
|
|
|
|
|
|
import cn.ezhizao.common.utils.DateUtils;
|
|
|
+import cn.ezhizao.common.utils.PageUtils;
|
|
|
import cn.ezhizao.common.utils.SecurityUtils;
|
|
|
import cn.ezhizao.common.utils.StringUtils;
|
|
|
import cn.ezhizao.common.utils.poi.ExcelUtil;
|
|
@@ -68,8 +69,7 @@ public class OnceWorkOrderProductionController extends BaseController {
|
|
|
@ResponseBody
|
|
|
public TableDataInfo getList(BizWorkOrder conditions) throws NoSuchFieldException, IllegalAccessException {
|
|
|
setTenantId(conditions);
|
|
|
- startPage();
|
|
|
- startOrderBy();
|
|
|
+ PageUtils.OnceStartPage();
|
|
|
List<BizWorkOrder> list = workOrderService.getList(conditions);
|
|
|
list.forEach(v -> {
|
|
|
Integer style = v.getAddressStyle();
|
|
@@ -106,7 +106,6 @@ public class OnceWorkOrderProductionController extends BaseController {
|
|
|
@PostMapping("/export")
|
|
|
public void export(HttpServletResponse response, BizWorkOrder conditions) throws NoSuchFieldException, IllegalAccessException {
|
|
|
setTenantId(conditions);
|
|
|
- startOrderBy();
|
|
|
List<BizWorkOrder> list = workOrderService.getList(conditions);
|
|
|
for (BizWorkOrder l : list) {
|
|
|
l.setProjectType((l.getNoContract() == 1 ? l.getRemark() : "") + l.getTaskTypeName() + (l.getTaskTypeDetailName() != null ? "-" + l.getTaskTypeDetailName() : ""));
|