“zhifk” 2 سال پیش
والد
کامیت
8b89bb07d4

+ 10 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO.java

@@ -60,6 +60,16 @@ public class ArchivesAutoVO extends ArchivesAuto {
 	private String nodeIds;
 	private String nodeIds;
 
 
 	private List<String> nodeIdArray;
 	private List<String> nodeIdArray;
+
+	/**
+	 * 保密级别
+	 */
+	private String secretLevelValue;
+
+	/**
+	 * 保管期限(单位/年)
+	 */
+	private String storageTimeValue;
 	/**
 	/**
 	* 案卷收集附件信息
 	* 案卷收集附件信息
 	* */
 	* */

+ 19 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -18,6 +18,7 @@ package org.springblade.archive.service.impl;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.vo.ArchivesAutoVO;
 import org.springblade.archive.vo.ArchivesAutoVO;
@@ -28,6 +29,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.entity.DictBiz;
+import org.springblade.system.feign.IDictBizClient;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 
@@ -40,8 +42,10 @@ import java.util.List;
  * @since 2023-02-17
  * @since 2023-02-17
  */
  */
 @Service
 @Service
+@AllArgsConstructor
 public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper, ArchivesAuto> implements IArchivesAutoService {
 public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper, ArchivesAuto> implements IArchivesAutoService {
 
 
+	private final IDictBizClient iDictBizClient;
 	@Override
 	@Override
 	public IPage<ArchivesAutoVO> selectArchivesAutoPage(IPage<ArchivesAutoVO> page, ArchivesAutoVO archivesAuto) {
 	public IPage<ArchivesAutoVO> selectArchivesAutoPage(IPage<ArchivesAutoVO> page, ArchivesAutoVO archivesAuto) {
 		return page.setRecords(baseMapper.selectArchivesAutoPage(page, archivesAuto));
 		return page.setRecords(baseMapper.selectArchivesAutoPage(page, archivesAuto));
@@ -67,6 +71,21 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		//设置分页信息
 		//设置分页信息
 		iPage.setTotal(total);
 		iPage.setTotal(total);
 		List<ArchivesAutoVO> pageVoList = JSONArray.parseArray(JSONObject.toJSONString(pageList), ArchivesAutoVO.class);
 		List<ArchivesAutoVO> pageVoList = JSONArray.parseArray(JSONObject.toJSONString(pageList), ArchivesAutoVO.class);
+		List<DictBiz> sheetSourceList = this.iDictBizClient.getList("security_level", "notRoot").getData();
+		List<DictBiz> sheetSourceList1 = this.iDictBizClient.getList("storage_period", "notRoot").getData();
+
+		pageVoList.forEach(vos -> {
+			if(StringUtils.isNotEmpty(vos.getSecretLevel()) || StringUtils.isNotEmpty(vos.getStorageTime())){
+				sheetSourceList.forEach(source -> {
+					if(StringUtils.isNotEmpty(vos.getSecretLevel()) && source.getDictKey().equals(vos.getSecretLevel())){
+						vos.setSecretLevelValue(source.getDictValue());
+					}
+					if(StringUtils.isNotEmpty(vos.getStorageTime()) && source.getDictKey().equals(vos.getStorageTime())){
+						vos.setStorageTimeValue(source.getDictValue());
+					}
+				});
+			}
+		});
 
 
 		return iPage.setRecords(pageVoList);
 		return iPage.setRecords(pageVoList);
 	}
 	}