Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-business-qinghai into dev

src/main/java/com/chinaitop/depot/grainReserves/common/PageParam.java

@@ -23,4 +23,8 @@ public class PageParam {
     @NotNull(message = "页码非空")
     @Min(value = 1, message = "每页条数>=1")
     private Integer pageSize;
+
+    @ApiModelProperty(value = "库区编码")
+    @NotNull(message = "库区编码非空")
+    private Integer orgId;
 }

src/main/java/com/chinaitop/depot/grainReserves/mapper/BizGopsPlanMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 @Repository
 public interface BizGopsPlanMapper {
-    List<BizGopsPlan> getPageList(@Param("orgName") String orgName);
+    List<BizGopsPlan> getPageList(@Param("planName") String planName, @Param("orgId") Integer orgId);
 
     List<GopsPlanObject> getPlanSaleList(@Param("id") String id);
 

src/main/java/com/chinaitop/depot/grainReserves/mapper/BizGopsPlanMapper.xml

@@ -19,8 +19,9 @@
         LEFT JOIN org_info oi ON bfp.org_id = oi.org_id
         <where>
             bfp.`status` = 1
-            <if test="orgName != null and orgName != ''">
-                oi.org_name LIKE CONCAT("%", orgName, "%")
+            and bfp.org_id = #{orgId}
+            <if test="planName != null and planName != ''">
+               and bfp.plan_name LIKE CONCAT("%", #{planName}, "%")
             </if>
         </where>
     </select>

src/main/java/com/chinaitop/depot/grainReserves/model/BizGopsPlan.java

@@ -42,7 +42,7 @@ public class BizGopsPlan {
     private Integer planType;
 
     @ApiModelProperty(value = "计划下达时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date planReleaseTime;
 
     @ApiModelProperty(value = "状态 0：保存；1：下发；")

src/main/java/com/chinaitop/depot/grainReserves/model/BizGopsPlanPage.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 public class BizGopsPlanPage extends PageParam implements Serializable {
     private static final long serialVersionUID = 4988791677403961372L;
 
-    @ApiModelProperty(value = "库区名称")
-    private String orgName;
+    @ApiModelProperty(value = "计划名称")
+    private String planName;
 
 }

src/main/java/com/chinaitop/depot/grainReserves/model/GopsPlanObject.java

@@ -50,28 +50,28 @@ public class GopsPlanObject {
     private Integer warehouseId;
 
     @ApiModelProperty(value = "货位名称", position = 6)
-    private Integer warehouseName;
+    private String warehouseName;
 
     /** 粮食品种；外库depot_qh.basic_enum的id； */
     @ApiModelProperty(value = "粮食品种id", position = 7)
     private Integer grainVarietyId;
 
     @ApiModelProperty(value = "粮食品种名称", position = 8)
-    private Integer grainVarietyName;
+    private String grainVarietyName;
 
     /** 粮食性质；外库depot_qh.basic_enum的id； */
     @ApiModelProperty(value = "粮食性质id", position = 9)
     private Integer grainNatureId;
 
     @ApiModelProperty(value = "粮食性质名称", position = 10)
-    private Integer grainNatureName;
+    private String grainNatureName;
 
     /** 粮食等级；外库depot_qh.basic_enum的id； */
     @ApiModelProperty(value = "粮食等级id", position = 11)
     private Integer grainGradeId;
 
     @ApiModelProperty(value = "粮食等级名称", position = 12)
-    private Integer grainGradeName;
+    private String grainGradeName;
 
     /** 计划数量 */
     @ApiModelProperty(value = "计划数量", position = 13)

src/main/java/com/chinaitop/depot/grainReserves/service/BizGopsPlanService.java

@@ -31,7 +31,7 @@ public interface BizGopsPlanService {
         @Override
         public PageInfo<BizGopsPlan> getPageList(BizGopsPlanPage pageParam) {
             PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
-            List<BizGopsPlan> list = gopsPlanMapper.getPageList(pageParam.getOrgName());
+            List<BizGopsPlan> list = gopsPlanMapper.getPageList(pageParam.getPlanName(), pageParam.getOrgId());
             return new PageInfo<>(list);
         }
 

src/main/java/com/chinaitop/depot/pg/mapper/BusinessPgGopsPlanDetailMapper.xml

@@ -13,6 +13,7 @@
     <result column="weight" property="weight" jdbcType="DECIMAL" />
     <result column="unit_price" property="unitPrice" jdbcType="DECIMAL" />
     <result column="amount" property="amount" jdbcType="DECIMAL" />
+    <result column="completion_quantity" property="completionQuantity" jdbcType="DECIMAL" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >

src/main/java/com/chinaitop/depot/pg/mapper/BusinessPgGopsPlanMapper.xml

@@ -16,8 +16,8 @@
     <result column="total_amount" property="totalAmount" jdbcType="DECIMAL" />
     <result column="completion_amount" property="completionAmount" jdbcType="DECIMAL" />
     <result column="remaining_amount" property="remainingAmount" jdbcType="DECIMAL" />
-    <result column="plan_quantity" property="planQuantity" jdbcType="INTEGER" />
-    <result column="completion_quantity" property="completionQuantity" jdbcType="INTEGER" />
+    <result column="plan_quantity" property="planQuantity" jdbcType="DECIMAL" />
+    <result column="completion_quantity" property="completionQuantity" jdbcType="DECIMAL" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >

src/main/java/com/chinaitop/depot/pg/model/BusinessPgGopsPlan.java

@@ -86,11 +86,11 @@ public class BusinessPgGopsPlan {
 
     /** 计划数量 */
     @ApiModelProperty(value = "计划数量", position = 15)
-    private Integer planQuantity;
+    private BigDecimal planQuantity;
 
     /** 完成数量 */
     @ApiModelProperty(value = "完成数量", position = 16)
-    private Integer completionQuantity;
+    private BigDecimal completionQuantity;
 
     @ApiModelProperty(value = "成品粮明细数据", position = 17)
     List<BusinessPgGopsPlanDetail> detailList;

src/main/java/com/chinaitop/depot/pg/model/BusinessPgGopsPlanDetail.java

@@ -63,4 +63,8 @@ public class BusinessPgGopsPlanDetail {
     /** 金额，单位：万元 */
     @ApiModelProperty(value = "金额，单位：万元", position = 11)
     private BigDecimal amount;
+
+    /** 完成数量 */
+    @ApiModelProperty(value = "完成数量", position = 16)
+    private BigDecimal completionQuantity;
 }

src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpBiweeklyReportMapper.xml

@@ -272,6 +272,9 @@
         LEFT JOIN depot_qh.business_rp_biweekly_report_grain f on f.rp_biweekly_report_id = a.id
         LEFT JOIN depot_qh.basic_enum g on g.enumId = f.grain_variety_id
         where 1=1
+        <if test="pageParam.orgId !=null and pageParam.orgId!=''">
+            and a.org_id = #{pageParam.orgId}
+        </if>
         <if test="pageParam.unitName !=null and pageParam.unitName!=''">
             and b.dwmc like concat("%",#{pageParam.unitName},"%")
         </if>

src/main/java/com/chinaitop/depot/rp/param/BusinessRpBiweeklyReportPageParam.java

@@ -42,6 +42,10 @@ public class BusinessRpBiweeklyReportPageParam {
     @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
     private String sortOrder;
 
+    /** 库区id */
+    @ApiModelProperty(value = "库区id")
+    private String orgId;
+
     /** 企业名称 */
     @ApiModelProperty(value = "企业名称")
     private String unitName;