Commit 52205668 authored by 廖旭伟's avatar 廖旭伟

事项申请材料查询条件增加deptCode

parent e3aa79c2
...@@ -20,4 +20,10 @@ public class MatterDatumVo extends BaseEntityLong { ...@@ -20,4 +20,10 @@ public class MatterDatumVo extends BaseEntityLong {
private List <Long> idList; private List <Long> idList;
/** 是否加入公共库 0否1是 */ /** 是否加入公共库 0否1是 */
private Integer isAddLibrary; private Integer isAddLibrary;
/**
* 部门编码
*/
private String deptCode;
/** 事项id列表 */
private List <Long> matterIdList;
} }
\ No newline at end of file
...@@ -3,9 +3,12 @@ import com.mortals.framework.common.Rest; ...@@ -3,9 +3,12 @@ import com.mortals.framework.common.Rest;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.utils.BeanUtil; import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.matter.model.*; import com.mortals.xhx.module.matter.model.*;
import com.mortals.xhx.module.matter.service.DatumLibraryService; import com.mortals.xhx.module.matter.service.DatumLibraryService;
import com.mortals.xhx.module.matter.service.MatterApplyService;
import com.mortals.xhx.module.matter.service.MatterDatumFileService; import com.mortals.xhx.module.matter.service.MatterDatumFileService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
...@@ -13,7 +16,6 @@ import com.mortals.framework.exception.AppException; ...@@ -13,7 +16,6 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.xhx.module.matter.dao.MatterDatumDao; import com.mortals.xhx.module.matter.dao.MatterDatumDao;
import com.mortals.xhx.module.matter.service.MatterDatumService; import com.mortals.xhx.module.matter.service.MatterDatumService;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -38,6 +40,23 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -38,6 +40,23 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
private UploadService uploadService; private UploadService uploadService;
@Autowired @Autowired
private DatumLibraryService datumLibraryService; private DatumLibraryService datumLibraryService;
@Autowired
private MatterApplyService matterApplyService;
@Override
protected MatterDatumEntity findBefore(MatterDatumEntity params, PageInfo pageInfo, Context context) throws AppException {
if(StringUtils.isNotEmpty(params.getDeptCode())){
List<MatterApplyEntity> list = matterApplyService.find(new MatterApplyQuery().deptCode(params.getDeptCode()));
if(CollectionUtils.isNotEmpty(list)){
List<Long> matterIdList = new ArrayList<>();
list.stream().forEach(item->{
matterIdList.add(item.getId());
});
params.setMatterIdList(matterIdList);
}
}
return params;
}
@Override @Override
protected void findAfter(MatterDatumEntity params, Context context, List<MatterDatumEntity> list) throws AppException { protected void findAfter(MatterDatumEntity params, Context context, List<MatterDatumEntity> list) throws AppException {
......
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