|
|
|
@ -150,6 +150,13 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
|
|
|
|
|
|
|
|
|
|
order.setPersonList(personList);
|
|
|
|
|
|
|
|
|
|
// 保养图片
|
|
|
|
|
BaseFileData selectTemp = new BaseFileData();
|
|
|
|
|
selectTemp.setSourceId(equOrder.getId());
|
|
|
|
|
List<String> upkeepPictures = equFileMapper.selectUrlList(selectTemp);
|
|
|
|
|
if (upkeepPictures != null) {
|
|
|
|
|
order.setUpkeepPictures(upkeepPictures);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return success(order);
|
|
|
|
|
}
|
|
|
|
@ -304,6 +311,23 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
|
|
|
|
|
if (equOrder.getPlanType().equals("maintenance")) {
|
|
|
|
|
// 设置结束时间
|
|
|
|
|
equOrder.setOrderEnd(DateUtils.getNowDate());
|
|
|
|
|
//上传附件
|
|
|
|
|
if (StringUtils.isNotEmpty(equOrder.getPicturePath())) {
|
|
|
|
|
String[] ids = equOrder.getPicturePath().split(",");
|
|
|
|
|
List<BaseFileData> files = new ArrayList<>();
|
|
|
|
|
BaseFileData file = null;
|
|
|
|
|
for (String id : ids) {
|
|
|
|
|
file = new BaseFileData();
|
|
|
|
|
file.setFileId(IdUtils.fastSimpleUUID());
|
|
|
|
|
file.setFileName(id.split("&fileName=")[1]);
|
|
|
|
|
file.setFileAddress(id);
|
|
|
|
|
file.setSourceId(equOrder.getOrderId());
|
|
|
|
|
file.setCreateBy(SecurityUtils.getUsername());
|
|
|
|
|
file.setCreateTime(new Date());
|
|
|
|
|
files.add(file);
|
|
|
|
|
}
|
|
|
|
|
equFileMapper.insertEquFileBatch(files);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 更新工单信息
|
|
|
|
@ -413,6 +437,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
|
|
|
|
|
order.setShutDown(pdadto.getShutDown());
|
|
|
|
|
// 设置开始时间
|
|
|
|
|
order.setOrderStart(DateUtils.getNowDate());
|
|
|
|
|
// 设置保养人
|
|
|
|
|
order.setPlanPerson(SecurityContextHolder.getUserName());
|
|
|
|
|
// 更新数据表
|
|
|
|
|
order.setUpdateBy(SecurityContextHolder.getUserName());
|
|
|
|
|
order.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
|