qu

yamato-admin/src/main/resources/i18n/messages.properties

@@ -69,6 +69,9 @@ I0004=\u53D6\u8FBC\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 I0008=\u30ED\u30B0\u30A4\u30F3\u3057\u307E\u3057\u305F\u3002
 I0009=\u30ED\u30B0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F\u3002
 certificationType=\u691C\u5B9A\u7A2E\u985E
+orderId=\u767A\u6CE8ID
+resultId=\u5B9F\u7E3EID
+partnerCode=\u8F38\u9001\u30D1\u30FC\u30C8\u30CA\u30FCID
 branchNo=\u679D\u756A
 orderNo=\u4E26\u3073\u9806
 itemLabel=\u9805\u76EE\u30E9\u30D9\u30EB

yamato-bbib/src/main/java/com/yamato/bbib/controller/TBaseOrderController.java

@@ -4,16 +4,11 @@ import java.util.List;
 
 import com.yamato.common.utils.DateUtils;
 import com.yamato.bbib.param.MCertificationItemParam;
+import com.yamato.common.validator.utils.ValidatorGroup;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 import com.yamato.common.annotation.Log;
 import com.yamato.common.core.controller.BaseController;
 import com.yamato.common.core.domain.AjaxResult;
@@ -41,7 +36,7 @@ public class TBaseOrderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('yamato:order:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TBaseOrder tBaseOrder)
+    public TableDataInfo list(@Validated({ValidatorGroup.AddGroup.class})TBaseOrder tBaseOrder)
     {
         startPage();
         List<TBaseOrder> list = tBaseOrderService.selectTBaseOrderList(tBaseOrder);

yamato-bbib/src/main/java/com/yamato/bbib/controller/TVehicleResultsController.java

@@ -7,8 +7,10 @@ import com.yamato.common.core.page.TableDataInfo;
 import com.yamato.common.enums.BusinessType;
 import com.yamato.bbib.domain.TVehicleResults;
 import com.yamato.bbib.service.ITVehicleResultsService;
+import com.yamato.common.validator.utils.ValidatorGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -32,7 +34,7 @@ public class TVehicleResultsController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('yamato:result:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TVehicleResults tVehicleResults)
+    public TableDataInfo list(@Validated({ValidatorGroup.AddGroup.class})TVehicleResults tVehicleResults)
     {
         startPage();
         List<TVehicleResults> list = tVehicleResultsService.selectTVehicleResults(tVehicleResults);

yamato-bbib/src/main/java/com/yamato/bbib/domain/TBaseOrder.java

@@ -4,6 +4,11 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yamato.common.validator.annotation.LmLength;
+import com.yamato.common.validator.annotation.LmNotBlank;
+import com.yamato.common.validator.annotation.LmType;
+import com.yamato.common.validator.enums.CheckTypeEnum;
+import com.yamato.common.validator.utils.ValidatorGroup;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.yamato.common.annotation.Excel;
@@ -20,10 +25,14 @@ public class TBaseOrder extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 発注ID */
+    @LmLength(min = 1, max = 64, params = {"{orderId}", "64"}, groups = {ValidatorGroup.AddGroup.class})
+    @LmType(params = {"{orderId}", "{halfNumeric}"}, checkType = CheckTypeEnum.NUMERIC, groups = {ValidatorGroup.AddGroup.class})
     private String orderId;
 
     /** 輸送パートナーコード */
     @Excel(name = "輸送パートナーコード")
+    @LmLength(min = 1, max = 10, params = {"{partnerCode}", "10"}, groups = {ValidatorGroup.AddGroup.class})
+    @LmType(params = {"{partnerCode}", "{halfNumeric}"}, checkType = CheckTypeEnum.NUMERIC, groups = {ValidatorGroup.AddGroup.class})
     private String partnerCode;
 
     private String sectionTypeText;

yamato-bbib/src/main/java/com/yamato/bbib/domain/TVehicleResults.java

@@ -3,6 +3,10 @@ package com.yamato.bbib.domain;
 import com.yamato.common.annotation.Excel;
 import com.yamato.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yamato.common.validator.annotation.LmLength;
+import com.yamato.common.validator.annotation.LmType;
+import com.yamato.common.validator.enums.CheckTypeEnum;
+import com.yamato.common.validator.utils.ValidatorGroup;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -20,10 +24,14 @@ public class TVehicleResults extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 実績ID */
+    @LmLength(min = 1, max = 64, params = {"{resultId}", "64"}, groups = {ValidatorGroup.AddGroup.class})
+    @LmType(params = {"{resultId}", "{halfNumeric}"}, checkType = CheckTypeEnum.NUMERIC, groups = {ValidatorGroup.AddGroup.class})
     private String resultId;
 
     /** 輸送パートナーコード */
     @Excel(name = "輸送パートナーコード")
+    @LmLength(min = 1, max = 10, params = {"{partnerCode}", "10"}, groups = {ValidatorGroup.AddGroup.class})
+    @LmType(params = {"{partnerCode}", "{halfNumeric}"}, checkType = CheckTypeEnum.NUMERIC, groups = {ValidatorGroup.AddGroup.class})
     private String partnerCode;
 
     private String sectionTypeText;

yamato-bbib/src/main/java/com/yamato/bbib/service/impl/TVehicleRssultsImpl.java

@@ -217,7 +217,7 @@ public class TVehicleRssultsImpl implements ITVehicleResultsService
         tVehicleResults.setActionDate(getNowDate());
         String uuid = IdUtils.nextIdStr(IdPrefixConstants.ACTION_ID);
         tVehicleResults.setActionId(uuid);
-        tVehicleResults.setActionKind(String.valueOf(1));
+        tVehicleResults.setActionKind(String.valueOf(2));
 
         switch (tVehicleResults.getActionType()) {
             case "10":

yamato-bbib/src/main/resources/mapper/bbib/TBaseOrderMapper.xml

@@ -114,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from t_action_history
         where
             action_code = #{orderId}
+          and action_kind = #{actionKind}
     </select>
 
     <select id="selectTBaseOrderList" parameterType="TBaseOrder" resultMap="TBaseOrderResult">

yamato-bbib/src/main/resources/mapper/bbib/TVehicleResultsMapper.xml

@@ -102,7 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               action_comment
         from t_action_history
         where
-            action_code = #{orderId}
+            action_code = #{resultId}
+        and action_kind = #{actionKind}
     </select>
 
     <select id="selectTVehicleResults" parameterType="TVehicleResults" resultMap="TVehicleResult">
@@ -187,12 +188,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateTBaseOrder" parameterType="TVehicleResults">
-        update t_month_plan
+        update t_daily_charter_fee
         <trim prefix="SET" suffixOverrides=",">
             <if test="changeFlag != null">change_flag = #{changeFlag},</if>
             <if test="newData != null">new_data = #{newData},</if>
         </trim>
-        where month_plan_id = #{monthPlanId}
+        where result_id = #{resultId}
         and run_day = #{runDay}
         and run_week_day = #{runWeekDay}
     </update>

yamato-common/src/main/java/com/yamato/common/validator/constraint/LmTypeValidator.java

@@ -53,6 +53,10 @@ public class LmTypeValidator implements ConstraintValidator<LmType, Object> {
                         // 英数字のみで入力してください。
                         isValid = ValidatorUtils.isAlphabetNumeric(StringUtils.trimLeftBlank(checkValue));
                         break;
+                    case NUMERIC:
+                        // 数字のみで入力してください。
+                        isValid = ValidatorUtils.isPlusNumber(StringUtils.trimLeftBlank(checkValue));
+                        break;
                     case CHAR_COUNT:
                         // 文字数は1～64で入力してください。
                         isValid = ValidatorUtils.isCharCount(StringUtils.trimLeftBlank(checkValue));