diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
index c587bb7a1..d4e9f4589 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
@@ -63,34 +63,34 @@ public class AuthDummyInventoryInfoEO implements Serializable {
     private java.lang.String sysOrgCode;
 
 	/**类别*/
-	@Excel(name = "*类别", width = 15)
+	@Excel(name = "类别", width = 15)
     @ApiModelProperty(value = "类别")
     private java.lang.String category;
 
 	/**检验项目*/
-	@Excel(name = "*检验项目", width = 15)
+	@Excel(name = "检验项目", width = 15)
     @ApiModelProperty(value = "检验项目")
     private java.lang.String inspectionItem;
 
 	/**配置项*/
-	@Excel(name = "*配置项", width = 15)
+	@Excel(name = "配置项", width = 15)
     @ApiModelProperty(value = "配置项")
     private java.lang.String configItem;
 
 	/**WVTA ID*/
-	@Excel(name = "*WVTA ID", width = 15)
+	@Excel(name = "WVTA ID", width = 15)
     @ApiModelProperty(value = "WVTA ID")
     private java.lang.String wvtaId;
 
 	/**标准编号*/
-	@Excel(name = "*编号", width = 15)
+	@Excel(name = "编号", width = 15)
     @ApiModelProperty(value = "编号")
     private java.lang.String serialNumber;
 
 	/**责任领域*/
     @ApiModelProperty(value = "责任领域")
     private java.lang.String dutyTerritory;
-    @Excel(name = "*责任领域", width = 15)
+    @Excel(name = "责任领域", width = 15)
     @TableField(exist = false)
     // 责任领域名称
     private String dutyTerritoryName;
@@ -107,7 +107,7 @@ public class AuthDummyInventoryInfoEO implements Serializable {
     @ApiModelProperty(value = "交付物类型")
     private String deliverableType;
     @TableField(exist = false)
-    @Excel(name = "*交付物类型", width = 15)
+    @Excel(name = "交付物类型", width = 15)
     // 交付物类型名称
     private String deliverableTypeName;
     // 交付物类型名称-英文
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java
index e7f53d6c4..4cbe07987 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java
@@ -60,27 +60,27 @@ public class AuthDummyInventoryInfoEOEn implements Serializable {
     private String sysOrgCode;
 
 	/**类别*/
-	@Excel(name = "*Category", width = 15)
+	@Excel(name = "Category", width = 15)
     @ApiModelProperty(value = "类别")
     private String category;
 
 	/**检验项目*/
-	@Excel(name = "*Inspection Items", width = 15)
+	@Excel(name = "Inspection Items", width = 15)
     @ApiModelProperty(value = "检验项目")
     private String inspectionItem;
 
 	/**配置项*/
-	@Excel(name = "*Configuration Item", width = 15)
+	@Excel(name = "Configuration Item", width = 15)
     @ApiModelProperty(value = "配置项")
     private String configItem;
 
 	/**WVTA ID*/
-	@Excel(name = "*WVTA ID", width = 15)
+	@Excel(name = "WVTA ID", width = 15)
     @ApiModelProperty(value = "WVTA ID")
     private String wvtaId;
 
 	/**标准编号*/
-	@Excel(name = "*Number", width = 15)
+	@Excel(name = "Number", width = 15)
     @ApiModelProperty(value = "标准编号")
     private String serialNumber;
 
@@ -88,7 +88,7 @@ public class AuthDummyInventoryInfoEOEn implements Serializable {
     @ApiModelProperty(value = "责任领域")
     private String dutyTerritory;
     @TableField(exist = false)
-    @Excel(name = "*Responsible Field", width = 15)
+    @Excel(name = "Responsible Field", width = 15)
     // 责任领域名称
     private String dutyTerritoryName;
     /**责任领域名称-英文**/
@@ -100,11 +100,19 @@ public class AuthDummyInventoryInfoEOEn implements Serializable {
     @ApiModelProperty(value = "交付物")
     private String deliverable;
 
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private java.lang.String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "Deliverable Template", width = 40)
+    private String deliverableTemplateName;
+
     /**交付物类型*/
     @ApiModelProperty(value = "交付物类型")
     private String deliverableType;
     @TableField(exist = false)
-    @Excel(name = "*Deliverable Type", width = 15)
+    @Excel(name = "Deliverable Type", width = 15)
     // 交付物类型名称
     private String deliverableTypeName;
     // 交付物类型名称-英文
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
index 6fb49863b..0099558a7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
@@ -27,9 +27,11 @@ import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
 import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum;
 import com.jero.modules.dummy.service.impl.DummyLogEOServiceImpl;
 import com.jero.modules.dummy.util.DeepCopyListUtil;
+import com.jero.modules.dummy.util.ListDiff;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
 import com.jero.modules.split.common.FileUnZip;
 import com.jero.modules.system.entity.SysCategory;
@@ -41,7 +43,9 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import lombok.SneakyThrows;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFRichTextString;
@@ -62,6 +66,7 @@ import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 
 import java.io.*;
@@ -152,18 +157,371 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
     public void editById(AuthDummyInventoryInfoEO authDummyInventoryInfoEO) {
     	Date now = new Date();
         authDummyInventoryInfoEO.setUpdateTime(now);
-    	saveOrUpdate(authDummyInventoryInfoEO);
 
-    	//更新log
+		AuthDummyInventoryInfoEO authDummyInventoryInfoEOcopy = SerializationUtils.clone(authDummyInventoryInfoEO);//复制
+
+		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String username = sysUser.getUsername();
 		String serialNumber = authDummyInventoryInfoEO.getSerialNumber();
-		String contentLog = username+"编辑了清单中的“" + serialNumber + "”:</br>";
-		String enContentLog = username+" edited the “" + serialNumber + "” in the list:</br>";
-		authDummyLogService.updateLog(contentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.CN.getValue());
-		authDummyLogService.updateLog(enContentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.EN.getValue());
+		String contentLog = username+"编辑了清单中的“" + serialNumber + "”:";
+		String enContentLog = username+" edited the “" + serialNumber + "” in the list:";
+//		authDummyLogService.updateLog(contentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.CN.getValue());
+//		authDummyLogService.updateLog(enContentLog, authDummyInventoryInfoEO.getAuthDummyInventoryBaseId(),CutEnum.EN.getValue());
+
+		List<AuthDummyInventoryInfoEO> infoEOList = new ArrayList<>();
+		infoEOList.add(authDummyInventoryInfoEO);
+		List<AuthDummyInventoryInfoEO> infoEOListCopy = new ArrayList<>();
+		infoEOListCopy.add(authDummyInventoryInfoEOcopy);
+
+		//查询数据库里原来的数据
+		QueryWrapper<AuthDummyInventoryInfoEO> queryWrapper = new QueryWrapper<>();
+		List<AuthDummyInventoryInfoEO> dataList = list(queryWrapper.eq("id", authDummyInventoryInfoEO.getId()));
+		List<AuthDummyInventoryInfoEO> dataListCopy = DeepCopyListUtil.depCopy(dataList);
+
+
+		saveOrUpdate(authDummyInventoryInfoEO);
+
+
+		//翻译-中文
+		translateData(infoEOList);
+		translateData(dataList);
+		//翻译-英文
+		translateDataToEn(infoEOListCopy);
+		translateDataToEn(dataListCopy);
+
+		//比对不同字段
+		Map<String, String> infoDiff = ListDiff.compareObject(dataList.get(0),authDummyInventoryInfoEO);
+		Map<String, String> infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),authDummyInventoryInfoEO);
+
+		//设置更新log
+		setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,authDummyInventoryInfoEO.getAuthDummyInventoryBaseId());
     }
 
+	private void setContentLog(Map<String, String> infoDiff, String contentLog, Map<String, String> infoDiffEn, String enContentLog,
+							   String authDummyInventoryBaseId) {
+		//设置维护清单的修改消息
+		if(MapUtils.isNotEmpty(infoDiff)){
+			//类别
+			if (StringUtils.isNotBlank(infoDiff.get("category"))) {
+				List<String> list = Arrays.asList(infoDiff.get("category").split(","));
+				if(list.size() > 1){
+					String infoDiffOld = list.get(0);
+					String infoDiffNew = list.get(1);
+					contentLog += "'"+"类别" + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+				}
+				if(StringUtils.isNotBlank(infoDiffEn.get("category"))){
+					List<String> listEn = Arrays.asList(infoDiffEn.get("category").split(","));
+					if(listEn.size() > 1){
+						String infoDiffOldEn = listEn.get(0);
+						String infoDiffNewEn = listEn.get(1);
+						enContentLog += "'"+"Category" +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					}
+				}
+			}
+			//检验项目
+			if (StringUtils.isNotBlank(infoDiff.get("inspectionItem"))) {
+				List<String> list = Arrays.asList(infoDiff.get("inspectionItem").split(","));
+				if(list.size() > 1){
+					String infoDiffOld = list.get(0);
+					String infoDiffNew = list.get(1);
+					contentLog += "'"+"检验项目" + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+				}
+				if(StringUtils.isNotBlank(infoDiffEn.get("inspectionItem"))){
+					List<String> listEn = Arrays.asList(infoDiffEn.get("inspectionItem").split(","));
+					if(listEn.size() > 1){
+						String infoDiffOldEn = listEn.get(0);
+						String infoDiffNewEn = listEn.get(1);
+						enContentLog += "'"+"Inspection Items" +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					}
+				}
+			}
+			//配置项
+			if (StringUtils.isNotBlank(infoDiff.get("configItem"))) {
+				List<String> list = Arrays.asList(infoDiff.get("configItem").split(","));
+				if(list.size() > 1){
+					String infoDiffOld = list.get(0);
+					String infoDiffNew = list.get(1);
+					contentLog += "'"+"配置项" + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+				}
+				if(StringUtils.isNotBlank(infoDiffEn.get("configItem"))){
+					List<String> listEn = Arrays.asList(infoDiffEn.get("configItem").split(","));
+					if(listEn.size() > 1){
+						String infoDiffOldEn = listEn.get(0);
+						String infoDiffNewEn = listEn.get(1);
+						enContentLog += "'"+"Configuration Item" +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					}
+				}
+			}
+			//WVTA ID
+			if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
+				List<String> list = Arrays.asList(infoDiff.get("wvtaId").split(","));
+				if(list.size() > 1){
+					String infoDiffOld = list.get(0);
+					String infoDiffNew = list.get(1);
+					contentLog += "'"+"WVTA ID" + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+				}
+				if(StringUtils.isNotBlank(infoDiffEn.get("wvtaId"))){
+					List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
+					if(listEn.size() > 1){
+						String infoDiffOldEn = listEn.get(0);
+						String infoDiffNewEn = listEn.get(1);
+						enContentLog += "'"+"WVTA ID" +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					}
+				}
+			}
+			//责任领域
+			if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) {
+				List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|"));
+
+				if(list.size() > 1){
+					String infoDiffOld = list.get(0);
+					String infoDiffNew = list.get(1);
+					contentLog += "'"+"责任领域" + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+				}
+				if(StringUtils.isNotBlank(infoDiffEn.get("dutyTerritory"))){
+					List<String> listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|"));
+					if(listEn.size() > 1){
+						String infoDiffOldEn = listEn.get(0);
+						String infoDiffNewEn = listEn.get(1);
+						enContentLog += "'"+"Responsible Field" +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					}
+				}
+			}
+			//交付物类型
+			if (StringUtils.isNotBlank(infoDiff.get("deliverableTypeName"))) {
+				List<String> list = Arrays.asList(infoDiff.get("deliverableTypeName").split("\\|"));
+
+				if(list.size() > 1){
+					String infoDiffOld = list.get(0);
+					String infoDiffNew = list.get(1);
+					contentLog += "'"+"交付物类型" + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+				}
+				if(StringUtils.isNotBlank(infoDiffEn.get("deliverableTypeNameEn"))){
+					List<String> listEn = Arrays.asList(infoDiffEn.get("deliverableTypeNameEn").split("\\|"));
+					if(listEn.size() > 1){
+						String infoDiffOldEn = listEn.get(0);
+						String infoDiffNewEn = listEn.get(1);
+						enContentLog += "'"+"Deliverable Type" +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					}
+				}
+			}
+			//交付物模板
+			if (StringUtils.isNotBlank(infoDiff.get("deliverableTemplateName"))) {
+				List<String> list = Arrays.asList(infoDiff.get("deliverableTemplateName").split("\\|"));
+
+				if(list.size() > 1){
+					String infoDiffOld = list.get(0);
+					String infoDiffNew = list.get(1);
+					contentLog += "'"+"交付物模板" + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+				}
+				if(StringUtils.isNotBlank(infoDiffEn.get("deliverableTemplateName"))){
+					List<String> listEn = Arrays.asList(infoDiffEn.get("deliverableTemplateName").split("\\|"));
+					if(listEn.size() > 1){
+						String infoDiffOldEn = listEn.get(0);
+						String infoDiffNewEn = listEn.get(1);
+						enContentLog += "'"+"Deliverable Template" +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					}
+				}
+			}
+			contentLog = contentLog.substring(0, contentLog.length()-1);
+			enContentLog =enContentLog.substring(0, enContentLog.length()-1);
+			authDummyLogService.updateLog(contentLog, authDummyInventoryBaseId,CutEnum.CN.getValue());
+			authDummyLogService.updateLog(enContentLog, authDummyInventoryBaseId,CutEnum.EN.getValue());
+		}
+	}
+
+	private void translateDataToEn(List<AuthDummyInventoryInfoEO> infoEOListCopy) {
+		for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : infoEOListCopy) {
+			//类别
+			if(StringUtils.isBlank(authDummyInventoryInfoEO.getCategory())){
+				authDummyInventoryInfoEO.setCategory("null");
+			}
+			//检验项目
+			if(StringUtils.isBlank(authDummyInventoryInfoEO.getInspectionItem())){
+				authDummyInventoryInfoEO.setInspectionItem("null");
+			}
+			//配置项
+			if(StringUtils.isBlank(authDummyInventoryInfoEO.getConfigItem())){
+				authDummyInventoryInfoEO.setConfigItem("null");
+			}
+			//WVTA ID
+			if (StringUtils.isBlank(authDummyInventoryInfoEO.getWvtaId())) {
+				authDummyInventoryInfoEO.setWvtaId("null");
+			}
+			//责任领域
+			if (StringUtils.isNotBlank(authDummyInventoryInfoEO.getDutyTerritory())) {
+				List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+				List<String> dutyTerritoryList = Arrays.asList(authDummyInventoryInfoEO.getDutyTerritory().split(","));
+				StringBuilder dutyTerritoryBuilder = new StringBuilder();
+				for (String midDutyTerritory : dutyTerritoryList) {
+					String dutyTerritoryName = dutyTerritory.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getItemText()).collect(Collectors.joining(","));
+					dutyTerritoryBuilder.append(dutyTerritoryName).append(",");
+				}
+				authDummyInventoryInfoEO.setDutyTerritory(dutyTerritoryBuilder.substring(0, dutyTerritoryBuilder.toString().length() - 1));
+			} else {
+				authDummyInventoryInfoEO.setDutyTerritory("null");
+			}
+
+			//交付物类型
+			Set<String> deliverableTypeSet = new HashSet<>();
+			List<String> deliverableTypeIdList= new ArrayList<>();
+			if(StringUtils.isNotBlank(authDummyInventoryInfoEO.getDeliverableType())){
+				deliverableTypeIdList = Arrays.asList(authDummyInventoryInfoEO.getDeliverableType().split(","));
+				deliverableTypeSet.addAll(deliverableTypeIdList);
+			}
+			//树形结构
+			List<SysCategory> deliverableTypeList = new ArrayList<>();
+			if (deliverableTypeSet.size() != 0) {
+				LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
+				wrapper.in(SysCategory::getId, deliverableTypeSet);
+				deliverableTypeList = sysCategoryService.list(wrapper);
+			}
+
+			if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(authDummyInventoryInfoEO.getDeliverableType())) {
+				StringBuilder deliverableBuilder = new StringBuilder();
+				for(String id : deliverableTypeIdList){
+					List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
+					if (designList.size() != 0) {
+						deliverableBuilder.append(designList.get(0).getName() + ",");
+					}
+				}
+				String designName = null;
+				if (StringUtils.isNotBlank(deliverableBuilder)) {
+					designName = deliverableBuilder.substring(0, deliverableBuilder.length() - 1);
+				}
+				authDummyInventoryInfoEO.setDeliverableTypeName(designName);
+			} else {
+				authDummyInventoryInfoEO.setDeliverableTypeName("null");
+			}
+
+			//文件
+			List<String> deliverableList = new ArrayList<>();
+			//交付物模板
+			if(StringUtils.isNotBlank(authDummyInventoryInfoEO.getDeliverableTemplate())){
+				deliverableList.addAll(Arrays.asList(authDummyInventoryInfoEO.getDeliverableTemplate().split(",")));
+			}else {
+				authDummyInventoryInfoEO.setDeliverableTemplateName("null");
+			}
+			List<OSSFile> fileInfos = new ArrayList<>();
+			if(deliverableList.size() != 0){
+				fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
+			}
+			//交付物类型模板
+			if(fileInfos.size() != 0){
+				if(StringUtils.isNotBlank(authDummyInventoryInfoEO.getDeliverableTemplate())){
+					String fileName = getFileName(authDummyInventoryInfoEO, fileInfos,authDummyInventoryInfoEO.getDeliverableTemplate());
+					if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
+						authDummyInventoryInfoEO.setDeliverableTemplateName(fileName);
+					}
+				}
+			}
+		}
+	}
+
+	private void translateData(List<AuthDummyInventoryInfoEO> infoEOList) {
+		for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : infoEOList) {
+			//类别
+			if(StringUtils.isBlank(authDummyInventoryInfoEO.getCategory())){
+				authDummyInventoryInfoEO.setCategory("空");
+			}
+			//检验项目
+			if(StringUtils.isBlank(authDummyInventoryInfoEO.getInspectionItem())){
+				authDummyInventoryInfoEO.setInspectionItem("空");
+			}
+			//配置项
+			if(StringUtils.isBlank(authDummyInventoryInfoEO.getConfigItem())){
+				authDummyInventoryInfoEO.setConfigItem("空");
+			}
+			//WVTA ID
+			if (StringUtils.isBlank(authDummyInventoryInfoEO.getWvtaId())) {
+				authDummyInventoryInfoEO.setWvtaId("空");
+			}
+			//责任领域
+			if (StringUtils.isNotBlank(authDummyInventoryInfoEO.getDutyTerritory())) {
+				List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+				List<String> dutyTerritoryList = Arrays.asList(authDummyInventoryInfoEO.getDutyTerritory().split(","));
+				StringBuilder dutyTerritoryBuilder = new StringBuilder();
+				for (String midDutyTerritory : dutyTerritoryList) {
+					String dutyTerritoryName = dutyTerritory.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getItemText()).collect(Collectors.joining(","));
+					dutyTerritoryBuilder.append(dutyTerritoryName).append(",");
+				}
+				authDummyInventoryInfoEO.setDutyTerritory(dutyTerritoryBuilder.substring(0, dutyTerritoryBuilder.toString().length() - 1));
+			} else {
+				authDummyInventoryInfoEO.setDutyTerritory("空");
+			}
+
+			//交付物类型
+			Set<String> deliverableTypeSet = new HashSet<>();
+			List<String> deliverableTypeIdList= new ArrayList<>();
+			if(StringUtils.isNotBlank(authDummyInventoryInfoEO.getDeliverableType())){
+				deliverableTypeIdList = Arrays.asList(authDummyInventoryInfoEO.getDeliverableType().split(","));
+				deliverableTypeSet.addAll(deliverableTypeIdList);
+			}
+			//树形结构
+			List<SysCategory> deliverableTypeList = new ArrayList<>();
+			if (deliverableTypeSet.size() != 0) {
+				LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
+				wrapper.in(SysCategory::getId, deliverableTypeSet);
+				deliverableTypeList = sysCategoryService.list(wrapper);
+			}
+
+			if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(authDummyInventoryInfoEO.getDeliverableType())) {
+				StringBuilder deliverableBuilder = new StringBuilder();
+				for(String id : deliverableTypeIdList){
+					List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
+					if (designList.size() != 0) {
+						deliverableBuilder.append(designList.get(0).getName() + ",");
+					}
+				}
+				String designName = null;
+				if (StringUtils.isNotBlank(deliverableBuilder)) {
+					designName = deliverableBuilder.substring(0, deliverableBuilder.length() - 1);
+				}
+				authDummyInventoryInfoEO.setDeliverableTypeName(designName);
+			} else {
+				authDummyInventoryInfoEO.setDeliverableTypeName("空");
+			}
+
+			//文件
+			List<String> deliverableList = new ArrayList<>();
+			//交付物模板
+			if(StringUtils.isNotBlank(authDummyInventoryInfoEO.getDeliverableTemplate())){
+				deliverableList.addAll(Arrays.asList(authDummyInventoryInfoEO.getDeliverableTemplate().split(",")));
+			}else {
+				authDummyInventoryInfoEO.setDeliverableTemplateName("空");
+			}
+			List<OSSFile> fileInfos = new ArrayList<>();
+			if(deliverableList.size() != 0){
+				fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
+			}
+			//交付物类型模板
+			if(fileInfos.size() != 0){
+				if(StringUtils.isNotBlank(authDummyInventoryInfoEO.getDeliverableTemplate())){
+					String fileName = getFileName(authDummyInventoryInfoEO, fileInfos,authDummyInventoryInfoEO.getDeliverableTemplate());
+					if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
+						authDummyInventoryInfoEO.setDeliverableTemplateName(fileName);
+					}
+				}
+			}
+		}
+	}
+
+	private String getFileName(AuthDummyInventoryInfoEO authDummyInventoryInfoEO, List<OSSFile> fileInfos, String deliverableTemplate) {
+		StringBuilder sb = new StringBuilder();
+		for (String s : deliverableTemplate.split(",")) {
+			List<OSSFile> collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList());
+			if(collect.size() != 0){
+				sb.append(collect.get(0).getFileName() + ",");
+			}
+		}
+		String sbStr = "";
+		if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){
+			sbStr = sb.substring(0, sb.length() - 1);
+		}
+		return sbStr;
+	}
+
 	/**
 	 * 通过id删除
 	 *
@@ -223,6 +581,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 	@Override
     public List<AuthDummyInventoryInfoEO> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) {
 		QueryWrapper<AuthDummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		List<AuthDummyInventoryInfoEO> authDummyInventoryInfoEOList = this.list(queryWrapper);
 		return authDummyInventoryInfoEOList;
     }
@@ -515,9 +874,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		if(CollectionUtils.isNotEmpty(baseList)){
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-				title = "*类别,*检验项目,*配置项,*WVTA ID,*编号,*责任领域,*交付物类型";
+				title = "*类别,*检验项目,*配置项,*WVTA ID,*编号,*责任领域,交付物模板,*交付物类型";
 			}else{
-				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID,*Number,*Responsible Field,*Deliverable Type";
+				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID,*Number,*Responsible Field,Deliverable Template,*Deliverable Type";
 			}
 
 			int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -635,7 +994,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 									if (i == 0) {
 										cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 										headerSb.append(cell.getStringCellValue() + ",");
-										if(j == 6){
+										if(j == 7){
 											break;
 										}
 									} else if(i > 1){
@@ -659,43 +1018,6 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 									}
 								}
 							}
-							if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-								for(int k = 0 ;k<rowList.size();k++){
-									if("".equals(rowList.get("category")) ||
-											"".equals(rowList.get("inspectionItem")) ||
-											"".equals(rowList.get("configItem")) ||
-											"".equals(rowList.get("wvtaId")) ||
-											"".equals(rowList.get("serialNumber")) ||
-											"".equals(rowList.get("dutyTerritoryName")) ||
-											"".equals(rowList.get("deliverableTypeName")) ){
-										//删除原上传文件
-										FileUnZip.deleteDir(saveDirectory);
-										if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-											throw new JeroBootException("请填写必填字段内容,带*的为必填");
-										}else{
-											throw new JeroBootException("Please fill in the required fields marked with *");
-										}
-									}
-								}
-							}else {
-								for(int k = 0 ;k<rowList.size();k++){
-									if("".equals(rowList.get("category")) ||
-											"".equals(rowList.get("inspectionItem")) ||
-											"".equals(rowList.get("configItem")) ||
-											"".equals(rowList.get("wvtaId")) ||
-											"".equals(rowList.get("serialNumber")) ||
-											"".equals(rowList.get("dutyTerritoryName")) ||
-											"".equals(rowList.get("deliverableTypeNameEn")) ){
-										//删除原上传文件
-										FileUnZip.deleteDir(saveDirectory);
-										if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-											throw new JeroBootException("请填写必填字段内容,带*的为必填");
-										}else{
-											throw new JeroBootException("Please fill in the required fields marked with *");
-										}
-									}
-								}
-							}
 							if (i > 1) {
 								dataList.add(rowList);
 							}
@@ -736,6 +1058,44 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 							throw new JeroBootException("The data fails to be read. Import data strictly according to the template file");
 						}
 					}
+					//必填项校验  *类别,*检验项目,*配置项,*WVTA ID,*编号,*责任领域,*交付物类型";
+					if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
+						for(int k = 0 ; k <datas.size(); k++){
+							if((datas.get(k).getCategory() == null) ||
+									datas.get(k).getInspectionItem() == null ||
+									datas.get(k).getConfigItem() == null ||
+									datas.get(k).getWvtaId() == null ||
+									datas.get(k).getSerialNumber() == null ||
+									datas.get(k).getDutyTerritoryName() == null ||
+									datas.get(k).getDeliverableTypeName() == null ){
+									//删除原上传文件
+									FileUnZip.deleteDir(saveDirectory);
+									if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
+										throw new JeroBootException("请填写必填字段内容,带*的为必填");
+									}else{
+										throw new JeroBootException("Please fill in the required fields marked with *");
+									}
+							}
+						}
+					}else {
+						for(int k = 0 ; k <datas.size(); k++){
+							if((datas.get(k).getCategory() == null) ||
+									datas.get(k).getInspectionItem() == null ||
+									datas.get(k).getConfigItem() == null ||
+									datas.get(k).getWvtaId() == null ||
+									datas.get(k).getSerialNumber() == null ||
+									datas.get(k).getDutyTerritoryName() == null ||
+									datas.get(k).getDeliverableTypeNameEn() == null ){
+								//删除原上传文件
+								FileUnZip.deleteDir(saveDirectory);
+								if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
+									throw new JeroBootException("请填写必填字段内容,带*的为必填");
+								}else{
+									throw new JeroBootException("Please fill in the required fields marked with *");
+								}
+							}
+						}
+					}
 				}
 			}
 			workbook.close();
@@ -778,6 +1138,18 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		}else {
 			if (datas.size() != 0) {
 				this.saveBatch(datas);
+				//更新log
+				StringBuilder serialNumberBuilder = new StringBuilder();
+				for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : datas){
+					serialNumberBuilder.append(authDummyInventoryInfoEO.getSerialNumber()).append(",");
+				}
+				String serialNumber = serialNumberBuilder.substring(0, serialNumberBuilder.length() - 1);
+				LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+				String username = sysUser.getUsername();
+				String contentLog = username+"向清单中导入了“"+serialNumber+"”";
+				String enContentLog = username+" imported “"+serialNumber+"” into the list.";
+				authDummyLogService.updateLog(contentLog, datas.get(0).getAuthDummyInventoryBaseId(),CutEnum.CN.getValue());
+				authDummyLogService.updateLog(enContentLog, datas.get(0).getAuthDummyInventoryBaseId(),CutEnum.EN.getValue());
 			}
 		}
 	}
@@ -829,57 +1201,58 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 				deliverableType = authDummyInventoryInfoEO.getDeliverableTypeNameEn();
 			}
 
+			//文件
+			//交付物模板
+			String deliverableTemplate = authDummyInventoryInfoEO.getDeliverableTemplateName();
+
 			//编号必填
 			flag = must(authDummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "Number");
 
-			//WVTA ID
 
-			if(StringUtils.isNotBlank(wvtaId)){
-				if(wvtaId.length() > 300){
-					String message = "";
-					if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){
-						message = errorMsg + "WVTA ID不能超过300个字符, ";
-					}else{
-						message = errorMsg + " The WVTA ID cannot contain more than 300 characters, ";
-					}
-					msgList.add(message);
-				}
-			}
 			//类别
-
 			if(StringUtils.isNotBlank(category)){
 				if(category.length() > 300){
 					String message = "";
 					if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){
-						message = errorMsg + "类别不能超过300个字符, ";
+						message = errorMsg + "类别不能超过300个字符";
 					}else{
-						message = errorMsg + " The Category cannot contain more than 300 characters, ";
+						message = errorMsg + " The Category cannot contain more than 300 characters";
 					}
 					msgList.add(message);
 				}
 			}
 			//检验项目
-
 			if(StringUtils.isNotBlank(inspectionItem)){
 				if(inspectionItem.length() > 300){
 					String message = "";
 					if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){
-						message = errorMsg + "检验项目不能超过300个字符, ";
+						message = errorMsg + "检验项目不能超过300个字符";
 					}else{
-						message = errorMsg + " The InspectionItem cannot contain more than 300 characters, ";
+						message = errorMsg + " The InspectionItem cannot contain more than 300 characters";
 					}
 					msgList.add(message);
 				}
 			}
 			//配置项
-
 			if(StringUtils.isNotBlank(configItem)){
 				if(configItem.length() > 300){
 					String message = "";
 					if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){
-						message = errorMsg + "配置项不能超过300个字符, ";
+						message = errorMsg + "配置项不能超过300个字符";
 					}else{
-						message = errorMsg + " The ConfigItem cannot contain more than 300 characters, ";
+						message = errorMsg + " The ConfigItem cannot contain more than 300 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//WVTA ID
+			if(StringUtils.isNotBlank(wvtaId)){
+				if(wvtaId.length() > 300){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){
+						message = errorMsg + "WVTA ID不能超过300个字符";
+					}else{
+						message = errorMsg + " The WVTA ID cannot contain more than 300 characters";
 					}
 					msgList.add(message);
 				}
@@ -891,6 +1264,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 					authDummyInventoryInfoEO.setDutyTerritory(value);
 				}
 			}
+			value = templateTransition(zipEntryName, authDummyInventoryInfoEO, errorMsg, deliverableTemplate,msgList,"交付物模板","Deliverable Template");
+			if(StringUtils.isNotBlank(value)){
+				authDummyInventoryInfoEO.setDeliverableTemplate(value);
+			}
 			//交付物类型
 			if(StringUtils.isNotEmpty(deliverableType)){
 				value = tree(categoryList,treeNameList, authDummyInventoryInfoEO, errorMsg, deliverableType,msgList,"交付物类型","Deliverable Type","deliverable_template");
@@ -903,6 +1280,46 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		return msgList;
 	}
 
+	private String templateTransition(String zipEntryName, AuthDummyInventoryInfoEO authDummyInventoryInfoEO,
+									  String errorMsg, String deliverableTemplate,
+									  List<String> msgList, String nameCn, String nameEn) {
+		String value = "";
+		if (StringUtils.isNotBlank(deliverableTemplate)) {
+			StringBuilder sb = new StringBuilder();
+			for (String fileName : deliverableTemplate.split(",")) {
+				List<File> nowFileList = new ArrayList<>();
+
+				nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,authDummyInventoryInfoEO.getCut(),errorMsg,msgList,nameCn,nameEn);
+
+				if (nowFileList.size() == 0) {
+//					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+//						errorMsg += "压缩包中没有" + fileName + "文件; ";
+//					}else{
+//						errorMsg += " Not in the zip package" + fileName + "file; ";
+//					}
+//					msgList.add(errorMsg);
+				} else {
+					try {
+						FileInputStream input = new FileInputStream(nowFileList.get(0));
+						MultipartFile multipartFile =
+								new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input);
+						//文件存入文件表
+						OSSFile ossFile = iOSSFileService.uploadLocalOfCos(multipartFile, "", null,null);
+						if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(ossFile)) {
+							sb.append(ossFile.getId() + ",");
+						}
+					} catch (IOException e) {
+						log.error("市场认证清单导入"+e.getMessage());
+					}
+				}
+			}
+			if (StringUtils.isNotBlank(sb)) {
+				value = sb.substring(0, sb.length() - 1);
+			}
+		}
+		return value;
+	}
+
 	private String getTreeId(List<SysCategory> categoryList, AuthDummyInventoryInfoEO authDummyInventoryInfoEOTemp,
 							 List<String> treeNameList, String value) {
 		StringBuilder sb = new StringBuilder();
@@ -940,9 +1357,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			if(StringUtils.isNotBlank(sb)){
 				String substring = sb.substring(0, sb.length() - 1);
 				if (CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())) {
-					errorMsg += nameCn + "中的" + substring + "与数据字典不匹配, ";
+					errorMsg += nameCn + "中的" + substring + "与数据字典不匹配";
 				} else {
-					errorMsg += nameEn + " " + substring + " does not match the data dictionary, ";
+					errorMsg += nameEn + " " + substring + " does not match the data dictionary";
 				}
 				msgList.add(errorMsg);
 			}else{
@@ -991,9 +1408,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 				List<String> finalValueList = valueList;
 				List<String> diffList = list.stream().filter(e -> !finalValueList.contains(e)).collect(Collectors.toList());
 				if (CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())) {
-					errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配, ";
+					errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配";
 				} else {
-					errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary, ";
+					errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary";
 				}
 				msgList.add(errorMsg);
 			}
@@ -1121,6 +1538,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			case "*WVTA ID": return "wvtaId";
 			case "*编号" : return "serialNumber";
 			case "*责任领域": return "dutyTerritoryName";
+			case "交付物模板": return "deliverableTemplateName";
 			case "*交付物类型" : return "deliverableTypeName";
 
 			case "*Category" : return  "Category";
@@ -1129,6 +1547,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 //			case "WVTA ID" : return "wvtaId";
 			case "*Number" : return "serialNumber";
 			case "*Responsible Field" : return "dutyTerritoryName";
+			case "Deliverable Template" : return "deliverableTemplateName";
 			case "*Deliverable Type" : return "deliverableTypeNameEn";
 
 
@@ -1212,10 +1631,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
 				title = "*类别,*检验项目,*配置项,*WVTA ID," +
-						"*编号,*责任领域,*交付物类型,";
+						"*编号,*责任领域,交付物模板,*交付物类型,";
 			}else{
 				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
-						"*Number,*Responsible Field,*Deliverable Type,";
+						"*Number,*Responsible Field,Deliverable Template,*Deliverable Type,";
 			}
 			List<String> list = Arrays.asList(title.split(","));
 			int index = 0;
@@ -1242,7 +1661,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			cellStyleTemp.setWrapText(true);//自动换行
 
 			CellRangeAddress region =
-					new CellRangeAddress(1, 1, 0, 6); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+					new CellRangeAddress(1, 1, 0, 7); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
 			sheet.addMergedRegion(region);
 			String explain= "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java
index 6fc60dfed..42067c84f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java
@@ -204,6 +204,7 @@ public class OtaBaCxAqcsController extends JeroController<OtaBaCxAqcs, IOtaBaCxA
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         OtaBaCxAqcs res;
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
@@ -213,7 +214,7 @@ public class OtaBaCxAqcsController extends JeroController<OtaBaCxAqcs, IOtaBaCxA
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
index c7d4f16a2..8127b0c46 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
@@ -84,7 +84,13 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
     @ApiOperation(value = "车型备案-车型基本信息-添加", notes = "车型备案-车型基本信息-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@Validated @RequestBody OtaBaCxJbxx otaBaCxJbxx) {
-        OtaBaCxJbxx res = otaBaCxJbxxService.add(otaBaCxJbxx);
+        OtaBaCxJbxx res;
+        try {
+            res = otaBaCxJbxxService.add(otaBaCxJbxx);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error(e.getMessage());
+        }
         return Result.OK(res);
     }
 
@@ -197,6 +203,7 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         OtaBaCxJbxx res;
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
@@ -206,7 +213,7 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK(res).success(errMsg.toString());
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java
index b35764eba..5788a14bf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java
@@ -200,6 +200,7 @@ public class OtaBaCxJsfzbacsController extends JeroController<OtaBaCxJsfzbacs, I
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
@@ -209,7 +210,7 @@ public class OtaBaCxJsfzbacsController extends JeroController<OtaBaCxJsfzbacs, I
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java
index 8e5842398..3fc1f7240 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java
@@ -201,6 +201,7 @@ public class OtaBaCxKsjjsmccsController extends JeroController<OtaBaCxKsjjsmccs,
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
@@ -210,7 +211,7 @@ public class OtaBaCxKsjjsmccsController extends JeroController<OtaBaCxKsjjsmccs,
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java
index 1f711357d..ff69d9c4b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java
@@ -203,6 +203,7 @@ public class OtaBaCxKsjxtmccsController extends JeroController<OtaBaCxKsjxtmccs,
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
@@ -212,7 +213,7 @@ public class OtaBaCxKsjxtmccsController extends JeroController<OtaBaCxKsjxtmccs,
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
index 7c5fe7bef..2a4a6554b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
@@ -238,14 +238,14 @@ public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxL
     public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
                                 @RequestParam(value = "cut", required = false) String cut) throws Exception {
         StringBuilder errMsg = new StringBuilder();
-        errMsg.append("导入成功！ 提示信息:");
+        errMsg.append("导入成功！ ");
         try {
             this.otaBaCxListService.importData(file, cut, errMsg);
         } catch (Exception e) {
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 
     @ApiOperation(value = "车型及功能备案列表-数据导出")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java
index d43f3164e..2b2cda855 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java
@@ -198,6 +198,7 @@ public class OtaBaCxZxsjyqController extends JeroController<OtaBaCxZxsjyq, IOtaB
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         OtaBaCxZxsjyq res;
         try {
             String[] params = otaId.split("\\?");
@@ -208,7 +209,7 @@ public class OtaBaCxZxsjyqController extends JeroController<OtaBaCxZxsjyq, IOtaB
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java
index 028a45963..f50fc5f5c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java
@@ -203,6 +203,7 @@ public class OtaBaSjGgnrfsController extends JeroController<OtaBaSjGgnrfs, IOtaB
 								 @RequestParam(value = "cut", required = false) String cut,
 								 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
 		 StringBuilder errMsg = new StringBuilder();
+		 errMsg.append("导入成功！");
 		 try {
 			 String[] params = otaId.split("\\?");
 			 otaId = params[0].equals("null") ? "" : params[0];
@@ -212,7 +213,7 @@ public class OtaBaSjGgnrfsController extends JeroController<OtaBaSjGgnrfs, IOtaB
 			 e.printStackTrace();
 			 return Result.error(e.getMessage());
 		 }
-		 return Result.error(errMsg.toString());
+		 return Result.OK().success(errMsg.toString());
 	 }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
index 4bcd03f36..216efc815 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
@@ -234,13 +234,14 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
     public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
                                 @RequestParam(value = "cut", required = false) String cut) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             this.otaBaSjListService.importData(file, cut, errMsg);
         } catch (Exception e) {
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 
     @ApiOperation(value = "升级备案-数据导出")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java
index 53b0b05ee..e13b15f92 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java
@@ -201,6 +201,7 @@ public class OtaBaSjSjfzbhController extends JeroController<OtaBaSjSjfzbh, IOtaB
 								 @RequestParam(value = "cut", required = false) String cut,
 								 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
 		 StringBuilder errMsg = new StringBuilder();
+		 errMsg.append("导入成功！");
 		 try {
 			 String[] params = otaId.split("\\?");
 			 otaId = params[0].equals("null") ? "" : params[0];
@@ -210,7 +211,7 @@ public class OtaBaSjSjfzbhController extends JeroController<OtaBaSjSjfzbh, IOtaB
 			 e.printStackTrace();
 			 return Result.error(e.getMessage());
 		 }
-		 return Result.error(errMsg.toString());
+		 return Result.OK().success(errMsg.toString());
 	 }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
index f72893bd1..350eab020 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
@@ -196,6 +196,7 @@ public class OtaBaSjSjmbclController extends JeroController<OtaBaSjSjmbcl, IOtaB
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         OtaBaSjSjmbcl res;
         try {
             String[] params = otaId.split("\\?");
@@ -206,6 +207,6 @@ public class OtaBaSjSjmbclController extends JeroController<OtaBaSjSjmbcl, IOtaB
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
index aad8350d5..795fdda3a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
@@ -197,6 +197,7 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
 								 @RequestParam(value = "cut", required = false) String cut,
 								 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
 		 StringBuilder errMsg = new StringBuilder();
+		 errMsg.append("导入成功！");
 		 OtaBaSjSjmbcx res;
 		 try {
 			 String[] params = otaId.split("\\?");
@@ -207,7 +208,7 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
 			 e.printStackTrace();
 			 return Result.error(e.getMessage());
 		 }
-		 return Result.error(errMsg.toString());
+		 return Result.OK().success(errMsg.toString());
 	 }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java
index 93a1d106a..f4f071438 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java
@@ -203,6 +203,7 @@ public class OtaBaSjSjxtbhController extends JeroController<OtaBaSjSjxtbh, IOtaB
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
@@ -212,7 +213,7 @@ public class OtaBaSjSjxtbhController extends JeroController<OtaBaSjSjxtbh, IOtaB
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
index f869ab979..2f4404aaf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
@@ -202,6 +202,7 @@ public class OtaBaSjSjyxpgController extends JeroController<OtaBaSjSjyxpg, IOtaB
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         OtaBaSjSjyxpg res;
         try {
             String[] params = otaId.split("\\?");
@@ -212,7 +213,7 @@ public class OtaBaSjSjyxpgController extends JeroController<OtaBaSjSjyxpg, IOtaB
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.error(errMsg.toString());
+        return Result.OK().success(errMsg.toString());
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
index ef7da7c50..1e72122b2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
@@ -55,7 +55,7 @@ public enum OtaTitleEnum {
     CZXTBBH("czxtbbh", "软件版本号", "0", "", 50),
 
     GNMC("gnmc", "功能名称", "0", "", 50),
-    PZQK("pzqk", "配置情况", "2", "", 0),
+    PZQK("pzqk", "配置情况", "1", "", 0),
     JSZDHJB("jszdhjb", "驾驶自动化级别", "driving_automation_level", "", 0),
     SJGGCS("sjggcs", "升级可能变更的《公告》技术参数", "0", "", 500),
     GNMS("gnms", "功能描述", "0", "", 500),
@@ -64,81 +64,81 @@ public enum OtaTitleEnum {
     CSYZSJ("csyzsj", "初始软件包的完整性验证数据", "0", "", 500),
     FJ("fj", "附件", "0", "", 0),
 
-    WLAQYQ_PZ("jgldPz", "激光雷达-配置", "2", "", 0),
+    WLAQYQ_PZ("jgldPz", "激光雷达-配置", "1", "", 0),
     WLAQYQ_SL("jgldSl", "激光雷达-数量", "0", "", 50),
     WLAQYQ_BZWZ("jgldBzwz", "激光雷达-布置位置", "0", "", 50),
     WLAQYQ_GGXH("jgldGgxh", "激光雷达-规格型号", "0", "", 0),
     WLAQYQ_SCQY("jgldScqy", "激光雷达-生产企业", "0", "", 50),
-    HMBLD_PZ("hmbldPz", "毫米波雷达-配置", "2", "", 0),
+    HMBLD_PZ("hmbldPz", "毫米波雷达-配置", "1", "", 0),
     HMBLD_SL("hmbldSl", "毫米波雷达-数量", "0", "", 50),
     HMBLD_BZWZ("hmbldBzwz", "毫米波雷达-布置位置", "0", "", 50),
     HMBLD_GGXH("hmbldGgxh", "毫米波雷达-规格型号", "0", "", 50),
     HMBLD_SCQY("hmbldScqy", "毫米波雷达-生产企业", "0", "", 50),
-    CSBLD_PZ("csbldPz", "超声波雷达-配置", "2", "", 0),
+    CSBLD_PZ("csbldPz", "超声波雷达-配置", "1", "", 0),
     CSBLD_SL("csbldSl", "超声波雷达-数量", "0", "", 50),
     CSBLD_BZWZ("csbldBzwz", "超声波雷达-布置位置", "0", "", 50),
     CSBLD_GGXH("csbldGgxh", "超声波雷达-规格型号", "0", "", 50),
     CSBLD_SCQY("csbldScqy", "超声波雷达-生产企业", "0", "", 50),
-    SXTHS_PZ("sxthsPz", "摄像头-倒车影像/360(环视)-配置", "2", "", 0),
+    SXTHS_PZ("sxthsPz", "摄像头-倒车影像/360(环视)-配置", "1", "", 0),
     SXTHS_SL("sxthsSl", "摄像头-倒车影像/360(环视)-数量", "0", "", 50),
     SXTHS_BZWZ("sxthsBzwz", "摄像头-倒车影像/360(环视)-布置位置", "0", "", 50),
     SXTHS_GGXH("sxthsGgxh", "摄像头-倒车影像/360(环视)-规格型号", "0", "", 50),
     SXTHS_SCQY("sxthsScqy", "摄像头-倒车影像/360(环视)-生产企业", "0", "", 50),
-    SXTDSD_PZ("sxtdsdPz", "摄像头-单目/双目/多目-配置", "2", "", 50),
+    SXTDSD_PZ("sxtdsdPz", "摄像头-单目/双目/多目-配置", "1", "", 50),
     SXTDSD_SL("sxtdsdSl", "摄像头-单目双目多目-数量", "0", "", 50),
     SXTDSD_BZWZ("sxtdsdBzwz", "摄像头-单目双多目-布置位置", "0", "", 50),
     SXTDSD_GGXH("sxtdsdGgxh", "摄像头-单目/双目/多目-规格型号", "0", "", 50),
     SXTDSD_SCQY("sxtdsdScqy", "摄像头-单目/双目/多目-生产企业", "0", "", 50),
-    JSYJK_PZ("jsyjkPz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-配置", "2", "", 0),
+    JSYJK_PZ("jsyjkPz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-配置", "1", "", 0),
     JSYJK_SL("jsyjkSl", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-数量", "0", "", 50),
     JSYJK_BZWZ("jsyjkBzwz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-布置位置", "0", "", 50),
     JSYJK_GGXH("jsyjkGgxh", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-规格型号", "0", "", 50),
     JSYJK_SCQY("jsyjkScqy", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-生产企业", "0", "", 50),
-    JSYHW_PZ("jsyhwPz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-配置", "2", "", 0),
+    JSYHW_PZ("jsyhwPz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-配置", "1", "", 0),
     JSYHW_SL("jsyhwSl", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-数量", "0", "", 50),
     JSYHW_BZWZ("jsyhwBzwz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-布置位置", "0", "", 50),
     JSYHW_GGXH("jsyhwGgxh", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-规格型号", "0", "", 50),
     JSYHW_SCQY("jsyhwScqy", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-生产企业", "0", "", 50),
-    CZWXDW_PZ("czwxdwPz", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-配置", "2", "", 0),
+    CZWXDW_PZ("czwxdwPz", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-配置", "1", "", 0),
     CZWXDW_GGXH("czwxdwGgxh", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-规格型号", "0", "", 50),
     CZWXDW_SCQY("czwxdwScqy", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-生产企业", "0", "", 50),
-    GXDH_PZ("gxdhPz", "定位及导航系统-惯性导航系统-配置", "2", "", 0),
+    GXDH_PZ("gxdhPz", "定位及导航系统-惯性导航系统-配置", "1", "", 0),
     GXDH_GGXH("gxdhGgxh", "定位及导航系统-惯性导航系统-规格型号", "0", "", 50),
     GXDH_SCQY("gxdhScqy", "定位及导航系统-惯性导航系统-生产企业", "0", "", 50),
-    LSJ_PZ("lsjPz", "定位及导航系统-轮速计-配置", "2", "", 0),
+    LSJ_PZ("lsjPz", "定位及导航系统-轮速计-配置", "1", "", 0),
     LSJ_GGXH("lsjGgxh", "定位及导航系统-轮速计-规格型号", "0", "", 50),
     LSJ_SCQY("lsjScqy", "定位及导航系统-轮速计-生产企业", "0", "", 50),
-    GJDDT_PZ("gjddtPz", "定位及导航系统-高精度地图-配置", "2", "", 0),
+    GJDDT_PZ("gjddtPz", "定位及导航系统-高精度地图-配置", "1", "", 0),
     GJDDT_GGXH("gjddtGgxh", "定位及导航系统-高精度地图-规格型号", "0", "", 50),
     GJDDT_SCQY("gjddtScqy", "定位及导航系统-高精度地图-生产企业", "0", "", 50),
-    DZWL_PZ("dzwlPz", "定位及导航系统-电子围栏-配置", "2", "", 0),
+    DZWL_PZ("dzwlPz", "定位及导航系统-电子围栏-配置", "1", "", 0),
     DZWL_DXXGCS("dzwlDxxgcs", "定位及导航系统-电子围栏-定性描述相关场所", "0", "", 50),
-    CZTX_PZ("cztxPz", "车载通信系统-配置", "2", "", 0),
+    CZTX_PZ("cztxPz", "车载通信系统-配置", "1", "", 0),
     CZTX_XTMC("cztxXtmc", "车载通信系统-系统名称", "0", "", 50),
     CZTX_GGXH("cztxGgxh", "车载通信系统-规格型号", "0", "", 50),
     CZTX_SCQY("cztxScqy", "车载通信系统-生产企业", "0", "", 50),
     CZTX_BBH("cztxBbh", "车载通信系统-版本号", "0", "", 50),
     CZTX_KFQY("cztxKfqy", "车载通信系统-软件开发企业", "0", "", 50),
-    JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-配置", "2", "", 0),
+    JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-配置", "1", "", 0),
     JSFZCZJ_MC("jsfzczjMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-操纵件名称", "0", "", 50),
     JSFZCZJ_YJXH("jsfzczjYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-硬件规格型号", "0", "", 50),
     JSFZCZJ_SCQY("jsfzczjScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-生产企业", "0", "", 50),
-    JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-配置", "2", "", 0),
+    JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-配置", "1", "", 0),
     JSFZZSQ_MC("jsfzzsqMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-指示器/信号装置名称", "0", "", 50),
     JSFZZSQ_YJXH("jsfzzsqYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-硬件规格型号", "0", "", 50),
     JSFZZSQ_SCQY("jsfzzsqScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-生产企业", "0", "", 50),
-    FXPTSTS_PZ("fxptstsPz", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-配置", "2", "", 0),
+    FXPTSTS_PZ("fxptstsPz", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-配置", "1", "", 0),
     FXPTSTS_MC("fxptstsMc", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-指示器/信号装置名称", "0", "", 50),
     FXPTSTS_YJXH("fxptstsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-硬件规格型号", "0", "", 50),
     FXPTSTS_SCQY("fxptstsScqy", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-生产企业", "0", "", 50),
-    JSYZYLTS_PZ("jsyzyltsPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-配置", "2", "", 0),
+    JSYZYLTS_PZ("jsyzyltsPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-配置", "1", "", 0),
     JSYZYLTS_MC("jsyzyltsMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-指示器/信号装置名称", "0", "", 50),
     JSYZYLTS_YJXH("jsyzyltsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-硬件规格型号", "0", "", 50),
     JSYZYLTS_SCQY("jsyzyltsScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-生产企业", "0", "", 50),
-    DSSAD_PZ("dssadPz", "自动驾驶数据记录系统(DSSAD)-系统配置", "2", "", 0),
+    DSSAD_PZ("dssadPz", "自动驾驶数据记录系统(DSSAD)-系统配置", "1", "", 0),
     DSSAD_GGXH("dssadGgxh", "自动驾驶数据记录系统(DSSAD)-规格型号", "0", "", 50),
     DSSAD_SCQY("dssadScqy", "自动驾驶数据记录系统(DSSAD)-生产企业", "0", "", 50),
-    EDR_PZ("edrPz", "事件数据记录系统(EDR)-配置", "2", "", 0),
+    EDR_PZ("edrPz", "事件数据记录系统(EDR)-配置", "1", "", 0),
     EDR_GGXH("edrGgxh", "事件数据记录系统(EDR)-规格型号", "0", "", 50),
     EDR_SCQY("edrScqy", "事件数据记录系统(EDR)-生产企业", "0", "", 50),
 
@@ -184,7 +184,7 @@ public enum OtaTitleEnum {
     SJBYZSJ("sjbyzsj", "升级包完整性验证数据", "0", "", 500),
     SJBDX("sjbdx", "升级包大小", "0", "", 50),
     SFCFSJ("sfcfsj", "是否差分升级", "0", "", 50),
-    SJMDLX("sjmdlx", "升级目的类型", "0", "", 0),
+    SJMDLX("sjmdlx", "升级目的类型", "0", "", 50),
     GNBGMS("gnbgms", "功能变更描述", "0", "", 500),
     SYTJBG("sytjbg", "适用条件变更", "0", "", 500),
     SJSJKZQ("sjsjkzq", "升级涉及的电子控制器", "0", "", 500),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java
index 58359daad..8d49f18cb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java
@@ -73,4 +73,6 @@ public interface IOtaBaCxAqcsService extends IService<OtaBaCxAqcs> {
     OtaBaCxAqcs parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, File attFile, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java
index 360d3f1c0..5ff675dca 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java
@@ -23,7 +23,7 @@ public interface IOtaBaCxJbxxService extends IService<OtaBaCxJbxx> {
      * @param otaBaCxJbxx
      * @return
      */
