Merge remote-tracking branch 'origin/develop_dl_3.7.0.9' into develop_dl_3.7.0.9

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

@@ -752,6 +752,23 @@ public class InputItemController extends AbstractBaseController {
 				map.put("OkScore",param.getOkScore()!=null?param.getOkScore():0);
 				map.put("NoScore",param.getNoScore()!=null?param.getNoScore():0);
 				map.put("CheckType",param.getCheckType());
+				String inputClassify = "";
+				switch(param.getInputClassify()) {
+					case "WGJC":
+						inputClassify = "外观检查";
+						break;
+					case "GNCS":
+						inputClassify = "功能测试";
+						break;
+					case "HJJC":
+						inputClassify = "环境检查";
+						break;
+					case "QT":
+						inputClassify = "其他";
+						break;
+					default:
+				}
+				inputItem.setInputClassify(inputClassify);
 				inputItem.setDataJson(JSONObject.toJSONString(map));
 
 			}else if(param.getItemType().equals("选择")){
@@ -771,10 +788,10 @@ public class InputItemController extends AbstractBaseController {
 				map.put("ValidDown",param.getValidDown()!=null?param.getValidDown():"");
 				map.put("OkUp",param.getOkUp()!=null?param.getOkUp():"");
 				map.put("OkDown",param.getOkDown()!=null?param.getOkDown():"");
-				map.put("CheckValidUp",param.getCheckValidUp().equals("false")?false:true);
-				map.put("CheckValidDown",param.getCheckValidDown().equals("false")?false:true);
-				map.put("CheckOkUp",param.getCheckOkUp().equals("false")?false:true);
-				map.put("CheckOkDown",param.getCheckOkDown().equals("false")?false:true);
+				map.put("CheckValidUp",param.getCheckValidUp().equals("否")?false:true);
+				map.put("CheckValidDown",param.getCheckValidDown().equals("否")?false:true);
+				map.put("CheckOkUp",param.getCheckOkUp().equals("否")?false:true);
+				map.put("CheckOkDown",param.getCheckOkDown().equals("否")?false:true);
 				map.put("Precision",param.getPrecision()!=null?param.getPrecision():0);
 				inputItem.setDataJson(JSONObject.toJSONString(map));
 			}

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1870,7 +1870,7 @@
         WHERE
         (
         0 <![CDATA[<>]]> find_in_set(`fs`.`id`, `s`.`system_id`)
-        ) limt 1
+        ) LIMIT 1
         ) AS `chargePersonName`
         FROM
         `wl_equipment_specific_index` `si`