修改版本控制

platform-admin/src/main/java/com/platform/entity/TbCfVersionEntity.java

@@ -29,7 +29,10 @@ public class TbCfVersionEntity implements Serializable {
      * 版本更新内容
      */
     private String versionDetail;
-
+    /**
+     * 版本分类(0安卓,1苹果)
+     */
+    private Integer versionSort;
     /**
      * 设置：版本号Id
      */
@@ -82,4 +85,17 @@ public class TbCfVersionEntity implements Serializable {
     public String getVersionDetail() {
         return versionDetail;
     }
+
+    /**
+     * 获取： 版本分类(0安卓,1苹果)
+     */
+    public Integer getVersionSort() {
+        return versionSort;
+    }
+    /**
+     * 设置： 版本分类(0安卓,1苹果)
+     */
+    public void setVersionSort(Integer versionSort) {
+        this.versionSort = versionSort;
+    }
 }

platform-admin/src/main/resources/com/platform/dao/TbCfVersionDao.xml

@@ -8,6 +8,7 @@
         <result property="versionCode" column="version_code"/>
         <result property="versionLike" column="version_like"/>
         <result property="versionDetail" column="version_detail"/>
+		<result property="versionSort" column="version_sort"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.platform.entity.TbCfVersionEntity">
@@ -15,7 +16,8 @@
 			`version_id`,
 			`version_code`,
 			`version_like`,
-			`version_detail`
+			`version_detail`,
+			`version_sort`
 		from tb_cf_version
 		where version_id = #{id}
 	</select>
@@ -25,7 +27,8 @@
     		`version_id`,
     		`version_code`,
     		`version_like`,
-    		`version_detail`
+    		`version_detail`,
+		`version_sort`
 		from tb_cf_version
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
@@ -57,18 +60,21 @@
 			`version_id`,
 			`version_code`,
 			`version_like`,
-			`version_detail`)
+			`version_detail`,
+			`version_sort`)
 		values(
 			#{versionId},
 			#{versionCode},
 			#{versionLike},
-			#{versionDetail})
+			#{versionDetail},
+			#{versionSort})
 	</insert>
 	 
 	<update id="update" parameterType="com.platform.entity.TbCfVersionEntity">
 		update tb_cf_version 
 		<set>
 			<if test="versionCode != null">`version_code` = #{versionCode}, </if>
+			<if test="versionSort != null">`version_sort` = #{versionSort}, </if>
 			<if test="versionLike != null">`version_like` = #{versionLike}, </if>
 			<if test="versionDetail != null">`version_detail` = #{versionDetail}</if>
 		</set>

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfversion.html

@@ -41,9 +41,16 @@
             <Form-item label="版本code" prop="versionCode">
                 <i-input v-model="tbCfVersion.versionCode" placeholder="版本code"/>
             </Form-item>
+            <Form-item label="版本分类(0安卓,1苹果)" prop="versionSort">
+                <i-select  placeholder="版本分类(0安卓,1苹果)" v-model="tbCfVersion.versionSort">
+                    <i-option value="0">安卓</i-option>
+                    <i-option value="1">苹果</i-option>
+                </i-select>
+            </Form-item>
             <Form-item label="版本更新链接" prop="versionLike">
                 <i-input v-model="tbCfVersion.versionLike" placeholder="版本更新链接"/>
             </Form-item>
+
             <Form-item label="版本更新内容" prop="versionDetail">
                <!-- <script id="Detail" name="tbCfVersion.versionDetail"type="text/plain">${pd.COLLSORT_DETAILS}</script>-->
                 <textarea id="Detail" style="width: 800px;height: 600px;"></textarea>

platform-admin/src/main/webapp/js/common.js

@@ -573,6 +573,19 @@ validFormat = function (cellvalue) {
     }
     return returnStr;
 };
+
+sortFormat = function (cellvalue) {
+    let returnStr = "未知"
+    if (!!cellvalue||cellvalue == '0') {
+        if (cellvalue == '0') {
+            returnStr = "安卓";
+        } else if (cellvalue == '1') {
+            returnStr = "苹果";
+        }
+    }
+    return returnStr;
+};
+
 /**
  * 是否为注册就送优惠券
  * @param cellvalue

platform-admin/src/main/webapp/js/sys/tbcfversion.js

@@ -5,7 +5,8 @@ $(function () {
 			{label: 'versionId', name: 'versionId', index: 'version_id', key: true, hidden: true},
 			{label: '版本code', name: 'versionCode', index: 'version_code', width: 80},
 			{label: '版本更新链接', name: 'versionLike', index: 'version_like', width: 80},
-			{label: '版本更新内容', name: 'versionDetail', index: 'version_detail', width: 80}]
+			{label: '版本更新内容', name: 'versionDetail', index: 'version_detail', width: 80},
+			{label: '版本分类', name: 'versionSort', index: 'version_sort', width: 80,formatter:sortFormat}]
     });
 });