農家インターフェース修正

farm-common/src/main/java/jp/yamoto/farm/common/enums/BusinessType.java

@@ -23,6 +23,11 @@ public enum BusinessType
     UPDATE,
 
     /**
+     * Save
+     */
+    SAVE,
+
+    /**
      * Delete
      */
     DELETE,

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/domain/bo/MastFarmerBo.java

@@ -64,6 +64,7 @@ public class MastFarmerBo implements Serializable {
     /**
      * 郵便番号
      */
+    @LmLength(min = 1, max = 8, params = {"{postalCode}", "8"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
     private String postalCode;
 
     /**

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/service/impl/MastFarmerServiceImpl.java

@@ -102,15 +102,15 @@ public class MastFarmerServiceImpl implements IMastFarmerService {
         MastFarmer mastFarmer = new MastFarmer();
         BeanUtils.copyProperties(mastFarmerBo, mastFarmer);
 
-        // その他の情報を構築します。
-        this.buildFarmerInfo4Save(mastFarmer);
-
         // 農家IDの重複チェック
         int mastFarmerCount = mastFarmerMapper.getFarmerIdCount(mastFarmerBo.getFarmerId());
         if (mastFarmerCount > 0) {
             throw new ServiceException(MessageUtils.message("E0001", MessageUtils.message("label.farmerId")));
         }
 
+        // 保存前にデータを構築
+        this.buildFarmerInfo4Save(mastFarmer);
+
         return mastFarmerMapper.insert(mastFarmer);
     }
 
@@ -123,7 +123,7 @@ public class MastFarmerServiceImpl implements IMastFarmerService {
     private int update(MastFarmerBo mastFarmerBo) {
         MastFarmer mastFarmer = new MastFarmer();
         BeanUtils.copyProperties(mastFarmerBo, mastFarmer);
-        // その他の情報を構築します。
+        // 保存前にデータを構築
         this.buildFarmerInfo4Save(mastFarmer);
 
         int result = mastFarmerMapper.update(mastFarmer);
@@ -151,7 +151,7 @@ public class MastFarmerServiceImpl implements IMastFarmerService {
     }
 
     /**
-     * その他の情報を構築します。
+     * 保存前にデータを構築
      *
      * @param mastFarmer 農家マスタ情報
      */

farm-crm/src/main/java/jp/yamoto/farm/crm/web/controller/master/MastFarmerController.java

@@ -52,10 +52,10 @@ public class MastFarmerController extends BaseController {
     /**
      * 農家マスタの保存
      */
-    @PreAuthorize("@ss.hasPermi('crm:mastNoka:add')")
-    @Log(title = "農家マスタ", businessType = BusinessType.INSERT)
+    @PreAuthorize("@ss.hasPermi('crm:mastNoka:save')")
+    @Log(title = "農家マスタ", businessType = BusinessType.SAVE)
     @PostMapping("/save")
-    public AjaxResult add(@RequestBody @Validated({ValidatorGroup.AddGroup.class}) MastFarmerBo mastFarmerBo) {
+    public AjaxResult save(@RequestBody @Validated({ValidatorGroup.AddGroup.class}) MastFarmerBo mastFarmerBo) {
         return toAjax(mastFarmerService.save(mastFarmerBo));
     }
 

farm-crm/src/main/resources/i18n/messages.properties

@@ -78,12 +78,15 @@ I0009=\u30ED\u30B0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F\u3002
 label.farmerId=\u8FB2\u5BB6ID
 label.farmerName=\u8FB2\u5BB6\u540D
 label.farmerNameKn=\u8FB2\u5BB6\u540D\uFF08\u30AB\u30CA\uFF09
-
 label.rakuuruCartId=\u3089\u304F\u3046\u308B\u30AB\u30FC\u30C8ID
 label.rakuuruCartPwd=\u3089\u304F\u3046\u308B\u30AB\u30FC\u30C8\u30D1\u30B9\u30EF\u30FC\u30C9
 label.representativeName=\u4EE3\u8868\u8005\u540D
 label.representativeNameKn=\u4EE3\u8868\u8005\u540D\uFF08\u30AB\u30CA\uFF09
 
+#\u9867\u5BA2
+label.customerId=\u9867\u5BA2ID
+label.customerName=\u9867\u5BA2\u540D
+
 label.branchNo=\u679D\u756A
 label.orderNo=\u4E26\u3073\u9806
 label.itemLabel=\u9805\u76EE\u30E9\u30D9\u30EB
@@ -120,4 +123,6 @@ label.authenticateError=\u8A8D\u8A3C\u30A8\u30E9\u30FC
 label.newAdd=\u65B0\u898F\u767B\u9332
 label.edit=\u7DE8\u96C6
 label.address=\u4F4F\u6240
-label.phoneNumber=\u96FB\u8A71\u756A\u53F7
+label.phoneNumber=\u96FB\u8A71\u756A\u53F7
+label.postalCode=\u90F5\u4FBF\u756A\u53F7
+label.fax=FAX\u756A\u53F7