소스 검색

fix:导出添加说明列,列表显示状态修改

ly 11 달 전
부모
커밋
73bf97d2c5
1개의 변경된 파일21개의 추가작업 그리고 1개의 파일을 삭제
  1. 21 1
      src/main/java/cn/ezhizao/project/business/workOrder/controller/OnceWorkOrderProductionController.java

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

@@ -167,6 +167,26 @@ public class OnceWorkOrderProductionController extends BaseController {
                 str.append(DateUtil.format(detail.getRecordDate(), "MM.dd")).append("--").append(detail.getRecordDetail()).append(";");
             }
             l.setOnWorkDetail(str.toString());
+            Integer style = l.getAddressStyle();
+            if(style!=null){
+                if (l.getTaskTypeId() == 5L && style == 1 && StringUtils.isNotEmpty(l.getInputProvince())) {
+                    //自有地址
+                    l.setExplain("自有地址:" + l.getInputProvince() + l.getInputCity() + l.getInputDistrict());
+                } else if (l.getTaskTypeId() == 5L && style == 2 && l.getFictionAddressId() != null) {
+                    //虚拟地址
+                    SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getFictionAddressId());
+                    if (sysDictData == null) {
+                        return;
+                    }
+                    l.setExplain("虚拟地址:" + sysDictData.getDictLabel());
+                } else {
+                    if (StringUtils.isEmpty(l.getInputProvince())) {
+                        return;
+                    }
+                    l.setExplain("办理地区:" + l.getInputProvince() + l.getInputCity() + l.getInputDistrict());
+                }
+            }
+
         }
         ExcelUtil<BizWorkOrder> util = new ExcelUtil<BizWorkOrder>(BizWorkOrder.class);
         util.exportExcel(response, list, "单次任务数据");
@@ -290,7 +310,7 @@ public class OnceWorkOrderProductionController extends BaseController {
                 .list();
         BizWorkOrderRecord bizWorkOrderRecord = bizWorkOrderRecordList.get(0);
         bizWorkOrderRecord.setStatus(1);
-        bizWorkOrderRecord.setResultStatus(4);
+        bizWorkOrderRecord.setResultStatus(-1);
         bizWorkOrderRecord.setHandlerId(SecurityUtils.getUserId());
         workOrderRecordService.updateById(bizWorkOrderRecord);
         return success("继续办理成功");