Merge branch 'master' of http://192.168.101.10:13000/gogs/zhaoshangyinzi

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmProjectProduct.java

@@ -42,6 +42,18 @@ public class BmProjectProduct extends BaseEntity
     @Excel(name = "投产图片")
     private String productPhoto;
 
+
+    /**
+     * 设备订购合同
+     */
+    private String arrivalListPhoto;
+
+    /**
+     * 到资清单
+     */
+    private String orderContractPhoto;
+
+
     /** 项目入规(限) */
     @Excel(name = "项目入规(限)")
     private String isOk;
@@ -51,7 +63,23 @@ public class BmProjectProduct extends BaseEntity
     @Excel(name = "项目入规时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date okDate;
 
-    public void setId(Long id) 
+    public String getArrivalListPhoto() {
+        return arrivalListPhoto;
+    }
+
+    public void setArrivalListPhoto(String arrivalListPhoto) {
+        this.arrivalListPhoto = arrivalListPhoto;
+    }
+
+    public String getOrderContractPhoto() {
+        return orderContractPhoto;
+    }
+
+    public void setOrderContractPhoto(String orderContractPhoto) {
+        this.orderContractPhoto = orderContractPhoto;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

ruoyi-system/src/main/resources/mapper/system/project/BmProjectProductMapper.xml

@@ -16,12 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="macInvestment"    column="mac_investment"    />
         <result property="productDate"    column="product_date"    />
         <result property="productPhoto"    column="product_photo"    />
+        <result property="arrivalListPhoto"    column="arrival_list_photo"    />
+        <result property="orderContractPhoto"    column="order_contract_photo"    />
         <result property="isOk"    column="is_ok"    />
         <result property="okDate"    column="ok_date"    />
     </resultMap>
 
     <sql id="selectBmProjectProductVo">
-        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, tot_investment, mac_investment, product_date, product_photo, is_ok, ok_date from bm_project_product
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, tot_investment, mac_investment, product_date, product_photo, arrival_list_photo, order_contract_photo, is_ok, ok_date from bm_project_product
     </sql>
 
     <select id="selectBmProjectProductList" parameterType="BmProjectProduct" resultMap="BmProjectProductResult">
@@ -34,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="macInvestment != null "> and mac_investment = #{macInvestment}</if>
             <if test="productDate != null "> and product_date = #{productDate}</if>
             <if test="productPhoto != null  and productPhoto != ''"> and product_photo = #{productPhoto}</if>
+            <if test="arrivalListPhoto != null  and arrivalListPhoto != ''"> and arrival_list_photo = #{arrivalListPhoto}</if>
+            <if test="orderContractPhoto != null  and orderContractPhoto != ''"> and order_contract_photo = #{orderContractPhoto}</if>
             <if test="isOk != null  and isOk != ''"> and is_ok = #{isOk}</if>
             <if test="okDate != null "> and ok_date = #{okDate}</if>
         </where>
@@ -58,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="macInvestment != null">mac_investment,</if>
             <if test="productDate != null">product_date,</if>
             <if test="productPhoto != null">product_photo,</if>
+            <if test="arrivalListPhoto != null">arrival_list_photo,</if>
+            <if test="orderContractPhoto != null">order_contract_photo,</if>
             <if test="isOk != null">is_ok,</if>
             <if test="okDate != null">ok_date,</if>
          </trim>
@@ -72,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="macInvestment != null">#{macInvestment},</if>
             <if test="productDate != null">#{productDate},</if>
             <if test="productPhoto != null">#{productPhoto},</if>
+            <if test="arrivalListPhoto != null">#{arrivalListPhoto},</if>
+            <if test="orderContractPhoto != null">#{orderContractPhoto},</if>
             <if test="isOk != null">#{isOk},</if>
             <if test="okDate != null">#{okDate},</if>
          </trim>
@@ -90,6 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="macInvestment != null">mac_investment = #{macInvestment},</if>
             <if test="productDate != null">product_date = #{productDate},</if>
             <if test="productPhoto != null">product_photo = #{productPhoto},</if>
+            <if test="arrivalListPhoto != null">arrival_list_photo = #{arrivalListPhoto},</if>
+            <if test="orderContractPhoto != null">order_contract_photo = #{orderContractPhoto},</if>
             <if test="isOk != null">is_ok = #{isOk},</if>
             <if test="okDate != null">ok_date = #{okDate},</if>
         </trim>