1

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

@@ -9,7 +9,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -52,10 +52,11 @@ public class StorageWarterCheckController {
         @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
         @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
-        @ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "query")
+        @ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "query"),
+        @ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query"),
+        @ApiImplicitParam(name = "dataStatus", value = "数据状态(0:保存,1:提交)", paramType = "query")
     })
-	public PageInfo<StorageWaterCheck> getList(HttpServletRequest request, 
-			Integer pageNum, Integer pageSize, Integer houseId, Integer wareId) {
+	public PageInfo<StorageWaterCheck> getList(Integer pageNum, Integer pageSize, Integer houseId, Integer wareId, Integer orgId, String dataStatus) {
 		
 		List<StorageWaterCheck> list = null;
 		PageInfo<StorageWaterCheck> pageInfo = null;
@@ -71,8 +72,13 @@ public class StorageWarterCheckController {
 			criteria.andWareIdEqualTo(wareId);
 		}
 
-		int org_id = Integer.parseInt(ObjectUtils.toString(request.getSession().getAttribute("orgId"), "0"));
-		criteria.andOrgIdEqualTo(org_id);
+		if (null != orgId) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+
+		if (StringUtils.isNotBlank(dataStatus)) {
+			criteria.andDataStatusEqualTo(dataStatus);
+		}
 
 		if (null != pageNum && null != pageSize) {
 			PageHelper.startPage(pageNum, pageSize);

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

@@ -12,6 +12,7 @@
     <result column="remark" property="remark" jdbcType="VARCHAR" />
     <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
     <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+    <result column="data_status" property="dataStatus" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -72,7 +73,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, org_id, house_id, ware_id, lspz, hy_date, hy_person, remark, input_time, edit_time
+    id, org_id, house_id, ware_id, lspz, hy_date, hy_person, remark, input_time, edit_time, data_status
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheckExample" >
     select
@@ -108,11 +109,11 @@
     insert into storage_water_check (id, org_id, house_id, 
       ware_id, lspz, hy_date, 
       hy_person, remark, input_time, 
-      edit_time)
+      edit_time, data_status)
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, 
       #{wareId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, #{hyDate,jdbcType=TIMESTAMP}, 
       #{hyPerson,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{inputTime,jdbcType=TIMESTAMP}, 
-      #{editTime,jdbcType=TIMESTAMP})
+      #{editTime,jdbcType=TIMESTAMP},#{dataStatus,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheck" >
     insert into storage_water_check
@@ -147,6 +148,9 @@
       <if test="editTime != null" >
         edit_time,
       </if>
+      <if test="dataStatus != null">
+        data_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -179,6 +183,9 @@
       <if test="editTime != null" >
         #{editTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="dataStatus != null">
+        #{dataStatus,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheckExample" resultType="java.lang.Integer" >
@@ -220,6 +227,9 @@
       <if test="record.editTime != null" >
         edit_time = #{record.editTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.dataStatus != null" >
+        data_status = #{record.dataStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -236,7 +246,8 @@
       hy_person = #{record.hyPerson,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
       input_time = #{record.inputTime,jdbcType=TIMESTAMP},
-      edit_time = #{record.editTime,jdbcType=TIMESTAMP}
+      edit_time = #{record.editTime,jdbcType=TIMESTAMP},
+      data_status = #{record.dataStatus,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -271,6 +282,9 @@
       <if test="editTime != null" >
         edit_time = #{editTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="dataStatus != null" >
+        data_status = #{dataStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -284,7 +298,8 @@
       hy_person = #{hyPerson,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       input_time = #{inputTime,jdbcType=TIMESTAMP},
-      edit_time = #{editTime,jdbcType=TIMESTAMP}
+      edit_time = #{editTime,jdbcType=TIMESTAMP},
+      data_status = #{dataStatus,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -8,14 +8,21 @@ import java.util.Date;
 import java.util.List;
 
 public class StorageQualitycheck {
-	
+
 	private Integer processState;
-	
 
+	/**
+	 * '1:已扦样但化验待处理,2:化验已保存,3:化验已提交'
+	 * @return
+	 */
     public Integer getProcessState() {
 		return processState;
 	}
 
+    /**
+     * '1:已扦样但化验待处理,2:化验已保存,3:化验已提交'
+     * @param processState
+     */
 	public void setProcessState(Integer processState) {
 		this.processState = processState;
 	}

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

@@ -23,170 +23,188 @@ public class StorageWaterCheck {
 
     private Date editTime;
 
+    private String dataStatus;
+
     private String redAlert;//红色警报
 
     private String blueAlert;//绿色警报
 
     /**
-     * null
-     * @return id null
+     * 主键唯一ID
+     * @return id 主键唯一ID
      */
     public String getId() {
         return id;
     }
 
     /**
-     * null
-     * @param id null
+     * 主键唯一ID
+     * @param id 主键唯一ID
      */
     public void setId(String id) {
         this.id = id == null ? null : id.trim();
     }
 
     /**
-     * null
-     * @return org_id null
+     * 库ID
+     * @return org_id 库ID
      */
     public Integer getOrgId() {
         return orgId;
     }
 
     /**
-     * null
-     * @param orgId null
+     * 库ID
+     * @param orgId 库ID
      */
     public void setOrgId(Integer orgId) {
         this.orgId = orgId;
     }
 
     /**
-     * null
-     * @return house_id null
+     * 仓房ID
+     * @return house_id 仓房ID
      */
     public Integer getHouseId() {
         return houseId;
     }
 
     /**
-     * null
-     * @param houseId null
+     * 仓房ID
+     * @param houseId 仓房ID
      */
     public void setHouseId(Integer houseId) {
         this.houseId = houseId;
     }
 
     /**
-     * null
-     * @return ware_id null
+     * 货位ID
+     * @return ware_id 货位ID
      */
     public Integer getWareId() {
         return wareId;
     }
 
     /**
-     * null
-     * @param wareId null
+     * 货位ID
+     * @param wareId 货位ID
      */
     public void setWareId(Integer wareId) {
         this.wareId = wareId;
     }
 
     /**
-     * null
-     * @return lspz null
+     * 粮食品种ID
+     * @return lspz 粮食品种ID
      */
     public Integer getLspz() {
         return lspz;
     }
 
     /**
-     * null
-     * @param lspz null
+     * 粮食品种ID
+     * @param lspz 粮食品种ID
      */
     public void setLspz(Integer lspz) {
         this.lspz = lspz;
     }
 
     /**
-     * null
-     * @return hy_date null
+     * 化验时间
+     * @return hy_date 化验时间
      */
     public Date getHyDate() {
         return hyDate;
     }
 
     /**
-     * null
-     * @param hyDate null
+     * 化验时间
+     * @param hyDate 化验时间
      */
     public void setHyDate(Date hyDate) {
         this.hyDate = hyDate;
     }
 
     /**
-     * null
-     * @return hy_person null
+     * 化验人
+     * @return hy_person 化验人
      */
     public String getHyPerson() {
         return hyPerson;
     }
 
     /**
-     * null
-     * @param hyPerson null
+     * 化验人
+     * @param hyPerson 化验人
      */
     public void setHyPerson(String hyPerson) {
         this.hyPerson = hyPerson == null ? null : hyPerson.trim();
     }
 
     /**
-     * null
-     * @return remark null
+     * 备注
+     * @return remark 备注
      */
     public String getRemark() {
         return remark;
     }
 
     /**
-     * null
-     * @param remark null
+     * 备注
+     * @param remark 备注
      */
     public void setRemark(String remark) {
         this.remark = remark == null ? null : remark.trim();
     }
 
     /**
-     * null
-     * @return input_time null
+     * 数据生成时间
+     * @return input_time 数据生成时间
      */
     public Date getInputTime() {
         return inputTime;
     }
 
     /**
-     * null
-     * @param inputTime null
+     * 数据生成时间
+     * @param inputTime 数据生成时间
      */
     public void setInputTime(Date inputTime) {
         this.inputTime = inputTime;
     }
 
     /**
-     * null
-     * @return edit_time null
+     * 最后修改时间
+     * @return edit_time 最后修改时间
      */
     public Date getEditTime() {
         return editTime;
     }
 
     /**
-     * null
-     * @param editTime null
+     * 最后修改时间
+     * @param editTime 最后修改时间
      */
     public void setEditTime(Date editTime) {
         this.editTime = editTime;
     }
 
+    /**
+     * 数据状态(0:保存,1:提交)
+     * @return
+     */
+    public String getDataStatus() {
+		return dataStatus;
+	}
+
+    /**
+     * 数据状态(0:保存,1:提交)
+     * @param dataStatus
+     */
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
 	public String getRedAlert() {
 		return redAlert;
 	}

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

@@ -746,6 +746,11 @@ public class StorageWaterCheckExample {
             addCriterion("edit_time not between", value1, value2, "editTime");
             return (Criteria) this;
         }
+
+        public Criteria andDataStatusEqualTo(String value) {
+            addCriterion("data_status =", value, "dataStatus");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -405,7 +405,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
 	@Override
 	public void pushQualitycheckLsdj_crk(StorageQualitycheck qualitycheck, String ws_path) throws Exception {
-		if ("0".equals(qualitycheck.getTypeUpdate())) {//只有粮食自检才走这里
+		if ("0".equals(qualitycheck.getTypeUpdate()) && qualitycheck.getProcessState() == 3) {//只有粮食自检,并且是已提交的数据才走这里
 			String crk_yjd_url = qualitycheckMapper.findConditionCrkYjdUrl(qualitycheck.getOrgId().toString());
 			if (StringUtils.isNotBlank(crk_yjd_url)) {
 				//拼接完整URL
@@ -450,7 +450,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
         	criteria.andOrgIdEqualTo(orgId);
         }
 
-        //1扦样化验待处理 2化验已处理
+        //1扦样化验待处理 2化验已处理,3:化验已保存
         if (null != processState) {
         	criteria.andProcessStateEqualTo(processState);
         }
@@ -511,7 +511,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
 		Map<String, Object> resultMap = new HashMap<>();
 		if (StringUtils.isNotBlank(fcsj)) {
-			List<StorageQualitycheck> list = getList(houseId, wareId, checkType, null, null, null, 2, "0" , fcsj);
+			List<StorageQualitycheck> list = getList(houseId, wareId, checkType, null, null, null, 3, "0" , fcsj);
 			if (null != list && list.size() > 0) {
 				resultMap.put("status", "200");
 				resultMap.put("msg", list);