ソース修正

yamada-fcbi/src/main/java/jp/yamada/fcbi/domain/YmdfFcStore.java

@@ -19,7 +19,7 @@ public class YmdfFcStore extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 店舗ID */
-    private String id;
+    private String storeId;
 
     /** 店舗コード */
     @Excel(name = "店舗コード")

yamada-fcbi/src/main/java/jp/yamada/fcbi/service/impl/YmdfFcMemberServiceImpl.java

@@ -100,7 +100,7 @@ public class YmdfFcMemberServiceImpl extends BaseService implements IYmdfFcMembe
      */
     private YmdfFcStore buildStore(YmdfFcApplicant applicant, String fcMemberId, String storeId) {
         YmdfFcStore fcStore = new YmdfFcStore();
-        fcStore.setId(storeId);
+        fcStore.setStoreId(storeId);
         fcStore.setStoreCode(generateStoreCode(applicant.getApplyBrandCode()));
         fcStore.setStoreName(applicant.getFcApplicantName() + "店");
         // 希望ブランドコード

yamada-fcbi/src/main/resources/mapper/fcbi/YmdfFcStoreMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="jp.yamada.fcbi.mapper.YmdfFcStoreMapper">
     
     <resultMap type="YmdfFcStore" id="YmdfFcStoreResult">
-        <result property="id"    column="id"    />
+        <result property="storeId"    column="store_id"    />
         <result property="storeCode"    column="store_code"    />
         <result property="storeName"    column="store_name"    />
         <result property="brandCode"    column="brand_code"    />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectYmdfFcStoreVo">
-        select id, store_code, store_name, brand_code, business_type_code, region_code, store_address, store_phone, store_latitude, store_longitude, manager, store_status, del_flag, create_by, create_time, update_by, update_time, remark, version from ymdf_fc_store
+        select store_id, store_code, store_name, brand_code, business_type_code, region_code, store_address, store_phone, store_latitude, store_longitude, manager, store_status, del_flag, create_by, create_time, update_by, update_time, remark, version from ymdf_fc_store
     </sql>
 
     <select id="selectYmdfFcStoreList" parameterType="YmdfFcStore" resultMap="YmdfFcStoreResult">
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertYmdfFcStore" parameterType="YmdfFcStore">
         insert into ymdf_fc_store
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
+            <if test="storeId != null">store_id,</if>
             <if test="storeCode != null and storeCode != ''">store_code,</if>
             <if test="storeName != null and storeName != ''">store_name,</if>
             <if test="brandCode != null and brandCode != ''">brand_code,</if>
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">version,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
+            <if test="storeId != null">#{storeId},</if>
             <if test="storeCode != null and storeCode != ''">#{storeCode},</if>
             <if test="storeName != null and storeName != ''">#{storeName},</if>
             <if test="brandCode != null and brandCode != ''">#{brandCode},</if>
@@ -125,13 +125,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteYmdfFcStoreById" parameterType="String">
-        delete from ymdf_fc_store where id = #{id}
+        delete from ymdf_fc_store where store_id = #{storeId}
     </delete>
 
     <delete id="deleteYmdfFcStoreByIds" parameterType="String">
-        delete from ymdf_fc_store where id in 
+        delete from ymdf_fc_store where store_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
+            #{storeId}
         </foreach>
     </delete>
 </mapper>

yamada-generator/src/main/resources/vm/java/mapper.java.vm

@@ -5,13 +5,14 @@ import ${packageName}.domain.${ClassName};
 #if($table.sub)
 import ${packageName}.domain.${subClassName};
 #end
-
+import org.apache.ibatis.annotations.Mapper;
 /**
  * ${functionName}Mapper接口
  * 
  * @author ${author}
  * @date ${datetime}
  */
+@Mapper
 public interface ${ClassName}Mapper 
 {
     /**

yamada-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -18,18 +18,18 @@ import ${packageName}.domain.${subClassName};
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
-
+import lombok.RequiredArgsConstructor;
 /**
  * ${functionName}Service业务层处理
  * 
  * @author ${author}
  * @date ${datetime}
  */
+@RequiredArgsConstructor
 @Service
 public class ${ClassName}ServiceImpl implements I${ClassName}Service 
 {
-    @Autowired
-    private ${ClassName}Mapper ${className}Mapper;
+    private final ${ClassName}Mapper ${className}Mapper;
 
     /**
      * 查询${functionName}