转换错误修改，报错就是因为这个

application-facade/src/main/java/com/factory/web/service/impl/ini/BentelerIniVersionServiceImpl.java

@@ -7,6 +7,8 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -234,8 +236,8 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         Long versionId = req.getId();
         BentelerIniVersion version = versionService.getById(versionId);
         String baseMap = version.getBaseMap();
-        Map<String, String> stringStringMap = Convert.toMap(String.class, String.class, JSONUtil.parseObj(baseMap));
-
+        //Map<String, String> stringStringMap = Convert.toMap(String.class, String.class, JSONUtil.parseObj(baseMap));
+        Map<String,String> stringStringMap = JSON.parseObject(version.getBaseMap(), new TypeReference<HashMap<String,String>>() {});
         GetVersionBaseRes basemap = GetVersionBaseRes.builder()
                 .project(stringStringMap.get("project"))
                 .part(stringStringMap.get("part"))
@@ -701,8 +703,8 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
 
         String baseMapStr = version.getBaseMap();
 
-
-        Map<String, String> baseMap = Convert.toMap(String.class, String.class, JSONUtil.parseObj(baseMapStr));
+        Map<String,String> baseMap = JSON.parseObject(baseMapStr, new TypeReference<HashMap<String,String>>() {});
+       // Map<String, String> baseMap = Convert.toMap(String.class, String.class, JSONUtil.parseObj());
 
         //责任人
         Long principleOne = version.getPrincipleOne();
@@ -758,10 +760,10 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         BentelerIniVersion version = versionService.getById(versionId);
 
 
-        Map<String, String> baseMap = Convert.toMap(String.class, String.class,
-                JSONUtil.parseObj(version.getBaseMap()));
-
+      //  Map<String, String> baseMap = Convert.toMap(String.class, String.class,
+          //      JSONUtil.parseObj(version.getBaseMap()));
 
+        Map<String,String> baseMap = JSON.parseObject(version.getBaseMap(), new TypeReference<HashMap<String,String>>() {});
         // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
         String templateFileName = "systemLib/template/首件计划表.xlsx";
 
@@ -856,4 +858,4 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
                 .collect(Collectors.toList());
         return ResponseBeanBuilder.ok(works);
     }
-}
+}

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -114,25 +114,25 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 	@Autowired
 	private OnsiteItemResultService onsiteItemResultService;
-	
+
 	@Autowired
 	private OnsiteTaskService onsiteTaskService;
-	
+
 	@Autowired
 	private OnsiteApprovalTaskService onsiteApprovalTaskService;
-	
+
 	@Autowired
 	private OnsiteApprovalPlanService onsiteApprovalPlanService;
-	
+
 	@Autowired
 	private OnsitePlanHisBlobService onsitePlanHisBlobService;
-	
+
 	@Autowired
 	private OnsiteTaskHisBlobService onsiteTaskHisBlobService;
 
 	/**
 	 * 新建防错计划
-	 * 
+	 *
 	 * @param req
 	 * @return
 	 */
@@ -226,7 +226,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 	/**
 	 * 校验计划名是否存在
-	 * 
+	 *
 	 * @param name
 	 * @return true存在，false不存在
 	 */
@@ -243,7 +243,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 	/**
 	 * 校验工作站名是否存在
-	 * 
+	 *
 	 * @param wsName
 	 * @return true存在，false不存在
 	 */
@@ -257,7 +257,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			return false;
 		}
 	}
-	
+
 	/**
      * 取得防错计划点检列表
      * @param req
@@ -271,7 +271,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 	/**
 	 * 取得防错计划列表
-	 * 
+	 *
 	 * @param req
 	 * @return 防错计划列表
 	 */
@@ -279,7 +279,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	public ResponseBean<PageBean<PmPlanListRes>> getPmPlanList(SearchPmPlanListReq req) {
 		Page<PmPlanListRes> page = new Page<>(req.getPage(), req.getSize());
 		Page<PmPlanListRes> listResPage = preventMistakeMapper.getPmPlanList(page, req);
-		
+
 //		// TODO 测一下status值是都设置成功
 //		SearchPmPlanReq searchPmPlanReq = null;
 //		for (PmPlanListRes pmPlan : listResPage.getRecords()) {
@@ -309,13 +309,13 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 //			} else if (count3 > 0) {
 //				planStatus = 2; // 所有任务都检查完毕，存在不放行记录，计划状态2待重检
 //			}
-//			
+//
 //			pmPlan.setPlanStatus(planStatus);
 //		}
-		
+
 		return ResponseBeanBuilder.ok(listResPage, Function.identity());
 	}
