fix:导出添加三个列

src/main/java/cn/ezhizao/project/business/workOrder/controller/OnceWorkOrderProductionController.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.workOrder.controller;
 
+import cn.ezhizao.common.utils.DateUtils;
 import cn.ezhizao.common.utils.SecurityUtils;
 import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
@@ -10,6 +11,8 @@ import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
+import cn.ezhizao.project.business.onwork.domain.BizOnceworkDetail;
+import cn.ezhizao.project.business.onwork.service.IBizOnceworkDetailService;
 import cn.ezhizao.project.business.workOrder.domain.BizRecordStatusVo;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrder;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord;
@@ -21,6 +24,7 @@ import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
 import cn.ezhizao.project.system.service.ISysDictDataService;
 import cn.ezhizao.project.system.service.ISysFileStorageService;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,6 +49,8 @@ public class OnceWorkOrderProductionController extends BaseController {
     @Resource
     IBizWorkOrderRecordService workOrderRecordService;
     @Resource
+    IBizOnceworkDetailService bizOnceworkDetailService;
+    @Resource
     private SysUserMapper sysUserMapper;
     @Resource
     private ISysFileStorageService sysFileStorageService;
@@ -154,6 +160,13 @@ public class OnceWorkOrderProductionController extends BaseController {
                 bizWorkOrderRecord.setStatus(0);
                 l.setRecord(bizWorkOrderRecord);
             }
+            List<BizOnceworkDetail> bizOnceworkDetailList = bizOnceworkDetailService.query().eq("work_order_id",l.getId()).orderByDesc("create_time").list();
+            StringBuilder str= new StringBuilder();
+
+            for(BizOnceworkDetail detail : bizOnceworkDetailList){
+                str.append(DateUtil.format(detail.getRecordDate(), "MM.dd")).append("--").append(detail.getRecordDetail()).append(";");
+            }
+            l.setOnWorkDetail(str.toString());
         }
         ExcelUtil<BizWorkOrder> util = new ExcelUtil<BizWorkOrder>(BizWorkOrder.class);
         util.exportExcel(response, list, "单次任务数据");
@@ -238,7 +251,13 @@ public class OnceWorkOrderProductionController extends BaseController {
             sysFileStorageService.save(sysFileStorage);
         }
         //更新状态
-        bizWorkOrderRecord.setStatus(statusVo.getRecordStatus());
+
+        if(statusVo.getResultStatus().equals(0) || statusVo.getResultStatus().equals(1)){
+            bizWorkOrderRecord.setStatus(3);
+        }else if(statusVo.getResultStatus().equals(2)){
+            bizWorkOrderRecord.setStatus(4);
+        }
+        bizWorkOrderRecord.setResultStatus(statusVo.getResultStatus());
         return success(workOrderRecordService.updateById(bizWorkOrderRecord));
     }
     @RequestMapping("FileList")

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizRecordStatusVo.java

@@ -7,5 +7,6 @@ import lombok.Data;
 public class BizRecordStatusVo {
     private Long workOrderId;
     private Integer recordStatus;
+    private Integer resultStatus;
     private SysFileStorage sysFileStorage;
 }

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.workOrder.domain;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.aspectj.lang.annotation.Excels;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -215,7 +216,10 @@ 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)
+    @Excels({
+            @Excel(name = "结果情况",targetAttr="resultStatus",readConverterExp = "2=暂停办理,0=中止任务,1=完成任务", sort = 20),
+            @Excel(name = "状态",targetAttr="status",readConverterExp = "0=未开始,1=进行中,3=已完成,4=暂停中", sort = 21)
+    })
     private BizWorkOrderRecord record;
 
     //是否为自己负责(当前登陆人Id)
@@ -275,4 +279,6 @@ public class BizWorkOrder extends BaseEntity {
     @TableField(exist = false)
     @Excel(name = "任务进度", sort = 12)
     private String onWorkDetail;
+    @TableField(exist = false)
+    private Integer resultStatus;
 }

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrderRecord.java

@@ -90,4 +90,5 @@ public class BizWorkOrderRecord extends BaseEntity
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date finishTime;
+    private Integer resultStatus;
 }

src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -39,7 +39,7 @@
         group by contract_id
     </select>
     <select id="getOnWorkDetail" resultType="java.lang.String">
-        select record_detail from biz_oncework_detail where work_order_id = #{id} order by create_time desc limit 1
+        select CONCAT(DATE_FORMAT(record_date,'%m.%d'),'---',record_detail) as record_detail from biz_oncework_detail where work_order_id = #{id} order by create_time desc limit 1
     </select>
     <select id="getList" parameterType="BizWorkOrder" resultMap="BizWorkOrderResult">
         SELECT CONCAT(t1.remark, t3.name, t4.name) AS contact_info,if(t7.status is null,0,t7.`status`),t1.*, t2.name as
@@ -91,6 +91,8 @@
             <if test="endMonth != null ">AND t1.end_month = #{endMonth}</if>
             <if test="monthNum != null ">AND t1.month_num = #{monthNum}</if>
             <if test="isStop != null ">AND t1.is_stop = #{isStop}</if>
+            <if test="resultStatus != null">AND t7.result_status = #{resultStatus}</if>
+
             <if test="companyName != null">AND t2.name like concat('%', #{companyName}, '%')</if>
         </trim>
     </select>