档案查询，增加类别搜索

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -440,5 +440,14 @@ public class ArchivesAutoController extends BladeController {
 		return R.status(archivesAutoService.updateBatchById(JSONArray.parseArray(JSONObject.toJSONString(archivesAutoVo.getList()), ArchivesAuto.class)));
 	}
 
+	/**
+	 * 获取节点载体类别集合
+	 */
+	@GetMapping("/getCarrierTypeByDict")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "获取节点载体类别集合", notes = "获取节点载体类别集合")
+	public R getCarrierTypeByDict(){
+		return R.data(archivesAutoService.getCarrierTypeByDict());
+	}
 
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -23,6 +23,8 @@ import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.vo.ArchivesAutoVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.system.entity.DictBiz;
+
 import java.util.List;
 import java.util.Map;
 
@@ -102,4 +104,6 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 
 
 	Integer splitFiles(@Param("ids") List<Long> ids);
+
+	List<DictBiz> getCarrierTypeByDict();
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -302,6 +302,9 @@
         FROM  u_archives_auto WHERE project_id =#{projectId} AND filing_unit is not NULL
         GROUP BY filing_unit
     </select>
+    <select id="getCarrierTypeByDict" resultType="org.springblade.system.entity.DictBiz">
+        SELECT * FROM blade_dict_biz WHERE code = 'storage_type' AND  parent_id > 0 AND tenant_id = 000000
+    </select>
 
 
     <update id="splitFiles" >

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -21,6 +21,7 @@ import org.springblade.archive.vo.ArchivesAutoVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.manager.entity.ArchiveTreeContract;
+import org.springblade.system.entity.DictBiz;
 
 import java.util.List;
 import java.util.Map;
@@ -75,4 +76,6 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 	void refreshFileNumberNoSlipt(Long projectId,Long contractId,Long nodeId);
 
 	void test();
+
+    List<DictBiz> getCarrierTypeByDict();
 }

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

@@ -85,6 +85,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	private ArchiveTreeContractClient archiveTreeContractClient;
 	private ContractClient contractClient;
 	private ProjectClient projectClient;
+	private final ArchivesAutoMapper autoMapper;
 
 	@Autowired
 	private ExecutorService executorService;
@@ -119,6 +120,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if (StringUtils.isNotBlank(vo.getMonth())) {
 			vo.setMonths(Arrays.asList(vo.getMonth().split(",")));
 		}
+		if (StringUtils.isNotBlank(vo.getCarrierType())) {
+			vo.setCarrierTypes(Arrays.asList(vo.getCarrierType().split(",")));
+		}
 		List<ArchivesAutoVO> archivesAutos = null;
 		if (StringUtils.isNotBlank(vo.getNodeIds())){
 			vo.setNodeIdArray(Arrays.asList(vo.getNodeIds().split(",")));
@@ -1458,6 +1462,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		System.out.println();
 	}
 
+	@Override
+	public List<DictBiz> getCarrierTypeByDict() {
+		return autoMapper.getCarrierTypeByDict();
+	}
 
 
 }