-	
+
 	/**
      * 取得防错计划当天任务信息
      * @param req
@@ -326,7 +326,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		List<PmTaskListRes> listRes = preventMistakeMapper.getTaskList(req);
 		return listRes;
 	}
-	
+
 	/**
      * 取得防错计划信息
      * @param req
@@ -340,11 +340,11 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		pmPlanRes.setBentelerPlanName(plan.getName());
 		pmPlanRes.setPlanType(plan.getPlanType());
 		pmPlanRes.setEffectiveDate(plan.getEffectiveDate());;
-		
+
 		List<OnsiteCalendar> onsiteCalendarList = onsiteCalendarService.list(Wrappers.<OnsiteCalendar>lambdaQuery()
                 .eq(OnsiteCalendar::getBentelerPlanId, plan.getId()));
 		pmPlanRes.setOnsiteCalendarList(onsiteCalendarList);
-		
+
 		try {
 			OnsiteTitleBlob onsiteTitleBlob = onsiteTitleBlobService.getOne(new LambdaQueryWrapper<OnsiteTitleBlob>()
 	    			.eq(OnsiteTitleBlob::getBentelerPlanId, req.getBentelerPlanId()));
@@ -362,14 +362,14 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			onsiteWorkshop.setOnsiteItemList(onsiteItemList);
 		}
 		pmPlanRes.setOnsiteWorkshopList(onsiteWorkshopList);
-		
+
 		return pmPlanRes;
     }
 
 	/**
      * 禁用解禁防错计划
      * @param req
-     * @return 
+     * @return
      */
 	@Override
     public ResponseBean disablePmPlan(PmPlanPauseFlagReq req) {
@@ -379,7 +379,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                 .build());
         return ResponseBeanBuilder.ok();
     }
-	
+
 	/**
      * 取得工作站信息
      * @param req
@@ -387,24 +387,24 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
      */
 	@Override
     public ResponseBean<OnsiteWorkshop> getWorkshop(SearchWorkshopReq req) {
-    	
+
 		OnsiteWorkshop onsiteWorkshop = onsiteWorkshopService.getById(req.getWorkshopId());
-		
+
 		List<OnsiteItem> onsiteItemList = onsiteItemService.list(Wrappers.<OnsiteItem>lambdaQuery()
                 .eq(OnsiteItem::getWorkshopId, onsiteWorkshop.getId()));
 		onsiteWorkshop.setOnsiteItemList(onsiteItemList);
-		
+
 		return ResponseBeanBuilder.ok(onsiteWorkshop);
     }
-    
+
     /**
      * 修改防错计划
      * @param req
-     * @return 
+     * @return
      */
 	@Override
 	public ResponseBean editPmPlan(EditPmPlanReq req) {
-		
+
 		BentelerPlan oldPlan = planService.getById(req.getBentelerPlanId());
 		if (!req.getBentelerPlanName().equals(oldPlan.getName())) {
 			/* 校验计划名称是否存在 */
@@ -529,10 +529,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 					.build();
 			onsiteApprovalPlanService.save(onsiteApprovalPlan);
 		}
-		
+
 		return ResponseBeanBuilder.ok();
 	}
