提交

src/main/java/com/minpay/common/service/IPublicService.java

@@ -235,4 +235,17 @@ public interface IPublicService extends IMINLocalService, IMINInitializer {
 	public String getMenuId(String url) throws MINBusinessException;
 	
 	public String getSysParStrValueByCode(String sprCode) throws MINBusinessException ;
+
+	/**
+	 * 上传文件到本地
+	 * @param file  上传文件
+	 * @param fileType 文件类型,用于区分文件路径上传
+	 * @param size 缓冲区 默认512，大文件需要手动修改
+	 * @param renameFlag 是否重命名
+	 * @return
+	 * @throws MINBusinessException
+	 * @throws BusinessCodeException
+	 */
+	public Map<String, Object> uploadFile(FileItem file,String fileType,int size,boolean renameFlag) throws MINBusinessException,BusinessCodeException;
+
 }

src/main/java/com/minpay/db/table/mapper/VmProductInfMapper.java

@@ -3,9 +3,10 @@ package com.minpay.db.table.mapper;
 import com.minpay.db.table.model.VmProductInf;
 import com.minpay.db.table.model.VmProductInfExample;
 import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface VmProductInfMapper extends IMINMybatisEntityMapper<VmProductInf, String, VmProductInfExample> {
     /**
      * This method was generated by MyBatis Generator.

src/main/java/com/minpay/db/table/model/VmProductInf.java

@@ -77,11 +77,11 @@ public class VmProductInf extends AbstractMINBean {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column vm_product_inf.PRT_USER_ID
+     * This field corresponds to the database column vm_product_inf.PRT_BRANCHID
      *
      * @mbggenerated
      */
-    private String userId;
+    private String branchid;
 
     /**
      * This field was generated by MyBatis Generator.
@@ -101,6 +101,14 @@ public class VmProductInf extends AbstractMINBean {
 
     /**
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_product_inf.PRT_PRO_COST
+     *
+     * @mbggenerated
+     */
+    private String proCost;
+
+    /**
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column vm_product_inf.PRT_CREATE_USER
      *
      * @mbggenerated
@@ -349,26 +357,26 @@ public class VmProductInf extends AbstractMINBean {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column vm_product_inf.PRT_USER_ID
+     * This method returns the value of the database column vm_product_inf.PRT_BRANCHID
      *
-     * @return the value of vm_product_inf.PRT_USER_ID
+     * @return the value of vm_product_inf.PRT_BRANCHID
      *
      * @mbggenerated
      */
-    public String getUserId() {
-        return userId;
+    public String getBranchid() {
+        return branchid;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column vm_product_inf.PRT_USER_ID
+     * This method sets the value of the database column vm_product_inf.PRT_BRANCHID
      *
-     * @param userId the value for vm_product_inf.PRT_USER_ID
+     * @param branchid the value for vm_product_inf.PRT_BRANCHID
      *
      * @mbggenerated
      */
-    public void setUserId(String userId) {
-        this.userId = userId == null ? null : userId.trim();
+    public void setBranchid(String branchid) {
+        this.branchid = branchid == null ? null : branchid.trim();
     }
 
     /**
@@ -421,6 +429,30 @@ public class VmProductInf extends AbstractMINBean {
 
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_product_inf.PRT_PRO_COST
+     *
+     * @return the value of vm_product_inf.PRT_PRO_COST
+     *
+     * @mbggenerated
+     */
+    public String getProCost() {
+        return proCost;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_product_inf.PRT_PRO_COST
+     *
+     * @param proCost the value for vm_product_inf.PRT_PRO_COST
+     *
+     * @mbggenerated
+     */
+    public void setProCost(String proCost) {
+        this.proCost = proCost == null ? null : proCost.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_product_inf.PRT_CREATE_USER
      *
      * @return the value of vm_product_inf.PRT_CREATE_USER

src/main/java/com/minpay/db/table/model/VmProductInfExample.java

@@ -892,81 +892,81 @@ public class VmProductInfExample {
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIsNull() {
-            addCriterion("PRT_USER_ID is null");
+        public Criteria andBranchidIsNull() {
+            addCriterion("PRT_BRANCHID is null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIsNotNull() {
-            addCriterion("PRT_USER_ID is not null");
+        public Criteria andBranchidIsNotNull() {
+            addCriterion("PRT_BRANCHID is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdEqualTo(String value) {
+        public Criteria andBranchidEqualTo(String value) {
             if(value == null ){
-                andUserIdIsNull();
+                andBranchidIsNull();
             } else {
-                addCriterion("PRT_USER_ID =", value, "userId");
+                addCriterion("PRT_BRANCHID =", value, "branchid");
             }
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotEqualTo(String value) {
+        public Criteria andBranchidNotEqualTo(String value) {
             if(value == null ){
-                andUserIdIsNotNull();
+                andBranchidIsNotNull();
             } else {
-                addCriterion("PRT_USER_ID <>", value, "userId");
+                addCriterion("PRT_BRANCHID <>", value, "branchid");
             }
             return (Criteria) this;
         }
 
-        public Criteria andUserIdGreaterThan(String value) {
-            addCriterion("PRT_USER_ID >", value, "userId");
+        public Criteria andBranchidGreaterThan(String value) {
+            addCriterion("PRT_BRANCHID >", value, "branchid");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
-            addCriterion("PRT_USER_ID >=", value, "userId");
+        public Criteria andBranchidGreaterThanOrEqualTo(String value) {
+            addCriterion("PRT_BRANCHID >=", value, "branchid");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLessThan(String value) {
-            addCriterion("PRT_USER_ID <", value, "userId");
+        public Criteria andBranchidLessThan(String value) {
+            addCriterion("PRT_BRANCHID <", value, "branchid");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLessThanOrEqualTo(String value) {
-            addCriterion("PRT_USER_ID <=", value, "userId");
+        public Criteria andBranchidLessThanOrEqualTo(String value) {
+            addCriterion("PRT_BRANCHID <=", value, "branchid");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLike(String value) {
-            addCriterion("PRT_USER_ID like", value, "userId");
+        public Criteria andBranchidLike(String value) {
+            addCriterion("PRT_BRANCHID like", value, "branchid");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotLike(String value) {
-            addCriterion("PRT_USER_ID not like", value, "userId");
+        public Criteria andBranchidNotLike(String value) {
+            addCriterion("PRT_BRANCHID not like", value, "branchid");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIn(List<String> values) {
-            addCriterion("PRT_USER_ID in", values, "userId");
+        public Criteria andBranchidIn(List<String> values) {
+            addCriterion("PRT_BRANCHID in", values, "branchid");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotIn(List<String> values) {
-            addCriterion("PRT_USER_ID not in", values, "userId");
+        public Criteria andBranchidNotIn(List<String> values) {
+            addCriterion("PRT_BRANCHID not in", values, "branchid");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdBetween(String value1, String value2) {
-            addCriterion("PRT_USER_ID between", value1, value2, "userId");
+        public Criteria andBranchidBetween(String value1, String value2) {
+            addCriterion("PRT_BRANCHID between", value1, value2, "branchid");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotBetween(String value1, String value2) {
-            addCriterion("PRT_USER_ID not between", value1, value2, "userId");
+        public Criteria andBranchidNotBetween(String value1, String value2) {
+            addCriterion("PRT_BRANCHID not between", value1, value2, "branchid");
             return (Criteria) this;
         }
 
@@ -1126,6 +1126,84 @@ public class VmProductInfExample {
             return (Criteria) this;
         }
 
+        public Criteria andProCostIsNull() {
+            addCriterion("PRT_PRO_COST is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostIsNotNull() {
+            addCriterion("PRT_PRO_COST is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostEqualTo(String value) {
+            if(value == null ){
+                andProCostIsNull();
+            } else {
+                addCriterion("PRT_PRO_COST =", value, "proCost");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostNotEqualTo(String value) {
+            if(value == null ){
+                andProCostIsNotNull();
+            } else {
+                addCriterion("PRT_PRO_COST <>", value, "proCost");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostGreaterThan(String value) {
+            addCriterion("PRT_PRO_COST >", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostGreaterThanOrEqualTo(String value) {
+            addCriterion("PRT_PRO_COST >=", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostLessThan(String value) {
+            addCriterion("PRT_PRO_COST <", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostLessThanOrEqualTo(String value) {
+            addCriterion("PRT_PRO_COST <=", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostLike(String value) {
+            addCriterion("PRT_PRO_COST like", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostNotLike(String value) {
+            addCriterion("PRT_PRO_COST not like", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostIn(List<String> values) {
+            addCriterion("PRT_PRO_COST in", values, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostNotIn(List<String> values) {
+            addCriterion("PRT_PRO_COST not in", values, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostBetween(String value1, String value2) {
+            addCriterion("PRT_PRO_COST between", value1, value2, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostNotBetween(String value1, String value2) {
+            addCriterion("PRT_PRO_COST not between", value1, value2, "proCost");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateUserIsNull() {
             addCriterion("PRT_CREATE_USER is null");
             return (Criteria) this;

src/main/java/com/minpay/shouhuo/productaction/ProductManageAction.java

@@ -157,10 +157,11 @@ public class ProductManageAction implements IMINAction {
 		pro.setName(name); 						// 商品名称
 		pro.setDescribe(describe); 				// 商品描述
 		pro.setCategoryId(categoryId); 			// 分类id
-		pro.setFmpic(fmpic); 						// 封面图片
+		pro.setFmpic(fmpic); 					// 封面图片
 		pro.setState("0"); 	// 默认状态正常
-		pro.setChannel(user.getChannel()); 		// 渠道号
+		pro.setChannel("V01"); 						// 渠道号
 		pro.setMasterMap(masterMap);              	//商品主图
+		pro.setBranchid("88888888");              	//商品主图
 		/*String piclist2 = piclist.substring(0, piclist.length() - 1);
 		String imgss[] = piclist2.split(",");*/
 /*		// 至少上传2张图片
@@ -360,9 +361,9 @@ public class ProductManageAction implements IMINAction {
 		map.put("channel", user.getChannel());//渠道号
 		map.put("category", categoryId);//分类
 		//验证操作员权限
-//		if("00".equals(user.getIdentity())){
-//			map.put("userId",user.getId());
-//		}
+		if("00".equals(user.getBranchId())){
+			map.put("userId",user.getBranchId());
+		}
 /*		if("10000002".equals(user.getRoleId())){
 			map.put("userId",user.getId());
 		}*/

src/main/java/com/minpay/shouhuo/system/FileManageAction.java

@@ -0,0 +1,107 @@
+package com.minpay.shouhuo.system;
+
+import com.min.util.CommonUtil;
+import com.minpay.common.exception.BusinessCodeException;
+import com.minpay.common.service.IPublicService;
+import com.startup.minpay.frame.business.IMINAction;
+import com.startup.minpay.frame.business.MINHttpServletRequestContext;
+import com.startup.minpay.frame.business.res.MINActionResult;
+import com.startup.minpay.frame.exception.MINBusinessException;
+import com.startup.minpay.frame.service.base.Service;
+import com.startup.minpay.frame.target.MINAction;
+import com.startup.minpay.frame.target.MINComponent;
+import com.startup.minpay.frame.target.MINParam;
+import com.startup.minpay.util.Log;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.lang.StringUtils;
+import org.json.JSONObject;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件上传公共接口
+ * 
+ * @author ZHANGZZ
+ *
+ */
+@MINComponent
+public class FileManageAction implements IMINAction {
+
+	private final static String UPLOAD_BYBYTES = "uploadByBytes";
+
+	private final static String UPLOAD_FILE = "uploadFile";
+
+	/**
+	 * 
+	 * @param MINRequest
+	 * @param fileType   文件类型00图片01文档02视频
+	 * @param response
+	 * @param size       文件大小
+	 * @param proportion 图片宽高比区间 格式最小区间,最大区间 例如 1.50,1.80
+	 * @return
+	 * @throws MINBusinessException
+	 */
+	@MINAction(value = UPLOAD_FILE, session = false)
+	public MINActionResult uploadFile(MINHttpServletRequestContext MINRequest,
+                                      @MINParam(key = "fileFiledId") String fileFiledId, @MINParam(key = "fileType") String fileType,
+                                      @MINParam(key = "size") int size, @MINParam(key = "proportion") String proportion,
+                                      HttpServletResponse response) throws MINBusinessException {
+		MINActionResult res = new MINActionResult();
+
+		if (StringUtils.isEmpty(fileFiledId)) {
+			fileFiledId = "file";
+		}
+
+		FileItem file = MINRequest.getFile(fileFiledId);
+
+		// 判断文件大小上传抛出异常
+		Log.info("文件大小：" + String.valueOf((file.getSize() / 1024D / 1024D)) + "M");
+		if (size > 0 && (1024L * 1024L * size) < file.getSize()) {
+			throw new MINBusinessException("请上传小于" + String.valueOf(size) + "M的文件");
+		}
+		if (size < 0) {
+			throw new MINBusinessException("size参数异常，size不能小于0");
+		}
+
+		Map<String, Object> map = Service.lookup(IPublicService.class).uploadFile(file, fileType, 0, true);
+
+		if ("00".equals(fileType) && !CommonUtil.isEmpty(proportion)) {
+			double minRatio = -1;
+			double maxRatio = -1;
+			String[] proportions = null;
+			if (proportion != null && !proportion.isEmpty()) {
+				// 截取参数 图片的宽高比
+				proportions = proportion.split(",");
+				minRatio = Double.parseDouble(proportions[0].trim());
+				maxRatio = Double.parseDouble(proportions[1].trim());
+			}
+			// 获取宽高
+			Double width = (Double) map.get("width");
+			Double height = (Double) map.get("height");
+			// 判断宽高比是否符合规定
+			Double ratio = width / height;
+			Log.info("上传图片宽高比：" + String.valueOf(ratio));
+			if (ratio < minRatio || ratio > maxRatio) {
+				throw new MINBusinessException(
+						"请上传宽高比" + proportions[0].trim() + "到" + proportions[1].trim() + "之间的图片");
+			}
+		}
+
+		String url = (String) map.get("url");
+
+		JSONObject js = new JSONObject();
+		js.put("src", url);// 获取图片路径
+
+		res.set("code", 0);
+		res.set("msg", "");
+		res.set("data", js);
+		return res;
+	}
+
+}

src/main/resources/com/minpay/db/table/mapper/VmProductInfMapper.xml

@@ -15,9 +15,10 @@
     <result column="PRT_PICLIST" jdbcType="VARCHAR" property="piclist" />
     <result column="PRT_DESCRIBE" jdbcType="VARCHAR" property="describe" />
     <result column="PRT_PRO_VEDIO" jdbcType="VARCHAR" property="proVedio" />
-    <result column="PRT_USER_ID" jdbcType="VARCHAR" property="userId" />
+    <result column="PRT_BRANCHID" jdbcType="VARCHAR" property="branchid" />
     <result column="PRT_SORT" jdbcType="VARCHAR" property="sort" />
     <result column="PRT_STATE" jdbcType="CHAR" property="state" />
+    <result column="PRT_PRO_COST" jdbcType="VARCHAR" property="proCost" />
     <result column="PRT_CREATE_USER" jdbcType="VARCHAR" property="createUser" />
     <result column="PRT_CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
     <result column="PRT_MODIFY_USER" jdbcType="VARCHAR" property="modifyUser" />
@@ -95,8 +96,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     PRT_ID, PRT_CHANNEL, PRT_NAME, PRT_CATEGORY_ID, PRT_MASTER_MAP, PRT_FMPIC, PRT_PICLIST, 
-    PRT_DESCRIBE, PRT_PRO_VEDIO, PRT_USER_ID, PRT_SORT, PRT_STATE, PRT_CREATE_USER, PRT_CREATE_TIME, 
-    PRT_MODIFY_USER, PRT_MODIFY_TIME
+    PRT_DESCRIBE, PRT_PRO_VEDIO, PRT_BRANCHID, PRT_SORT, PRT_STATE, PRT_PRO_COST, PRT_CREATE_USER, 
+    PRT_CREATE_TIME, PRT_MODIFY_USER, PRT_MODIFY_TIME
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmProductInfExample" resultMap="BaseResultMap">
     <!--
@@ -152,15 +153,15 @@
     insert into vm_product_inf (PRT_ID, PRT_CHANNEL, PRT_NAME, 
       PRT_CATEGORY_ID, PRT_MASTER_MAP, PRT_FMPIC, 
       PRT_PICLIST, PRT_DESCRIBE, PRT_PRO_VEDIO, 
-      PRT_USER_ID, PRT_SORT, PRT_STATE, PRT_CREATE_USER, 
-      PRT_CREATE_TIME, PRT_MODIFY_USER, PRT_MODIFY_TIME
-      )
+      PRT_BRANCHID, PRT_SORT, PRT_STATE, 
+      PRT_PRO_COST, PRT_CREATE_USER, PRT_CREATE_TIME, 
+      PRT_MODIFY_USER, PRT_MODIFY_TIME)
     values (#{id,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{categoryId,jdbcType=VARCHAR}, #{masterMap,jdbcType=VARCHAR}, #{fmpic,jdbcType=VARCHAR}, 
       #{piclist,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR}, #{proVedio,jdbcType=VARCHAR}, 
-      #{userId,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{state,jdbcType=CHAR}, #{createUser,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}
-      )
+      #{branchid,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{state,jdbcType=CHAR}, 
+      #{proCost,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
+      #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmProductInf">
     <!--
@@ -196,8 +197,8 @@
       <if test="proVedio != null">
         PRT_PRO_VEDIO,
       </if>
-      <if test="userId != null">
-        PRT_USER_ID,
+      <if test="branchid != null">
+        PRT_BRANCHID,
       </if>
       <if test="sort != null">
         PRT_SORT,
@@ -205,6 +206,9 @@
       <if test="state != null">
         PRT_STATE,
       </if>
+      <if test="proCost != null">
+        PRT_PRO_COST,
+      </if>
       <if test="createUser != null">
         PRT_CREATE_USER,
       </if>
@@ -246,8 +250,8 @@
       <if test="proVedio != null">
         #{proVedio,jdbcType=VARCHAR},
       </if>
-      <if test="userId != null">
-        #{userId,jdbcType=VARCHAR},
+      <if test="branchid != null">
+        #{branchid,jdbcType=VARCHAR},
       </if>
       <if test="sort != null">
         #{sort,jdbcType=VARCHAR},
@@ -255,6 +259,9 @@
       <if test="state != null">
         #{state,jdbcType=CHAR},
       </if>
+      <if test="proCost != null">
+        #{proCost,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
@@ -313,8 +320,8 @@
       <if test="record.proVedio != null">
         PRT_PRO_VEDIO = #{record.proVedio,jdbcType=VARCHAR},
       </if>
-      <if test="record.userId != null">
-        PRT_USER_ID = #{record.userId,jdbcType=VARCHAR},
+      <if test="record.branchid != null">
+        PRT_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
       </if>
       <if test="record.sort != null">
         PRT_SORT = #{record.sort,jdbcType=VARCHAR},
@@ -322,6 +329,9 @@
       <if test="record.state != null">
         PRT_STATE = #{record.state,jdbcType=CHAR},
       </if>
+      <if test="record.proCost != null">
+        PRT_PRO_COST = #{record.proCost,jdbcType=VARCHAR},
+      </if>
       <if test="record.createUser != null">
         PRT_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       </if>
@@ -354,9 +364,10 @@
       PRT_PICLIST = #{record.piclist,jdbcType=VARCHAR},
       PRT_DESCRIBE = #{record.describe,jdbcType=VARCHAR},
       PRT_PRO_VEDIO = #{record.proVedio,jdbcType=VARCHAR},
-      PRT_USER_ID = #{record.userId,jdbcType=VARCHAR},
+      PRT_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
       PRT_SORT = #{record.sort,jdbcType=VARCHAR},
       PRT_STATE = #{record.state,jdbcType=CHAR},
+      PRT_PRO_COST = #{record.proCost,jdbcType=VARCHAR},
       PRT_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       PRT_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       PRT_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
@@ -396,8 +407,8 @@
       <if test="proVedio != null">
         PRT_PRO_VEDIO = #{proVedio,jdbcType=VARCHAR},
       </if>
-      <if test="userId != null">
-        PRT_USER_ID = #{userId,jdbcType=VARCHAR},
+      <if test="branchid != null">
+        PRT_BRANCHID = #{branchid,jdbcType=VARCHAR},
       </if>
       <if test="sort != null">
         PRT_SORT = #{sort,jdbcType=VARCHAR},
@@ -405,6 +416,9 @@
       <if test="state != null">
         PRT_STATE = #{state,jdbcType=CHAR},
       </if>
+      <if test="proCost != null">
+        PRT_PRO_COST = #{proCost,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null">
         PRT_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       </if>
@@ -434,9 +448,10 @@
       PRT_PICLIST = #{piclist,jdbcType=VARCHAR},
       PRT_DESCRIBE = #{describe,jdbcType=VARCHAR},
       PRT_PRO_VEDIO = #{proVedio,jdbcType=VARCHAR},
-      PRT_USER_ID = #{userId,jdbcType=VARCHAR},
+      PRT_BRANCHID = #{branchid,jdbcType=VARCHAR},
       PRT_SORT = #{sort,jdbcType=VARCHAR},
       PRT_STATE = #{state,jdbcType=CHAR},
+      PRT_PRO_COST = #{proCost,jdbcType=VARCHAR},
       PRT_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       PRT_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       PRT_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},