-    OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx);
+    OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx) throws Exception;
 
     /**
      * 更新
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java
index b08b0ea21..992af4e6f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java
@@ -73,4 +73,6 @@ public interface IOtaBaCxJsfzbacsService extends IService<OtaBaCxJsfzbacs> {
     void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java
index 5b423a3f9..1c0cd5e97 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java
@@ -73,4 +73,6 @@ public interface IOtaBaCxKsjjsmccsService extends IService<OtaBaCxKsjjsmccs> {
     void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, File attFile, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java
index 97cf02357..364370d50 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java
@@ -73,4 +73,6 @@ public interface IOtaBaCxKsjxtmccsService extends IService<OtaBaCxKsjxtmccs> {
     void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, File attFile, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxSjmkService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxSjmkService.java
index 0fb43b158..fd3877699 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxSjmkService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxSjmkService.java
@@ -52,6 +52,7 @@ public interface IOtaBaCxSjmkService extends IService<OtaBaCxSjmk> {
 	 */
     OtaBaCxSjmk queryById(String id);
 
+	List<OtaBaCxSjmk> setDefault(String otaId);
 
 	List<OtaBaCxSjmk> queryByOtaId(String otaId);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java
index 7b79dc017..0623ec346 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java
@@ -74,4 +74,6 @@ public interface IOtaBaCxZxsjyqService extends IService<OtaBaCxZxsjyq> {
     OtaBaCxZxsjyq parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, File attFile,String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java
index 0f41d278d..818836014 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java
@@ -73,4 +73,6 @@ public interface IOtaBaSjGgnrfsService extends IService<OtaBaSjGgnrfs> {
     void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, File fsAttFile, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java
index a660411a0..27e33e5b7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjfzbhService.java
@@ -74,4 +74,6 @@ public interface IOtaBaSjSjfzbhService extends IService<OtaBaSjSjfzbh> {
     void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java
index 31d68ecb2..b20645824 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java
@@ -74,4 +74,6 @@ public interface IOtaBaSjSjmbclService extends IService<OtaBaSjSjmbcl> {
     OtaBaSjSjmbcl importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, File mbclAttFile, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java
index 4695ad5bc..db0fd020c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java
@@ -75,4 +75,6 @@ public interface IOtaBaSjSjmbcxService extends IService<OtaBaSjSjmbcx> {
     OtaBaSjSjmbcx parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java
index 02b5f148d..339255a98 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java
@@ -72,4 +72,6 @@ public interface IOtaBaSjSjxtbhService extends IService<OtaBaSjSjxtbh> {
     void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java
index cd020b1ce..544da83be 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java
@@ -74,4 +74,6 @@ public interface IOtaBaSjSjyxpgService extends IService<OtaBaSjSjyxpg> {
     OtaBaSjSjyxpg parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception;
 
     void exportData(File file, File attFile, File attFile2, String otaId, String cut) throws Exception;
+
+    void deleteByOtaId(String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
index 2b36d28d4..de4757b51 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
@@ -62,12 +62,21 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
      * @param otaBaCxJbxx
      * @return
      */
-    public OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx) {
+    public OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx) throws Exception {
+        String ggpc = otaBaCxJbxx.getGgpc();
         //对比填写记录用的
         OtaBaCxJbxx otaBaCxJbxxOld = new OtaBaCxJbxx();
         Date now = new Date();
         OtaBaCxList otaBaCxList;
         if (StringUtils.isEmpty(otaBaCxJbxx.getOtaId())) {
+            if (StringUtils.isNotEmpty(ggpc)) {
+                List<OtaBaCxJbxx> xxList = this.list();
+                for (OtaBaCxJbxx xx : xxList) {
+                    if (ggpc.equals(xx.getGgpc())) {
+                        throw new JeroBootException("公告批次重复");
+                    }
+                }
+            }
             //在保存的时候设置一个id  并返回前端  下次保存的时候判断是否为更新
             otaBaCxList = new OtaBaCxList();
             otaBaCxList.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -77,6 +86,14 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
             otaBaCxJbxx.setCreateTime(now);
         } else {
             otaBaCxJbxxOld = this.getByOtaId(otaBaCxJbxx.getOtaId());
+            if (StringUtils.isNotEmpty(ggpc)) {
+                List<OtaBaCxJbxx> xxList = this.list();
+                for (OtaBaCxJbxx xx : xxList) {
+                    if (!xx.getOtaId().equals(otaBaCxJbxx.getOtaId()) && ggpc.equals(xx.getGgpc())) {
+                        throw new JeroBootException("公告批次重复");
+                    }
+                }
+            }
             otaBaCxJbxx.setId(otaBaCxJbxx.getId());
             otaBaCxList = otaBaCxListService.queryById(otaBaCxJbxx.getOtaId());
             otaBaCxList.updateData(otaBaCxJbxx);
@@ -119,9 +136,11 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
 
     @Override
     public void deleteByOtaId(String id) {
-        LambdaQueryWrapper<OtaBaCxJbxx> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(OtaBaCxJbxx::getOtaId, id);
-        remove(queryWrapper);
+        if (StringUtils.isNotEmpty(id)) {
+            LambdaQueryWrapper<OtaBaCxJbxx> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(OtaBaCxJbxx::getOtaId, id);
+            remove(queryWrapper);
+        }
     }
 
     /**
@@ -236,7 +255,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
         jbxx.setQymc(ImportFileUtil.getCellValue(cell, wb));
         row = s.getRow(3);
         cell = row.getCell(1);
-        jbxx.setCplb(ImportFileUtil.getCellValue(cell, wb));
+        jbxx.setCplb(ImportFileUtil.getCellValueDict(cell, wb, "product_category", sysDictService, cut));
         row = s.getRow(5);
         cell = row.getCell(1);
         jbxx.setCpsb(ImportFileUtil.getCellValue(cell, wb));
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
index 8aa311690..26c4ff291 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
@@ -228,16 +228,30 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
         JSONObject res = new JSONObject();
         res.put("otaId", otaId);
         OtaBaCxJsfzbacs otaBaCxJsfzbacs = getByOtaId(otaId);
-        List<OtaBaCxSjmk> kzqList = OtaBaCxSjmkService.queryByOtaId(otaId);
         if (ObjectUtils.isEmpty(otaBaCxJsfzbacs)) {
             otaBaCxJsfzbacs = getByOtaId(otaIdT);
+        }
+        List<OtaBaCxSjmk> kzqList = OtaBaCxSjmkService.queryByOtaId(otaId);
+        if(ObjectUtils.isEmpty(kzqList)){
             kzqList = OtaBaCxSjmkService.queryByOtaId(otaIdT);
         }
+        if(ObjectUtils.isEmpty(kzqList)){
+            kzqList = OtaBaCxSjmkService.setDefault(otaId);
+        }
         res.put("bj", otaBaCxJsfzbacs);
         res.put("kzq", kzqList);
         return res;
     }
 
+    @Override
+    public void deleteByOtaId(String id) {
+        if (StringUtils.isNotEmpty(id)) {
+            LambdaQueryWrapper<OtaBaCxJsfzbacs> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(OtaBaCxJsfzbacs::getOtaId, id);
+            remove(queryWrapper);
+        }
+    }
+
     private OtaBaCxJsfzbacs getByOtaId(String otaId) {
         if (StringUtils.isEmpty(otaId)) {
             return null;
@@ -313,7 +327,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
                 sjmk.setCreateTime(now);
                 sjmk.setBjmc(str);
                 cell = row.getCell(1);
-                sjmk.setPzqk(ImportFileUtil.getCellValueYesOrNo(cell, wb));
+                sjmk.setPzqk(ImportFileUtil.getCellValueHaveOrNot(cell, wb));
                 cell = row.getCell(2);
                 sjmk.setKzqmc(ImportFileUtil.getCellValue(cell, wb));
                 cell = row.getCell(3);
@@ -342,7 +356,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         Row row = s.getRow(2);
         Cell cell = row.getCell(2);
-        bass.setJgldPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setJgldPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(2);
         cell = row.getCell(4);
         bass.setJgldSl(ImportFileUtil.getCellValue(cell, wb));
@@ -358,7 +372,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(6);
         cell = row.getCell(2);
-        bass.setHmbldPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setHmbldPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(6);
         cell = row.getCell(4);
         bass.setHmbldSl(ImportFileUtil.getCellValue(cell, wb));
@@ -375,7 +389,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(10);
         cell = row.getCell(2);
-        bass.setCsbldPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setCsbldPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(10);
         cell = row.getCell(4);
         bass.setCsbldSl(ImportFileUtil.getCellValue(cell, wb));
@@ -392,7 +406,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(14);
         cell = row.getCell(2);
-        bass.setSxthsPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setSxthsPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(14);
         cell = row.getCell(4);
         bass.setSxthsSl(ImportFileUtil.getCellValue(cell, wb));
@@ -408,7 +422,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(18);
         cell = row.getCell(2);
-        bass.setSxtdsdPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setSxtdsdPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(18);
         cell = row.getCell(4);
         bass.setSxtdsdSl(ImportFileUtil.getCellValue(cell, wb));
@@ -424,7 +438,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(22);
         cell = row.getCell(2);
-        bass.setJsyjkPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setJsyjkPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(22);
         cell = row.getCell(4);
         bass.setJsyjkSl(ImportFileUtil.getCellValue(cell, wb));
@@ -440,7 +454,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(26);
         cell = row.getCell(2);
-        bass.setJsyhwPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setJsyhwPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(26);
         cell = row.getCell(4);
         bass.setJsyhwSl(ImportFileUtil.getCellValue(cell, wb));
@@ -456,7 +470,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(30);
         cell = row.getCell(2);
-        bass.setCzwxdwPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setCzwxdwPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(30);
         cell = row.getCell(4);
         bass.setCzwxdwGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -466,7 +480,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(32);
         cell = row.getCell(2);
-        bass.setGxdhPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setGxdhPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(32);
         cell = row.getCell(4);
         bass.setGxdhGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -476,7 +490,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(34);
         cell = row.getCell(2);
-        bass.setLsjPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setLsjPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(34);
         cell = row.getCell(4);
         bass.setLsjGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -486,7 +500,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(36);
         cell = row.getCell(2);
-        bass.setGjddtPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setGjddtPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(36);
         cell = row.getCell(4);
         bass.setGjddtGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -496,14 +510,14 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(38);
         cell = row.getCell(2);
-        bass.setDzwlPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setDzwlPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(38);
         cell = row.getCell(4);
         bass.setDzwlDxxgcs(ImportFileUtil.getCellValue(cell, wb));
 
         row = s.getRow(39);
         cell = row.getCell(2);
-        bass.setCztxPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setCztxPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(39);
         cell = row.getCell(4);
         bass.setCztxXtmc(ImportFileUtil.getCellValue(cell, wb));
@@ -522,7 +536,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(44);
         cell = row.getCell(2);
-        bass.setJsfzczjPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setJsfzczjPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(44);
         cell = row.getCell(4);
         bass.setJsfzczjMc(ImportFileUtil.getCellValue(cell, wb));
@@ -535,7 +549,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(47);
         cell = row.getCell(2);
-        bass.setJsfzzsqPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setJsfzzsqPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(47);
         cell = row.getCell(4);
         bass.setJsfzzsqMc(ImportFileUtil.getCellValue(cell, wb));
@@ -548,7 +562,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(50);
         cell = row.getCell(2);
-        bass.setFxptstsPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setFxptstsPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(50);
         cell = row.getCell(4);
         bass.setFxptstsMc(ImportFileUtil.getCellValue(cell, wb));
@@ -561,7 +575,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(53);
         cell = row.getCell(2);
-        bass.setJsyzyltsPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setJsyzyltsPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(53);
         cell = row.getCell(4);
         bass.setJsyzyltsMc(ImportFileUtil.getCellValue(cell, wb));
@@ -574,7 +588,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(56);
         cell = row.getCell(2);
-        bass.setDssadPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setDssadPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(56);
         cell = row.getCell(4);
         bass.setDssadGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -584,7 +598,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         row = s.getRow(58);
         cell = row.getCell(2);
-        bass.setEdrPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setEdrPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
         row = s.getRow(58);
         cell = row.getCell(4);
         bass.setEdrGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -605,7 +619,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             Row row = s.getRow(2);
             Cell cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzczjPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsfzczjPz()));
             row = s.getRow(2);
             cell = row.getCell(4);
             cell.setCellValue(bass.getJgldSl());
@@ -621,7 +635,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(6);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getHmbldPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getHmbldPz()));
             row = s.getRow(6);
             cell = row.getCell(4);
             cell.setCellValue(bass.getHmbldSl());
@@ -636,7 +650,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
             cell.setCellValue(bass.getHmbldScqy());
             row = s.getRow(10);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCsbldPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getCsbldPz()));
             row = s.getRow(10);
             cell = row.getCell(4);
             cell.setCellValue(bass.getCsbldSl());
@@ -652,7 +666,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(14);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getSxthsPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getSxthsPz()));
             row = s.getRow(14);
             cell = row.getCell(4);
             cell.setCellValue(bass.getSxthsSl());
@@ -668,7 +682,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(18);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getSxtdsdPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getSxtdsdPz()));
             row = s.getRow(18);
             cell = row.getCell(4);
             cell.setCellValue(bass.getSxtdsdSl());
@@ -684,7 +698,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(22);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyjkPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsyjkPz()));
             row = s.getRow(22);
             cell = row.getCell(4);
             cell.setCellValue(bass.getJsyjkSl());
@@ -700,7 +714,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(26);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyhwPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsyhwPz()));
             row = s.getRow(26);
             cell = row.getCell(4);
             cell.setCellValue(bass.getJsyhwSl());
@@ -716,7 +730,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(30);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCzwxdwPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getCzwxdwPz()));
             row = s.getRow(30);
             cell = row.getCell(4);
             cell.setCellValue(bass.getCzwxdwGgxh());
@@ -726,7 +740,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(32);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getGxdhPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getGxdhPz()));
             row = s.getRow(32);
             cell = row.getCell(4);
             cell.setCellValue(bass.getGxdhGgxh());
@@ -736,7 +750,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(34);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getLsjPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getLsjPz()));
             row = s.getRow(34);
             cell = row.getCell(4);
             cell.setCellValue(bass.getLsjGgxh());
@@ -746,7 +760,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(36);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getGjddtPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getGjddtPz()));
             row = s.getRow(36);
             cell = row.getCell(4);
             cell.setCellValue(bass.getGjddtGgxh());
@@ -756,14 +770,14 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(38);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getDzwlPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getDzwlPz()));
             row = s.getRow(38);
             cell = row.getCell(4);
             cell.setCellValue(bass.getDzwlDxxgcs());
 
             row = s.getRow(39);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCztxPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getCztxPz()));
             row = s.getRow(39);
             cell = row.getCell(4);
             cell.setCellValue(bass.getCztxXtmc());
@@ -782,7 +796,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(44);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzczjPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsfzczjPz()));
             row = s.getRow(44);
             cell = row.getCell(4);
             cell.setCellValue(bass.getJsfzczjMc());
@@ -795,7 +809,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(47);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzzsqPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsfzzsqPz()));
             row = s.getRow(47);
             cell = row.getCell(4);
             cell.setCellValue(bass.getJsfzzsqMc());
@@ -808,7 +822,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(50);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getFxptstsPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getFxptstsPz()));
             row = s.getRow(50);
             cell = row.getCell(4);
             cell.setCellValue(bass.getFxptstsMc());
@@ -821,7 +835,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(53);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyzyltsPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsyzyltsPz()));
             row = s.getRow(53);
             cell = row.getCell(4);
             cell.setCellValue(bass.getJsyzyltsMc());
@@ -834,7 +848,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(56);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getDssadPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getDssadPz()));
             row = s.getRow(56);
             cell = row.getCell(4);
             cell.setCellValue(bass.getDssadGgxh());
@@ -844,7 +858,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
             row = s.getRow(58);
             cell = row.getCell(2);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getEdrPz()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getEdrPz()));
             row = s.getRow(58);
             cell = row.getCell(4);
             cell.setCellValue(bass.getEdrGgxh());
@@ -860,7 +874,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
                 cell = row.createCell(0);
                 cell.setCellValue(sjmk.getBjmc());
                 cell = row.createCell(1);
-                cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(sjmk.getPzqk()));
+                cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(sjmk.getPzqk()));
                 cell = row.createCell(2);
                 cell.setCellValue(sjmk.getKzqmc());
                 cell = row.createCell(3);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
index 8f1d2d1d0..2137f28ca 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
@@ -109,9 +109,6 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
                 otaBaCxJsfzbacs.setUpdateTime(now);
                 newList.add(otaBaCxJsfzbacs);
             }
-            if (ObjectUtils.isEmpty(oldList)) {
-                oldList = new ArrayList<>();
-            }
             ComparisonUtil cu = new ComparisonUtil();
             List<OtaBaCxTxjl> reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService);
             saveOrUpdateBatch(newList);
@@ -218,7 +215,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
 
     private List<OtaBaCxKsjjsmccs> getByOtaId(String otaId) {
         if (StringUtils.isEmpty(otaId)) {
-            return null;
+            return new ArrayList<>();
         }
         LambdaQueryWrapper<OtaBaCxKsjjsmccs> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(OtaBaCxKsjjsmccs::getOtaId, otaId);
@@ -303,11 +300,11 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
                 }
                 mssc.setGnmc(gnmc);
                 cell = row.getCell(1);
-                mssc.setPzqk(ImportFileUtil.getCellValueYesOrNo(cell, wb));
+                mssc.setPzqk(ImportFileUtil.getCellValueHaveOrNot(cell, wb));
                 cell = row.getCell(2);
                 mssc.setSfksj(ImportFileUtil.getCellValueYesOrNo(cell, wb));
                 cell = row.getCell(3);
-                mssc.setJszdhjb(ImportFileUtil.getCellValue(cell, wb));
+                mssc.setJszdhjb(ImportFileUtil.getCellValueDict(cell, wb, "driving_automation_level", sysDictService, cut));
                 cell = row.getCell(4);
                 mssc.setSjggcs(ImportFileUtil.getCellValue(cell, wb));
                 cell = row.getCell(5);
@@ -350,7 +347,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
             Cell cell = row.createCell(0);
             cell.setCellValue(mccs.getGnmc());
             cell = row.createCell(1);
-            cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getPzqk()));
+            cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(mccs.getPzqk()));
             cell = row.createCell(2);
             cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj()));
             cell = row.createCell(3);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
index 8497f6128..42fc50f27 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
@@ -286,7 +286,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
 
     private List<OtaBaCxKsjxtmccs> getByOtaId(String otaId) {
         if (org.apache.commons.lang3.StringUtils.isEmpty(otaId)) {
-            return null;
+            return new ArrayList<>();
         }
         LambdaQueryWrapper<OtaBaCxKsjxtmccs> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(OtaBaCxKsjxtmccs::getOtaId, otaId);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
index 88dba6d41..767abeb93 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
@@ -105,8 +105,15 @@ public class OtaBaCxListServiceImpl extends ServiceImpl<OtaBaCxListMapper, OtaBa
      */
     @Override
     public void deleteById(String id) {
-        removeById(id);
-        otaBaCxJbxxService.deleteByOtaId(id);
+        if(StringUtils.isNotEmpty(id)){
+            removeById(id);
+            otaBaCxJbxxService.deleteByOtaId(id);
+            otaBaCxZxsjyqService.deleteByOtaId(id);
+            otaBaCxAqcsService.deleteByOtaId(id);
+            otaBaCxKsjxtmccsService.deleteByOtaId(id);
+            otaBaCxKsjjsmccsService.deleteByOtaId(id);
+            otaBaCxJsfzbacsService.deleteByOtaId(id);
+        }
     }
 
     /**
@@ -185,6 +192,7 @@ public class OtaBaCxListServiceImpl extends ServiceImpl<OtaBaCxListMapper, OtaBa
             otaBaCxKsjjsmccsService.parseFileList(fileList, otaId, cut, errMsg);
             otaBaCxJsfzbacsService.parseFileList(fileList, otaId, cut, errMsg);
         } else {
+            this.deleteById(otaId);
             throw new JeroBootException("导入失败");
         }
     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java
index 904dbb49f..c81425400 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java
@@ -2,14 +2,18 @@ package com.jero.modules.ota.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs;
 import com.jero.modules.ota.entity.OtaBaCxSjmk;
 import com.jero.modules.ota.mapper.OtaBaCxSjmkMapper;
 import com.jero.modules.ota.service.IOtaBaCxSjmkService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * @Description: 车型备案-车端OTA升级功能模块
@@ -80,8 +84,28 @@ public class OtaBaCxSjmkServiceImpl extends ServiceImpl<OtaBaCxSjmkMapper, OtaBa
         return getById(id);
     }
 
+	@Override
+	public List<OtaBaCxSjmk> setDefault(String otaId) {
+		Date now = new Date();
+		List<OtaBaCxSjmk> res = new ArrayList<>();
+		String[] titles = {"车端OTA升级功能模块"};
+		for (String t : titles) {
+			OtaBaCxSjmk cs = new OtaBaCxSjmk();
+			cs.setOtaId(otaId);
+			cs.setBjmc(t);
+			cs.setCreateTime(now);
+			cs.setId(UUID.randomUUID().toString().replace("-", ""));
+			res.add(cs);
+		}
+		saveBatch(res);
+		return res;
+	}
+
 	@Override
 	public List<OtaBaCxSjmk> queryByOtaId(String otaId) {
+		if(StringUtils.isEmpty(otaId)){
+			return new ArrayList<>();
+		}
 		LambdaQueryWrapper<OtaBaCxSjmk> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(OtaBaCxSjmk::getOtaId, otaId);
 		List<OtaBaCxSjmk> list = this.list(queryWrapper);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
index a2fec666d..8a65776b1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.ota.entity.AttachmentEO;
+import com.jero.modules.ota.entity.OtaBaCxJbxx;
 import com.jero.modules.ota.entity.OtaBaCxTxjl;
 import com.jero.modules.ota.entity.OtaBaCxZxsjyq;
 import com.jero.modules.ota.enums.OtaModuleEnum;
@@ -195,6 +196,15 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl<OtaBaCxZxsjyqMapper, O
         return this.getOne(queryWrapper, false);
     }
 
+    @Override
+    public void deleteByOtaId(String id) {
+        if (StringUtils.isNotEmpty(id)) {
+            LambdaQueryWrapper<OtaBaCxZxsjyq> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(OtaBaCxZxsjyq::getOtaId, id);
+            remove(queryWrapper);
+        }
+    }
+
     @Override
     public void exportTemplate(HttpServletResponse response, HttpServletRequest request) {
         ImportFileUtil.exportTemplate(response, templatePath + "在线升级要求.zip");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
index 331e66439..2b5e7f052 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
@@ -194,13 +194,13 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl<OtaBaSjGgnrfsMapper, O
     }
 
     @Override
-    public void importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception{
+    public void importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception {
         List<File> upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath);
-        parseFileList(upLoadFiles, otaId, cut,errMsg);
+        parseFileList(upLoadFiles, otaId, cut, errMsg);
     }
 
     @Override
-    public void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception{
+    public void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception {
         File attFile = null;
         for (File f : upLoadFiles) {
             if (f.isDirectory() && f.getName().equals("用户告知内容及方式")) {
@@ -210,32 +210,61 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl<OtaBaSjGgnrfsMapper, O
         if (null == attFile) {
             throw new JeroBootException("请上传正确的文件");
         }
-        OtaBaSjGgnrfs fs = parseFile(attFile, otaId, cut,errMsg);
+        OtaBaSjGgnrfs fs = parseFile(attFile, otaId, cut, errMsg);
         add(fs);
     }
 
-    private OtaBaSjGgnrfs parseFile(File attFile, String otaId, String cut, StringBuilder errMsg) throws Exception{
+    private OtaBaSjGgnrfs parseFile(File attFile, String otaId, String cut, StringBuilder errMsg) throws Exception {
         OtaBaSjGgnrfs fs = new OtaBaSjGgnrfs();
         fs.setOtaId(otaId);
         OtaBaSjSjyxpg pg = otaBaSjSjyxpgService.queryByOtaId(otaId, "");
         if (StringUtils.isNotEmpty(pg.getSjmd())) {
             fs.setSjmd(pg.getSjmd());
         }
+        fs.setSjky("车辆解闭锁功能可用，但不可驾驶");
+        fs.setSjbkygn("除解闭锁均不可用");
+        fs.setSjsfcg(1);
+        fs.setGzbg(1);
+        fs.setGzscnr(1);
+        fs.setGzyhfs("1,3");
         StringBuilder attStr1 = new StringBuilder();
         File[] attFiles1 = attFile.listFiles();
+        //已导入文件数，用于判断超过20
+        int inFile = 0;
         for (int i = 0; i < attFiles1.length; i++) {
+            if (inFile >= 20) {
+                errMsg.append("用户告知方式 仅支持上传20个文件，超出部分文件忽略, ");
+                break;
+            }
             if (!attFiles1[i].isDirectory() && (attFiles1[i].getName().contains(".doc") || attFiles1[i].getName().contains(".docx") || attFiles1[i].getName().contains(".pdf"))) {
+                if (attFiles1[i].length() > 50 * 1024 * 1024) {
+                    errMsg.append("用户告知方式 上传文件不可以超过50MB, ");
+                    continue;
+                }
                 if (i >= attFiles1.length - 1) {
                     attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService));
                 } else {
                     attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService)).append(",");
                 }
+                inFile++;
+            } else {
+                errMsg.append("用户告知方式 只支持doc/docx/pdf格式, ");
+                continue;
             }
         }
         fs.setXgwj(attStr1.toString());
         return fs;
     }
 
+    @Override
+    public void deleteByOtaId(String id) {
+        if (StringUtils.isNotEmpty(id)) {
+            LambdaQueryWrapper<OtaBaSjGgnrfs> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(OtaBaSjGgnrfs::getOtaId, id);
+            remove(queryWrapper);
+        }
+    }
+
     @Override
     public void exportData(File file, File attFile, String otaId, String cut) throws Exception {
         OtaBaSjGgnrfs fs = this.getByOtaId(otaId);
@@ -277,7 +306,7 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl<OtaBaSjGgnrfsMapper, O
             cell.setCellValue(ComparisonUtil.queryDictTextByKey("user_notification_mode", fs.getGzyhfs(), sysDictService));
 
             String attStr = fs.getXgwj();
-            if(StringUtils.isNotEmpty(attStr)){
+            if (StringUtils.isNotEmpty(attStr)) {
                 String[] strs = attStr.split(",");
                 for (String str : strs) {
                     List<OSSFile> ossFileList = ossFileService.getFileInfos(str);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
index 117e19ec7..c6eb79457 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
@@ -2,14 +2,13 @@ package com.jero.modules.ota.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
-import com.jero.modules.ota.entity.OtaBaCxJbxx;
 import com.jero.modules.ota.entity.OtaBaSjList;
 import com.jero.modules.ota.entity.OtaBaSjLsjl;
 import com.jero.modules.ota.entity.OtaBaSjSjmbcx;
 import com.jero.modules.ota.mapper.OtaBaSjListMapper;
 import com.jero.modules.ota.service.*;
 import com.jero.modules.ota.utils.ImportFileUtil;
-import com.jero.modules.system.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -100,7 +99,15 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
      */
     @Override
     public void deleteById(String id) {
-        removeById(id);
+        if (StringUtils.isNotEmpty(id)) {
+            removeById(id);
+            otaBaSjSjmbcxService.deleteByOtaId(id);
+            otaBaSjSjmbclService.deleteByOtaId(id);
+            otaBaSjSjyxpgService.deleteByOtaId(id);
+            otaBaSjSjxtbhService.deleteByOtaId(id);
+            otaBaSjSjfzbhService.deleteByOtaId(id);
+            otaBaSjGgnrfsService.deleteByOtaId(id);
+        }
     }
 
     /**
@@ -174,12 +181,12 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
         String otaId = mbcx.getOtaId();
         if (StringUtils.isNotEmpty(otaId)) {
             otaBaSjSjmbclService.parseFileList(fileList, otaId, cut, errMsg);
-            otaBaSjSjmbcxService.parseFileList(fileList, otaId, cut, errMsg);
             otaBaSjSjyxpgService.parseFileList(fileList, otaId, cut, errMsg);
             otaBaSjSjxtbhService.parseFileList(fileList, otaId, cut, errMsg);
             otaBaSjSjfzbhService.parseFileList(fileList, otaId, cut, errMsg);
             otaBaSjGgnrfsService.parseFileList(fileList, otaId, cut, errMsg);
         } else {
+            this.deleteById(otaId);
             throw new JeroBootException("导入失败");
         }
     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
index 8c474fadd..ad56dc740 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
@@ -197,6 +197,15 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
         return mbcl;
     }
 
+    @Override
+    public void deleteByOtaId(String id) {
+        if (StringUtils.isNotEmpty(id)) {
+            LambdaQueryWrapper<OtaBaSjSjmbcl> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(OtaBaSjSjmbcl::getOtaId, id);
+            remove(queryWrapper);
+        }
+    }
+
     private OtaBaSjSjmbcl parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception {
         OtaBaSjSjmbcl mbcl = new OtaBaSjSjmbcl();
         OtaBaSjSjmbcx mbcx = otaBaSjSjmbcxService.queryByOtaId(otaId, "");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
index e8082eb79..6a873a186 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
@@ -236,7 +236,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
         queryWrapper.eq(OtaBaCxJbxx::getGgpc, pc);
         OtaBaCxJbxx jbxx = otaBaCxJbxxService.getOne(queryWrapper, false);
         if (ObjectUtils.isEmpty(jbxx)) {
-            errMsg.append("车型及功能备案《公告》批次:" + pc + " 无法找到车型备案数据");
+            errMsg.append("车型及功能备案《公告》批次:" + pc + " 无法找到车型备案数据, ");
         } else {
             mbcx.setCpsb(jbxx.getCpsb());
             mbcx.setCpmc(jbxx.getCpmc());
@@ -249,6 +249,15 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
         return mbcx;
     }
 
+    @Override
+    public void deleteByOtaId(String id) {
+        if (StringUtils.isNotEmpty(id)) {
+            LambdaQueryWrapper<OtaBaSjSjmbcx> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(OtaBaSjSjmbcx::getOtaId, id);
+            remove(queryWrapper);
+        }
+    }
+
     @Override
     public void exportData(File file, String otaId, String cut) throws Exception {
         OtaBaSjSjmbcx cx = this.getByOtaId(otaId);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
index 531c7a46f..9a86599ef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
@@ -93,8 +93,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
             List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService);
             reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newYzcl, oldYzcl, OtaModuleEnum.SJ_SJMBCL, "验证材料", ossFileService));
             reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newZmcl, oldZmcl, OtaModuleEnum.SJ_SJMBCL, "证明材料", ossFileService));
-
-            deleteById(otaBaSjSjyxpg.getId());
+            deleteByOtaId(otaBaSjSjyxpg.getOtaId());
             saveOrUpdate(otaBaSjSjyxpg);
             otaBaCxTxjlService.saveBatch(reList);
         }
@@ -225,6 +224,14 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
             }
             sjyxpg.setSjmd(sb.toString());
         }
+        sjyxpg.setFhgd(2);
+        sjyxpg.setZdjsxg(1);
+        sjyxpg.setZxsj(2);
+        sjyxpg.setAqjz("2");
+        sjyxpg.setSfyxaq(2);
+        sjyxpg.setYhqr(1);
+        sjyxpg.setSjbcs("3,4");
+        sjyxpg.setAqkkx(1);
         StringBuilder attStr1 = new StringBuilder();
         File[] attFiles1 = attFile1.listFiles();
         for (int i = 0; i < attFiles1.length; i++) {
@@ -290,6 +297,15 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
         return sjyxpg;
     }
 
+    @Override
+    public void deleteByOtaId(String id) {
+        if (StringUtils.isNotEmpty(id)) {
+            LambdaQueryWrapper<OtaBaSjSjyxpg> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(OtaBaSjSjyxpg::getOtaId, id);
+            remove(queryWrapper);
+        }
+    }
+
     @Override
     public void exportData(File file, File attFile1, File attFile2, String otaId, String cut) throws Exception {
         OtaBaSjSjyxpg pg = this.getByOtaId(otaId);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
index 737870be8..fb694b87c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
@@ -62,13 +62,13 @@ public class ComparisonUtil<T> {
     }
 
     public OtaBaCxTxjl addAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) {
-        String content = title + "中添加了附件:'" + attName;
+        String content = title + "中添加了附件:'" + attName + ",";
         OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content);
         return jl;
     }
 
     public OtaBaCxTxjl delAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) {
-        String content = title + "中删除了附件:'" + attName;
+        String content = title + "中删除了附件:'" + attName + ",";
         OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content);
         return jl;
     }
@@ -178,9 +178,9 @@ public class ComparisonUtil<T> {
     }
 
     public void checkAttError(String[] strs, StringBuilder errMsg, String title, String cut) {
-        for (String str:strs) {
-            if(!str.endsWith(".doc")&&!str.endsWith(".docx")&&!str.endsWith(".pdf")&&!str.endsWith(".DOC")&&!str.endsWith(".DOCX")&&!str.endsWith(".PDF")){
-                errMsg.append(title + " 支持doc/docx/pdf格式 , ");
+        for (String str : strs) {
+            if (!str.endsWith(".doc") && !str.endsWith(".docx") && !str.endsWith(".pdf") && !str.endsWith(".DOC") && !str.endsWith(".DOCX") && !str.endsWith(".PDF")) {
+                errMsg.append(title + " 支持doc/docx/pdf格式, ");
             }
         }
     }
@@ -203,9 +203,14 @@ public class ComparisonUtil<T> {
                             errMsg.append(title + " 的长度超过了 " + ote.getLen() + ", ");
                             field.set(clazz, "");
                         }
+                    } else if ("1".equals(ote.getType())) {
+                        if (!"1".equals(str) && !"2".equals(str)) {
+                            errMsg.append(title + " 必须填写有或无, ");
+                            field.set(clazz, "");
+                        }
                     } else if ("2".equals(ote.getType())) {
-                        if (!"是".equals(str) && !"否".equals(str)) {
-                            errMsg.append(title + " 必须填写是或否 , ");
+                        if (!"1".equals(str) && !"2".equals(str)) {
+                            errMsg.append(title + " 必须填写是或否, ");
                             field.set(clazz, "");
                         }
                     } else if ("3".equals(ote.getType())) {
@@ -213,9 +218,9 @@ public class ComparisonUtil<T> {
                     } else {
                         String[] strs = str.split(",");
                         for (String s : strs) {
-                            String res = sysDictService.queryDictItemByValue(ote.getType(), s, cut);
+                            String res = sysDictService.queryDictTextByKeyEn(ote.getType(), s, cut);
                             if (StringUtils.isEmpty(res)) {
-                                errMsg.append(title + " 填写了无法识别的选项 , ");
+                                errMsg.append(title + " 填写了无法识别的选项, ");
                                 field.set(clazz, "");
                             }
                         }
@@ -285,6 +290,14 @@ public class ComparisonUtil<T> {
                 if (ObjectUtils.isNotEmpty(newVal)) {
                     res = newVal.toString();
                 }
+            } else if ("1".equals(ote.getType())) {
+                if (ObjectUtils.isNotEmpty(newVal)) {
+                    if ("1".equals(newVal.toString())) {
+                        res = "有";
+                    } else if ("2".equals(newVal.toString())) {
+                        res = "无";
+                    }
+                }
             } else if ("2".equals(ote.getType())) {
                 if (ObjectUtils.isNotEmpty(newVal)) {
                     if ("1".equals(newVal.toString())) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
index 9d05199bb..adb05d7f3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
@@ -155,15 +155,41 @@ public class ImportFileUtil {
         return "";
     }
 
-    public static Integer getCellValueYesOrNoInt(Cell cell, Workbook workbook) throws Exception {
+    public static Integer getCellValueHaveOrNotInt(Cell cell, Workbook workbook) throws Exception {
         Integer res = null;
-        String str = getCellValueYesOrNo(cell, workbook);
+        String str = getCellValueHaveOrNot(cell, workbook);
         if (StringUtils.isNotEmpty(str)) {
             res = Integer.parseInt(str);
         }
         return res;
     }
 
+
+    public static String getCellValueHaveOrNot(Cell cell, Workbook workbook) throws Exception {
+        String res = "";
+        String str = getCellValue(cell, workbook);
+        if (StringUtils.isNotEmpty(str)) {
+            if (str.equals("有")) {
+                res = "1";
+            } else if (str.equals("无")) {
+                res = "2";
+            }
+        }
+        return res;
+    }
+
+    public static String getCellValueHaveOrNotInt(Integer val) throws Exception {
+        String res = "";
+        if (ObjectUtils.isNotEmpty(val)) {
+            if (val.equals(1)) {
+                res = "有";
+            } else if (val.equals(2)) {
+                res = "无";
+            }
+        }
+        return res;
+    }
+
     public static String getCellValueYesOrNo(Cell cell, Workbook workbook) throws Exception {
         String res = "";
         String str = getCellValue(cell, workbook);
@@ -189,6 +215,18 @@ public class ImportFileUtil {
         return res;
     }
 
+    public static String getCellValueHaveOrNot(String str) throws Exception {
+        String res = "";
+        if (StringUtils.isNotEmpty(str)) {
+            if (str.equals("1")) {
+                res = "有";
+            } else if (str.equals("2")) {
+                res = "无";
+            }
+        }
+        return res;
+    }
+
     public static String getCellValueYesOrNo(String str) throws Exception {
         String res = "";
         if (StringUtils.isNotEmpty(str)) {
@@ -277,25 +315,32 @@ public class ImportFileUtil {
 
     public static List<OSSFile> uploadFiles1(File attFile, String[] strs, IOSSFileService ossFileService, StringBuilder errMsg, String title, String cut) throws Exception {
         List<OSSFile> res = new ArrayList<>();
+        //已导入文件数，用于判断超过20
+        int inFile = 0;
         for (int i = 0; i < strs.length; i++) {
+            if (inFile >= 20) {
+                errMsg.append(title + " 仅支持上传20个文件，超出部分文件忽略, ");
+                break;
+            }
             if (StringUtils.isNotEmpty(strs[i])) {
                 File file = ImportFileUtil.findFile(attFile, strs[i]);
                 if (null == file) {
-                    errMsg.append(title + " 找不到文件 , ");
+                    errMsg.append(title + " 找不到文件:" + strs[i] + ", ");
                     continue;
                 }
                 if (!file.getName().endsWith(".doc") && !file.getName().endsWith(".docx") && !file.getName().endsWith(".pdf")
                         && !file.getName().endsWith(".DOC") && !file.getName().endsWith(".DOCX") && !file.getName().endsWith(".PDF")) {
-                    errMsg.append(title + " 只支持doc/docx/pdf格式 , ");
+                    errMsg.append(title + " 只支持doc/docx/pdf格式, ");
                     continue;
                 }
                 if (file.length() > 50 * 1024 * 1024) {
-                    errMsg.append(title + " 上传文件不可以超过50MB , ");
+                    errMsg.append(title + " 上传文件不可以超过50MB, ");
                     continue;
                 }
                 OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null);
                 if (ObjectUtils.isNotEmpty(ossFile)) {
                     res.add(ossFile);
+                    inFile++;
                 }
             }
         }
@@ -313,20 +358,26 @@ public class ImportFileUtil {
 
     public static String uploadFiles(File attFile, String[] strs, IOSSFileService ossFileService, StringBuilder errMsg, String title, String cut) throws Exception {
         String res = "";
+        //已导入文件数，用于判断超过20
+        int inFile = 0;
         for (int i = 0; i < strs.length; i++) {
+            if (inFile >= 20) {
+                errMsg.append(title + " 仅支持上传20个文件，超出部分文件忽略, ");
+                break;
+            }
             if (StringUtils.isNotEmpty(strs[i])) {
                 File file = ImportFileUtil.findFile(attFile, strs[i]);
                 if (null == file) {
-                    errMsg.append(title + " 找不到文件 , ");
+                    errMsg.append(title + " 找不到文件:" + strs[i] + ", ");
                     continue;
                 }
                 if (!file.getName().endsWith(".doc") && !file.getName().endsWith(".docx") && !file.getName().endsWith(".pdf")
                         && !file.getName().endsWith(".DOC") && !file.getName().endsWith(".DOCX") && !file.getName().endsWith(".PDF")) {
-                    errMsg.append(title + " 只支持doc/docx/pdf格式 , ");
+                    errMsg.append(title + " 只支持doc/docx/pdf格式, ");
                     continue;
                 }
                 if (file.length() > 50 * 1024 * 1024) {
-                    errMsg.append(title + " 上传文件不可以超过50MB , ");
+                    errMsg.append(title + " 上传文件不可以超过50MB, ");
                     continue;
                 }
                 OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null);
@@ -336,6 +387,7 @@ public class ImportFileUtil {
                     } else {
                         res += ossFile.getId() + ",";
                     }
+                    i++;
                 }
             }
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
index 2574ed923..a8af91796 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
@@ -59,7 +59,9 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 				(String) map.get("dutyTerritory"),
 				(String) map.get("lawEngineer"),
 				(String) map.get("engineeringInterfacePerson"),
-				(String) map.get("certificationEngineer"));
+				(String) map.get("engineerLawSet"),
+				(String) map.get("engineerAttSet"));
+//				(String) map.get("certificationEngineer"));
 		return Result.OK((String)map.get("cut"),pageList);
 	}
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
index 09da7697e..25c9133ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
@@ -86,7 +86,7 @@ public class ProjectCertificationInventoryEO implements Serializable {
     private String wvtaId;
 
 	/**标准编号*/
-	@Excel(name = "*标准编号", width = 20)
+	@Excel(name = "标准编号", width = 20)
     @ApiModelProperty(value = "标准编号")
     private String serialNumber;
 
@@ -94,7 +94,7 @@ public class ProjectCertificationInventoryEO implements Serializable {
     @ApiModelProperty(value = "责任领域")
     private String dutyTerritory;
     /**责任领域名称**/
-    @Excel(name = "*责任领域", width = 20)
+    @Excel(name = "责任领域", width = 20)
     @TableField(exist = false)
     private String dutyTerritoryName;
     /**责任领域名称-英文**/
@@ -117,6 +117,14 @@ public class ProjectCertificationInventoryEO implements Serializable {
     @TableField(exist = false)
     private String dutyPersonName;
 
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "交付物模板", width = 20)
+    private String deliverableTemplateName;
+
     /**交付物类型*/
     @ApiModelProperty(value = "交付物类型")
     private String deliverableType;
@@ -138,14 +146,7 @@ public class ProjectCertificationInventoryEO implements Serializable {
     @ApiModelProperty(value = "文档库id")
     private String bussDocumentLibraryId;
 
-	/**交付物模板*/
 
-    @ApiModelProperty(value = "交付物模板")
-    private String deliverableTemplate;
-	/**交付物模板名称**/
-    @TableField(exist = false)
-    @Excel(name = "交付物模板", width = 20)
-    private String deliverableTemplateName;
 
 	/**交付结果*/
 	@Excel(name = "交付结果", width = 20)
@@ -215,7 +216,7 @@ public class ProjectCertificationInventoryEO implements Serializable {
     @TableField(exist = false)
     private String excelName;
 
-//    @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
+//    @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
     @TableField(exist = false)
     private String endTimeStr;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java
index e4205cdfe..f4a653976 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java
@@ -84,7 +84,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
     private java.lang.String wvtaId;
 
     /**标准编号*/
-    @Excel(name = "*Standard No", width = 20)
+    @Excel(name = "Standard No", width = 20)
     @ApiModelProperty(value = "标准编号")
     private java.lang.String serialNumber;
 
@@ -92,7 +92,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
     @ApiModelProperty(value = "责任领域")
     private java.lang.String dutyTerritory;
     /**责任领域名称**/
-    @Excel(name = "*Responsible Field", width = 20)
+    @Excel(name = "Responsible Field", width = 20)
     @TableField(exist = false)
     private String dutyTerritoryName;
     /**责任领域名称-英文**/
@@ -115,6 +115,14 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
     @TableField(exist = false)
     private String dutyPersonName;
 
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private java.lang.String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "Deliverable Template", width = 40)
+    private String deliverableTemplateName;
+
     /**交付物类型*/
     @ApiModelProperty(value = "交付物类型")
     private java.lang.String deliverableType;
@@ -136,14 +144,7 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
     @ApiModelProperty(value = "文档库id")
     private java.lang.String bussDocumentLibraryId;
 
-    /**交付物模板*/
 
-    @ApiModelProperty(value = "交付物模板")
-    private java.lang.String deliverableTemplate;
-    /**交付物模板名称**/
-    @TableField(exist = false)
-    @Excel(name = "Deliverable Template", width = 40)
-    private String deliverableTemplateName;
 
     /**交付结果*/
     @Excel(name = "Deliverables Result", width = 20)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java
index 2b1a62419..14aec4667 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java
@@ -59,22 +59,24 @@ public class ProjectRelatedPersonnel implements Serializable {
     /**工程接口人法规工程师设置*/
     private java.lang.String engineerLawSet;
     @TableField(exist = false)
+    @Excel(name = "工程接口人-法规工程师设置,Project Interface Person - Regulation Engineer Setting", width = 30,orderNum = "4")
     private java.lang.String engineerLawSetName;
 
     /**工程接口人认证工程师设置*/
     private java.lang.String engineerAttSet;
     @TableField(exist = false)
+    @Excel(name = "工程接口人-认证工程师设置,Project Interface Person - Certification Engineer Setting", width = 30,orderNum = "5")
     private java.lang.String engineerAttSetName;
 
     /**认证工程师*/
     private java.lang.String certificationEngineer;
     @TableField(exist = false)
-    @Excel(name = "认证工程师,Homologation Engineer", width = 15,orderNum = "4")
+//    @Excel(name = "认证工程师,Homologation Engineer", width = 15,orderNum = "4")
     private java.lang.String certificationEngineerName;
     @TableField(exist = false)
     private List<String> certificationEngineerNameList;
     /**备注*/
-    @Excel(name = "备注,Comments", width = 15,orderNum = "5")
+    @Excel(name = "备注,Comments", width = 15,orderNum = "6")
     private java.lang.String remark;
 
     /**创建人*/
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java
index fb4d2d269..ce5557e25 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java
@@ -19,7 +19,9 @@ public interface ProjectRelatedPersonnelMapper extends BaseMapper<ProjectRelated
                                                 @Param("dutyTerritory") String dutyTerritory,
                                                 @Param("lawEngineer") String lawEngineer,
                                                 @Param("engineeringInterfacePerson") String engineeringInterfacePerson,
-                                                @Param("certificationEngineer") String certificationEngineer);
+//                                                @Param("certificationEngineer") String certificationEngineer
+                                                @Param("engineerLawSet") String engineerLawSet,
+                                                @Param("engineerAttSet") String engineerAttSet);
 
     List<ProjectRelatedPersonnel> queryById(@Param("id")String id);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
index 107fe1a72..961232976 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
@@ -22,6 +22,8 @@
             prp.law_engineer,
             prp.engineering_interface_person,
             prp.certification_engineer,
+            prp.engineer_law_set,
+            prp.engineer_att_set,
             prp.remark,
             prp.create_by,
             prp.create_time,
@@ -51,8 +53,14 @@
             <if test="engineeringInterfacePerson != null and engineeringInterfacePerson != ''">
                 AND prp.engineering_interface_person like concat(concat('%',#{engineeringInterfacePerson}),'%')
             </if>
-            <if test="certificationEngineer != null and certificationEngineer != ''">
-                AND prp.certification_engineer like concat(concat('%',#{certificationEngineer}),'%')
+<!--            <if test="certificationEngineer != null and certificationEngineer != ''">-->
+<!--                AND prp.certification_engineer like concat(concat('%',#{certificationEngineer}),'%')-->
+<!--            </if>-->
+            <if test="engineerLawSet != null and engineerLawSet != ''">
+                AND prp.engineer_law_set like concat(concat('%',#{engineerLawSet}),'%')
+            </if>
+            <if test="engineerAttSet != null and engineerAttSet != ''">
+                AND prp.engineer_att_set like concat(concat('%',#{engineerAttSet}),'%')
             </if>
             AND sd.dict_code = #{dictCode}
         </where>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
index f19b5f1e1..29f18ec42 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
@@ -67,7 +67,8 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
 	 */
     List<ProjectRelatedPersonnel> queryList();
 
-	List<ProjectRelatedPersonnel> queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String certificationEngineer);
+//	List<ProjectRelatedPersonnel> queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String certificationEngineer);
+	List<ProjectRelatedPersonnel> queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String engineerLawSet,String engineerAttSet);
 
 	Map<String,Object> queryPersonByProjectId(String projectId, String dutyTerritory);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index b0e469b38..39445e708 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -1,5 +1,8 @@
 package com.jero.modules.project.service.impl;
 
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -20,6 +23,8 @@ import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
 import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
 import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
+import com.jero.modules.cert.template.vo.ParamsInfoCnImport;
+import com.jero.modules.cert.template.vo.ParamsInfoEnImport;
 import com.jero.modules.document.controller.BussDocumentLibraryEOController;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
@@ -61,6 +66,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.util.FileUtil;
@@ -258,6 +264,46 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		Date now = new Date();
         projectCertificationInventoryEO.setUpdateTime(now);
     	saveOrUpdate(projectCertificationInventoryEO);
+
+
+//    	//获取责任人的所有用户
+//		List<SysUser> listUserName = new ArrayList<>();
+//		listUserName = sysUserMapper.getListUserName();
+//		listUserName = listUserName.stream().distinct().collect(Collectors.toList());
+
+		//获取当前的责任人
+		String dutyPerson = projectCertificationInventoryEO.getDutyPerson();
+		//获取当前的责任领域
+		List<String> dutyTerritoryList = new ArrayList<>();
+		dutyTerritoryList = Arrays.asList(projectCertificationInventoryEO.getDutyTerritory().split(","));
+		dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList());
+		//获取当前的projectId
+		String projectId = projectCertificationInventoryEO.getProjectLibraryId();
+		//根据责任领域个projectId去查相关人员名单
+		List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectId, dutyTerritoryList);
+
+		//根据相关人员名单获取的工程接口人
+		List<String> enginnerList = new ArrayList<>();
+		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
+			enginnerList.add(relatedPersonnel.getEngineeringInterfacePerson());
+		}
+		for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
+			//如果工程接口人不为空的话
+			if(enginnerList.size()>0){
+				//判断哪个不存在 再去去存入
+				if(!enginnerList.contains(dutyPerson)){
+					relatedPersonnel.setEngineerAttSet(dutyPerson);
+//					projectRelatedPersonnelService.editById(relatedPersonnel);
+				}
+			}else {
+				//工程接口人为空的话，直接将责任设置到认证工程师下
+				relatedPersonnel.setEngineerAttSet(dutyPerson);
+//				projectRelatedPersonnelService.editById(relatedPersonnel);
+			}
+		}
+
+		this.projectRelatedPersonnelService.updateBatchById(projectRelatedPersonnelList);
+
 		//设置权限 先删后加
 		List<ProjectUserPermission> adds = new ArrayList<>();
 		if (ObjectUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())) {
@@ -1028,7 +1074,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 			// 法规
 			//相关人员名单中取法规工程师
-			List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null);
+			List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null);
 			List<String> lawEngineerNameList = new ArrayList<>();
 			if(projectRelatedPersonnels.size() != 0){
 				for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
@@ -2757,13 +2803,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
 		String title = "";
 		if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-			title = title = "*类别,*检验项目,*配置项,*WVTA ID," +
+			title = "*类别,*检验项目,*配置项,*WVTA ID," +
 					"*标准编号,*责任领域,*工程接口人,*责任人," +
-					"*交付物类型,交付物模板,*截止日期,报告编号,产品型号,生产企业名称";
+					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 		}else {
 			title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
 					"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
-					"*Deliverable Type,Deliverable Template,*Due Date,Report No,Product Model,Name Of Manufacturer";
+					"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 		}
 
 		int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -2903,49 +2949,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 								}
 							}
 						}
-						if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-							for(int k = 0 ;k<rowList.size();k++){
-								if("".equals(rowList.get("category")) ||
-										"".equals(rowList.get("inspectionItem")) ||
-										"".equals(rowList.get("configItem")) ||
-										"".equals(rowList.get("wvtaId")) ||
-										"".equals(rowList.get("serialNumber")) ||
-										"".equals(rowList.get("dutyTerritoryName")) ||
-										"".equals(rowList.get("sdtName")) ||
-										"".equals(rowList.get("dutyPersonName")) ||
-										"".equals(rowList.get("deliverableTypeName")) ||
-										"".equals(rowList.get("endTimeStr")) ){
-									//删除原上传文件
-									FileUnZip.deleteDir(saveDirectory);
-									if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-										throw new JeroBootException("请填写必填字段内容,带*的为必填");
-									}else{
-										throw new JeroBootException("Please fill in the required fields marked with *");
-									}
-								}
-							}
-						}else {
-							for(int k = 0 ;k<rowList.size();k++){
-								if("".equals(rowList.get("category")) ||
-										"".equals(rowList.get("inspectionItem")) ||
-										"".equals(rowList.get("configItem")) ||
-										"".equals(rowList.get("wvtaId")) ||
-										"".equals(rowList.get("serialNumber")) ||
-										"".equals(rowList.get("dutyTerritoryName")) ||
-										"".equals(rowList.get("sdtName")) ||
-										"".equals(rowList.get("dutyPersonName")) ||
-										"".equals(rowList.get("deliverableTypeNameEn")) ||
-										"".equals(rowList.get("endTimeStr")) ){
-									//删除原上传文件
-									FileUnZip.deleteDir(saveDirectory);
-									if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-										throw new JeroBootException("请填写必填字段内容,带*的为必填");
-									}else{
-										throw new JeroBootException("Please fill in the required fields marked with *");
-									}
-								}
-							}
-						}
 						if (i > 1) {
 							dataList.add(rowList);
 						}
@@ -2987,6 +2990,50 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 						throw new JeroBootException("The data fails to be read. Import data strictly according to the template file");
 					}
 				}
+				//必填项校验
+				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+					for(int k = 0 ; k <datas.size(); k++){
+						if((datas.get(k).getCategory() == null) ||
+								datas.get(k).getInspectionItem() == null ||
+								datas.get(k).getConfigItem() == null ||
+								datas.get(k).getWvtaId() == null ||
+								datas.get(k).getSerialNumber() == null ||
+								datas.get(k).getDutyTerritoryName() == null ||
+								datas.get(k).getSdtName() == null ||
+								datas.get(k).getDutyPersonName() == null ||
+								datas.get(k).getDeliverableTypeName() == null ||
+								datas.get(k).getEndTimeStr() == null ){
+							//删除原上传文件
+							FileUnZip.deleteDir(saveDirectory);
+							if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+								throw new JeroBootException("请填写必填字段内容,带*的为必填");
+							}else{
+								throw new JeroBootException("Please fill in the required fields marked with *");
+							}
+						}
+					}
+				}else {
+					for(int k = 0 ; k <datas.size(); k++){
+						if((datas.get(k).getCategory() == null) ||
+								datas.get(k).getInspectionItem() == null ||
+								datas.get(k).getConfigItem() == null ||
+								datas.get(k).getWvtaId() == null ||
+								datas.get(k).getSerialNumber() == null ||
+								datas.get(k).getDutyTerritoryName() == null ||
+								datas.get(k).getSdtName() == null ||
+								datas.get(k).getDutyPersonName() == null ||
+								datas.get(k).getDeliverableTypeNameEn() == null ||
+								datas.get(k).getEndTimeStr() == null ){
+							//删除原上传文件
+							FileUnZip.deleteDir(saveDirectory);
+							if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+								throw new JeroBootException("请填写必填字段内容,带*的为必填");
+							}else{
+								throw new JeroBootException("Please fill in the required fields marked with *");
+							}
+						}
+					}
+				}
 			}
 		}
 		workbook.close();
