Bladeren bron

fix:单次任务导出时,列表数据修改,页面字典修改

ly 11 maanden geleden
bovenliggende
commit
b7ae066c2c

+ 5 - 1
src/main/java/cn/ezhizao/project/business/workOrder/controller/OnceWorkOrderProductionController.java

@@ -149,7 +149,11 @@ public class OnceWorkOrderProductionController extends BaseController {
                 default:
                     break;
             }
-
+            if(null == l.getRecord()){
+                BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();
+                bizWorkOrderRecord.setStatus(0);
+                l.setRecord(bizWorkOrderRecord);
+            }
         }
         ExcelUtil<BizWorkOrder> util = new ExcelUtil<BizWorkOrder>(BizWorkOrder.class);
         util.exportExcel(response, list, "单次任务数据");

+ 3 - 2
src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -193,7 +193,7 @@ public class BizWorkOrder extends BaseEntity {
     @TableField(exist = false)
     private Integer status;
 
-    @Excel(name = "状态", sort = 20)
+
     @TableField(exist = false)
     private String statusType;
 
@@ -215,6 +215,7 @@ public class BizWorkOrder extends BaseEntity {
     @TableField(exist = false)
     private BizEntrust entrust;
     @TableField(exist = false)
+    @Excel(name = "结果情况",targetAttr="status",readConverterExp = "null=未开始,0=未开始,1=办理中,3=已完成,5=已完成(终止任务),6=已完成(完成任务),7=暂停中", sort = 20)
     private BizWorkOrderRecord record;
 
     //是否为自己负责(当前登陆人Id)
@@ -272,6 +273,6 @@ public class BizWorkOrder extends BaseEntity {
     @Excel(name = "收款金额", sort = 11)
     private BigDecimal arriveAmount;
     @TableField(exist = false)
-    @Excel(name = "结果情况", sort = 12)
+    @Excel(name = "任务进度", sort = 12)
     private String onWorkDetail;
 }