Merge remote-tracking branch 'origin/master' into xinghong-dev

java110-bean/src/main/java/com/java110/dto/menuGroup/MenuGroupDto.java

@@ -14,7 +14,7 @@ public class MenuGroupDto extends PageDto implements Serializable {
     private String description;
     private String statusCd;
     private String groupType;
-    private String storeTypeCd;
+    private String storeType;
 
     public String getGId() {
         return gId;
@@ -88,11 +88,12 @@ public class MenuGroupDto extends PageDto implements Serializable {
         this.groupType = groupType;
     }
 
-    public String getStoreTypeCd() {
-        return storeTypeCd;
+
+    public String getStoreType() {
+        return storeType;
     }
 
-    public void setStoreTypeCd(String storeTypeCd) {
-        this.storeTypeCd = storeTypeCd;
+    public void setStoreType(String storeType) {
+        this.storeType = storeType;
     }
 }

java110-bean/src/main/java/com/java110/vo/api/menuGroup/ApiMenuGroupDataVo.java

@@ -13,17 +13,16 @@ public class ApiMenuGroupDataVo implements Serializable {
     private String groupType;
 
 
-    private String storeTypeCd;
+    private String storeType;
 
-    public String getStoreTypeCd() {
-        return storeTypeCd;
+    public String getStoreType() {
+        return storeType;
     }
 
-    public void setStoreTypeCd(String storeTypeCd) {
-        this.storeTypeCd = storeTypeCd;
+    public void setStoreType(String storeType) {
+        this.storeType = storeType;
     }
 
-
     public String getGId() {
         return gId;
     }

java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存路由信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveMenuGroupInfo" parameterType="Map">
         insert into m_menu_group(
-        g_id,name,icon,label,seq,description,group_type,store_type_cd
+        g_id,name,icon,label,seq,description,group_type,store_type
         ) values (
-        #{gId},#{name},#{icon},#{label},#{seq},#{description},#{groupType},#{storeTypeCd}
+        #{gId},#{name},#{icon},#{label},#{seq},#{description},#{groupType},#{storeType}
         )
 
     </insert>
@@ -18,7 +18,7 @@
 
     <!-- 查询路由信息 add by wuxw 2018-07-03 -->
     <select id="getMenuGroupInfo" parameterType="Map" resultType="Map">
-        select t.g_id,t.name,t.icon,t.label,t.seq,t.description,t.g_id gId,t.group_type groupType,t.store_type_cd storeTypeCd
+        select t.g_id,t.name,t.icon,t.label,t.seq,t.description,t.g_id gId,t.group_type groupType,t.store_type storeType
         from m_menu_group t
         where t.status_cd= '0'
         <if test="gId !=null and gId != ''">
@@ -36,8 +36,8 @@
         <if test="groupType !=null and groupType != ''">
             and t.group_type= #{groupType}
         </if>
-        <if test="storeTypeCd !=null and storeTypeCd != ''">
-            and t.store_type_cd= #{storeTypeCd}
+        <if test="storeType !=null and storeType != ''">
+            and t.store_type= #{storeType}
         </if>
         <if test="seq !=null">
             and t.seq= #{seq}
@@ -76,8 +76,8 @@
             <if test="seq !=null ">
                 t.seq= #{seq},
             </if>
-            <if test="storeTypeCd !=null and storeTypeCd != ''">
-                t.store_type_cd= #{storeTypeCd},
+            <if test="storeType !=null and storeType != ''">
+                t.store_type= #{storeType},
             </if>
             <if test="description !=null and description != ''">
                 t.description= #{description}
@@ -113,8 +113,8 @@
         <if test="seq !=null">
             and t.seq= #{seq}
         </if>
-        <if test="storeTypeCd !=null and storeTypeCd != ''">
-            and t.store_type_cd= #{storeTypeCd}
+        <if test="storeType !=null and storeType != ''">
+            and t.store_type= #{storeType}
         </if>
         <if test="description !=null and description != ''">
             and t.description= #{description}

service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -343,6 +343,8 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
                 paramIn.put("configId", ttFee.getString("configId"));
                 paramIn.put("storeId", result.getStoreId());
                 paramIn.put("feeEndDate", room.getFeeEndDate().split("#")[feeIndex]);
+                paramIn.put("startTime", paramIn.getString("feeEndDate"));
+
                 responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
             }