-	
+
 	/**
      * 取得计划审批信息
      * @param req
@@ -544,7 +544,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                 .eq(OnsiteApprovalPlan::getBentelerPlanId, req.getBentelerPlanId()));
 		return ResponseBeanBuilder.ok(onsiteApprovalPlanList, Function.identity());
     }
-    
+
     /**
      * 取得巡检规则信息
      * @param req
@@ -556,7 +556,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                 .eq(OnsiteCalendar::getBentelerPlanId, req.getBentelerPlanId()));
 		return ResponseBeanBuilder.ok(onsiteCalendarList, Function.identity());
     }
-	
+
 	/**
      * 取得检查记录列表
      * @param req
@@ -565,22 +565,22 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     @Override
     public ResponseBean<List<PmCheckRecordListRes>> getPmCheckRecordList(SearchPmCheckRecordListReq req) {
     	SearchPmPlanReq workshopItemReq = new SearchPmPlanReq();
-    	workshopItemReq.setBentelerPlanId(req.getBentelerPlanId());    	
+    	workshopItemReq.setBentelerPlanId(req.getBentelerPlanId());
     	List<PmCheckRecordListRes> workshopItemList = preventMistakeMapper.getPmWorkshopItemList(workshopItemReq);
-    	
+
     	for (PmCheckRecordListRes workshopItem : workshopItemList) {
     		SearchCheckRecordReq itemResultReq = new SearchCheckRecordReq();
-    		itemResultReq.setOnsiteItemId(workshopItem.getOnsiteItemId());    		
+    		itemResultReq.setOnsiteItemId(workshopItem.getOnsiteItemId());
     		itemResultReq.setYearMonth(req.getYearMonth());
     		itemResultReq.setTypeFlag(req.getTypeFlag());
     		List<PmCheckRecordRes> itemResultList = preventMistakeMapper.getPmItemResultList(itemResultReq);
-    		
+
     		workshopItem.setCheckRecordList(itemResultList);
     	}
 
 		return ResponseBeanBuilder.ok(workshopItemList, Function.identity());
     }
-    
+
     /**
      * 取得Pad端防错计划列表
      * @param req
@@ -591,7 +591,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     	List<PmPlanListForPadRes> listRes = preventMistakeMapper.getPmPlanListForPad(req);
 		return ResponseBeanBuilder.ok(listRes, Function.identity());
     }
-    
+
     /**
      * 取得表头信息
      * @param bentelerPlanId
@@ -610,7 +610,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		}
 		return onsiteTitle;
     }
-    
+
     /**
      * 取得工作站列表
      * @param req
@@ -622,7 +622,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                 .eq(OnsiteWorkshop::getBentelerPlanId, req.getBentelerPlanId()));
 		return ResponseBeanBuilder.ok(onsiteWorkshopList, Function.identity());
     }
-    
+
     /**
      * 取得巡检项目列表
      * @param req
@@ -634,11 +634,11 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                 .eq(OnsiteItem::getWorkshopId, req.getWorkshopId()));
     	return ResponseBeanBuilder.ok(onsiteItemList, Function.identity());
     }
-    
+
     /**
      * 添加巡检项目检查结果
      * @param req
-     * @return 
+     * @return
      */
     @Override
 	public ResponseBean addItemResult(AddItemResultListReq req) {
@@ -651,14 +651,14 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     				.build();
     		onsiteItemResultService.save(onsiteItemResult);
     	}
-		
+
 		return ResponseBeanBuilder.ok();
 	}
-	
+
 	/**
      * 任务提交
      * @param req
-     * @return 
+     * @return
      */
 	@Override
 	public ResponseBean submitTask(SearchTaskReq req) {
@@ -672,7 +672,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 				break;
 			}
 		}
-		
+
 		if (flag) { // 巡检项目都通过
 			OnsiteTask onsiteTask = OnsiteTask.builder()
 					.id(req.getOnsiteTaskId())
@@ -686,11 +686,11 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 					.status(1)
 					.build();
 			onsiteTaskService.updateById(onsiteTask);
-			
+
 			/* 删除之前的审批记录 */
 			onsiteApprovalTaskService.remove(Wrappers.<OnsiteApprovalTask>lambdaQuery()
 	                .eq(OnsiteApprovalTask::getOnsiteTaskId, onsiteTask.getId()));
-			
+
 			/* 取得审批人 approvalLevel=1级审批 type=3防错任务审批 */
 			ApprovalUserRes approvalUserRes = this.getApprovalUserInfo(1, 3);
 			if (approvalUserRes != null) {
@@ -704,10 +704,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 				onsiteApprovalTaskService.save(onsiteApprovalTask);
 			}
 		}
-		
+
 		return ResponseBeanBuilder.ok();
 	}
-	
+
 	/**
      * 取得审批人
      * @param req
@@ -718,7 +718,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
     	ApprovalUserRes approvalUserRes = preventMistakeMapper.getApprovalUser(req);
 		return ResponseBeanBuilder.ok(approvalUserRes);
     }
-    
+
     /**
      * 取得审批人
      * @param approvalLevel 1是1级审批 2是2级审批
@@ -733,10 +733,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		ApprovalUserRes approvalUserRes = preventMistakeMapper.getApprovalUser(searchApprovalUserReq);
         return approvalUserRes;
     }
-    
+
     /**
 	 * 取得每频次点检信息
-	 * 
+	 *
 	 * @param req
 	 * @return 每频次点检信息
 	 */
@@ -745,10 +745,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		List<PmCheckListRes> pmCheckList = preventMistakeMapper.getPmCheckList(req);
     	return ResponseBeanBuilder.ok(pmCheckList, Function.identity());
 	}
-	
+
 	/**
 	 * 取得不放行任务对应的工作站
-	 * 
+	 *
 	 * @param req
 	 * @return 不放行任务对应的工作站
 	 */
@@ -757,10 +757,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		List<PmWorkshopNoGoListRes> pmWorkshopNoGoList = preventMistakeMapper.getPmWorkshopNoGoList(req);
     	return ResponseBeanBuilder.ok(pmWorkshopNoGoList, Function.identity());
 	}
-	
+
 	/**
 	 * 取得不放行任务对应的点检项目
-	 * 
+	 *
 	 * @param req
 	 * @return 不放行任务对应的点检项目
 	 */
