认证-参数项收集-bug55428

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java

@@ -140,7 +140,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	@ApiOperation(value="参数项收集清单-添加查询", notes="参数项收集清单-添加查询")
 	@GetMapping(value = "/paramsInfoList")
 //	@RequiresPermissions("params:collectManifest:add")
-	public Result<List<ParamsInfoPublishEO>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
+	public Result<List<Map<String, Object>>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
 															@RequestParam(name = "cut") String cut) {
 		if (StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber())) {
 			paramsCollectManifestVO.setNioNumber(paramsCollectManifestVO.getNioNumber().replace("%","\\%"));
@@ -149,8 +149,8 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 			paramsCollectManifestVO.setParamsName(paramsCollectManifestVO.getParamsName().replace("%","\\%"));
 		}
 
-		List<ParamsInfoPublishEO> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO);
+		List<Map<String, Object>> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO);
-		return Result.OK(cut, list);
+		return Result.OK(list);
 	}
 
 	/**

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java

@@ -95,7 +95,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	 * @param paramsCollectManifestVO
 	 * @return
 	 */
-	List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
+	List<Map<String, Object>> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
 
 	List<Map<String,String>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO);
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -841,7 +841,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	 * @return
 	 */
 	@Override
-	public List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) {
+	public List<Map<String, Object>> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String cut = paramsCollectManifestVO.getCut();
+
 		LambdaQueryWrapper<ParamsInfoPublishEO> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(ParamsInfoPublishEO::getParamsTemplateId, paramsCollectManifestVO.getParamsTemplateId())
 				.eq(ParamsInfoPublishEO::getVersion, paramsCollectManifestVO.getParamsTemplatePublishVersion())
@@ -859,7 +861,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
 		paramsInfoPublishEOList = paramsInfoPublishEOList.stream().filter(e-> !nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
 
-		return paramsInfoPublishEOList;
+		// 查询 责任领域 数据字典
+		List<SysDictItem> dictItems = sysDictItemService.selectItemsByDictCode("duty_territory");
+		Map<String, String> dictItemsMap = new HashMap<>();
+		if (CutEnum.EN.getValue().equals(cut)) {
+			dictItemsMap = dictItems.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName));
+		} else {
+			dictItemsMap = dictItems.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText));
+		}
+
+		// 处理数据 返回map ---> 解决数据量大,系统拦截器转换数据字典慢的问题
+		List<Map<String, Object>> listMapForAdd = new ArrayList<>();
+		Map<String, String> finalDictItemsMap = dictItemsMap;
+		paramsInfoPublishEOList.forEach(paramsInfoPublishEO -> {
+			Map<String, Object> paramsInfoPublishMap = objectToMap(paramsInfoPublishEO);
+			// 处理责任领域数据字典
+			paramsInfoPublishMap.put("dutyTerritory_dictText", finalDictItemsMap.get(paramsInfoPublishEO.getDutyTerritory()));
+
+			listMapForAdd.add(paramsInfoPublishMap);
+		});
+
+		return listMapForAdd;
 	}
 
 	@Override
@@ -1664,7 +1686,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				if (o != null) {
 					if (Date.class.equals(field.getType())) {
 						Date date = (Date) o;
-						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String pattern = "";
+						if ("deadline".equals(varName)) {
+							pattern = "yyyy-MM-dd";
+						} else {
+							pattern = "yyyy-MM-dd HH:mm:ss";
+						}
+						SimpleDateFormat formatter=new SimpleDateFormat(pattern);
 						String time=formatter.format(date);
 						map.put(varName, time);
 					} else {

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java

@@ -501,7 +501,13 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 				if (o != null) {
 					if (Date.class.equals(field.getType())) {
 						Date date = (Date) o;
-						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String pattern = "";
+						if ("deadline".equals(varName)) {
+							pattern = "yyyy-MM-dd";
+						} else {
+							pattern = "yyyy-MM-dd HH:mm:ss";
+						}
+						SimpleDateFormat formatter=new SimpleDateFormat(pattern);
 						String time=formatter.format(date);
 						map.put(varName, time);
 					} else {

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -909,7 +909,13 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				if (o != null) {
 					if (Date.class.equals(field.getType())) {
 						Date date = (Date) o;
-						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String pattern = "";
+						if ("deadline".equals(varName)) {
+							pattern = "yyyy-MM-dd";
+						} else {
+							pattern = "yyyy-MM-dd HH:mm:ss";
+						}
+						SimpleDateFormat formatter=new SimpleDateFormat(pattern);
 						String time=formatter.format(date);
 						map.put(varName, time);
 					} else {