|
@@ -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("继续办理成功");
|