修改代码

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

@@ -87,6 +87,8 @@ public class InputItemController extends AbstractBaseController {
 	 */
 	private static final String EQUIP_AND_FIRE_TREE = "EQUIP_AND_FIRE_TREE:";
 
+	private static final String ITEMTYPE = "选择,文本:";
+
 
 /**
  * 新加接口*****************************************************************************
@@ -376,11 +378,11 @@ public class InputItemController extends AbstractBaseController {
 		//此处对数据做统一处理 拼接为易读内容
 		for (InputItemExcelVo inputItemExcelDto : content) {
 			String text = "";
-			if (inputItemExcelDto.getItemType().equals("选择")&& !inputItemExcelDto.getDataJson().equals("[]")) {
+			if (inputItemExcelDto.getItemType().equals("选择")&& !inputItemExcelDto.getDataJson().equals("[]")&& !inputItemExcelDto.getDataJson().equals("")) {
 				List<Map> maps = JSONObject.parseArray(inputItemExcelDto.getDataJson(), Map.class);
 				for (int i = 0; i< maps.size(); i++) {
 					Map jsonObject = maps.get(i);
-					text = text + jsonObject.get("name")+","+jsonObject.get("score")+","+jsonObject.get("isOk")+","+jsonObject.get("isChecked");
+					text = text +"名称："+jsonObject.get("name")+" "+"评分："+jsonObject.get("score")+" "+"选择是否合格："+jsonObject.get("isOk")+" "+"默认选中："+jsonObject.get("isChecked");
 					if(i < (maps.size()-1) ){
 						text = text+"|";
 						inputItemExcelDto.setDataJson(text);
@@ -389,6 +391,20 @@ public class InputItemController extends AbstractBaseController {
 					}
 				}
 			}
+			if (ITEMTYPE.contains(inputItemExcelDto.getItemType()) && !inputItemExcelDto.getPictureJson().equals("[]")&& !inputItemExcelDto.getPictureJson().equals("")) {
+				List<Map> maps = JSONObject.parseArray(inputItemExcelDto.getPictureJson(), Map.class);
+				text = "";
+				for (int i = 0; i< maps.size(); i++) {
+					Map jsonObject = maps.get(i);
+					text = text +"名称："+ jsonObject.get("name")+","+ "是否拍照："+jsonObject.get("isMust");
+					if(i < (maps.size()-1) ){
+						text = text+"|";
+						inputItemExcelDto.setPictureJson(text);
+					}else {
+						inputItemExcelDto.setPictureJson(text);
+					}
+				}
+			}
 			if (inputItemExcelDto.getItemType().equals("数字") || inputItemExcelDto.getItemType().equals("文本")) {
 				//此处为避免大量set方法 将data_json字段中的数据转为对象组装
 				InputItemDataJsonlDto inputItemDataJsonlDto = JSONObject.parseObject(inputItemExcelDto.getDataJson(), InputItemDataJsonlDto.class);

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

 package com.yeejoin.amos.patrol.business.dto;
 
-import cn.jiguang.common.utils.StringUtils;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -9,6 +8,7 @@ import com.yeejoin.amos.patrol.common.enums.PointCheckTypeEnum;
 import com.yeejoin.amos.patrol.common.enums.PointLevelEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import liquibase.pro.packaged.S;
 import lombok.Data;
 
 
@@ -66,7 +66,7 @@ public class InputItemExcelVo extends BaseDto {
 
     @ExcelProperty(value = "拍照项(文本/选择)", index = 14)
     @ApiModelProperty(value = "拍照项")
-    private Object pictureJson;
+    private String pictureJson;
 
     @ExplicitConstraint(indexNum=11,source = {"是","否"})
     @ExcelProperty(value = "是否必填", index = 11)
@@ -117,19 +117,19 @@ public class InputItemExcelVo extends BaseDto {
 
     @ExcelProperty(value = "强制校验，输入值不能大于有效值上限(数字)", index = 22)
     @ApiModelProperty(value = "强制校验，输入值不能大于有效值上限")
-    private String checkValidUp = "false";
+    private String checkValidUp ;
 
     @ExcelProperty(value = "强制校验，输入值不能小于有效值下限(数字)", index = 23)
     @ApiModelProperty(value = "强制校验，输入值不能小于有效值下限")
-    private String checkValidDown = "false";
+    private String checkValidDown ;
 
     @ExcelProperty(value = "合格判断，输入值大于合格值上限时为不合格(数字)", index = 24)
     @ApiModelProperty(value = "合格判断，输入值大于合格值上限时为不合格")
-    private String checkOkUp = "false";
+    private String checkOkUp ;
 
     @ExcelProperty(value = "合格判断，输入值小于合格值上限时为不合格(数字)", index = 25)
     @ApiModelProperty(value = "合格判断，输入值小于合格值上限时为不合格")
-    private String checkOkDown = "false";
+    private String checkOkDown ;
 
     @ExcelProperty(value = "小数点后位数(数字)", index = 26)
     @ApiModelProperty(value = "小数点后位数")
@@ -446,11 +446,11 @@ public class InputItemExcelVo extends BaseDto {
         this.orgCode = orgCode;
     }
 
-    public Object getPictureJson() {
+    public String getPictureJson() {
         return pictureJson;
     }
 
-    public void setPictureJson(Object pictureJson) {
+    public void setPictureJson(String pictureJson) {
         this.pictureJson = pictureJson;
     }
 

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

@@ -398,7 +398,18 @@
 		IFNULL(a.key_parts_type,1) AS keyPartsType,
 		IFNULL(a.custom_type,1) AS customType,
 		a.risk_desc,
+		(CASE a.data_json
+		WHEN '[]' THEN
+		''
+		ELSE
 		a.data_json
+		END ) AS dataJson,
+		(CASE a.picture_json
+		WHEN '[]' THEN
+		''
+		ELSE
+		a.picture_json
+		END ) AS pictureJson
 		from
 		p_input_item a left join p_catalog_tree b on a.catalog_id = b.id
 		where a.is_delete = '0'
@@ -441,10 +452,6 @@
 			<when test="level!=null and level != '-0'">and a.level = #{level}</when>
 		</choose>
 		order by a.id desc
-		<choose>
-			<when test="pageSize==-1"></when>
-			<when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
-		</choose>
 	</select>
 
 <select id="getEquipParentCode" resultType="map">