近期更改。

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -179,10 +179,24 @@
         AND cs.signclosed_date = #{signclosedDate}
       </if>
       <if test="startTime != null and startTime != ''" >
-        AND cs.signclosed_date &gt;= #{startTime}
+        AND
+        (
+            cs.signclosed_date &gt;= #{startTime}
+          OR
+          (
+            DATE_FORMAT(cd.detect_confirm_time, '%H:%i:%S') != "00:00:00" AND cd.detect_confirm_time &gt;= #{startTime}
+          )
+        )
       </if>
       <if test="endTime != null and endTime != ''" >
-        AND cs.signclosed_date  &lt;= #{endTime}
+        AND
+        (
+            cs.signclosed_date &lt;= #{endTime}
+          OR
+          (
+            DATE_FORMAT(cd.detect_confirm_time, '%H:%i:%S') != "00:00:00" AND cd.detect_confirm_time &lt;= #{endTime}
+          )
+        )
       </if>
       <if test="todayTime != null and todayTime != ''" >
         AND to_days(cs.signclosed_date) = to_days(now())

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -513,7 +513,10 @@ public class AdminCustomerController {
                         date.set(Calendar.DATE, date.get(Calendar.DATE) - 2);
                         customerInfo.setAfterTime(sdf.format(date.getTime()));
                         break;
+                    default:
+                        break;
                 }
+                // 与我相关
                 String isOneself = request.getParameter("isOneself");
                 if (isOneself != null) {
                     if ("2".equals(isOneself)) {

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineBarQrcode.java

@@ -79,22 +79,22 @@ public class MachineBarQrcode {
             // 净水机
             switch (String.valueOf(machineNumber).length()) {
                 case 0:
-                    num = "0001";
+                    num = "00001";
                     break;
                 case 1:
-                    num = "000" + String.valueOf(machineNumber);
+                    num = "0000" + String.valueOf(machineNumber);
                     break;
                 case 2:
-                    num = "00" + String.valueOf(machineNumber);
+                    num = "000" + String.valueOf(machineNumber);
                     break;
                 case 3:
-                    num = "0" + String.valueOf(machineNumber);
+                    num = "00" + String.valueOf(machineNumber);
                     break;
                 case 4:
-                    num = String.valueOf(machineNumber);
+                    num = "0" + String.valueOf(machineNumber);
                     break;
                 default:
-                    num = null;
+                    num = String.valueOf(machineNumber);
                     break;
             }