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-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -1437,13 +1437,17 @@ public class TopographyController extends AbstractBaseController {
 
 
     private Date dateParse(String value) throws ParseException {
-        String strDate = value.substring(0, 19);
-        SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
-        SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
-        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-        Date date = sdf.parse(strDate);
-        String time = DateTimeUtil.format(date, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
-        return  sdf1.parse(time);
+        if(value.length() > 19) {
+            String strDate = value.substring(0, 19);
+            SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
+            SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
+            sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+            Date date = sdf.parse(strDate);
+            String time = DateTimeUtil.format(date, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
+            return  sdf1.parse(time);
+        } else {
+            return DateUtils.dateParse(value, DateUtils.DATE_TIME_PATTERN);
+        }
     }
 
     /***

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/EquipmentCategoryMapper.xml

@@ -573,6 +573,7 @@
           AND biz_org_code like concat(#{bizOrgCode}, '%')
           AND is_delete = '0'
           AND input_type!='1'
+         AND key_parts_type='0'
     </select>
 
     <select id="countByCustomType" resultType="int">
@@ -581,6 +582,7 @@
           AND biz_org_code like concat(#{bizOrgCode}, '%')
           AND is_delete = '0'
           AND input_type!='1'
+          AND custom_type='0'
     </select>
 
     <select id="countAll" resultType="int">

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`

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

@@ -333,10 +333,10 @@
 			and a.equipment_type is not null
 		</if>
 		<if test="treeId != null and treeId != '' and treeId == '-4'">
-			and a.key_parts_type is not null
+			and a.key_parts_type ='0'
 		</if>
 		<if test="treeId != null and treeId != '' and treeId == '-5'">
-			and a.custom_type is not null
+			and a.custom_type ='0'
 		</if>
 		<if test="subCode!=null and subCode!='' and subCode!=' ' and
 		 treeId != null and treeId != '' and treeId != '-3' and treeId != '-1' and