Merge remote-tracking branch 'remotes/origin/dev-1.1' into dev

src/main/java/com/chinaitop/depot/storage/controller/WarehouseSealingRecordController.java

@@ -5,6 +5,7 @@ import com.chinaitop.depot.storage.model.ClearanceConfirmation;
 import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
 import com.chinaitop.depot.storage.model.vo.WareHouseVO;
+import com.chinaitop.depot.storage.model.vo.kcswVO;
 import com.chinaitop.depot.storage.service.WarehouseSealingRecordService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -204,15 +205,15 @@ public class WarehouseSealingRecordController {
      * @return
      */
     @RequestMapping(value = "/findkcsw",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
-    public WareHouseVO findkcsw(Integer warehouseId) {
-        WareHouseVO wareHouseVO = null;
+    public kcswVO findkcsw(Integer warehouseId) {
+        kcswVO kcswVO = null;
         try {
-            wareHouseVO = WarehouseSealingRecordService.findkcsw(warehouseId);
+            kcswVO = WarehouseSealingRecordService.findkcsw(warehouseId);
 
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return wareHouseVO;
+        return kcswVO;
     }
 
 

src/main/java/com/chinaitop/depot/storage/mapper/WarehouseSealingRecordMapper.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.storage.mapper;
 import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
 import com.chinaitop.depot.storage.model.vo.WareHouseVO;
+import com.chinaitop.depot.storage.model.vo.kcswVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -27,5 +28,5 @@ public interface WarehouseSealingRecordMapper {
 
     List<WareHouseVO> findWareHouse(@Param("storehouseId") Integer storehouseId);
 
-    WareHouseVO findkcsw(@Param("warehouseId") Integer warehouseId);
+    kcswVO findkcsw(@Param("warehouseId") Integer warehouseId);
 }

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

@@ -164,7 +164,7 @@
     WHERE
      bw.storehouse_id=#{storehouseId}
   </select>
-  <select id="findkcsw"  parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.vo.WareHouseVO">
+  <select id="findkcsw"  parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.vo.kcswVO">
     select
       bw.dutystoreman   bgy,
       kc.mxpz	grainVarietyId,

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

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -18,20 +19,33 @@ public class WarehouseSealingRecord {
     private String updatename;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updatedate;
-
+    @ApiModelProperty(value = "封仓单确认单号")
     private String fcqrdh; //封仓单确认单号
+    @ApiModelProperty(value = "业务日期")
     private Date ywrq;      //业务日期，格式：yyyy-MM-dd
+    @ApiModelProperty(value = "统一廒间编码")
     private String tyajbm; //统一廒间编码
+    @ApiModelProperty(value = "保管员")
     private String bgy;    //保管员
+    @ApiModelProperty(value = "粮食品种代码")
     private String lspzdm; //粮食品种代码
+    @ApiModelProperty(value = "粮食性质代码")
     private String lsxzdm; //粮食性质代码
-    private BigDecimal lssl; //粮食数量，单位：公斤
-    private String lsdjdm; //粮食等级代码，货位（油罐）状态为2、3、4时必填
+    @ApiModelProperty(value = "粮食数量")
+    private BigDecimal lssl;
+    @ApiModelProperty(value = "粮食等级代码")
+    private String lsdjdm;
+    @ApiModelProperty(value = "粮食产地")
     private String lscd;  //货位（油罐）状态为2、3、4时必填
+    @ApiModelProperty(value = "收获年度")
     private  Integer shnd;//收获年度，格式：YYYY，货位（油罐）状态为2、3、4时必填
+    @ApiModelProperty(value = "申请人")
     private String sqr;  //申请人
+    @ApiModelProperty(value = "部门审核")
     private String bmsh;  //部门审核
+    @ApiModelProperty(value = "单位领导审核")
     private String dwldsh;  //单位领导审核
+    @ApiModelProperty(value = "备注")
     private String bz;      //备注
 
     private String storehouseName;

src/main/java/com/chinaitop/depot/storage/model/vo/kcswVO.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.storage.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -7,9 +8,9 @@ import java.util.Date;
 public class kcswVO {
 
     private String bgy;
-
+    @ApiModelProperty(value = "粮食数量")
      private Double lssl;
-
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
      private Date  rcrq;
 
     @ApiModelProperty(value = "粮食品种；basic_enum的id；")
@@ -41,4 +42,108 @@ public class kcswVO {
 
     @ApiModelProperty(value = "粮食产地；basic_enum的id；粮食产地名称")
     private String producerName;
+
+    public String getBgy() {
+        return bgy;
+    }
+
+    public void setBgy(String bgy) {
+        this.bgy = bgy;
+    }
+
+    public Double getLssl() {
+        return lssl;
+    }
+
+    public void setLssl(Double lssl) {
+        this.lssl = lssl;
+    }
+
+    public Date getRcrq() {
+        return rcrq;
+    }
+
+    public void setRcrq(Date rcrq) {
+        this.rcrq = rcrq;
+    }
+
+    public Integer getGrainVarietyId() {
+        return grainVarietyId;
+    }
+
+    public void setGrainVarietyId(Integer grainVarietyId) {
+        this.grainVarietyId = grainVarietyId;
+    }
+
+    public Integer getGrainNatureId() {
+        return grainNatureId;
+    }
+
+    public void setGrainNatureId(Integer grainNatureId) {
+        this.grainNatureId = grainNatureId;
+    }
+
+    public Integer getGrainGradeId() {
+        return grainGradeId;
+    }
+
+    public void setGrainGradeId(Integer grainGradeId) {
+        this.grainGradeId = grainGradeId;
+    }
+
+    public Integer getProducerId() {
+        return producerId;
+    }
+
+    public void setProducerId(Integer producerId) {
+        this.producerId = producerId;
+    }
+
+    public String getBasicStorehouseName() {
+        return basicStorehouseName;
+    }
+
+    public void setBasicStorehouseName(String basicStorehouseName) {
+        this.basicStorehouseName = basicStorehouseName;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getGrainVarietyName() {
+        return grainVarietyName;
+    }
+
+    public void setGrainVarietyName(String grainVarietyName) {
+        this.grainVarietyName = grainVarietyName;
+    }
+
+    public String getGrainNatureName() {
+        return grainNatureName;
+    }
+
+    public void setGrainNatureName(String grainNatureName) {
+        this.grainNatureName = grainNatureName;
+    }
+
+    public String getGrainGradeName() {
+        return grainGradeName;
+    }
+
+    public void setGrainGradeName(String grainGradeName) {
+        this.grainGradeName = grainGradeName;
+    }
+
+    public String getProducerName() {
+        return producerName;
+    }
+
+    public void setProducerName(String producerName) {
+        this.producerName = producerName;
+    }
 }

src/main/java/com/chinaitop/depot/storage/service/WarehouseSealingRecordService.java

@@ -4,6 +4,7 @@ package com.chinaitop.depot.storage.service;
 import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
 import com.chinaitop.depot.storage.model.vo.WareHouseVO;
+import com.chinaitop.depot.storage.model.vo.kcswVO;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -41,5 +42,5 @@ public interface WarehouseSealingRecordService {
 
     List<WareHouseVO> findWareHouse(Integer storehouseId);
 
-    WareHouseVO findkcsw(Integer warehouseId);
+    kcswVO findkcsw(Integer warehouseId);
 }

src/main/java/com/chinaitop/depot/storage/service/impl/WarehouseSealingRecordServiceImpl.java

@@ -5,6 +5,7 @@ import com.chinaitop.depot.storage.mapper.WarehouseSealingRecordMapper;
 import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
 import com.chinaitop.depot.storage.model.vo.WareHouseVO;
+import com.chinaitop.depot.storage.model.vo.kcswVO;
 import com.chinaitop.depot.storage.service.WarehouseSealingRecordService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang.ObjectUtils;
@@ -122,8 +123,8 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
     }
 
     @Override
-    public WareHouseVO findkcsw(Integer warehouseId) {
-        WareHouseVO wareHouseVO =WarehouseSealingRecordMapper.findkcsw(warehouseId);
+    public kcswVO findkcsw(Integer warehouseId) {
+        kcswVO wareHouseVO =WarehouseSealingRecordMapper.findkcsw(warehouseId);
 
         return wareHouseVO;
     }