@@ -3042,6 +3089,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		String value = "";
 		boolean flag = true;
 
+//		List<SysUser> listUserName = new ArrayList<>();
+//		listUserName = sysUserMapper.getListUserName();
+//		listUserName = listUserName.stream().distinct().collect(Collectors.toList());
+
+		List<String> userNameList = datas.stream().map(ProjectCertificationInventoryEO::getDutyPersonName).distinct().collect(Collectors.toList());
+		List<SysUser> listUserName = this.sysUserService.querySysUserByUserNameList(userNameList);
+
 		//编号验证
 		verifySerialNumber(datas,projectCertificationInventoryEOTemp);
 		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) {
@@ -3095,159 +3149,69 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			//编号必填
 //			flag = must(projectCertificationInventoryEO, errorMsg, msgList, serialNumber, "编号", "Standard No");
 
-			//报告编号
-			if(StringUtils.isNotBlank(reportNumber)){
-				if(reportNumber.length() > 200){
+
+
+			//类别
+			if(StringUtils.isNotBlank(category)){
+				if(category.length() > 300){
 					String message = "";
 					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-						message = errorMsg + "报告编号不能超过200个字符, ";
+						message = errorMsg + "类别不能超过300个字符";
 					}else{
-						message = errorMsg + " The Report No cannot contain more than 200 characters, ";
+						message = errorMsg + " The Category cannot contain more than 300 characters";
 					}
 					msgList.add(message);
 				}
 			}
-			//产品型号
-			if(StringUtils.isNotBlank(productModel)){
-				if(productModel.length() > 200){
+			//检验项目
+			if(StringUtils.isNotBlank(inspectionItem)){
+				if(inspectionItem.length() > 300){
 					String message = "";
 					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-						message = errorMsg + "产品型号不能超过200个字符, ";
+						message = errorMsg + "检验项目不能超过300个字符";
 					}else{
-						message = errorMsg + " The Product Model cannot contain more than 200 characters, ";
+						message = errorMsg + " The InspectionItem cannot contain more than 300 characters";
 					}
 					msgList.add(message);
 				}
 			}
-			//生产企业名称
-			if(StringUtils.isNotBlank(productionEnterpriseName)){
-				if(productionEnterpriseName.length() > 200){
+			//配置项
+			if(StringUtils.isNotBlank(configItem)){
+				if(configItem.length() > 300){
 					String message = "";
 					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-						message = errorMsg + "生产企业名称不能超过200个字符, ";
+						message = errorMsg + "配置项不能超过300个字符";
 					}else{
-						message = errorMsg + " The Name Of Manufacturer cannot contain more than 200 characters, ";
+						message = errorMsg + " The ConfigItem cannot contain more than 300 characters";
 					}
 					msgList.add(message);
 				}
 			}
 			//WVTA ID
-
 			if(StringUtils.isNotBlank(wvtaId)){
 				if(wvtaId.length() > 300){
 					String message = "";
 					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-						message = errorMsg + "WVTA ID不能超过300个字符, ";
+						message = errorMsg + "WVTA ID不能超过300个字符";
 					}else{
-						message = errorMsg + " The WVTA ID cannot contain more than 300 characters, ";
+						message = errorMsg + " The WVTA ID cannot contain more than 300 characters";
 					}
 					msgList.add(message);
 				}
 			}
-//			else {
-//				String message = "";
-//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-//					message = errorMsg + "WVTA ID不能为空, ";
-//				}else{
-//					message = errorMsg + " The WVTA ID cannot null, ";
-//				}
-//				msgList.add(message);
-//			}
-			//类别
-
-			if(StringUtils.isNotBlank(category)){
-				if(category.length() > 300){
-					String message = "";
-					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-						message = errorMsg + "类别不能超过300个字符, ";
-					}else{
-						message = errorMsg + " The Category cannot contain more than 300 characters, ";
-					}
-					msgList.add(message);
-				}
-			}
-//			else {
-//				String message = "";
-//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-//					message = errorMsg + "类别不能为空, ";
-//				}else{
-//					message = errorMsg + " The Category cannot null, ";
-//				}
-//				msgList.add(message);
-//			}
-			//检验项目
-
-			if(StringUtils.isNotBlank(inspectionItem)){
-				if(inspectionItem.length() > 100){
-					String message = "";
-					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-						message = errorMsg + "检验项目不能超过300个字符, ";
-					}else{
-						message = errorMsg + " The InspectionItem cannot contain more than 300 characters, ";
-					}
-					msgList.add(message);
-				}
-			}
-//			else {
-//				String message = "";
-//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-//					message = errorMsg + "检验项目不能为空, ";
-//				}else{
-//					message = errorMsg + " The InspectionItem cannot null, ";
-//				}
-//				msgList.add(message);
-//			}
-			//配置项
-
-			if(StringUtils.isNotBlank(configItem)){
-				if(configItem.length() > 300){
-					String message = "";
-					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-						message = errorMsg + "配置项不能超过100个字符, ";
-					}else{
-						message = errorMsg + " The ConfigItem cannot contain more than 300 characters, ";
-					}
-					msgList.add(message);
-				}
-			}
-//			else {
-//				String message = "";
-//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-//					message = errorMsg + "配置项不能为空, ";
-//				}else{
-//					message = errorMsg + " The ConfigItem cannot null, ";
-//				}
-//				msgList.add(message);
-//			}
 
 			//责任领域
