Commit 9ce82895 authored by 廖旭伟's avatar 廖旭伟

修改测试bug

parent f67fdb14
package com.mortals.xhx.module.apply.model.vo;
import com.mortals.xhx.common.pdu.matter.MatterDatumFilePdu;
import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
import lombok.Data;
......@@ -31,5 +32,5 @@ public class MatterApplyDatumGroupVO {
private List<DatumFileVO> datumFileList;
/** 示例样表 */
private List<MatterDatumFileEntity> exampleFileList;
private List<MatterDatumFilePdu> exampleFileList;
}
package com.mortals.xhx.module.apply.service.impl;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
......@@ -7,6 +8,10 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.matter.MatterDatumFilePdu;
import com.mortals.xhx.feign.matter.IMatterDatumFileFeign;
import com.mortals.xhx.module.apply.dao.MatterApplyDao;
import com.mortals.xhx.module.apply.model.MatterApplyDatumEntity;
import com.mortals.xhx.module.apply.model.MatterApplyDatumQuery;
......@@ -56,7 +61,7 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
@Autowired
private SingleMatterService singleMatterService;
@Autowired
private MatterDatumFileService matterDatumFileService;
private IMatterDatumFileFeign iMatterDatumFileFeign;
@Override
protected void saveBefore(MatterApplyEntity entity, Context context) throws AppException {
......@@ -233,8 +238,13 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
datumFileList.add(fileVO);
}
groupVO.setDatumFileList(datumFileList);
List<MatterDatumFileEntity> datumFileEntities = matterDatumFileService.find(new MatterDatumFileQuery().datumId(groupVO.getDatumId()).filetype("示例样表"));
groupVO.setExampleFileList(datumFileEntities);
MatterDatumFilePdu matterDatumFilePdu = new MatterDatumFilePdu();
matterDatumFilePdu.setDatumId(groupVO.getDatumId());
matterDatumFilePdu.setFiletype("示例样表");
Rest<RespData<List<MatterDatumFilePdu>>> datumFileEntities = iMatterDatumFileFeign.list(matterDatumFilePdu);
if(datumFileEntities.getCode()== YesNoEnum.YES.getValue()){
groupVO.setExampleFileList(datumFileEntities.getData().getData());
}
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