.

src/main/java/com/chinaitop/depot/business/mapper/BusinessPlanMapper.java

@@ -1,46 +1,45 @@
-package com.chinaitop.depot.business.mapper;
-
-import com.chinaitop.depot.business.model.BusinessPlan;
-import com.chinaitop.depot.business.model.BusinessPlanExample;
-import com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
-public interface BusinessPlanMapper {
-    int countByExample(BusinessPlanExample example);
-
-    int deleteByExample(BusinessPlanExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(BusinessPlan record);
-
-    int insertSelective(BusinessPlan record);
-
-    List<BusinessPlan> selectByExample(BusinessPlanExample example);
-
-    BusinessPlan selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") BusinessPlan record, @Param("example") BusinessPlanExample example);
-
-    int updateByExample(@Param("record") BusinessPlan record, @Param("example") BusinessPlanExample example);
-
-    int updateByPrimaryKeySelective(BusinessPlan record);
-
-    int updateByPrimaryKey(BusinessPlan record);
-    
-    
-    
-    //自增
-    List<BusinessPlanAuditVO> getApprovalList(Map<String, Object> paramMap);
-    List<BusinessPlanAuditVO> selectByExampleToVO(BusinessPlanExample example);
-
-    List<BusinessPlanAuditVO> getAcceptanceList(Map<String, Object> paramMap);
-    int addAcceptance(Map<String, String> paramMap);
-    int addAcceptanceDetail(Map<String, String> paramMap);
-
-	void updateByStatus(Integer id);
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessPlan;
+import com.chinaitop.depot.business.model.BusinessPlanExample;
+import com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessPlanMapper {
+    int countByExample(BusinessPlanExample example);
+
+    int deleteByExample(BusinessPlanExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessPlan record);
+
+    int insertSelective(BusinessPlan record);
+
+    List<BusinessPlan> selectByExample(BusinessPlanExample example);
+
+    BusinessPlan selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessPlan record, @Param("example") BusinessPlanExample example);
+
+    int updateByExample(@Param("record") BusinessPlan record, @Param("example") BusinessPlanExample example);
+
+    int updateByPrimaryKeySelective(BusinessPlan record);
+
+    int updateByPrimaryKey(BusinessPlan record);
+    
+    
+    //自增
+    List<BusinessPlanAuditVO> getApprovalList(Map<String, Object> paramMap);
+    List<BusinessPlanAuditVO> selectByExampleToVO(BusinessPlanExample example);
+
+    List<BusinessPlanAuditVO> getAcceptanceList(Map<String, Object> paramMap);
+    int addAcceptance(Map<String, String> paramMap);
+    int addAcceptanceDetail(Map<String, String> paramMap);
+
+	void updateByStatus(Integer id);
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessPlanMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chinaitop.depot.business.mapper.BusinessPlanMapper">
   <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessPlan">
     <id column="id" jdbcType="INTEGER" property="id" />
@@ -8,6 +8,8 @@
     <result column="reference_number" jdbcType="VARCHAR" property="referenceNumber" />
     <result column="plan_desc" jdbcType="VARCHAR" property="planDesc" />
     <result column="execute_type" jdbcType="INTEGER" property="executeType" />
+    <result column="out_amount" jdbcType="VARCHAR" property="outAmount" />
+    <result column="in_amount" jdbcType="VARCHAR" property="inAmount" />
     <result column="total_amount" jdbcType="VARCHAR" property="totalAmount" />
     <result column="total_price" jdbcType="VARCHAR" property="totalPrice" />
     <result column="customer_plan_state" jdbcType="VARCHAR" property="customerPlanState" />
@@ -29,19 +31,20 @@
     <result column="province_remark" jdbcType="VARCHAR" property="provinceRemark" />
     <result column="enterprise_remark" jdbcType="VARCHAR" property="enterpriseRemark" />
     <result column="attribute_type" jdbcType="INTEGER" property="attributeType" />
-  </resultMap>
-  
-  <resultMap id="approvalResultMap" type="com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO" extends="BaseResultMap">
-    <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR" />
-    <result column="task_id" property="taskId" jdbcType="VARCHAR" />
-    <result column="result" property="result" jdbcType="VARCHAR" />
-    <result column="task_name" property="taskName" jdbcType="VARCHAR" />
-    <result column="auditId" property="auditId" jdbcType="INTEGER" />
-    <result column="applicationDate" property="applicationDate" jdbcType="VARCHAR" />
-    <result column="acceptanceType" property="acceptanceType" jdbcType="VARCHAR" />
-    <result column="house_id" property="houseId" jdbcType="INTEGER" />
-    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
-  </resultMap>
+  </resultMap>
+  
+  
+  <resultMap id="approvalResultMap" type="com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO" extends="BaseResultMap">
+    <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR" />
+    <result column="task_id" property="taskId" jdbcType="VARCHAR" />
+    <result column="result" property="result" jdbcType="VARCHAR" />
+    <result column="task_name" property="taskName" jdbcType="VARCHAR" />
+    <result column="auditId" property="auditId" jdbcType="INTEGER" />
+    <result column="applicationDate" property="applicationDate" jdbcType="VARCHAR" />
+    <result column="acceptanceType" property="acceptanceType" jdbcType="VARCHAR" />
+    <result column="house_id" property="houseId" jdbcType="INTEGER" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+  </resultMap>
   
   <sql id="Example_Where_Clause">
     <where>
@@ -102,11 +105,11 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, plan_number, plan_title, reference_number, plan_desc, execute_type, total_amount, 
-    total_price, customer_plan_state, plan_customer, audit_state, process_instance_id, 
-    process_definition_id, current_approve_path, agree_time, creater_id, creater, create_time, 
-    create_unit, org_id, in_application, total_quantity, report_date, send_date, province_remark, 
-    enterprise_remark, attribute_type
+    id, plan_number, plan_title, reference_number, plan_desc, execute_type, out_amount, 
+    in_amount, total_amount, total_price, customer_plan_state, plan_customer, audit_state, 
+    process_instance_id, process_definition_id, current_approve_path, agree_time, creater_id, 
+    creater, create_time, create_unit, org_id, in_application, total_quantity, report_date, 
+    send_date, province_remark, enterprise_remark, attribute_type
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" resultMap="BaseResultMap">
     select
@@ -141,24 +144,24 @@
   <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.business.model.BusinessPlan">
     insert into business_plan (id, plan_number, plan_title, 
       reference_number, plan_desc, execute_type, 
-      total_amount, total_price, customer_plan_state, 
-      plan_customer, audit_state, process_instance_id, 
-      process_definition_id, current_approve_path, 
-      agree_time, creater_id, creater, 
-      create_time, create_unit, org_id, 
-      in_application, total_quantity, report_date, 
-      send_date, province_remark, enterprise_remark, 
-      attribute_type)
+      out_amount, in_amount, total_amount, 
+      total_price, customer_plan_state, plan_customer, 
+      audit_state, process_instance_id, process_definition_id, 
+      current_approve_path, agree_time, creater_id, 
+      creater, create_time, create_unit, 
+      org_id, in_application, total_quantity, 
+      report_date, send_date, province_remark, 
+      enterprise_remark, attribute_type)
     values (#{id,jdbcType=INTEGER}, #{planNumber,jdbcType=VARCHAR}, #{planTitle,jdbcType=VARCHAR}, 
       #{referenceNumber,jdbcType=VARCHAR}, #{planDesc,jdbcType=VARCHAR}, #{executeType,jdbcType=INTEGER}, 
-      #{totalAmount,jdbcType=VARCHAR}, #{totalPrice,jdbcType=VARCHAR}, #{customerPlanState,jdbcType=VARCHAR}, 
-      #{planCustomer,jdbcType=VARCHAR}, #{auditState,jdbcType=VARCHAR}, #{processInstanceId,jdbcType=VARCHAR}, 
-      #{processDefinitionId,jdbcType=VARCHAR}, #{currentApprovePath,jdbcType=VARCHAR}, 
-      #{agreeTime,jdbcType=TIMESTAMP}, #{createrId,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{createUnit,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, 
-      #{inApplication,jdbcType=INTEGER}, #{totalQuantity,jdbcType=VARCHAR}, #{reportDate,jdbcType=TIMESTAMP}, 
-      #{sendDate,jdbcType=TIMESTAMP}, #{provinceRemark,jdbcType=VARCHAR}, #{enterpriseRemark,jdbcType=VARCHAR}, 
-      #{attributeType,jdbcType=INTEGER})
+      #{outAmount,jdbcType=VARCHAR}, #{inAmount,jdbcType=VARCHAR}, #{totalAmount,jdbcType=VARCHAR}, 
+      #{totalPrice,jdbcType=VARCHAR}, #{customerPlanState,jdbcType=VARCHAR}, #{planCustomer,jdbcType=VARCHAR}, 
+      #{auditState,jdbcType=VARCHAR}, #{processInstanceId,jdbcType=VARCHAR}, #{processDefinitionId,jdbcType=VARCHAR}, 
+      #{currentApprovePath,jdbcType=VARCHAR}, #{agreeTime,jdbcType=TIMESTAMP}, #{createrId,jdbcType=INTEGER}, 
+      #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUnit,jdbcType=VARCHAR}, 
+      #{orgId,jdbcType=INTEGER}, #{inApplication,jdbcType=INTEGER}, #{totalQuantity,jdbcType=VARCHAR}, 
+      #{reportDate,jdbcType=TIMESTAMP}, #{sendDate,jdbcType=TIMESTAMP}, #{provinceRemark,jdbcType=VARCHAR}, 
+      #{enterpriseRemark,jdbcType=VARCHAR}, #{attributeType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessPlan">
     insert into business_plan
@@ -181,6 +184,12 @@
       <if test="executeType != null">
         execute_type,
       </if>
+      <if test="outAmount != null">
+        out_amount,
+      </if>
+      <if test="inAmount != null">
+        in_amount,
+      </if>
       <if test="totalAmount != null">
         total_amount,
       </if>
@@ -264,6 +273,12 @@
       <if test="executeType != null">
         #{executeType,jdbcType=INTEGER},
       </if>
+      <if test="outAmount != null">
+        #{outAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="inAmount != null">
+        #{inAmount,jdbcType=VARCHAR},
+      </if>
       <if test="totalAmount != null">
         #{totalAmount,jdbcType=VARCHAR},
       </if>
@@ -356,6 +371,12 @@
       <if test="record.executeType != null">
         execute_type = #{record.executeType,jdbcType=INTEGER},
       </if>
+      <if test="record.outAmount != null">
+        out_amount = #{record.outAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inAmount != null">
+        in_amount = #{record.inAmount,jdbcType=VARCHAR},
+      </if>
       <if test="record.totalAmount != null">
         total_amount = #{record.totalAmount,jdbcType=VARCHAR},
       </if>
@@ -432,6 +453,8 @@
       reference_number = #{record.referenceNumber,jdbcType=VARCHAR},
       plan_desc = #{record.planDesc,jdbcType=VARCHAR},
       execute_type = #{record.executeType,jdbcType=INTEGER},
+      out_amount = #{record.outAmount,jdbcType=VARCHAR},
+      in_amount = #{record.inAmount,jdbcType=VARCHAR},
       total_amount = #{record.totalAmount,jdbcType=VARCHAR},
       total_price = #{record.totalPrice,jdbcType=VARCHAR},
       customer_plan_state = #{record.customerPlanState,jdbcType=VARCHAR},
@@ -475,6 +498,12 @@
       <if test="executeType != null">
         execute_type = #{executeType,jdbcType=INTEGER},
       </if>
+      <if test="outAmount != null">
+        out_amount = #{outAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="inAmount != null">
+        in_amount = #{inAmount,jdbcType=VARCHAR},
+      </if>
       <if test="totalAmount != null">
         total_amount = #{totalAmount,jdbcType=VARCHAR},
       </if>
@@ -548,6 +577,8 @@
       reference_number = #{referenceNumber,jdbcType=VARCHAR},
       plan_desc = #{planDesc,jdbcType=VARCHAR},
       execute_type = #{executeType,jdbcType=INTEGER},
+      out_amount = #{outAmount,jdbcType=VARCHAR},
+      in_amount = #{inAmount,jdbcType=VARCHAR},
       total_amount = #{totalAmount,jdbcType=VARCHAR},
       total_price = #{totalPrice,jdbcType=VARCHAR},
       customer_plan_state = #{customerPlanState,jdbcType=VARCHAR},
@@ -571,107 +602,210 @@
       attribute_type = #{attributeType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  
-  
-  <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
-    select
-        a.id id, a.plan_number plan_number, a.reference_number reference_number, a.execute_type execute_type,
-        a.total_amount total_amount, a.create_time create_time, 
-        a.process_instance_id process_instance_id,
-        a.process_definition_id process_definition_id,
-        b.id auditId,
-        b.result result, b.task_id task_id,b.task_name task_name
-    from business_plan a, business_approval b
-    <where>
-        a.process_instance_id = b.process_instance_id
-        and
-        a.audit_state != 0
-        <if test="operator != null">
-           and b.operator = #{operator}
-        </if>
-        <if test="result != null">
-           and b.result = #{result}
-        </if>
-        <if test="planNumber != null">
-           and a.plan_number LIKE CONCAT(CONCAT('%', #{planNumber}), '%')
-        </if>
-        <if test="attributeType != null">
-           and a.attribute_type = #{attributeType}
-        </if>
-        order by FIELD(b.result, '待审批', '同意', '驳回', '拒绝'), b.create_time desc
-    </where>
-  </select>
  
-  <select id="selectByExampleToVO" resultMap="approvalResultMap" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from business_plan
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-
   
-  <update id="updateByStatus" parameterType="java.lang.Integer">
-  	update business_plan set customer_plan_state=1 where id=#{id};
-  </update>
-
- <!-- 审批结束的(audit_state = 2),终止(in_application = 3),已上报的(customer_plan_state=50)的轮换计划(execute_type=3156)-->
-  <select id="getAcceptanceList" resultMap="approvalResultMap" parameterType="java.util.Map" >
-    SELECT
-      a.id id,a.plan_number plan_number,a.reference_number reference_number,
-      a.execute_type execute_type,
-      a.customer_plan_state customer_plan_state,
-      a.in_application in_application,
-      detail.grain_kind grain_kind,
-      detail.grain_attribute grain_attribute,
-      detail.grain_annual grain_annual,
-      detail.house_id house_id,
-      detail.warehouse_id warehouse_id,
-      a.create_time create_time,
-      a.process_instance_id process_instance_id,
-      a.process_definition_id process_definition_id,
-      a.plan_title plan_title,
-      acceptance.application_date applicationDate,
-      acceptance.acceptance_type acceptanceType
-    FROM
-      business_plan a
-    LEFT JOIN business_plan_acceptance acceptance ON acceptance.plan_id = a.id
-    LEFT JOIN business_store_ware_detail detail ON detail.zid = a.id
-    <where>
-      a.audit_state = 2 AND a.in_application = 3 AND a.execute_type=3156 AND customer_plan_state=50
-      <if test="planTitle != null">
-        and a.plan_title LIKE CONCAT(CONCAT('%', #{planTitle}), '%')
-      </if>
-      <if test="planNumber != null">
-        and a.plan_number LIKE CONCAT(CONCAT('%', #{planNumber}), '%')
-      </if>
-      order by a.create_time desc
-    </where>
-  </select>
-  <insert id="addAcceptance" useGeneratedKeys="true" keyProperty="id"  parameterType="java.util.Map">
-      INSERT INTO business_plan_acceptance (plan_id, application_date, acceptance_type) VALUES
-      ${sql}
-  </insert>
-  <insert id="addAcceptanceDetail" parameterType="java.util.Map">
-      INSERT INTO business_plan_acceptance_detail (acceptance_id, qualitycheck_id) VALUES
-      ${sqlDetail}
-  </insert>
-  <select id="getDataByZJId" resultMap="BaseResultMap" parameterType="java.util.Map" >
-    SELECT
-        quality.*,house.storehouse_name storehouseName,warehouse.warehouse_name wareHouseName, acceptance.id acceptanceId
-    FROM
-        business_plan_acceptance acceptance
-    INNER JOIN business_plan_acceptance_detail detail ON detail.acceptance_id = acceptance.id
-    INNER JOIN storage_qualitycheck quality ON quality.id = detail.qualitycheck_id
-    INNER JOIN basic_storehouse house ON house.storehouse_id = quality.house_id
-    INNER JOIN basic_warehouse warehouse ON warehouse.warehouse_id = quality.warehouse_id
-     where acceptance.plan_id = #{id,jdbcType=VARCHAR}
+  
+  
+  
+  <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
+
+    select
+
+        a.id id, a.plan_number plan_number, a.reference_number reference_number, a.execute_type execute_type,
+
+        a.total_amount total_amount, a.create_time create_time, 
+
+        a.process_instance_id process_instance_id,
+
+        a.process_definition_id process_definition_id,
+
+        b.id auditId,
+
+        b.result result, b.task_id task_id,b.task_name task_name
+
+    from business_plan a, business_approval b
+
+    <where>
+
+        a.process_instance_id = b.process_instance_id
+
+        and
+
+        a.audit_state != 0
+
+        <if test="operator != null">
+
+           and b.operator = #{operator}
+
+        </if>
+
+        <if test="result != null">
+
+           and b.result = #{result}
+
+        </if>
+
+        <if test="planNumber != null">
+
+           and a.plan_number LIKE CONCAT(CONCAT('%', #{planNumber}), '%')
+
+        </if>
+
+        <if test="attributeType != null">
+
+           and a.attribute_type = #{attributeType}
+
+        </if>
+
+        order by FIELD(b.result, '待审批', '同意', '驳回', '拒绝'), b.create_time desc
+
+    </where>
+
+  </select>
+
+ 
+
+  <select id="selectByExampleToVO" resultMap="approvalResultMap" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" >
+
+    select
+
+    <if test="distinct" >
+
+      distinct
+
+    </if>
+
+    <include refid="Base_Column_List" />
+
+    from business_plan
+
+    <if test="_parameter != null" >
+
+      <include refid="Example_Where_Clause" />
+
+    </if>
+
+    <if test="orderByClause != null" >
+
+      order by ${orderByClause}
+
+    </if>
+
+  </select>
+
+
+
+  
+
+  <update id="updateByStatus" parameterType="java.lang.Integer">
+
+  	update business_plan set customer_plan_state=1 where id=#{id};
+
+  </update>
+
+
+
+ <!-- 审批结束的(audit_state = 2),终止(in_application = 3),已上报的(customer_plan_state=50)的轮换计划(execute_type=3156)-->
+
+  <select id="getAcceptanceList" resultMap="approvalResultMap" parameterType="java.util.Map" >
+
+    SELECT
+
+      a.id id,a.plan_number plan_number,a.reference_number reference_number,
+
+      a.execute_type execute_type,
+
+      a.customer_plan_state customer_plan_state,
+
+      a.in_application in_application,
+
+      detail.grain_kind grain_kind,
+
+      detail.grain_attribute grain_attribute,
+
+      detail.grain_annual grain_annual,
+
+      detail.house_id house_id,
+
+      detail.warehouse_id warehouse_id,
+
+      a.create_time create_time,
+
+      a.process_instance_id process_instance_id,
+
+      a.process_definition_id process_definition_id,
+
+      a.plan_title plan_title,
+
+      acceptance.application_date applicationDate,
+
+      acceptance.acceptance_type acceptanceType
+
+    FROM
+
+      business_plan a
+
+    LEFT JOIN business_plan_acceptance acceptance ON acceptance.plan_id = a.id
+
+    LEFT JOIN business_store_ware_detail detail ON detail.zid = a.id
+
+    <where>
+
+      a.audit_state = 2 AND a.in_application = 3 AND a.execute_type=3156 AND customer_plan_state=50
+
+      <if test="planTitle != null">
+
+        and a.plan_title LIKE CONCAT(CONCAT('%', #{planTitle}), '%')
+
+      </if>
+
+      <if test="planNumber != null">
+
+        and a.plan_number LIKE CONCAT(CONCAT('%', #{planNumber}), '%')
+
+      </if>
+
+      order by a.create_time desc
+
+    </where>
+
+  </select>
+
+  <insert id="addAcceptance" useGeneratedKeys="true" keyProperty="id"  parameterType="java.util.Map">
+
+      INSERT INTO business_plan_acceptance (plan_id, application_date, acceptance_type) VALUES
+
+      ${sql}
+
+  </insert>
+
+  <insert id="addAcceptanceDetail" parameterType="java.util.Map">
+
+      INSERT INTO business_plan_acceptance_detail (acceptance_id, qualitycheck_id) VALUES
+
+      ${sqlDetail}
+
+  </insert>
+
+  <select id="getDataByZJId" resultMap="BaseResultMap" parameterType="java.util.Map" >
+
+    SELECT
+
+        quality.*,house.storehouse_name storehouseName,warehouse.warehouse_name wareHouseName, acceptance.id acceptanceId
+
+    FROM
+
+        business_plan_acceptance acceptance
+
+    INNER JOIN business_plan_acceptance_detail detail ON detail.acceptance_id = acceptance.id
+
+    INNER JOIN storage_qualitycheck quality ON quality.id = detail.qualitycheck_id
+
+    INNER JOIN basic_storehouse house ON house.storehouse_id = quality.house_id
+
+    INNER JOIN basic_warehouse warehouse ON warehouse.warehouse_id = quality.warehouse_id
+
+     where acceptance.plan_id = #{id,jdbcType=VARCHAR}
+
   </select>
 </mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessStoreWareDetailMapper.java

@@ -1,55 +1,55 @@
-package com.chinaitop.depot.business.mapper;
-
-import com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample;
-import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
-import com.chinaitop.depot.business.model.BusinessStoreWareDetailExample;
-import com.chinaitop.depot.business.model.vo.BusinessDeliveryStorageNoticeAuditVO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
-public interface BusinessStoreWareDetailMapper {
-    int countByExample(BusinessStoreWareDetailExample example);
-
-    int deleteByExample(BusinessStoreWareDetailExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(BusinessStoreWareDetail record);
-
-    int insertSelective(BusinessStoreWareDetail record);
-
-    List<BusinessStoreWareDetail> selectByExample(BusinessStoreWareDetailExample example);
-
-    BusinessStoreWareDetail selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") BusinessStoreWareDetail record, @Param("example") BusinessStoreWareDetailExample example);
-
-    int updateByExample(@Param("record") BusinessStoreWareDetail record, @Param("example") BusinessStoreWareDetailExample example);
-
-    int updateByPrimaryKeySelective(BusinessStoreWareDetail record);
-
-    int updateByPrimaryKey(BusinessStoreWareDetail record);
-    
-    
-    /**
-     * @param paramMap
-     * @return
-     */
-    List<BusinessDeliveryStorageNoticeAuditVO> getApprovalList(Map<String, Object> paramMap);
-
-    /**
-     * @param paramMap
-     */
-    void updateApplication(Map<String, Object> paramMap);
-
-    /**
-     * @param example
-     * @return
-     */
-    List<BusinessDeliveryStorageNoticeAuditVO> selectByExampleToVO(
-            BusinessDeliveryStorageNoticeExample example);
-    
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetailExample;
+import com.chinaitop.depot.business.model.vo.BusinessDeliveryStorageNoticeAuditVO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessStoreWareDetailMapper {
+    int countByExample(BusinessStoreWareDetailExample example);
+
+    int deleteByExample(BusinessStoreWareDetailExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessStoreWareDetail record);
+
+    int insertSelective(BusinessStoreWareDetail record);
+
+    List<BusinessStoreWareDetail> selectByExample(BusinessStoreWareDetailExample example);
+
+    BusinessStoreWareDetail selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessStoreWareDetail record, @Param("example") BusinessStoreWareDetailExample example);
+
+    int updateByExample(@Param("record") BusinessStoreWareDetail record, @Param("example") BusinessStoreWareDetailExample example);
+
+    int updateByPrimaryKeySelective(BusinessStoreWareDetail record);
+
+    int updateByPrimaryKey(BusinessStoreWareDetail record);
+    
+    
+    
+    /**
+     * @param paramMap
+     * @return
+     */
+    List<BusinessDeliveryStorageNoticeAuditVO> getApprovalList(Map<String, Object> paramMap);
+
+    /**
+     * @param paramMap
+     */
+    void updateApplication(Map<String, Object> paramMap);
+
+    /**
+     * @param example
+     * @return
+     */
+    List<BusinessDeliveryStorageNoticeAuditVO> selectByExampleToVO(
+            BusinessDeliveryStorageNoticeExample example);
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessStoreWareDetailMapper.xml

@@ -1,435 +1,448 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.chinaitop.depot.business.mapper.BusinessStoreWareDetailMapper" >
-  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="zid" property="zid" jdbcType="INTEGER" />
-    <result column="type" property="type" jdbcType="VARCHAR" />
-    <result column="house_id" property="houseId" jdbcType="INTEGER" />
-    <result column="house_name" property="houseName" jdbcType="VARCHAR" />
-    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
-    <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
-    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="org_id" property="orgId" jdbcType="INTEGER" />
-    <result column="grain_kind" property="grainKind" jdbcType="INTEGER" />
-    <result column="grain_detail_kind" property="grainDetailKind" jdbcType="INTEGER" />
-    <result column="grain_grade" property="grainGrade" jdbcType="INTEGER" />
-    <result column="grain_attribute" property="grainAttribute" jdbcType="INTEGER" />
-    <result column="grain_annual" property="grainAnnual" jdbcType="INTEGER" />
-    <result column="grain_producing_area" property="grainProducingArea" jdbcType="INTEGER" />
-    <result column="price" property="price" jdbcType="VARCHAR" />
-    <result column="count" property="count" jdbcType="VARCHAR" />
-    <result column="detail_total_price" property="detailTotalPrice" jdbcType="VARCHAR" />
-    <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause" >
-    <where >
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, zid, type, house_id, house_name, warehouse_id, warehouse_name, create_time, org_id, 
-    grain_kind, grain_detail_kind, grain_grade, grain_attribute, grain_annual, grain_producing_area, 
-    price, count, detail_total_price, input_time
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from business_store_ware_detail
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from business_store_ware_detail
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from business_store_ware_detail
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" >
-    delete from business_store_ware_detail
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
-    insert into business_store_ware_detail (id, zid, type, 
-      house_id, house_name, warehouse_id, 
-      warehouse_name, create_time, org_id, 
-      grain_kind, grain_detail_kind, grain_grade, 
-      grain_attribute, grain_annual, grain_producing_area, 
-      price, count, detail_total_price, 
-      input_time)
-    values (#{id,jdbcType=INTEGER}, #{zid,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
-      #{houseId,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, 
-      #{warehouseName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, 
-      #{grainKind,jdbcType=INTEGER}, #{grainDetailKind,jdbcType=INTEGER}, #{grainGrade,jdbcType=INTEGER}, 
-      #{grainAttribute,jdbcType=INTEGER}, #{grainAnnual,jdbcType=INTEGER}, #{grainProducingArea,jdbcType=INTEGER}, 
-      #{price,jdbcType=VARCHAR}, #{count,jdbcType=VARCHAR}, #{detailTotalPrice,jdbcType=VARCHAR}, 
-      #{inputTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
-    insert into business_store_ware_detail
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        id,
-      </if>
-      <if test="zid != null" >
-        zid,
-      </if>
-      <if test="type != null" >
-        type,
-      </if>
-      <if test="houseId != null" >
-        house_id,
-      </if>
-      <if test="houseName != null" >
-        house_name,
-      </if>
-      <if test="warehouseId != null" >
-        warehouse_id,
-      </if>
-      <if test="warehouseName != null" >
-        warehouse_name,
-      </if>
-      <if test="createTime != null" >
-        create_time,
-      </if>
-      <if test="orgId != null" >
-        org_id,
-      </if>
-      <if test="grainKind != null" >
-        grain_kind,
-      </if>
-      <if test="grainDetailKind != null" >
-        grain_detail_kind,
-      </if>
-      <if test="grainGrade != null" >
-        grain_grade,
-      </if>
-      <if test="grainAttribute != null" >
-        grain_attribute,
-      </if>
-      <if test="grainAnnual != null" >
-        grain_annual,
-      </if>
-      <if test="grainProducingArea != null" >
-        grain_producing_area,
-      </if>
-      <if test="price != null" >
-        price,
-      </if>
-      <if test="count != null" >
-        count,
-      </if>
-      <if test="detailTotalPrice != null" >
-        detail_total_price,
-      </if>
-      <if test="inputTime != null" >
-        input_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="zid != null" >
-        #{zid,jdbcType=INTEGER},
-      </if>
-      <if test="type != null" >
-        #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="houseId != null" >
-        #{houseId,jdbcType=INTEGER},
-      </if>
-      <if test="houseName != null" >
-        #{houseName,jdbcType=VARCHAR},
-      </if>
-      <if test="warehouseId != null" >
-        #{warehouseId,jdbcType=INTEGER},
-      </if>
-      <if test="warehouseName != null" >
-        #{warehouseName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null" >
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="orgId != null" >
-        #{orgId,jdbcType=INTEGER},
-      </if>
-      <if test="grainKind != null" >
-        #{grainKind,jdbcType=INTEGER},
-      </if>
-      <if test="grainDetailKind != null" >
-        #{grainDetailKind,jdbcType=INTEGER},
-      </if>
-      <if test="grainGrade != null" >
-        #{grainGrade,jdbcType=INTEGER},
-      </if>
-      <if test="grainAttribute != null" >
-        #{grainAttribute,jdbcType=INTEGER},
-      </if>
-      <if test="grainAnnual != null" >
-        #{grainAnnual,jdbcType=INTEGER},
-      </if>
-      <if test="grainProducingArea != null" >
-        #{grainProducingArea,jdbcType=INTEGER},
-      </if>
-      <if test="price != null" >
-        #{price,jdbcType=VARCHAR},
-      </if>
-      <if test="count != null" >
-        #{count,jdbcType=VARCHAR},
-      </if>
-      <if test="detailTotalPrice != null" >
-        #{detailTotalPrice,jdbcType=VARCHAR},
-      </if>
-      <if test="inputTime != null" >
-        #{inputTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" resultType="java.lang.Integer" >
-    select count(*) from business_store_ware_detail
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map" >
-    update business_store_ware_detail
-    <set >
-      <if test="record.id != null" >
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.zid != null" >
-        zid = #{record.zid,jdbcType=INTEGER},
-      </if>
-      <if test="record.type != null" >
-        type = #{record.type,jdbcType=VARCHAR},
-      </if>
-      <if test="record.houseId != null" >
-        house_id = #{record.houseId,jdbcType=INTEGER},
-      </if>
-      <if test="record.houseName != null" >
-        house_name = #{record.houseName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.warehouseId != null" >
-        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
-      </if>
-      <if test="record.warehouseName != null" >
-        warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null" >
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.orgId != null" >
-        org_id = #{record.orgId,jdbcType=INTEGER},
-      </if>
-      <if test="record.grainKind != null" >
-        grain_kind = #{record.grainKind,jdbcType=INTEGER},
-      </if>
-      <if test="record.grainDetailKind != null" >
-        grain_detail_kind = #{record.grainDetailKind,jdbcType=INTEGER},
-      </if>
-      <if test="record.grainGrade != null" >
-        grain_grade = #{record.grainGrade,jdbcType=INTEGER},
-      </if>
-      <if test="record.grainAttribute != null" >
-        grain_attribute = #{record.grainAttribute,jdbcType=INTEGER},
-      </if>
-      <if test="record.grainAnnual != null" >
-        grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
-      </if>
-      <if test="record.grainProducingArea != null" >
-        grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
-      </if>
-      <if test="record.price != null" >
-        price = #{record.price,jdbcType=VARCHAR},
-      </if>
-      <if test="record.count != null" >
-        count = #{record.count,jdbcType=VARCHAR},
-      </if>
-      <if test="record.detailTotalPrice != null" >
-        detail_total_price = #{record.detailTotalPrice,jdbcType=VARCHAR},
-      </if>
-      <if test="record.inputTime != null" >
-        input_time = #{record.inputTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map" >
-    update business_store_ware_detail
-    set id = #{record.id,jdbcType=INTEGER},
-      zid = #{record.zid,jdbcType=INTEGER},
-      type = #{record.type,jdbcType=VARCHAR},
-      house_id = #{record.houseId,jdbcType=INTEGER},
-      house_name = #{record.houseName,jdbcType=VARCHAR},
-      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
-      warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      org_id = #{record.orgId,jdbcType=INTEGER},
-      grain_kind = #{record.grainKind,jdbcType=INTEGER},
-      grain_detail_kind = #{record.grainDetailKind,jdbcType=INTEGER},
-      grain_grade = #{record.grainGrade,jdbcType=INTEGER},
-      grain_attribute = #{record.grainAttribute,jdbcType=INTEGER},
-      grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
-      grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
-      price = #{record.price,jdbcType=VARCHAR},
-      count = #{record.count,jdbcType=VARCHAR},
-      detail_total_price = #{record.detailTotalPrice,jdbcType=VARCHAR},
-      input_time = #{record.inputTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
-    update business_store_ware_detail
-    <set >
-      <if test="zid != null" >
-        zid = #{zid,jdbcType=INTEGER},
-      </if>
-      <if test="type != null" >
-        type = #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="houseId != null" >
-        house_id = #{houseId,jdbcType=INTEGER},
-      </if>
-      <if test="houseName != null" >
-        house_name = #{houseName,jdbcType=VARCHAR},
-      </if>
-      <if test="warehouseId != null" >
-        warehouse_id = #{warehouseId,jdbcType=INTEGER},
-      </if>
-      <if test="warehouseName != null" >
-        warehouse_name = #{warehouseName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null" >
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="orgId != null" >
-        org_id = #{orgId,jdbcType=INTEGER},
-      </if>
-      <if test="grainKind != null" >
-        grain_kind = #{grainKind,jdbcType=INTEGER},
-      </if>
-      <if test="grainDetailKind != null" >
-        grain_detail_kind = #{grainDetailKind,jdbcType=INTEGER},
-      </if>
-      <if test="grainGrade != null" >
-        grain_grade = #{grainGrade,jdbcType=INTEGER},
-      </if>
-      <if test="grainAttribute != null" >
-        grain_attribute = #{grainAttribute,jdbcType=INTEGER},
-      </if>
-      <if test="grainAnnual != null" >
-        grain_annual = #{grainAnnual,jdbcType=INTEGER},
-      </if>
-      <if test="grainProducingArea != null" >
-        grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
-      </if>
-      <if test="price != null" >
-        price = #{price,jdbcType=VARCHAR},
-      </if>
-      <if test="count != null" >
-        count = #{count,jdbcType=VARCHAR},
-      </if>
-      <if test="detailTotalPrice != null" >
-        detail_total_price = #{detailTotalPrice,jdbcType=VARCHAR},
-      </if>
-      <if test="inputTime != null" >
-        input_time = #{inputTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
-    update business_store_ware_detail
-    set zid = #{zid,jdbcType=INTEGER},
-      type = #{type,jdbcType=VARCHAR},
-      house_id = #{houseId,jdbcType=INTEGER},
-      house_name = #{houseName,jdbcType=VARCHAR},
-      warehouse_id = #{warehouseId,jdbcType=INTEGER},
-      warehouse_name = #{warehouseName,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      org_id = #{orgId,jdbcType=INTEGER},
-      grain_kind = #{grainKind,jdbcType=INTEGER},
-      grain_detail_kind = #{grainDetailKind,jdbcType=INTEGER},
-      grain_grade = #{grainGrade,jdbcType=INTEGER},
-      grain_attribute = #{grainAttribute,jdbcType=INTEGER},
-      grain_annual = #{grainAnnual,jdbcType=INTEGER},
-      grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
-      price = #{price,jdbcType=VARCHAR},
-      count = #{count,jdbcType=VARCHAR},
-      detail_total_price = #{detailTotalPrice,jdbcType=VARCHAR},
-      input_time = #{inputTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  
-  
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.business.mapper.BusinessStoreWareDetailMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="zid" property="zid" jdbcType="INTEGER" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="house_id" property="houseId" jdbcType="INTEGER" />
+    <result column="house_name" property="houseName" jdbcType="VARCHAR" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+    <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="grain_kind" property="grainKind" jdbcType="INTEGER" />
+    <result column="grain_detail_kind" property="grainDetailKind" jdbcType="INTEGER" />
+    <result column="grain_grade" property="grainGrade" jdbcType="INTEGER" />
+    <result column="grain_attribute" property="grainAttribute" jdbcType="INTEGER" />
+    <result column="grain_annual" property="grainAnnual" jdbcType="INTEGER" />
+    <result column="grain_producing_area" property="grainProducingArea" jdbcType="INTEGER" />
+    <result column="price" property="price" jdbcType="VARCHAR" />
+    <result column="count" property="count" jdbcType="VARCHAR" />
+    <result column="detail_total_price" property="detailTotalPrice" jdbcType="VARCHAR" />
+    <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
+    <result column="state" property="state" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, zid, type, house_id, house_name, warehouse_id, warehouse_name, create_time, org_id, 
+    grain_kind, grain_detail_kind, grain_grade, grain_attribute, grain_annual, grain_producing_area, 
+    price, count, detail_total_price, input_time, state
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_store_ware_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_store_ware_detail
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_store_ware_detail
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" >
+    delete from business_store_ware_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    insert into business_store_ware_detail (id, zid, type, 
+      house_id, house_name, warehouse_id, 
+      warehouse_name, create_time, org_id, 
+      grain_kind, grain_detail_kind, grain_grade, 
+      grain_attribute, grain_annual, grain_producing_area, 
+      price, count, detail_total_price, 
+      input_time, state)
+    values (#{id,jdbcType=INTEGER}, #{zid,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
+      #{houseId,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, 
+      #{warehouseName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, 
+      #{grainKind,jdbcType=INTEGER}, #{grainDetailKind,jdbcType=INTEGER}, #{grainGrade,jdbcType=INTEGER}, 
+      #{grainAttribute,jdbcType=INTEGER}, #{grainAnnual,jdbcType=INTEGER}, #{grainProducingArea,jdbcType=INTEGER}, 
+      #{price,jdbcType=VARCHAR}, #{count,jdbcType=VARCHAR}, #{detailTotalPrice,jdbcType=VARCHAR}, 
+      #{inputTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    insert into business_store_ware_detail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="zid != null" >
+        zid,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="houseId != null" >
+        house_id,
+      </if>
+      <if test="houseName != null" >
+        house_name,
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id,
+      </if>
+      <if test="warehouseName != null" >
+        warehouse_name,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="grainKind != null" >
+        grain_kind,
+      </if>
+      <if test="grainDetailKind != null" >
+        grain_detail_kind,
+      </if>
+      <if test="grainGrade != null" >
+        grain_grade,
+      </if>
+      <if test="grainAttribute != null" >
+        grain_attribute,
+      </if>
+      <if test="grainAnnual != null" >
+        grain_annual,
+      </if>
+      <if test="grainProducingArea != null" >
+        grain_producing_area,
+      </if>
+      <if test="price != null" >
+        price,
+      </if>
+      <if test="count != null" >
+        count,
+      </if>
+      <if test="detailTotalPrice != null" >
+        detail_total_price,
+      </if>
+      <if test="inputTime != null" >
+        input_time,
+      </if>
+      <if test="state != null" >
+        state,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="zid != null" >
+        #{zid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="houseName != null" >
+        #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null" >
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseName != null" >
+        #{warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="grainKind != null" >
+        #{grainKind,jdbcType=INTEGER},
+      </if>
+      <if test="grainDetailKind != null" >
+        #{grainDetailKind,jdbcType=INTEGER},
+      </if>
+      <if test="grainGrade != null" >
+        #{grainGrade,jdbcType=INTEGER},
+      </if>
+      <if test="grainAttribute != null" >
+        #{grainAttribute,jdbcType=INTEGER},
+      </if>
+      <if test="grainAnnual != null" >
+        #{grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="grainProducingArea != null" >
+        #{grainProducingArea,jdbcType=INTEGER},
+      </if>
+      <if test="price != null" >
+        #{price,jdbcType=VARCHAR},
+      </if>
+      <if test="count != null" >
+        #{count,jdbcType=VARCHAR},
+      </if>
+      <if test="detailTotalPrice != null" >
+        #{detailTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null" >
+        #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" resultType="java.lang.Integer" >
+    select count(*) from business_store_ware_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_store_ware_detail
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.zid != null" >
+        zid = #{record.zid,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null" >
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null" >
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.houseName != null" >
+        house_name = #{record.houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warehouseId != null" >
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseName != null" >
+        warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainKind != null" >
+        grain_kind = #{record.grainKind,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainDetailKind != null" >
+        grain_detail_kind = #{record.grainDetailKind,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainGrade != null" >
+        grain_grade = #{record.grainGrade,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainAttribute != null" >
+        grain_attribute = #{record.grainAttribute,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainAnnual != null" >
+        grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainProducingArea != null" >
+        grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
+      </if>
+      <if test="record.price != null" >
+        price = #{record.price,jdbcType=VARCHAR},
+      </if>
+      <if test="record.count != null" >
+        count = #{record.count,jdbcType=VARCHAR},
+      </if>
+      <if test="record.detailTotalPrice != null" >
+        detail_total_price = #{record.detailTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputTime != null" >
+        input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.state != null" >
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_store_ware_detail
+    set id = #{record.id,jdbcType=INTEGER},
+      zid = #{record.zid,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      house_name = #{record.houseName,jdbcType=VARCHAR},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      grain_kind = #{record.grainKind,jdbcType=INTEGER},
+      grain_detail_kind = #{record.grainDetailKind,jdbcType=INTEGER},
+      grain_grade = #{record.grainGrade,jdbcType=INTEGER},
+      grain_attribute = #{record.grainAttribute,jdbcType=INTEGER},
+      grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
+      grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
+      price = #{record.price,jdbcType=VARCHAR},
+      count = #{record.count,jdbcType=VARCHAR},
+      detail_total_price = #{record.detailTotalPrice,jdbcType=VARCHAR},
+      input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      state = #{record.state,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    update business_store_ware_detail
+    <set >
+      <if test="zid != null" >
+        zid = #{zid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="houseName != null" >
+        house_name = #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseName != null" >
+        warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="grainKind != null" >
+        grain_kind = #{grainKind,jdbcType=INTEGER},
+      </if>
+      <if test="grainDetailKind != null" >
+        grain_detail_kind = #{grainDetailKind,jdbcType=INTEGER},
+      </if>
+      <if test="grainGrade != null" >
+        grain_grade = #{grainGrade,jdbcType=INTEGER},
+      </if>
+      <if test="grainAttribute != null" >
+        grain_attribute = #{grainAttribute,jdbcType=INTEGER},
+      </if>
+      <if test="grainAnnual != null" >
+        grain_annual = #{grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="grainProducingArea != null" >
+        grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
+      </if>
+      <if test="price != null" >
+        price = #{price,jdbcType=VARCHAR},
+      </if>
+      <if test="count != null" >
+        count = #{count,jdbcType=VARCHAR},
+      </if>
+      <if test="detailTotalPrice != null" >
+        detail_total_price = #{detailTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null" >
+        input_time = #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null" >
+        state = #{state,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    update business_store_ware_detail
+    set zid = #{zid,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=INTEGER},
+      house_name = #{houseName,jdbcType=VARCHAR},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER},
+      grain_kind = #{grainKind,jdbcType=INTEGER},
+      grain_detail_kind = #{grainDetailKind,jdbcType=INTEGER},
+      grain_grade = #{grainGrade,jdbcType=INTEGER},
+      grain_attribute = #{grainAttribute,jdbcType=INTEGER},
+      grain_annual = #{grainAnnual,jdbcType=INTEGER},
+      grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
+      price = #{price,jdbcType=VARCHAR},
+      count = #{count,jdbcType=VARCHAR},
+      detail_total_price = #{detailTotalPrice,jdbcType=VARCHAR},
+      input_time = #{inputTime,jdbcType=TIMESTAMP},
+      state = #{state,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

src/main/java/com/chinaitop/depot/business/model/BusinessStoreWareDetail.java

@@ -1,347 +1,365 @@
-package com.chinaitop.depot.business.model;
-
-import java.util.Date;
-
-public class BusinessStoreWareDetail {
-    private Integer id;
-
-    private Integer zid;
-
-    private String type;
-
-    private Integer houseId;
-
-    private String houseName;
-
-    private Integer warehouseId;
-
-    private String warehouseName;
-
-    private Date createTime;
-
-    private Integer orgId;
-
-    private Integer grainKind;
-
-    private Integer grainDetailKind;
-
-    private Integer grainGrade;
-
-    private Integer grainAttribute;
-
-    private Integer grainAnnual;
-
-    private Integer grainProducingArea;
-
-    private String price;
-
-    private String count;
-
-    private String detailTotalPrice;
-
-    private Date inputTime;
-
-    /**
-     * 计划合同通知单明细表
-     * @return id 计划合同通知单明细表
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * 计划合同通知单明细表
-     * @param id 计划合同通知单明细表
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 出入库通知单表id
-     * @return zid 出入库通知单表id
-     */
-    public Integer getZid() {
-        return zid;
-    }
-
-    /**
-     * 出入库通知单表id
-     * @param zid 出入库通知单表id
-     */
-    public void setZid(Integer zid) {
-        this.zid = zid;
-    }
-
-    /**
-     * 类型 plan(计划) contract(合同) notice(通知单)
-     * @return type 类型 plan(计划) contract(合同) notice(通知单)
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * 类型 plan(计划) contract(合同) notice(通知单)
-     * @param type 类型 plan(计划) contract(合同) notice(通知单)
-     */
-    public void setType(String type) {
-        this.type = type == null ? null : type.trim();
-    }
-
-    /**
-     * 仓房id
-     * @return house_id 仓房id
-     */
-    public Integer getHouseId() {
-        return houseId;
-    }
-
-    /**
-     * 仓房id
-     * @param houseId 仓房id
-     */
-    public void setHouseId(Integer houseId) {
-        this.houseId = houseId;
-    }
-
-    /**
-     * 仓房名称
-     * @return house_name 仓房名称
-     */
-    public String getHouseName() {
-        return houseName;
-    }
-
-    /**
-     * 仓房名称
-     * @param houseName 仓房名称
-     */
-    public void setHouseName(String houseName) {
-        this.houseName = houseName == null ? null : houseName.trim();
-    }
-
-    /**
-     * 货位id
-     * @return warehouse_id 货位id
-     */
-    public Integer getWarehouseId() {
-        return warehouseId;
-    }
-
-    /**
-     * 货位id
-     * @param warehouseId 货位id
-     */
-    public void setWarehouseId(Integer warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-    /**
-     * 货位名称
-     * @return warehouse_name 货位名称
-     */
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    /**
-     * 货位名称
-     * @param warehouseName 货位名称
-     */
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName == null ? null : warehouseName.trim();
-    }
-
-    /**
-     * 创建时间
-     * @return create_time 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 创建时间
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 承储库点
-     * @return org_id 承储库点
-     */
-    public Integer getOrgId() {
-        return orgId;
-    }
-
-    /**
-     * 承储库点
-     * @param orgId 承储库点
-     */
-    public void setOrgId(Integer orgId) {
-        this.orgId = orgId;
-    }
-
-    /**
-     * 粮油品种
-     * @return grain_kind 粮油品种
-     */
-    public Integer getGrainKind() {
-        return grainKind;
-    }
-
-    /**
-     * 粮油品种
-     * @param grainKind 粮油品种
-     */
-    public void setGrainKind(Integer grainKind) {
-        this.grainKind = grainKind;
-    }
-
-    /**
-     * 明细品种
-     * @return grain_detail_kind 明细品种
-     */
-    public Integer getGrainDetailKind() {
-        return grainDetailKind;
-    }
-
-    /**
-     * 明细品种
-     * @param grainDetailKind 明细品种
-     */
-    public void setGrainDetailKind(Integer grainDetailKind) {
-        this.grainDetailKind = grainDetailKind;
-    }
-
-    /**
-     * 粮油等级
-     * @return grain_grade 粮油等级
-     */
-    public Integer getGrainGrade() {
-        return grainGrade;
-    }
-
-    /**
-     * 粮油等级
-     * @param grainGrade 粮油等级
-     */
-    public void setGrainGrade(Integer grainGrade) {
-        this.grainGrade = grainGrade;
-    }
-
-    /**
-     * 粮油性质
-     * @return grain_attribute 粮油性质
-     */
-    public Integer getGrainAttribute() {
-        return grainAttribute;
-    }
-
-    /**
-     * 粮油性质
-     * @param grainAttribute 粮油性质
-     */
-    public void setGrainAttribute(Integer grainAttribute) {
-        this.grainAttribute = grainAttribute;
-    }
-
-    /**
-     * 生产年限
-     * @return grain_annual 生产年限
-     */
-    public Integer getGrainAnnual() {
-        return grainAnnual;
-    }
-
-    /**
-     * 生产年限
-     * @param grainAnnual 生产年限
-     */
-    public void setGrainAnnual(Integer grainAnnual) {
-        this.grainAnnual = grainAnnual;
-    }
-
-    /**
-     * 粮油产地
-     * @return grain_producing_area 粮油产地
-     */
-    public Integer getGrainProducingArea() {
-        return grainProducingArea;
-    }
-
-    /**
-     * 粮油产地
-     * @param grainProducingArea 粮油产地
-     */
-    public void setGrainProducingArea(Integer grainProducingArea) {
-        this.grainProducingArea = grainProducingArea;
-    }
-
-    /**
-     * 单价
-     * @return price 单价
-     */
-    public String getPrice() {
-        return price;
-    }
-
-    /**
-     * 单价
-     * @param price 单价
-     */
-    public void setPrice(String price) {
-        this.price = price == null ? null : price.trim();
-    }
-
-    /**
-     * 数量
-     * @return count 数量
-     */
-    public String getCount() {
-        return count;
-    }
-
-    /**
-     * 数量
-     * @param count 数量
-     */
-    public void setCount(String count) {
-        this.count = count == null ? null : count.trim();
-    }
-
-    /**
-     * 总价
-     * @return detail_total_price 总价
-     */
-    public String getDetailTotalPrice() {
-        return detailTotalPrice;
-    }
-
-    /**
-     * 总价
-     * @param detailTotalPrice 总价
-     */
-    public void setDetailTotalPrice(String detailTotalPrice) {
-        this.detailTotalPrice = detailTotalPrice == null ? null : detailTotalPrice.trim();
-    }
-
-    /**
-     * 入库时间
-     * @return input_time 入库时间
-     */
-    public Date getInputTime() {
-        return inputTime;
-    }
-
-    /**
-     * 入库时间
-     * @param inputTime 入库时间
-     */
-    public void setInputTime(Date inputTime) {
-        this.inputTime = inputTime;
-    }
+package com.chinaitop.depot.business.model;
+
+import java.util.Date;
+
+public class BusinessStoreWareDetail {
+    private Integer id;
+
+    private Integer zid;
+
+    private String type;
+
+    private Integer houseId;
+
+    private String houseName;
+
+    private Integer warehouseId;
+
+    private String warehouseName;
+
+    private Date createTime;
+
+    private Integer orgId;
+
+    private Integer grainKind;
+
+    private Integer grainDetailKind;
+
+    private Integer grainGrade;
+
+    private Integer grainAttribute;
+
+    private Integer grainAnnual;
+
+    private Integer grainProducingArea;
+
+    private String price;
+
+    private String count;
+
+    private String detailTotalPrice;
+
+    private Date inputTime;
+
+    private Integer state;
+
+    /**
+     * 计划合同通知单明细表
+     * @return id 计划合同通知单明细表
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 计划合同通知单明细表
+     * @param id 计划合同通知单明细表
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 出入库通知单表id
+     * @return zid 出入库通知单表id
+     */
+    public Integer getZid() {
+        return zid;
+    }
+
+    /**
+     * 出入库通知单表id
+     * @param zid 出入库通知单表id
+     */
+    public void setZid(Integer zid) {
+        this.zid = zid;
+    }
+
+    /**
+     * 类型 plan(计划) contract(合同) notice(通知单)
+     * @return type 类型 plan(计划) contract(合同) notice(通知单)
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * 类型 plan(计划) contract(合同) notice(通知单)
+     * @param type 类型 plan(计划) contract(合同) notice(通知单)
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * 仓房id
+     * @return house_id 仓房id
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 仓房id
+     * @param houseId 仓房id
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 仓房名称
+     * @return house_name 仓房名称
+     */
+    public String getHouseName() {
+        return houseName;
+    }
+
+    /**
+     * 仓房名称
+     * @param houseName 仓房名称
+     */
+    public void setHouseName(String houseName) {
+        this.houseName = houseName == null ? null : houseName.trim();
+    }
+
+    /**
+     * 货位id
+     * @return warehouse_id 货位id
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位id
+     * @param warehouseId 货位id
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 货位名称
+     * @return warehouse_name 货位名称
+     */
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    /**
+     * 货位名称
+     * @param warehouseName 货位名称
+     */
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName == null ? null : warehouseName.trim();
+    }
+
+    /**
+     * 创建时间
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 承储库点
+     * @return org_id 承储库点
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 承储库点
+     * @param orgId 承储库点
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 粮油品种
+     * @return grain_kind 粮油品种
+     */
+    public Integer getGrainKind() {
+        return grainKind;
+    }
+
+    /**
+     * 粮油品种
+     * @param grainKind 粮油品种
+     */
+    public void setGrainKind(Integer grainKind) {
+        this.grainKind = grainKind;
+    }
+
+    /**
+     * 明细品种
+     * @return grain_detail_kind 明细品种
+     */
+    public Integer getGrainDetailKind() {
+        return grainDetailKind;
+    }
+
+    /**
+     * 明细品种
+     * @param grainDetailKind 明细品种
+     */
+    public void setGrainDetailKind(Integer grainDetailKind) {
+        this.grainDetailKind = grainDetailKind;
+    }
+
+    /**
+     * 粮油等级
+     * @return grain_grade 粮油等级
+     */
+    public Integer getGrainGrade() {
+        return grainGrade;
+    }
+
+    /**
+     * 粮油等级
+     * @param grainGrade 粮油等级
+     */
+    public void setGrainGrade(Integer grainGrade) {
+        this.grainGrade = grainGrade;
+    }
+
+    /**
+     * 粮油性质
+     * @return grain_attribute 粮油性质
+     */
+    public Integer getGrainAttribute() {
+        return grainAttribute;
+    }
+
+    /**
+     * 粮油性质
+     * @param grainAttribute 粮油性质
+     */
+    public void setGrainAttribute(Integer grainAttribute) {
+        this.grainAttribute = grainAttribute;
+    }
+
+    /**
+     * 生产年限
+     * @return grain_annual 生产年限
+     */
+    public Integer getGrainAnnual() {
+        return grainAnnual;
+    }
+
+    /**
+     * 生产年限
+     * @param grainAnnual 生产年限
+     */
+    public void setGrainAnnual(Integer grainAnnual) {
+        this.grainAnnual = grainAnnual;
+    }
+
+    /**
+     * 粮油产地
+     * @return grain_producing_area 粮油产地
+     */
+    public Integer getGrainProducingArea() {
+        return grainProducingArea;
+    }
+
+    /**
+     * 粮油产地
+     * @param grainProducingArea 粮油产地
+     */
+    public void setGrainProducingArea(Integer grainProducingArea) {
+        this.grainProducingArea = grainProducingArea;
+    }
+
+    /**
+     * 单价
+     * @return price 单价
+     */
+    public String getPrice() {
+        return price;
+    }
+
+    /**
+     * 单价
+     * @param price 单价
+     */
+    public void setPrice(String price) {
+        this.price = price == null ? null : price.trim();
+    }
+
+    /**
+     * 数量
+     * @return count 数量
+     */
+    public String getCount() {
+        return count;
+    }
+
+    /**
+     * 数量
+     * @param count 数量
+     */
+    public void setCount(String count) {
+        this.count = count == null ? null : count.trim();
+    }
+
+    /**
+     * 总价
+     * @return detail_total_price 总价
+     */
+    public String getDetailTotalPrice() {
+        return detailTotalPrice;
+    }
+
+    /**
+     * 总价
+     * @param detailTotalPrice 总价
+     */
+    public void setDetailTotalPrice(String detailTotalPrice) {
+        this.detailTotalPrice = detailTotalPrice == null ? null : detailTotalPrice.trim();
+    }
+
+    /**
+     * 入库时间
+     * @return input_time 入库时间
+     */
+    public Date getInputTime() {
+        return inputTime;
+    }
+
+    /**
+     * 入库时间
+     * @param inputTime 入库时间
+     */
+    public void setInputTime(Date inputTime) {
+        this.inputTime = inputTime;
+    }
+
+    /**
+     * 轮换计划（0：轮入，1：轮出）
+     * @return state 轮换计划（0：轮入，1：轮出）
+     */
+    public Integer getState() {
+        return state;
+    }
+
+    /**
+     * 轮换计划（0：轮入，1：轮出）
+     * @param state 轮换计划（0：轮入，1：轮出）
+     */
+    public void setState(Integer state) {
+        this.state = state;
+    }
 }