diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index fd5c6b4..3b25cf0 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1248,9 +1248,10 @@ public class PatrolResultController extends BaseController { if (str.equals("13")) { datetype = "3"; } else if (!str.equals("1") && !str.equals("2") && !str.equals("3")) { - datetype = str.equals("14") ? "4" : "2"; + datetype = str.equals("14") ? "4" : "1"; } else { - datetype = "1"; + datetype = "2"; + } } } @@ -1362,9 +1363,9 @@ public class PatrolResultController extends BaseController { if (strfile.equals("13")) { arr.setDataType("3"); } else if (!strfile.equals("1") && !strfile.equals("2") && !strfile.equals("3")) { - arr.setDataType(strfile.equals("14") ? "4" : "2"); + arr.setDataType(strfile.equals("14") ? "4" : "1"); } else { - arr.setDataType("1"); + arr.setDataType("2"); } } }