-
 			if(StringUtils.isNotBlank(dutyTerritory)){
 				value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
 				if(StringUtils.isNotBlank(value)){
 					projectCertificationInventoryEO.setDutyTerritory(value);
 				}
 			}
-//			else {
-//				String message = "";
-//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-//					message = errorMsg + "责任领域不能为空, ";
-//				}else{
-//					message = errorMsg + " The Responsible Field cannot null, ";
-//				}
-//				msgList.add(message);
-//			}
 			//工程接口人(责任领域下的工程接口人)
 			Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectCertificationInventoryEOTemp.getProjectLibraryId(), value);
 
 			//工程接口人
 			List<Map<String, String>> mapPersonList = (List<Map<String, String>>) objectMap.get("engineeringInterfacePersonList");
-			//所有人
-//			List<Map<String, String>> allPersonList = (List<Map<String, String>>) objectMap.get("allPersonList");
-
-			List<SysUser> listUserName = new ArrayList<>();
-			listUserName = sysUserMapper.getListUserName();
-			listUserName = listUserName.stream().distinct().collect(Collectors.toList());
 
 
 			String nameCn = "";
@@ -3259,15 +3223,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				//验证人员是否存在
 				personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
 			}
-//			else {
-//				String message = "";
-//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-//					message = errorMsg + "工程接口人不能为空, ";
-//				}else{
-//					message = errorMsg + " The Eng. Interface  cannot null, ";
-//				}
-//				msgList.add(message);
-//			}
+
 			//责任人
 			if(StringUtils.isNotBlank(dutyPerson)){
 				nameCn = "责任人";
@@ -3275,15 +3231,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				//验证人员是否存在
 				personDutyPerson(projectCertificationInventoryEO, errorMsg, msgList, dutyPerson, listUserName,nameCn,nameEn);
 			}
-//			else {
-//				String message = "";
-//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-//					message = errorMsg + "责任人不能为空, ";
-//				}else{
-//					message = errorMsg + " The Assignee  cannot null, ";
-//				}
-//				msgList.add(message);
-//			}
+
+			//交付物模板
+			value = templateTransition(zipEntryName, projectCertificationInventoryEO, errorMsg, deliverableTemplate,msgList,"交付物模板","Deliverable Template");
+			if(StringUtils.isNotBlank(value)){
+				projectCertificationInventoryEO.setDeliverableTemplate(value);
+			}
+
 			//交付物类型
 			if(StringUtils.isNotEmpty(deliverableType)){
 				value = tree(categoryList,treeNameList, projectCertificationInventoryEO, errorMsg, deliverableType,msgList,"交付物类型","Deliverable Type","deliverable_template");
@@ -3292,46 +3246,62 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					projectCertificationInventoryEO.setDeliverableType(treeId);
 				}
 			}
-//			else{
-//				String message = "";
-//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-//					message = errorMsg + "交付物类型不能为空, ";
-//				}else{
-//					message = errorMsg + " The Deliverable Type  cannot null, ";
-//				}
-//				msgList.add(message);
-//			}
 
-			//交付物模板
-			value = templateTransition(zipEntryName, projectCertificationInventoryEO, errorMsg, deliverableTemplate,msgList,"交付物模板","Deliverable Template");
-			if(StringUtils.isNotBlank(value)){
-				projectCertificationInventoryEO.setDeliverableTemplate(value);
-			}
 			//截止时间
 //			SimpleDateFormat sd = new SimpleDateFormat();
 //			String endTimeStr = sd.format(endTime);
-			if(StringUtils.isNotBlank(endTime)){
-				flag = dateVerify(projectCertificationInventoryEO, errorMsg, endTime,msgList,"截止时间","Due Date");
-				if(flag){
-					SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
-					Date date = null;
-					try {
-						date = sd.parse(endTime);
-					} catch (ParseException e) {
-						e.printStackTrace();
+
+			flag = dateVerify(projectCertificationInventoryEO, errorMsg, endTime,msgList,"截止日期","Due Date");
+			if(flag){
+				SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+				Date date = null;
+				try {
+					if(!endTime.contains("-")){
+						endTime = DateUtils.coverDate(endTime);
 					}
-					projectCertificationInventoryEO.setEndTime(date);
+					date = sd.parse(endTime);
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+				projectCertificationInventoryEO.setEndTime(date);
+			}
+
+			//报告编号
+			if(StringUtils.isNotBlank(reportNumber)){
+				if(reportNumber.length() > 200){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "报告编号不能超过200个字符";
+					}else{
+						message = errorMsg + " The Report No cannot contain more than 200 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//产品型号
+			if(StringUtils.isNotBlank(productModel)){
+				if(productModel.length() > 200){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "产品型号不能超过200个字符";
+					}else{
+						message = errorMsg + " The Product Model cannot contain more than 200 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//生产企业名称
+			if(StringUtils.isNotBlank(productionEnterpriseName)){
+				if(productionEnterpriseName.length() > 200){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
+						message = errorMsg + "生产企业名称不能超过200个字符";
+					}else{
+						message = errorMsg + " The Name Of Manufacturer cannot contain more than 200 characters";
+					}
+					msgList.add(message);
 				}
 			}
-//			else{
-//				String message = "";
-//				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEOTemp.getCut())){
-//					message = errorMsg + "截止时间不能为空, ";
-//				}else{
-//					message = errorMsg + " The Due Date Type  cannot null, ";
-//				}
-//				msgList.add(message);
-//			}
 
 		}
 		return msgList;
@@ -3367,29 +3337,37 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			if (!DateUtils.isValidDate(field)) {
 				flag = false;
 				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-					errorMsg += nameCn + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, ";
+					errorMsg += nameCn + "格式不正确, 正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日";
 				}else{
-					errorMsg += nameEn + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日, ";
+					errorMsg += nameEn + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日";
 				}
 				msgList.add(errorMsg);
-			}
-			Date now = new Date();
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			long longnow = now.getTime();
-			try {
-				Date date = sdf.parse(field);
-				long longdate = date.getTime();
-				if(longnow>longdate){
-					flag = false;
-					if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-						errorMsg += nameCn + "不能导入今天之前的日期, ";
-					}else{
-						errorMsg += nameEn + " Cannot import dates before today, ";
+			}else{
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				Date now = new Date();
+				String nowStr = sdf.format(now);
+//				String fieldStr = sdf.format(field);
+				Date now1 = null;
+				Date field1 = null;
+				try {
+					if(!field.contains("-")){
+						field = DateUtils.coverDate(field);
 					}
-					msgList.add(errorMsg);
+					now1 = sdf.parse(nowStr);
+					field1 = sdf.parse(field);
+					long day = now1.getTime()-field1.getTime();
+					if(day>0){
+						flag = false;
+						if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
+							errorMsg += nameCn + "不能导入今天之前的日期";
+						}else{
+							errorMsg += nameEn + " Cannot import dates before today";
+						}
+						msgList.add(errorMsg);
+					}
+				} catch (ParseException e) {
+					e.printStackTrace();
 				}
-			} catch (ParseException e) {
-				e.printStackTrace();
 			}
 		}
 		return flag;
@@ -3474,9 +3452,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			if(StringUtils.isNotBlank(sb)){
 				String substring = sb.substring(0, sb.length() - 1);
 				if (CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())) {
-					errorMsg += nameCn + "中的" + substring + "与数据字典不匹配, ";
+					errorMsg += nameCn + "中的" + substring + "与数据字典不匹配";
 				} else {
-					errorMsg += nameEn + " " + substring + " does not match the data dictionary, ";
+					errorMsg += nameEn + " " + substring + " does not match the data dictionary";
 				}
 				msgList.add(errorMsg);
 			}else{
@@ -3542,9 +3520,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		//单选
 		if(regulationOwnerId.contains(",")){
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				errorMsg += nameCn + "导入只能填写一个用户名, ";
+				errorMsg += nameCn + "导入只能填写一个用户名";
 			}else{
-				errorMsg += "Only one user name can be entered for"+ nameEn +"import, ";
+				errorMsg += "Only one user name can be entered for"+ nameEn +"import";
 			}
 			msgList.add(errorMsg);
 		}
@@ -3563,17 +3541,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			}
 			if(count == 0){
 				if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-					errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配, ";
+					errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
 				}else{
-					errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list, ";
+					errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
 				}
 				msgList.add(errorMsg);
 			}
 		}else{
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配, ";
+				errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
 			}else{
-				errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list, ";
+				errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
 			}
 			msgList.add(errorMsg);
 		}
@@ -3600,9 +3578,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				List<String> finalValueList = valueList;
 				List<String> diffList = list.stream().filter(e -> !finalValueList.contains(e)).collect(Collectors.toList());
 				if (CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())) {
-					errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配, ";
+					errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配";
 				} else {
-					errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary, ";
+					errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary";
 				}
 				msgList.add(errorMsg);
 			}
@@ -3651,13 +3629,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 						throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the project laws and cannot be added");
 					}
 				}
-			}else{
-				for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) {
-					List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
-							.filter(e -> e.getSerialNumber().equals(projectCertificationInventoryEO.getSerialNumber())).collect(Collectors.toList());
-					projectCertificationInventoryEO.setBussDocumentLibraryId(collect.get(0).getId());
-				}
 			}
+//			else{
+//				for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) {
+//					List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
+//							.filter(e -> e.getSerialNumber().equals(projectCertificationInventoryEO.getSerialNumber())).collect(Collectors.toList());
+//					projectCertificationInventoryEO.setBussDocumentLibraryId(collect.get(0).getId());
+//				}
+//			}
 		}
 
 	}
@@ -3706,29 +3685,40 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			//文件
 			exportFile(dataList,fileInfos);
 
-			for(int i =0 ;i<dataList.size();i++){
-				if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.FILE.getValue())){
-					if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){
-						fileName = ossFileService.getFileInfos(dataList.get(i).getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
-						dataList.get(i).setDeliveryResult(fileName);
 
-					}
-				}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.TEXT.getValue())){
-					if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){
-						fileName = dataList.get(i).getDeliveryResult();
-						dataList.get(i).setDeliveryResult(fileName);
-					}
-				}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.NA.getValue())){
-					fileName = "";
-					dataList.get(i).setDeliveryResult(fileName);
-				}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.SELECT.getValue())) {
-					if (StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())) {
-						fileName = dataList.get(i).getDeliveryResult();
+			for(int i =0 ;i<dataList.size();i++){
+				if(dataList.get(i).getValueType()!=null){
+					if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.FILE.getValue())){
+						if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){
+							fileName = ossFileService.getFileInfos(dataList.get(i).getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
+							dataList.get(i).setDeliveryResult(fileName);
+
+						}
+					}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.TEXT.getValue())){
+						if(StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())){
+							fileName = dataList.get(i).getDeliveryResult();
+							dataList.get(i).setDeliveryResult(fileName);
+						}
+					}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.NA.getValue())){
+						fileName = "";
 						dataList.get(i).setDeliveryResult(fileName);
+					}else if(dataList.get(i).getValueType().equals(SysCategoryValueTypeEnum.SELECT.getValue())) {
+						if (StringUtils.isNotEmpty(dataList.get(i).getDeliveryResult())) {
+							fileName = dataList.get(i).getDeliveryResult();
+							if(fileName.equals("1")){
+								fileName = "是";
+							}else if(fileName.equals("2")){
+								fileName = "否";
+							}
+							dataList.get(i).setDeliveryResult(fileName);
+						}
 					}
 				}
+
 			}
 
+
+
 			String excelName = projectCertificationInventoryEO.getExcelName()+".xlsx";
 //			String excelName = "";
 //			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
@@ -3985,11 +3975,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 				title = "*类别,*检验项目,*配置项,*WVTA ID," +
 						"*标准编号,*责任领域,*工程接口人,*责任人," +
-						"*交付物类型,交付物模板,*截止日期,报告编号,产品型号,生产企业名称";
+						"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 			}else {
 				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
 						"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
-						"*Deliverable Type,Deliverable Template,*Due Date,Report No,Product Model,Name Of Manufacturer";
+						"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 			}
 
 			List<String> list = Arrays.asList(title.split(","));
@@ -4008,7 +3998,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			nowFile.mkdirs();
 			HSSFSheet sheet = workbook.createSheet("认证清单导入模板");
 			sheet.setDefaultColumnWidth(16);//列宽
-//			HSSFCellStyle cellStyle = workbook.createCellStyle();
+
+			HSSFCellStyle cellStyle = workbook.createCellStyle();
+			cellStyle.setDataFormat((short) 49);
+			sheet.setDefaultColumnStyle(10,cellStyle);
+
 //			cellStyle.setWrapText(true);//自动换行
 //			cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
 //			cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 590d1ea76..759b95ce3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -531,55 +531,52 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			allList = allList.stream().distinct().collect(Collectors.toList());
 
 
-//			List<String> engineeringInterfacePersonList = new ArrayList<>();
-//			engineeringInterfacePersonList = Arrays.asList(projectLawsInventoryEO.getEngineeringInterfacePerson().split(","));
-//			engineeringInterfacePersonList = engineeringInterfacePersonList.stream().distinct().collect(Collectors.toList());
-
-
 			List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectLibrartId, dutyTerritoryList);
 
 			//enginnerList为每一条的工程接口人的集合
 			List<String> enginnerList = new ArrayList<>();
+			for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnelList){
+				enginnerList.add(projectRelatedPersonnel.getEngineeringInterfacePerson());
+			}
 			if(projectRelatedPersonnelList.size()>0){
 				for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnelList){
-					if(StringUtils.isEmpty(projectRelatedPersonnel.getEngineeringInterfacePerson())){
+					if(enginnerList.size()<0){
 						//直接将allList存入到
 						String all = String.join(",",allList);
 						projectRelatedPersonnel.setEngineerLawSet(all);
-						projectRelatedPersonnelService.editById(projectRelatedPersonnel);
+//						projectRelatedPersonnelService.editById(projectRelatedPersonnel);
 
 					}else {
-						enginnerList.add(projectRelatedPersonnel.getEngineeringInterfacePerson());
 						enginnerList = enginnerList.stream().distinct().collect(Collectors.toList());
 						//比较allList中有而enginnerList中没有的工程接口人
-						boolean flag = false;
-						List<String> resultList = new ArrayList<>();
-						if(allList.size()>0){
-							flag = CollectionUtils.isEqualCollection(allList,enginnerList);
-							if(!flag){
-								//进行遍历两个list，将allList中有的而enginnerList没有的存入到相关人员名单中的法规那里
-
-								for(String all : allList){
-									boolean flag1 = true;
-									for(String enginner : enginnerList){
-										if(all.equals(enginner)){
-											flag1 = false;
-											break;
-										}
-									}
-									if(flag1){
-										resultList.add(all);
-									}
-								}
-							}
-						}
+						allList.removeAll(enginnerList);
+//						if(allList.size()>0){
+//							flag = CollectionUtils.isEqualCollection(allList,enginnerList);
+//							if(!flag){
+//								//进行遍历两个list，将allList中有的而enginnerList没有的存入到相关人员名单中的法规那里
+//
+//								for(String all : allList){
+//									boolean flag1 = true;
+//									for(String enginner : enginnerList){
+//										if(all.equals(enginner)){
+//											flag1 = false;
+//											break;
+//										}
+//									}
+//									if(flag1){
+//										resultList.add(all);
+//									}
+//								}
+//							}
+//						}
 						//将相关人员名单中没有的resultList添加到相关人员记录表中
-						String result = String.join(",",resultList);
+						String result = String.join(",",allList);
 						projectRelatedPersonnel.setEngineerLawSet(result);
-						projectRelatedPersonnelService.editById(projectRelatedPersonnel);
+//						projectRelatedPersonnelService.editById(projectRelatedPersonnel);
 					}
 				}
 			}
+			this.projectRelatedPersonnelService.updateBatchById(projectRelatedPersonnelList);
 
 
 			//翻译-中文
@@ -10199,7 +10196,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 		}
 		//相关人员名单中取法规工程师
-		List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null);
+		List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null);
 		List<String> lawEngineerNameList = new ArrayList<>();
 		if(projectRelatedPersonnels.size() != 0){
 			for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index af60b7006..d876d9694 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -252,7 +252,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				null,
 				null,
 				null,
-				null);
+				null,null);
 		if(projectRelatedPersonnelList.size() != 0){
 			List<ProjectUserPermission> relatedPersonnelPermissionList = new ArrayList<>();
 			for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnelList) {
@@ -518,7 +518,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		//编辑时如果认证工程师发生变化,同步修改相关人员名单中的认证工程师
 		List<ProjectRelatedPersonnel> result = projectRelatedPersonnelMapper.queryPageList(projectLibraryBase.getId(),
-				DictCodeEnum.DUTY_TERRITORY.getValue(), null, null, null, null);
+				DictCodeEnum.DUTY_TERRITORY.getValue(), null, null, null, null,null);
 		//项目的认证工程师
 		String certificationEngineer = projectLibraryBase.getCertificationEngineer();
 		//一个都不选的情况下
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index 3b8b077e0..4de2a9337 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -287,14 +287,17 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 													   String dutyTerritoryTemp,
 													   String lawEngineer,
 													   String engineeringInterfacePerson,
