ZeroLiYi před 1 rokem
rodič
revize
50aacecc4e

+ 4 - 0
src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardMapper.xml

@@ -52,6 +52,7 @@
52
   <resultMap id="BaseResultMap1" extends="BaseResultMap" type="com.chinaitop.depot.storage.model.vo.GrainSituationCardVO">
52
   <resultMap id="BaseResultMap1" extends="BaseResultMap" type="com.chinaitop.depot.storage.model.vo.GrainSituationCardVO">
53
     <result column="storehouse_name" jdbcType="VARCHAR" property="storehouseName" />
53
     <result column="storehouse_name" jdbcType="VARCHAR" property="storehouseName" />
54
     <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
54
     <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
55
+    <result column="orgName" jdbcType="VARCHAR" property="orgName" />
55
     <result column="ajmc" jdbcType="VARCHAR" property="ajmc" />
56
     <result column="ajmc" jdbcType="VARCHAR" property="ajmc" />
56
     <result column="grainVarietyName" jdbcType="VARCHAR" property="grainVarietyName" />
57
     <result column="grainVarietyName" jdbcType="VARCHAR" property="grainVarietyName" />
57
     <result column="grainNatureName" jdbcType="VARCHAR" property="grainNatureName" />
58
     <result column="grainNatureName" jdbcType="VARCHAR" property="grainNatureName" />
@@ -466,6 +467,9 @@
466
         LEFT JOIN depot_qh.basic_warehouse wa ON wa.warehouse_id = gsr.warehouse_id
467
         LEFT JOIN depot_qh.basic_warehouse wa ON wa.warehouse_id = gsr.warehouse_id
467
         LEFT JOIN depot_qh.basic_enum pz ON pz.enumId = gsr.grain_variety_id
468
         LEFT JOIN depot_qh.basic_enum pz ON pz.enumId = gsr.grain_variety_id
468
         where 1=1
469
         where 1=1
470
+    <if test="orgId != null">
471
+      AND  o.org_id =#{orgId}
472
+    </if>
469
     <if test="orgName != null">
473
     <if test="orgName != null">
470
       AND  o.org_name like CONCAT('%', #{orgName}, '%')
474
       AND  o.org_name like CONCAT('%', #{orgName}, '%')
471
     </if>
475
     </if>

+ 3 - 0
src/main/java/com/chinaitop/depot/storage/param/GrainSituationCardPageParam.java

@@ -51,4 +51,7 @@ public class GrainSituationCardPageParam {
51
     @ApiModelProperty(value = "库区名称")
51
     @ApiModelProperty(value = "库区名称")
52
     private String orgName;
52
     private String orgName;
53
 
53
 
54
+    @ApiModelProperty(value = "单位Id")
55
+    private Integer orgId;
56
+
54
 }
57
 }