Commit 7ec556ef authored by 赵啸非's avatar 赵啸非

添加材料排序

parent 0f61fdf8
Pipeline #2624 canceled with stages
...@@ -58,10 +58,12 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -58,10 +58,12 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
protected void findAfter(MatterEntity entity, PageInfo pageInfo, Context context, List<MatterEntity> list) throws AppException { protected void findAfter(MatterEntity entity, PageInfo pageInfo, Context context, List<MatterEntity> list) throws AppException {
for (MatterEntity matterEntity : list) { for (MatterEntity matterEntity : list) {
matterEntity.setDatumCount(matterEntity.getMatterDatumList().size()); matterEntity.setDatumCount(matterEntity.getMatterDatumList().size());
matterEntity.setMatterFullName(matterEntity.getMatterName());
matterEntity.getMatterDatumList().forEach(matterDatumEntity -> { matterEntity.getMatterDatumList().forEach(matterDatumEntity -> {
matterDatumEntity.setMatterName(matterEntity.getMatterName()); matterDatumEntity.setMatterName(matterEntity.getMatterName());
matterDatumEntity.setMatterNo(matterEntity.getMatterNo()); matterDatumEntity.setMatterNo(matterEntity.getMatterNo());
matterDatumEntity.setDeptCode(matterEntity.getDeptCode()); matterDatumEntity.setDeptCode(matterEntity.getDeptCode());
matterDatumEntity.setMateriaFullName(matterDatumEntity.getMateriaFullName());
}); });
if (entity.getIsTerminal() == YesNoEnum.YES.getValue()) { if (entity.getIsTerminal() == YesNoEnum.YES.getValue()) {
......
...@@ -53,8 +53,6 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe ...@@ -53,8 +53,6 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private HotwordService hotwordService;
@Autowired @Autowired
private MatterDatumService matterDatumService; private MatterDatumService matterDatumService;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment