修改检查项导入导出模板下载中问题

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
 import com.yeejoin.amos.patrol.business.dto.InputItemDataDto;
 import com.yeejoin.amos.patrol.business.dto.InputItemDataJsonlDto;
 import com.yeejoin.amos.patrol.business.dto.InputItemExcelDto;
+import com.yeejoin.amos.patrol.business.dto.InputItemExcelVo;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.param.InputItemPageParam;
 import com.yeejoin.amos.patrol.business.param.InputItemParam;
@@ -370,9 +371,9 @@ public class InputItemController extends AbstractBaseController {
 	@RequestMapping(value = "/exportData", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public void exportData(HttpServletResponse response) {
 		InputItemPageParam  criterias = new InputItemPageParam();
-		List<InputItemExcelDto> content = inputItemMapper.getInputItemInfoExcelNew(criterias);
+		List<InputItemExcelVo> content = inputItemMapper.getInputItemInfoExcelNew(criterias);
 		//此处对数据做统一处理 拼接为易读内容
-		for (InputItemExcelDto inputItemExcelDto : content) {
+		for (InputItemExcelVo inputItemExcelDto : content) {
 			String text = "";
 			if (inputItemExcelDto.getItemType().equals("选择")&& !inputItemExcelDto.getDataJson().equals("[]")) {
 				List<Map> maps = JSONObject.parseArray(inputItemExcelDto.getDataJson(), Map.class);
@@ -395,7 +396,7 @@ public class InputItemController extends AbstractBaseController {
 			}
 		}
 
-		ExcelUtil.createTemplate(response,"检查项","检查项",content,InputItemExcelDto.class,null,true);
+		ExcelUtil.createTemplate(response,"检查项","检查项",content,InputItemExcelVo.class,null,true);
 
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/InputItemMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.patrol.business.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.patrol.business.dto.InputItemExcelDto;
+import com.yeejoin.amos.patrol.business.dto.InputItemExcelVo;
 import com.yeejoin.amos.patrol.business.param.InputItemPageParam;
 import com.yeejoin.amos.patrol.business.vo.InputItemVo;
 import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
@@ -31,7 +32,7 @@ public interface InputItemMapper extends BaseMapper<InputItem> {
 
     public List<InputItemVo> getInputItemInfoNew(InputItemPageParam param);
 
-    public List<InputItemExcelDto> getInputItemInfoExcelNew(InputItemPageParam param);
+    public List<InputItemExcelVo> getInputItemInfoExcelNew(InputItemPageParam param);
 
     Map<Long, Long> getAllCountInfo();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/InputItemExcelDto.java

@@ -71,7 +71,7 @@ public class InputItemExcelDto extends BaseDto {
     @ExplicitConstraint(indexNum=11,source = {"是","否"})
     @ExcelProperty(value = "是否必填", index = 11)
     @ApiModelProperty(value = "是否必填")
-    private String isMust = "0";
+    private String isMust = "否";
 
     @ExplicitConstraint(indexNum=12,source = {"是","否"})
     @ExcelProperty(value = "是否评分", index = 12)
@@ -298,20 +298,27 @@ public class InputItemExcelDto extends BaseDto {
     }
 
     public String getKeyPartsType() {
-        return keyPartsType.equals("是")?"0":"1";
+        return keyPartsType;
+        // keyPartsType.equals("是")?"0":"1";
     }
 
     public void setKeyPartsType(String keyPartsType) {
-        this.keyPartsType = StringUtils.isEmpty(keyPartsType) ? "1":keyPartsType;
+      //  this.keyPartsType = StringUtils.isEmpty(keyPartsType) ? "1":keyPartsType;
+        this.keyPartsType =StringUtils.isEmpty(keyPartsType) ? (keyPartsType.equals("是")?"0":"1") :keyPartsType;
+
     }
 
 
     public String getCustomType() {
-        return customType.equals("是")?"0":"1";
+        return customType;
     }
 
-    public void setCustomType(String customType) {
+ /*   public void setCustomType(String customType) {
         this.customType = StringUtils.isEmpty(customType) ? "1":customType;
+    }*/
+
+    public void setCustomType(String customType) {
+        this.customType =StringUtils.isEmpty(customType) ? (customType.equals("是")?"0":"1") :customType;
     }
 
     public String getUnit() {
@@ -347,11 +354,11 @@ public class InputItemExcelDto extends BaseDto {
     }
 
     public String getLevel() {
-        return  level == null? null :String.valueOf(PointLevelEnum.getValue(level));
+        return  level ;
     }
 
     public void setLevel(String level) {
-        this.level = level;
+        this.level = level  == null? null :String.valueOf(PointLevelEnum.getValue(level));
     }
 
     public long getCatalogId() {

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -388,7 +388,7 @@
 		</choose>
 	</select>
 
-	<select id="getInputItemInfoExcelNew" resultType="com.yeejoin.amos.patrol.business.dto.InputItemExcelDto">
+	<select id="getInputItemInfoExcelNew" resultType="com.yeejoin.amos.patrol.business.dto.InputItemExcelVo">
 		SELECT
 		a.id,
 		a.name,
@@ -402,27 +402,27 @@
 		a.input_classify,
 		a.check_method,
 		(CASE a.equipment_type
-		WHEN  a.equipment_type is not null and  a.equipment_type = '-1'
+		WHEN  '-1'
 		THEN '通用消防装备'
 		ELSE
 		(select name from  wl_equipment_category where code = a.equipment_type AND industry_code = 2)
 		END)   as  equipment_type,
 		(CASE a.facilities_type
-		WHEN  a.facilities_type is not null and  a.facilities_type = '-1'
+		WHEN  '-1'
 		THEN '通用消防设施'
 		ELSE (select name from  wl_equipment_category where code = a.facilities_type AND industry_code = 2)
 		END)   as  facilities_type,
 		(CASE a.level
 		WHEN 1 THEN
-		'1级'
+		'一级'
 		WHEN 2 THEN
-		'2级'
+		'二级'
 		WHEN 3 THEN
-		'3级'
+		'三级'
 		WHEN 4 THEN
-		'4级'
+		'四级'
 		ELSE
-		'5级'
+		'五级'
 		END )AS level,
 		(CASE a.key_parts_type
 		WHEN 0 THEN