Parcourir la source

[update] 区间统计生成异常问题修复

miajio il y a 2 semaines
Parent
commit
ebbb214a03

+ 1 - 1
warehouse-admin-data/src/main/resources/mapper/driver/DriverOnRouteAccountRecordMainMapper.xml

@@ -51,7 +51,7 @@
                                                           modifyName = #{bo.username}
         where
         isDelete != 'DELETE' and id in
-        <foreach item="item" index="index" collection="ids" separator="," close=")">
+        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
             #{item}
         </foreach>
     </update>

+ 8 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverIntervalCargoDamageController.java

@@ -95,6 +95,14 @@ public class DriverIntervalCargoDamageController extends BaseController {
     @PostMapping("/generator")
     @ResponseBody
     public Result<String> generator(@Validated @RequestBody DriverIntervalCargoDamageGeneratorRequest request, AdminUserInfo adminUserInfo) {
+        // 判断开始时间不能大于结束时间
+        if (request.getIntervalStartTime().isAfter(request.getIntervalEndTime())) {
+            throw new MessageException("开始时间不能大于结束时间");
+        }
+        if (request.getIntervalEndTime().isAfter(LocalDateTime.now())) {
+            throw new MessageException("结束时间不能大于当前时间");
+        }
+
         DriverIntervalCargoDamageGeneratorBo bo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.generatorRequestToBo(request);
         buildUserInfo(bo, adminUserInfo);