提交 89f814bc authored 作者: zhoushaopan's avatar zhoushaopan

fix(配发模块): 修改了横向配发的bug

修改了横向配发的bug
上级 34aeeb4f
...@@ -282,7 +282,7 @@ public class AllotBillController { ...@@ -282,7 +282,7 @@ public class AllotBillController {
// .distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件", // .distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件",
// null, ".", billId, 3, // null, ".", billId, 3,
// allotBillSaveVo.getSendUnitId(), 1, null, userIds); // allotBillSaveVo.getSendUnitId(), 1, null, userIds);
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_RECEIVE_FILE.id, "["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit())+ "]型号" + TaskBto taskBto2 = new TaskBto(StatusEnum.ALLOTING.id, "["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit())+ "]型号" +
StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel) StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel)
.distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件", .distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件",
null, ".", billId, 3, null, ".", billId, 3,
......
...@@ -7,7 +7,9 @@ import org.springframework.stereotype.Service; ...@@ -7,7 +7,9 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* @author zsp * @author zsp
...@@ -34,6 +36,7 @@ public class RemindCheckServiceImpl implements RemindCheckService { ...@@ -34,6 +36,7 @@ public class RemindCheckServiceImpl implements RemindCheckService {
@Override @Override
public List<RemindCheck> selectList(Integer unitId) { public List<RemindCheck> selectList(Integer unitId) {
return remindCheckDao.findAllByUnitId(unitId); return remindCheckDao.findAllByUnitId(unitId).stream()
.sorted(Comparator.comparing(RemindCheck::getCreateTime).reversed()).collect(Collectors.toList());
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论