Commit 072edb3b authored by 廖旭伟's avatar 廖旭伟

事项申请列表返回值增加材料分组

parent 43dde8b5
package com.mortals.xhx.module.apply.model.vo; package com.mortals.xhx.module.apply.model.vo;
import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -29,4 +30,6 @@ public class MatterApplyDatumGroupVO { ...@@ -29,4 +30,6 @@ public class MatterApplyDatumGroupVO {
private String materialName; private String materialName;
private List<DatumFileVO> datumFileList; private List<DatumFileVO> datumFileList;
/** 示例样表 */
private List<MatterDatumFileEntity> exampleFileList;
} }
...@@ -17,7 +17,10 @@ import com.mortals.xhx.module.apply.model.vo.MatterApplyDatumGroupVO; ...@@ -17,7 +17,10 @@ import com.mortals.xhx.module.apply.model.vo.MatterApplyDatumGroupVO;
import com.mortals.xhx.module.apply.service.ApproverService; import com.mortals.xhx.module.apply.service.ApproverService;
import com.mortals.xhx.module.apply.service.MatterApplyDatumService; import com.mortals.xhx.module.apply.service.MatterApplyDatumService;
import com.mortals.xhx.module.apply.service.MatterApplyService; import com.mortals.xhx.module.apply.service.MatterApplyService;
import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
import com.mortals.xhx.module.matter.model.MatterDatumFileQuery;
import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.service.MatterDatumFileService;
import com.mortals.xhx.module.matter.service.MatterService; import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.single.model.SingleMatterEntity; import com.mortals.xhx.module.single.model.SingleMatterEntity;
import com.mortals.xhx.module.single.service.SingleMatterService; import com.mortals.xhx.module.single.service.SingleMatterService;
...@@ -52,6 +55,8 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD ...@@ -52,6 +55,8 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
private UserService userService; private UserService userService;
@Autowired @Autowired
private SingleMatterService singleMatterService; private SingleMatterService singleMatterService;
@Autowired
private MatterDatumFileService matterDatumFileService;
@Override @Override
protected void saveBefore(MatterApplyEntity entity, Context context) throws AppException { protected void saveBefore(MatterApplyEntity entity, Context context) throws AppException {
...@@ -217,6 +222,8 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD ...@@ -217,6 +222,8 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
datumFileList.add(fileVO); datumFileList.add(fileVO);
} }
groupVO.setDatumFileList(datumFileList); groupVO.setDatumFileList(datumFileList);
List<MatterDatumFileEntity> datumFileEntities = matterDatumFileService.find(new MatterDatumFileQuery().datumId(groupVO.getDatumId()).filetype("示例样表"));
groupVO.setExampleFileList(datumFileEntities);
groupVOList.add(groupVO); groupVOList.add(groupVO);
} }
} }
......
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