dcs 1 月之前
父节点
当前提交
7c96918541

+ 13 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/workark/model/Proce.java

@@ -94,6 +94,11 @@ public class Proce {
      */
     private Invoice invoice;
 
+    /**
+     * 示例文件
+     */
+    private String example;
+
     public long getId() {
         return id;
     }
@@ -245,4 +250,12 @@ public class Proce {
     public void setInvoice(Invoice invoice) {
         this.invoice = invoice;
     }
+
+    public String getExample() {
+        return example;
+    }
+
+    public void setExample(String example) {
+        this.example = example;
+    }
 }

+ 13 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/workark/model/ProceModel.java

@@ -57,6 +57,11 @@ public class ProceModel {
      */
     private BigDecimal totalFee;
 
+    /**
+     * 示例文件
+     */
+    private String example;
+
     private List<ProceModel> children;
 
     public long getId() {
@@ -154,4 +159,12 @@ public class ProceModel {
     public void setTotalFee(BigDecimal totalFee) {
         this.totalFee = totalFee;
     }
+
+    public String getExample() {
+        return example;
+    }
+
+    public void setExample(String example) {
+        this.example = example;
+    }
 }

+ 1 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/workark/service/OrderInfoService.java

@@ -133,6 +133,7 @@ public class OrderInfoService {
         proce.setRemark(proceModel.getRemark());
         proce.setType(proceModel.getType());
         proce.setTotalFee(proceModel.getTotalFee());
+        proce.setExample(proceModel.getExample());
         proceDao.save(proce);
         if (proceModel.getChildren().size() > 0) {
             for (ProceModel model : proceModel.getChildren()) {

+ 4 - 2
virgo.api/src/main/resources/mapper/ProceMapper.xml

@@ -20,6 +20,7 @@
         <result column="status" property="status"/>
         <result column="type" property="type"/>
         <result column="totalFee" property="totalFee"/>
+        <result column="example" property="example"/>
         <result column="proceOrderNo" property="proceOrderNo"/>
         <result column="payStatus" property="payStatus"/>
         <collection property="invoice" ofType="com.bosshand.virgo.api.workark.model.Invoice" resultMap="com.bosshand.virgo.api.workark.dao.InvoiceDao.result" columnPrefix="invoice_"/>
@@ -65,8 +66,8 @@
     </select>
 
     <insert id="save" parameterType="com.bosshand.virgo.api.workark.model.Proce" useGeneratedKeys="true" keyProperty="id">
-        INSERT into workark_proce(name, parentId, orderId, productId, productLevelId, sequence, attachment, attachmentNumber, attachmentContent, roleId, remark, type, totalFee)
-        values(#{name}, #{parentId}, #{orderId}, #{productId}, #{productLevelId}, #{sequence}, #{attachment}, #{attachmentNumber}, #{attachmentContent}, #{roleId}, #{remark}, #{type}, #{totalFee})
+        INSERT into workark_proce(name, parentId, orderId, productId, productLevelId, sequence, attachment, attachmentNumber, attachmentContent, roleId, remark, type, totalFee, example)
+        values(#{name}, #{parentId}, #{orderId}, #{productId}, #{productLevelId}, #{sequence}, #{attachment}, #{attachmentNumber}, #{attachmentContent}, #{roleId}, #{remark}, #{type}, #{totalFee}, #{example})
     </insert>
 
     <update id="update" parameterType="com.bosshand.virgo.api.workark.model.Proce">
@@ -83,6 +84,7 @@
             <if test="attachmentContent!=null">attachmentContent=#{attachmentContent},</if>
             <if test="type!=null">type=#{type},</if>
             <if test="totalFee!=null">totalFee=#{totalFee},</if>
+            <if test="example!=null">example=#{example},</if>
             attachmentNumber=#{attachmentNumber},
             sequence=#{sequence},
         </trim>

+ 4 - 2
virgo.api/src/main/resources/mapper/ProceModelMapper.xml

@@ -16,6 +16,7 @@
         <result column="remark" property="remark"/>
         <result column="type" property="type"/>
         <result column="totalFee" property="totalFee"/>
+        <result column="example" property="example"/>
     </resultMap>
 
     <select id="get" resultMap="result">
@@ -35,8 +36,8 @@
     </select>
 
     <insert id="save" parameterType="com.bosshand.virgo.api.workark.model.ProceModel" useGeneratedKeys="true" keyProperty="id">
-        INSERT into workark_proce_model(name, parentId, productLevelId, sequence, attachment, attachmentNumber, roleId, remark, type, totalFee)
-        values(#{name}, #{parentId}, #{productLevelId}, #{sequence}, #{attachment}, #{attachmentNumber}, #{roleId}, #{remark}, #{type}, #{totalFee})
+        INSERT into workark_proce_model(name, parentId, productLevelId, sequence, attachment, attachmentNumber, roleId, remark, type, totalFee, example)
+        values(#{name}, #{parentId}, #{productLevelId}, #{sequence}, #{attachment}, #{attachmentNumber}, #{roleId}, #{remark}, #{type}, #{totalFee}, #{example})
     </insert>
 
     <update id="update" parameterType="com.bosshand.virgo.api.workark.model.ProceModel">
@@ -50,6 +51,7 @@
             <if test="remark!=null">remark=#{remark},</if>
             <if test="type!=null">type=#{type},</if>
             <if test="totalFee!=null">totalFee=#{totalFee},</if>
+            <if test="example!=null">example=#{example},</if>
             attachmentNumber=#{attachmentNumber},
             sequence=#{sequence},
         </trim>