修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractGoodsInfo.java

@@ -81,6 +81,22 @@ public class ContractGoodsInfo extends BaseModel<ContractGoodsInfo> {
      * 品级
      */
     private String grade;
+    /**
+     * 蛋白
+     */
+    private String protein;
+    /**
+     * 转基因
+     */
+    private String transgene;
+    /**
+     * 产地省
+     */
+    private String outputPrivate;
+    /**
+     * 产地市
+     */
+    private String outputCity;
 
     /**
      * 重量（吨）

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -49,6 +49,10 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 合同类型(1销售2采购)
      */
     private String contractType;
+    /**
+     * 货物类型(1现货2期货)
+     */
+    private String goodsType;
     /**
      * 交货方式(1我方自提2对方送货)
      */
@@ -121,6 +125,40 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 重量（吨）
      */
     private Float weight;
+    /**
+     * 点价（元/吨）
+     */
+    private Float pointPrice;
+    /**
+     * 合约号
+     */
+    private String contractNumber;
+    /**
+     * 点价日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date pointPriceDate;
+    /**
+     * 交易所
+     */
+    private String transactionsPlace;
+    /**
+     * 基差
+     */
+    private Float basisPrice;
+    /**
+     * 入库费
+     */
+    private Float warehousingFee;
+    /**
+     * 计费标准
+     */
+    private String measurementStandard;
+    /**
+     * 收货库
+     */
+    private String receiveWarehouse;
     /**
      * 验收方式key
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ProcurementPlanInfo.java

@@ -217,6 +217,11 @@ public class ProcurementPlanInfo extends BaseModel<ProcurementPlanInfo> {
      */
     @TableField(exist = false)
     private String searchKeyWord;
+    /**
+     * PC端(传1)
+     */
+    @TableField(exist = false)
+    private String pcFlag;
 
 
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ProcurementPlanInfoServiceImpl.java

@@ -88,6 +88,7 @@ public class ProcurementPlanInfoServiceImpl extends ServiceImpl<ProcurementPlanI
         //公司id
         pageView.put("compId",procurementPlanInfo.getCompId());
         pageView.put("searchKeyWord",procurementPlanInfo.getSearchKeyWord());
+        pageView.put("pcFlag",procurementPlanInfo.getPcFlag());
         pageView.put("goodsName",procurementPlanInfo.getGoodsName());
         pageView.put("pageSize",procurementPlanInfo.getPageSize());
         pageView.put("currentPage",procurementPlanInfo.getCurrentPage());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ProcurementPlanInfoMapper.xml

@@ -6,13 +6,14 @@
         SELECT
         COUNT(id)
         FROM procurement_plan_info
-        WHERE
-        comp_id = #{compId}
-        and delete_flag = '0'
+        WHERE delete_flag = '0'
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(procurement_plan_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(title) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
+        <if test="pcFlag != null and pcFlag != ''">
+            AND comp_id = #{compId}
+        </if>
     </select>
     <!-- 获得采购计划列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -29,15 +30,16 @@
         status as status,
         update_date as updateDate
         FROM procurement_plan_info
-        WHERE
-        comp_id = #{compId}
-        and delete_flag = '0'
+        WHERE delete_flag = '0'
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(procurement_plan_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(title) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         <if test="goodsName != null and goodsName != ''">
-            AND (lower(goods_name) like lower(CONCAT('%',#{goodsName},'%'))
+            AND goods_name = #{goodsName}
+        </if>
+        <if test="pcFlag != null and pcFlag != ''">
+            AND comp_id = #{compId}
         </if>
         ORDER BY status DESC , update_date DESC
         <if test="currentPage != null and currentPage != ''">