-													   String certificationEngineer) {
+													   String engineerLawSet,String engineerAttSet){
+//													   String certificationEngineer) {
 		//查询数据
 		List<ProjectRelatedPersonnel> result = projectRelatedPersonnelMapper.queryPageList(projectId,
 				DictCodeEnum.DUTY_TERRITORY.getValue(),
 				dutyTerritoryTemp,
 				lawEngineer,
 				engineeringInterfacePerson,
-				certificationEngineer);
+//				certificationEngineer
+				engineerLawSet,
+				engineerAttSet);
 		//查询数据里的责任领域
 		List<String> dutyTerritory = result.stream().map(e -> e.getDutyTerritory()).collect(Collectors.toList());
 		//查标签内容里的责任领域数据
@@ -303,7 +306,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		if(StringUtils.isBlank(dutyTerritoryTemp)
 				&& StringUtils.isBlank(lawEngineer)
 				&& StringUtils.isBlank(engineeringInterfacePerson)
-				&& StringUtils.isBlank(certificationEngineer)){
+//				&& StringUtils.isBlank(certificationEngineer)
+				&& StringUtils.isBlank(engineerLawSet)
+				&& StringUtils.isBlank(engineerLawSet)){
 			if(result.size() != sysDictItemValueList.size()){
 
 				//更新相关人员表里的责任领域数据
@@ -320,7 +325,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						dutyTerritoryTemp,
 						lawEngineer,
 						engineeringInterfacePerson,
-						certificationEngineer);
+						engineerLawSet,
+						engineerAttSet);
 			}
 		}
 		disposeData(result);
@@ -405,7 +411,54 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					projectRelatedPersonnel.setCertificationEngineerName(certificationName.substring(0,certificationName.toString().length()-1));
 				}
 			}
-
+			//法规工程师设置
+			List<SysUser> engineerLawSetUsers = new ArrayList<>();
+			if (StringUtils.isNotEmpty(projectRelatedPersonnel.getEngineerLawSet())){
+				List<String> engineerLawSetIdList = Arrays.asList(projectRelatedPersonnel.getEngineerLawSet().split(","));
+				if (CollectionUtils.isNotEmpty(engineerLawSetIdList)) {
+					engineerLawSetIdList=engineerLawSetIdList.stream().distinct().collect(Collectors.toList());
+					QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
+					userqueryWrapper.in("id ", engineerLawSetIdList);
+					engineerLawSetUsers = sysUserMapper.selectList(userqueryWrapper);
+				}
+				if(CollectionUtils.isNotEmpty(engineerLawSetUsers)) {
+					String engineerAttSetId = projectRelatedPersonnel.getEngineerAttSet();
+					String engineerLawSetName = null;
+					StringBuilder lawSetName = new StringBuilder();
+					for (String data : engineerLawSetIdList) {
+						if (StringUtils.isNotEmpty(engineerAttSetId)) {
+							engineerLawSetName = engineerLawSetUsers.stream().filter(e -> data.equals(e.getId()))
+									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
+						}
+						lawSetName.append(engineerLawSetName).append(",");
+					}
+					projectRelatedPersonnel.setEngineerLawSetName(lawSetName.substring(0,lawSetName.toString().length()-1));
+				}
+			}
+			//认证工程师设置
+			List<SysUser> engineerAttSetUsers = new ArrayList<>();
+			if (StringUtils.isNotEmpty(projectRelatedPersonnel.getEngineerAttSet())){
+				List<String> engineerAttSetIdList = Arrays.asList(projectRelatedPersonnel.getEngineerAttSet().split(","));
+				if (CollectionUtils.isNotEmpty(engineerAttSetIdList)) {
+					engineerAttSetIdList=engineerAttSetIdList.stream().distinct().collect(Collectors.toList());
+					QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
+					userqueryWrapper.in("id ", engineerAttSetIdList);
+					engineerAttSetUsers = sysUserMapper.selectList(userqueryWrapper);
+				}
+				if(CollectionUtils.isNotEmpty(engineerAttSetUsers)) {
+					String engineerAttSetId = projectRelatedPersonnel.getEngineerAttSet();
+					String engineerAttSetName = null;
+					StringBuilder AttSetName = new StringBuilder();
+					for (String data : engineerAttSetIdList) {
+						if (StringUtils.isNotEmpty(engineerAttSetId)) {
+							engineerAttSetName = engineerAttSetUsers.stream().filter(e -> data.equals(e.getId()))
+									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
+						}
+						AttSetName.append(engineerAttSetName).append(",");
+					}
+					projectRelatedPersonnel.setEngineerAttSetName(AttSetName.substring(0,AttSetName.toString().length()-1));
+				}
+			}
 		}
 	}
 
@@ -564,7 +617,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		QueryWrapper<ProjectRelatedPersonnel> wrapper = new QueryWrapper<>();
 		wrapper.eq("project_id",projectId).in("duty_territory",dutyTerritoryList);
 		List<ProjectRelatedPersonnel> projectRelatedPersonnels = baseMapper.selectList(wrapper);
-
 		return projectRelatedPersonnels;
 
 
@@ -589,7 +641,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				records = queryById(id);
 			}
 		}else{
-			records=queryPageList(projectId,null,null,null,null);
+			records=queryPageList(projectId,null,null,null,null,null);
 		}
 		//id无值,传全部
 		disposeDutyTerritory(records,cut);
@@ -744,10 +796,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		try {
 			String titleOne = "";
 			if (CutEnum.CN.getValue().equals(projectRelatedPersonnel.getCut())) {
-				titleOne = "责任领域,法规工程师,工程接口人,认证工程师,备注";
+				titleOne = "责任领域,法规工程师,工程接口人,工程接口人-法规工程师设置,工程接口人-认证工程师设置,备注";
 				fileOriName = "相关人员导入模板.xls";
 			} else {
-				titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Homologation Engineer,Comments";
+				titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Project Interface Person - Regulation Engineer Setting,Project Interface Person - Certification Engineer Setting,Comments";
 				fileOriName = "Import template of related personnel.xls";
 			}
 
@@ -764,7 +816,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				sheetName = "Personal List";
 			}
 			HSSFSheet sheet = workbook.createSheet(sheetName);
-			sheet.setDefaultColumnWidth(16);//列宽
+			sheet.setDefaultColumnWidth(20);//列宽
 			HSSFCellStyle cellStyle = workbook.createCellStyle();
 			cellStyle.setWrapText(true);//自动换行
 			cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
@@ -774,7 +826,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			cellStyleTemp.setWrapText(true);//自动换行
 
 			int startLine = 0;
-			int endLine = 4;
+			int endLine = 5;
 			//合并单元格
 			CellRangeAddress region1 =
 					new CellRangeAddress(1, 1, startLine, endLine); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
@@ -788,14 +840,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 								+ "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据；\n"
 								+ "2.填写人员时，必须使用人员账号进行填写；\n"
 								+ "3.填写的人员账号必须与系统中账号保持一致；\n"
-								+ "4.填写任意一责任领域内工程师人员时，必须填写法规工程师、工程接口人、认证工程师三个字段信息。";
+								+ "4.填写任意一责任领域内工程师人员时，必须填写法规工程师、工程接口人、工程接口人-法规工程师设置、工程接口人-认证工程师设置四个字段信息。";
 			} else {
 				explainInfo =
 						"filling explanation\n"
 								+ "1. Import data from the third line, the first line is header, the second line is description, and the third line is official data;\n"
 								+ "2. When filling in personnel, personnel account must be used to fill in;\n"
 								+ "3. The personnel account number filled in must be consistent with the account number in the system;\n"
-								+ "4. When filling in the engineers in any responsibility field, you must fill in the information of three fields: legal engineer, engineering interface person and certified engineer.";
+								+ "4. When filling in the engineers in any responsibility field, you must fill in the information of three fields: legal engineer, engineering interface person ,Project Interface Person - Regulation Engineer Setting and Project Interface Person - Certification Engineer Setting.";
 			}
 			HSSFRichTextString explain = new HSSFRichTextString(explainInfo);
 
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 787226665..a188678b6 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1669,7 +1669,7 @@ module.exports = {
     '(a)告知车辆用户车辆升级的结果(成功或失败)；\n' +
     '\n' +
     '(b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。',
-  upgradepacketprotectionmeasures:'软件版本（集）识别与存储',
+  // upgradepacketprotectionmeasures:'软件版本（集）识别与存储',
   otaupgradedsecuritymeasuresforvehicles:'车辆OTA升级安全措施',
   authenticityandintegrityprotectionmechanism:'真实性、完整性保护机制(可多选)',
   failsafmechanism:'防失效保护机制(可多选)',
diff --git a/jero-web/src/components/ImportFileData/index.vue b/jero-web/src/components/ImportFileData/index.vue
index 23e53b99c..d2126df9b 100644
--- a/jero-web/src/components/ImportFileData/index.vue
+++ b/jero-web/src/components/ImportFileData/index.vue
@@ -120,6 +120,25 @@
             })
             } else {
               if (this.isTrue) {
+                let {message} = info.file.response
+                let {name} = info.file
+                let content = []
+                if (message) {
+                  message = message.split('</br>')
+                  message.forEach(res => {
+                    if (res) {
+                      content.push( < div > {res} < /div>)
+                    }
+                  })
+                }
+                this.$warning({
+                  title: name,
+                  content: (
+                    < div >
+                      {content}
+                    < /div>
+                  )
+                })
                 if(info.file.response.result != null && info.file.response.result.otaId){
                   localStorage.setItem('otaId', info.file.response.result.otaId)
                 }
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 59f30073b..19e6f6876 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -176,7 +176,8 @@ export default {
       disabled: false,
       form: {
         qymc: '安徽江淮汽车集团股份有限公司',
-        bapc: undefined
+        bapc: undefined,
+        cxmb: undefined
       },
       url: {
         exportData: '/ota/otaBaSjSjmbcx/exportData',
@@ -206,7 +207,7 @@ export default {
     handleModule() {
       downloadFile('ota/otaBaSjSjmbcx/exportTemplate', '升级目标车型' + '.zip', {})
     },
-    getData() {
+    getData(item) {
       let otaIdT = localStorage.getItem('otaIdT')
       if (otaIdT == null) {
         otaIdT = ''
@@ -232,15 +233,15 @@ export default {
 
             this.form = res.result
             this.form.otaId=''
-            // if (this.$route.query.type == 1 && res.result.cxmb == null) {
-            //   this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
-            // } else {
-            //   if (this.$route.query.type == 2 && res.result.cxmb == null) {
-            //     this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
-            //   } else {
-            //     this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
-            //   }
-            // }
+            if (this.$route.query.type == 1 && res.result.cxmb == null && !item) {
+              this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
+            } else {
+              if (this.$route.query.type == 2 && res.result.cxmb == null  && !item) {
+                this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
+              } else {
+                this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
+              }
+            }
 
             if (res.result.dllx1 == null || res.result.dllx1 == "") {
               this.form.dllx1 = undefined
@@ -249,9 +250,9 @@ export default {
             if (res.result.dllx2 == null || res.result.dllx2 == "") {
               this.form.dllx2 = undefined
             }
-            if (res.result.cxmb == null || res.result.cxmb == "") {
-              this.form.cxmb = undefined
-            }
+            // if (res.result.cxmb == null || res.result.cxmb == "") {
+            //   this.form.cxmb = undefined
+            // }
             if (res.result.bapc == null || res.result.bapc == "") {
               this.form.bapc = undefined
             }
@@ -265,14 +266,15 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           let otaId = localStorage.getItem('otaId')
-      if (otaId == null|| otaId == undefined) {
-        otaId = ''
-      }
+          if (otaId == null || otaId == undefined) {
+            otaId = ''
+          }
           this.selectListPc.map(item => {
             if (item.id == this.form.bapc) {
               this.form.bapc = item.ggpc
             }
           })
+          this.form.otaId = otaId
           postAction('/ota/otaBaSjSjmbcx/add', { otaId: otaId, ...this.form }).then(res => {
             if (res.code == 200) {
               localStorage.setItem('otaId', res.result.otaId)
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index 15b86d0c6..69c67a94f 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -241,6 +241,7 @@ import { message } from 'ant-design-vue'
         formInline:{},
         projectNameList:[],
         formRules:[],
+        flag:'',
         url: {
           exportData: '/ota/otaBaCxJbxx/exportData',
           importZipUrl: '/ota/otaBaCxJbxx/importData?otaId=' + localStorage.getItem('otaId'),//导入
@@ -310,7 +311,7 @@ import { message } from 'ant-design-vue'
            }
          })
       },
-      getData(){
+      getData(item){
         let otaIdT=localStorage.getItem('otaIdT')
         if(otaIdT==null){
           otaIdT=''
@@ -332,10 +333,10 @@ import { message } from 'ant-design-vue'
             this.form.txzd=res.result.txzd
             this.form.cdotasj=res.result.cdotasj
             this.form.id=res.result.id
-           if(this.$route.query.type == 1 && res.result.cxmb == null){
+           if(this.$route.query.type == 1 && res.result.cxmb == null && !item){
              this.form.cxmb = this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
            }else {
-            if(this.$route.query.type == 2 && res.result.cxmb == null){
+            if(this.$route.query.type == 2 && res.result.cxmb == null && !item){
               this.form.cxmb = this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
             }else{
               this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
@@ -370,6 +371,9 @@ import { message } from 'ant-design-vue'
           if(valid){
             this.save()
          setTimeout(()=>{
+           if(this.flag == 1){
+             return
+           }
           this.$emit('basicInformationForm')
          },1000)
 
@@ -385,11 +389,14 @@ import { message } from 'ant-design-vue'
               otaId=''
             }
             postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => {
-           if(res.code == 200){
+           if(res.success){
             localStorage.setItem('otaId', res.result.otaId)
-             this.$message.success(this.$t('SavedSuccessfully'))
+             this.$message.success(res.message)
              this.getData()
-          }
+          }else{
+             this.$message.warning(res.message)
+             this.flag = 1
+           }
         })
           }
         })
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index ad8a466a4..541e9bdae 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -27,8 +27,8 @@
       <!--      配置情况-->
       <span slot="configuration" slot-scope="text,record" >
             <a-radio-group  v-model="record.pzqk" >
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+                    <a-radio :value="1"> {{ $t('have') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('nothing') }} </a-radio>
             </a-radio-group>
       </span>
       <!--      可升级-->
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
index 7de401508..40ce2ea96 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
@@ -304,7 +304,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('Quantity'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jgldBzwz',
@@ -320,7 +320,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jgldScqy',
@@ -328,7 +328,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('productionenterprise'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'hmbldSl',
@@ -336,7 +336,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('Quantity'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'hmbldBzwz',
@@ -352,7 +352,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'hmbldScqy',
@@ -360,7 +360,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('productionenterprise'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'csbldSl',
@@ -368,7 +368,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('Quantity'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'csbldBzwz',
@@ -384,7 +384,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'csbldScqy',
@@ -392,7 +392,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('productionenterprise'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'sxthsSl',
@@ -400,7 +400,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('Quantity'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'sxthsBzwz',
@@ -416,7 +416,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'sxthsScqy',
@@ -424,7 +424,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('productionenterprise'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'sxtdsdSl',
@@ -432,7 +432,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('Quantity'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'sxtdsdBzwz',
@@ -448,7 +448,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'sxtdsdScqy',
@@ -456,7 +456,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('productionenterprise'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsyjkSl',
@@ -464,7 +464,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('Quantity'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsyjkBzwz',
@@ -480,7 +480,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsyjkScqy',
@@ -488,7 +488,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('productionenterprise'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsyhwSl',
@@ -496,7 +496,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('Quantity'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsyhwBzwz',
@@ -512,7 +512,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsyhwScqy',
@@ -520,7 +520,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('productionenterprise'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'czwxdwGgxh',
@@ -528,7 +528,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'czwxdwScqy',
@@ -536,7 +536,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'gxdhGgxh',
@@ -544,7 +544,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'gxdhScqy',
@@ -552,7 +552,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'lsjGgxh',
@@ -560,7 +560,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'lsjScqy',
@@ -568,7 +568,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'gjddtGgxh',
@@ -576,7 +576,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('VersionNumber'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'gjddtScqy',
@@ -584,7 +584,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'dzwlDxxgcs',
@@ -592,7 +592,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('qualitativelydescriberelevantplaces'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'cztxXtmc',
@@ -600,7 +600,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('systemname'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'cztxGgxh',
@@ -616,7 +616,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('systemproductionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'cztxBbh',
@@ -624,7 +624,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('softwareversionnumber'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'cztxKfqy',
@@ -632,7 +632,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('softwaredevelopmententerprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsfzczjMc',
@@ -640,7 +640,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('controlname'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsfzczjYjxh',
@@ -648,7 +648,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('hardwarespecificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsfzczjScqy',
@@ -656,7 +656,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsfzzsqMc',
@@ -664,7 +664,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('nameofindicatorsignaldevice'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsfzzsqYjxh',
@@ -672,7 +672,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('hardwarespecificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsfzzsqScqy',
@@ -680,7 +680,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'fxptstsMc',
@@ -688,7 +688,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('nameofindicatorsignaldevice'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'fxptstsYjxh',
@@ -696,7 +696,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('hardwarespecificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'fxptstsScqy',
@@ -704,7 +704,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsyzyltsMc',
@@ -712,7 +712,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('nameofindicatorsignaldevice'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsyzyltsYjxh',
@@ -720,7 +720,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('hardwarespecificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'jsyzyltsScqy',
@@ -728,7 +728,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'dssadGgxh',
@@ -736,7 +736,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'dssadScqy',
@@ -744,7 +744,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'edrGgxh',
@@ -752,7 +752,7 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('specificationmodel'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
         {
           key: 'edrScqy',
@@ -760,13 +760,13 @@ export default {
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
           ParameterName: this.$t('productionenterprise'),
-          fillincontent:this.$t('haveisselected'),
+          fillincontent:this.$t('yesisselected'),
         },
       ],
       queryParam: {},
       dataSourceList: [
         {
-          bjmc:'车端OTA升级功能模块'
+          bjmc:''
         }
       ],
       columns: [
@@ -878,7 +878,7 @@ export default {
               if(res.result.kzq.length == 0){
                 this.dataSourceList=[
                 {
-                  bjmc:'车端OTA升级功能模块'
+                  bjmc:''
                 }
       ]
               }else{
@@ -981,7 +981,7 @@ export default {
     },
     addlineAtBot(){
         let obj={}
-        obj.bjmc='车端OTA升级功能模块'
+        obj.bjmc=''
         this.dataSourceList.push(obj)
         this.$forceUpdate()
       },