@@ -769,10 +769,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		List<PmItemNoGoListRes> pmItemNoGoList = preventMistakeMapper.getPmItemNoGoList(req);
     	return ResponseBeanBuilder.ok(pmItemNoGoList, Function.identity());
 	}
-	
+
 	/**
 	 * 取得不放行任务对应的质量经理审批信息
-	 * 
+	 *
 	 * @param req
 	 * @return 不放行任务对应的质量经理审批信息
 	 */
@@ -781,10 +781,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		PmNoGoTaskAapprovalRes pmNoGoTaskAapprovalRes = preventMistakeMapper.getPmNoGoTaskAapproval(req);
     	return ResponseBeanBuilder.ok(pmNoGoTaskAapprovalRes);
 	}
-    
+
 	/**
 	 * 修改巡检项目检查结果(这里只有重检走这里)
-	 * 
+	 *
 	 * @param req
 	 * @return
 	 */
@@ -802,7 +802,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 //		List<OnsiteItemResult> onsiteItemResultList = onsiteItemResultService.list(Wrappers.<OnsiteItemResult>lambdaQuery()
 //                .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId()));
 //		pmTaskRes.setOnsiteItemResultList(onsiteItemResultList);
-//		
+//
 //		try {
 //			OnsiteTaskHisBlob onsiteTaskHisBlob = OnsiteTaskHisBlob.builder()
 //					.onsiteTaskId(req.getOnsiteTaskId())
@@ -831,11 +831,11 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 		return ResponseBeanBuilder.ok();
 	}
-	
+
 	/**
      * 修改防错计划
      * @param req
-     * @return 
+     * @return
      */
 	@Override
 	public void setOnsitePlanHis(Long bentelerPlanId) {
@@ -854,10 +854,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * 任务和巡检结果记录历史
-	 * 
+	 *
 	 * @param onsiteTaskId
 	 * @return
 	 */
@@ -871,11 +871,11 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		pmTaskRes.setStatus(onsiteTask.getStatus());
 		pmTaskRes.setTaskTime(onsiteTask.getTaskTime());
 		pmTaskRes.setRemindTaskFlag(onsiteTask.getRemindTaskFlag());
-		pmTaskRes.setRemindNoworkFalg(onsiteTask.getRemindNoworkFalg());
+		pmTaskRes.setRemindNoworkFalg(onsiteTask.getRemindNoworkFlag());
 		List<OnsiteItemResult> onsiteItemResultList = onsiteItemResultService.list(Wrappers.<OnsiteItemResult>lambdaQuery()
                 .eq(OnsiteItemResult::getOnsiteTaskId, onsiteTaskId));
 		pmTaskRes.setOnsiteItemResultList(onsiteItemResultList);
-		
+
 		try {
 			OnsiteTaskHisBlob onsiteTaskHisBlob = OnsiteTaskHisBlob.builder()
 					.onsiteTaskId(onsiteTaskId)
@@ -887,10 +887,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * 取得所有工作站
-	 * 
+	 *
 	 * @param req
 	 * @return 所有工作站
 	 */
@@ -901,21 +901,21 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			queryWrapper.lambda().like(OnsiteWorkshop::getWsName, req.getWsName());
 		}
 		List<OnsiteWorkshop> onsiteWorkshopList = onsiteWorkshopService.list(queryWrapper);
-		
+
 		List<PmAllWorkshopListRes> pmAllWorkshopList = new ArrayList<PmAllWorkshopListRes>();
 		PmAllWorkshopListRes pmAllWorkshop = null;
 		for (OnsiteWorkshop onsiteWorkshop : onsiteWorkshopList) {
 			pmAllWorkshop = new PmAllWorkshopListRes();
-			pmAllWorkshop.setBentelerPlanId(onsiteWorkshop.getBentelerPlanId());			
+			pmAllWorkshop.setBentelerPlanId(onsiteWorkshop.getBentelerPlanId());
 			pmAllWorkshop.setWorkshopId(onsiteWorkshop.getId());
 			pmAllWorkshop.setWsName(onsiteWorkshop.getWsName());
-			
+
 			pmAllWorkshopList.add(pmAllWorkshop);
-		}		
+		}
 		return ResponseBeanBuilder.ok(pmAllWorkshopList, Function.identity());
 	}
-    
-    
+
+
     /**
      * Object转成byte[]
      * @param obj
@@ -931,7 +931,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		baos.close();
 		return bytes;
 	}
- 
+
     /**
      * byte[]转成Object
      * @param byte[]
@@ -945,5 +945,5 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		return ob;
 	}
 
-   
-}
+
+}