仓房编号改为仓房名称，货位编号改为货位名称；仓房维修，仓房检查加货位名称

src/main/java/com/chinaitop/depot/storage/mapper/StorageHouserepairMapper.xml

@@ -18,6 +18,7 @@
     <result column="check_person" jdbcType="VARCHAR" property="checkPerson" />
     <result column="repair_status" jdbcType="VARCHAR" property="repairStatus" />
     <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -80,7 +81,7 @@
   <sql id="Base_Column_List">
     id, storehouse_id, storehouse_code, check_date, project, problem_exist, problem, 
     opinion, repair_focus, remark, bosshead, repair_start_date, repair_end_date, check_person, 
-    repair_status, org_id
+    repair_status, org_id, warehouse_id
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageHouserepairExample" resultMap="BaseResultMap">
     select
@@ -118,13 +119,13 @@
       problem, opinion, repair_focus, 
       remark, bosshead, repair_start_date, 
       repair_end_date, check_person, repair_status, 
-      org_id)
+      org_id,warehouse_id)
     values (#{id,jdbcType=INTEGER}, #{storehouseId,jdbcType=INTEGER}, #{storehouseCode,jdbcType=VARCHAR}, 
       #{checkDate,jdbcType=TIMESTAMP}, #{project,jdbcType=VARCHAR}, #{problemExist,jdbcType=VARCHAR}, 
       #{problem,jdbcType=VARCHAR}, #{opinion,jdbcType=VARCHAR}, #{repairFocus,jdbcType=VARCHAR}, 
       #{remark,jdbcType=VARCHAR}, #{bosshead,jdbcType=VARCHAR}, #{repairStartDate,jdbcType=TIMESTAMP}, 
       #{repairEndDate,jdbcType=TIMESTAMP}, #{checkPerson,jdbcType=VARCHAR}, #{repairStatus,jdbcType=VARCHAR}, 
-      #{orgId,jdbcType=INTEGER})
+      #{orgId,jdbcType=INTEGER},#{warehouseId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageHouserepair">
     insert into storage_houserepair
@@ -177,6 +178,9 @@
       <if test="orgId != null">
         org_id,
       </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -227,6 +231,9 @@
       <if test="orgId != null">
         #{orgId,jdbcType=INTEGER},
       </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageHouserepairExample" resultType="java.lang.Integer">
@@ -286,6 +293,9 @@
       <if test="record.orgId != null">
         org_id = #{record.orgId,jdbcType=INTEGER},
       </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -308,7 +318,8 @@
       repair_end_date = #{record.repairEndDate,jdbcType=TIMESTAMP},
       check_person = #{record.checkPerson,jdbcType=VARCHAR},
       repair_status = #{record.repairStatus,jdbcType=VARCHAR},
-      org_id = #{record.orgId,jdbcType=INTEGER}
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -361,6 +372,9 @@
       <if test="orgId != null">
         org_id = #{orgId,jdbcType=INTEGER},
       </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -380,23 +394,26 @@
       repair_end_date = #{repairEndDate,jdbcType=TIMESTAMP},
       check_person = #{checkPerson,jdbcType=VARCHAR},
       repair_status = #{repairStatus,jdbcType=VARCHAR},
-      org_id = #{orgId,jdbcType=INTEGER}
+      org_id = #{orgId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
   <sql id="ExtBase_Column_List">
     shr.id, shr.storehouse_id, shr.storehouse_code, shr.check_date, shr.project, shr.problem_exist, shr.problem,
     shr.opinion, shr.repair_focus, shr.remark, shr.bosshead, shr.repair_start_date, shr.repair_end_date, shr.check_person,
-    shr.repair_status, shr.org_id
+    shr.repair_status, shr.org_id, shr.warehouse_id
   </sql>
 
   <select id="queryByExample" parameterType="com.chinaitop.depot.storage.model.StorageHouserepair" resultMap="BaseResultMap">
     select
       distinct
     <include refid="ExtBase_Column_List" />,
-    bs.storeHouse_name storehouseName
+    bs.storeHouse_name storehouseName,
+    bw.warehouse_name warehouseName
     FROM storage_houserepair shr
     LEFT JOIN basic_storehouse bs on bs.storehouse_id = shr.storehouse_id
+    LEFT JOIN basic_warehouse bw  on bw.warehouse_id = shr.warehouse_id
     <where>
       <if test="storehouseId !=null">
         and shr.storehouse_id = #{storehouseId}

src/main/java/com/chinaitop/depot/storage/model/StorageHouserepair.java

@@ -8,6 +8,8 @@ public class StorageHouserepair {
 
     private Integer storehouseId;
 
+    private Integer warehouseId;
+
     private String storehouseCode;
 
     private Date checkDate;
@@ -39,6 +41,17 @@ public class StorageHouserepair {
     //业务字段 仓房名称
     private String storehouseName;
 
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    //业务字段 仓房名称
+    private String warehouseName;
+
     //开始日期和结束日期
     private String searchStartDate;
     private String searchEndDate;
@@ -332,4 +345,12 @@ public class StorageHouserepair {
     public void setExistFlag(String existFlag) {
         this.existFlag = existFlag;
     }
+
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
 }