.

src/main/java/com/chinaitop/depot/business/controller/BusinessContractReceiveController.java

@@ -45,10 +45,11 @@ public class BusinessContractReceiveController {
 		@ApiImplicitParam(name = "htbh", value = "合同编号", paramType = "query"),
 		@ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query"),
 		@ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
-		@ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query")
+		@ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query"),
+		@ApiImplicitParam(name = "htlx", value = "合同类型(0:采购,1:销售)", paramType = "query")
 	})
     public PageInfo<BusinessContractReceive> getList(Integer pageNum, Integer pageSize, 
-    		String htbh ,Integer orgId, Integer houseId, Integer warehouseId) {
+    		String htbh ,Integer orgId, Integer houseId, Integer warehouseId, String htlx) {
        
 		PageInfo<BusinessContractReceive> pageInfo = null;
 
@@ -57,7 +58,7 @@ public class BusinessContractReceiveController {
         	if (null != pageNum && null != pageSize) {
         		PageHelper.startPage(pageNum, pageSize);
         	}
-			list = businessContractReceiveService.queryByExample(htbh, orgId, houseId, warehouseId);
+			list = businessContractReceiveService.queryByExample(htbh, orgId, houseId, warehouseId, htlx);
 			pageInfo = new PageInfo<BusinessContractReceive>(list);
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);

src/main/java/com/chinaitop/depot/business/controller/ReceiveNoticeController.java

@@ -2,6 +2,7 @@ package com.chinaitop.depot.business.controller;
 
 import com.chinaitop.depot.business.model.BusinessNoticeReceive;
 import com.chinaitop.depot.business.service.ReceiveNoticeService;
+import com.chinaitop.depot.business.service.SystemOutsideDataService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -39,6 +40,9 @@ public class ReceiveNoticeController {
 	@Resource
 	private ReceiveNoticeService receiveNoticeService;
 
+	@Resource
+	private SystemOutsideDataService systemOutsideDataService;
+
 
 	/**
 	 * 接收通知单列表
@@ -106,22 +110,41 @@ public class ReceiveNoticeController {
 	@RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
 	@ApiOperation(value="保存数据", notes = "保存")
 	@ApiImplicitParams({
-		@ApiImplicitParam(name = "save", value = "新增数据", paramType = "query")
+		@ApiImplicitParam(name = "notice", value = "JSON对象数据", paramType = "form")
 	})
     public Map<String, Object> save(String notice){
 
-		logger.info("市平台传推送过来的轮换通知单是：\n"+notice);
+		logger.info("市平台传推送过来的轮换通知单如下：");
+		logger.info(notice);
 		Map<String, Object> modelMap = new HashMap<String, Object>();
 		try {
 			modelMap = receiveNoticeService.receiveNotice(notice);
+			systemOutsideDataService.addlogger("tzdjs", notice, modelMap.toString());
 		} catch (Exception e) {
-			//e.printStackTrace();
 			modelMap.put("status", "error");
-			modelMap.put("msg", "保存失败！");
+			modelMap.put("msg", "接口异常，请联系管理员！");
 			logger.error(e.getMessage(), e);
+			systemOutsideDataService.addlogger("tzdjs", notice, modelMap.toString());
 		}
 		return modelMap;
     }
+
+	@RequestMapping(value="/update", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="修改数据", notes = "")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "notice", value = "JSON对象数据", paramType = "form")
+	})
+	public Map<String, Object> update(String notice) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		try {
+			modelMap = receiveNoticeService.updateReceiveNotice(notice);
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			modelMap.put("status", 500);
+			modelMap.put("msg", "操作失败");
+		}
+		return modelMap;
+	}
 	
 	
 	/**

src/main/java/com/chinaitop/depot/business/mapper/BusinessNoticeReceiveMapper.xml

@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.chinaitop.depot.business.mapper.BusinessNoticeReceiveMapper" >
   <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="notice_number" property="noticeNumber" jdbcType="VARCHAR" />
     <result column="crktype" property="crktype" jdbcType="VARCHAR" />
@@ -27,6 +22,7 @@
     <result column="grain_detail_kind" property="grainDetailKind" jdbcType="INTEGER" />
     <result column="receive_time" property="receiveTime" jdbcType="TIMESTAMP" />
     <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
+    <result column="htbh" property="htbh" jdbcType="VARCHAR" />
     <result column="grain_annual" property="grainAnnual" jdbcType="INTEGER" />
     <result column="productive_year" property="productiveYear" jdbcType="INTEGER" />
     <result column="grain_producing_area" property="grainProducingArea" jdbcType="INTEGER" />
@@ -116,22 +112,12 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     id, notice_number, crktype, contract_number, ywtype, house_id, ware_house_id, grain_kind, 
     grain_grade, count, outgoing_period, forwarding_unit, receive_unit, resion, in_application, 
     org_id, grain_attribute, grain_detail_kind, receive_time,input_time,grain_annual,productive_year,grain_producing_area,
-    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet
+    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     select
     <if test="distinct" >
       distinct
@@ -146,42 +132,22 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     select 
     <include refid="Base_Column_List" />
     from business_notice_receive
     where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     delete from business_notice_receive
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     delete from business_notice_receive
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     insert into business_notice_receive (id, notice_number, crktype, 
       contract_number, ywtype, house_id, 
       ware_house_id, grain_kind, grain_grade, 
@@ -189,7 +155,7 @@
       receive_unit, resion, in_application, 
       org_id, grain_attribute, grain_detail_kind, 
       receive_time,input_time,grain_annual,productive_year,grain_producing_area,
-      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet)
+      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh)
     values (#{id,jdbcType=INTEGER}, #{noticeNumber,jdbcType=VARCHAR}, #{crktype,jdbcType=VARCHAR}, 
       #{contractNumber,jdbcType=VARCHAR}, #{ywtype,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
       #{wareHouseId,jdbcType=INTEGER}, #{grainKind,jdbcType=INTEGER}, #{grainGrade,jdbcType=INTEGER}, 
@@ -202,14 +168,9 @@
       #{hzrq,jdbcType=TIMESTAMP},#{ccshr,jdbcType=VARCHAR},#{zjshr,jdbcType=VARCHAR},
       #{tjshr,jdbcType=VARCHAR},#{kjshr,jdbcType=VARCHAR},#{ldshr,jdbcType=VARCHAR},
       #{bz,jdbcType=VARCHAR},#{auditState,jdbcType=INTEGER},#{isNotice,jdbcType=INTEGER},#{pzmc,jdbcType=VARCHAR}
-      ,#{isSheet,jdbcType=INTEGER})
+      ,#{isSheet,jdbcType=INTEGER},#{htbh,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     insert into business_notice_receive
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -323,6 +284,9 @@
       <if test="isSheet != null" >
         is_sheet,
       </if>
+      <if test="htbh != null">
+        htbh,
+      </if>
       
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -437,25 +401,18 @@
       <if test="isSheet != null" >
          #{isSheet,jdbcType=INTEGER},
       </if>
+      <if test="htbh != null">
+        #{htbh,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" resultType="java.lang.Integer" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     select count(*) from business_notice_receive
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     update business_notice_receive
     <set >
       <if test="record.id != null" >
@@ -527,7 +484,6 @@
       <if test="record.grainProducingArea != null" >
         grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
       </if>
-      
       <if test="record.lsxzzbdh != null" >
         lsxzzbdh = #{record.lsxzzbdh,jdbcType=VARCHAR},
       </if>
@@ -570,17 +526,15 @@
       <if test="record.isSheet != null" >
         is_sheet = #{record.isSheet,jdbcType=INTEGER},
       </if>
+      <if test="record.htbh != null">
+        htbh = #{record.htbh,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExample" parameterType="map" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     update business_notice_receive
     set id = #{record.id,jdbcType=INTEGER},
       notice_number = #{record.noticeNumber,jdbcType=VARCHAR},
@@ -618,18 +572,14 @@
       audit_state = #{record.auditState,jdbcType=INTEGER},
       is_notice = #{record.isNotice,jdbcType=INTEGER},
       pzmc = #{record.pzmc,jdbcType=VARCHAR},
-      is_sheet = #{record.isSheet,jdbcType=INTEGER}
+      is_sheet = #{record.isSheet,jdbcType=INTEGER},
+      htbh = #{record.htbh,jdbcType=VARCHAR}
       
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     update business_notice_receive
     <set >
       <if test="noticeNumber != null" >
@@ -698,7 +648,6 @@
       <if test="grainProducingArea != null" >
         grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
       </if>
-      
        <if test="lsxzzbdh != null" >
         lsxzzbdh = #{lsxzzbdh,jdbcType=VARCHAR},
       </if>
@@ -741,15 +690,13 @@
       <if test="isSheet != null" >
         is_sheet = #{isSheet,jdbcType=INTEGER},
       </if>
+      <if test="htbh != null">
+        htbh = #{htbh,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jul 08 09:57:43 CST 2020.
-    -->
     update business_notice_receive
     set notice_number = #{noticeNumber,jdbcType=VARCHAR},
       crktype = #{crktype,jdbcType=VARCHAR},
@@ -786,7 +733,8 @@
       audit_state = #{auditState,jdbcType=INTEGER},
       is_notice = #{isNotice,jdbcType=INTEGER},
       pzmc = #{pzmc,jdbcType=VARCHAR},
-      is_sheet = #{isSheet,jdbcType=INTEGER}
+      is_sheet = #{isSheet,jdbcType=INTEGER},
+      htbh = #{htbh,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

src/main/java/com/chinaitop/depot/business/model/BusinessNoticeReceive.java

@@ -5,30 +5,37 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class BusinessNoticeReceive {
-		
-		//表里新增字段
-	  private String lsxzzbdh;
-	  private String lssl;
-	  private Integer hzqlsxzdm;
-	  @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	  private Date hzrq;//划转日期
-	  private String ccshr;
-	  private String zjshr;
-	  private String tjshr;
-	  private String kjshr;
-	  private String ldshr;
-	  private String bz;
-	  private Integer auditState;
-	  private Integer isNotice;
-	  private String pzmc;
-	  private Integer isSheet;
-	  
-	
 	
+	//表里新增字段
+    private String lsxzzbdh;
+    private String lssl;
+    private Integer hzqlsxzdm;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date hzrq;//划转日期
+    private String ccshr;
+    private String zjshr;
+    private String tjshr;
+    private String kjshr;
+    private String ldshr;
+    private String bz;
+    private Integer auditState;
+    private Integer isNotice;
+    private String pzmc;
+    private Integer isSheet;
+    private String htbh;
+
+    /**
+     * 0是性质转变单
+     * @return
+     */
 	public Integer getIsSheet() {
 		return isSheet;
 	}
 
+	/**
+	 * 0是性质转变单
+	 * @param isSheet
+	 */
 	public void setIsSheet(Integer isSheet) {
 		this.isSheet = isSheet;
 	}
@@ -41,42 +48,82 @@ public class BusinessNoticeReceive {
 		this.pzmc = pzmc;
 	}
 
+	/**
+	 * 是否引用(0:否,1:是)
+	 * @return
+	 */
 	public Integer getIsNotice() {
 		return isNotice;
 	}
 
+	/**
+	 * 是否引用(0:否,1:是)
+	 * @param isNotice
+	 */
 	public void setIsNotice(Integer isNotice) {
 		this.isNotice = isNotice;
 	}
 
+	/**
+	 * 粮食性质转变单单号
+	 * @return
+	 */
 	public String getLsxzzbdh() {
 		return lsxzzbdh;
 	}
 
+	/**
+	 * 粮食性质转变单单号
+	 * @param lsxzzbdh
+	 */
 	public void setLsxzzbdh(String lsxzzbdh) {
 		this.lsxzzbdh = lsxzzbdh;
 	}
 
+	/**
+	 * 库存数量
+	 * @return
+	 */
 	public String getLssl() {
 		return lssl;
 	}
 
+	/**
+	 * 库存数量
+	 * @param lssl
+	 */
 	public void setLssl(String lssl) {
 		this.lssl = lssl;
 	}
 
+	/**
+	 * 划转后粮食性质
+	 * @return
+	 */
 	public Integer getHzqlsxzdm() {
 		return hzqlsxzdm;
 	}
 
+	/**
+	 * 划转后粮食性质
+	 * @param hzqlsxzdm
+	 */
 	public void setHzqlsxzdm(Integer hzqlsxzdm) {
 		this.hzqlsxzdm = hzqlsxzdm;
 	}
 
+	/**
+	 * 划转时间
+	 * @return
+	 */
 	public Date getHzrq() {
 		return hzrq;
 	}
 
+	/**
+	 * 划转时间
+	 * @param hzrq
+	 */
 	public void setHzrq(Date hzrq) {
 		this.hzrq = hzrq;
 	}
@@ -129,111 +176,148 @@ public class BusinessNoticeReceive {
 		this.bz = bz;
 	}
 
+	/**
+	 * 审批状态(0:仓储部经理审批,1:质检部经理审批,2:统计经理审批,3:会计审批,4:库领导审批,5:审批结束)
+	 * @return
+	 */
 	public Integer getAuditState() {
 		return auditState;
 	}
 
+	/**
+	 * 审批状态(0:仓储部经理审批,1:质检部经理审批,2:统计经理审批,3:会计审批,4:库领导审批,5:审批结束)
+	 * @param auditState
+	 */
 	public void setAuditState(Integer auditState) {
 		this.auditState = auditState;
 	}
 
-		//业务字段
-		private String outCount;
-		private String outRemainingNumber;
-		private boolean checked;
-		private String inCount;
-		private String remainingNumber;
-		private boolean selected;
-		
-		
-		
-		
-		
-	    public boolean isSelected() {
-			return selected;
-		}
+	//业务字段
+	private String outCount;
+	private String outRemainingNumber;
+	private boolean checked;
+	private String inCount;
+	private String remainingNumber;
+	private boolean selected;
 
-		public void setSelected(boolean selected) {
-			this.selected = selected;
-		}
+    public boolean isSelected() {
+		return selected;
+	}
 
-		public String getInCount() {
-			return inCount;
-		}
+	public void setSelected(boolean selected) {
+		this.selected = selected;
+	}
 
-		public void setInCount(String inCount) {
-			this.inCount = inCount;
-		}
+	public String getInCount() {
+		return inCount;
+	}
 
-		public String getRemainingNumber() {
-			return remainingNumber;
-		}
+	public void setInCount(String inCount) {
+		this.inCount = inCount;
+	}
 
-		public void setRemainingNumber(String remainingNumber) {
-			this.remainingNumber = remainingNumber;
-		}
+	public String getRemainingNumber() {
+		return remainingNumber;
+	}
 
-		public boolean isChecked() {
-			return checked;
-		}
+	public void setRemainingNumber(String remainingNumber) {
+		this.remainingNumber = remainingNumber;
+	}
 
-		public void setChecked(boolean checked) {
-			this.checked = checked;
-		}
+	public boolean isChecked() {
+		return checked;
+	}
 
-		public String getOutCount() {
-			return outCount;
-		}
+	public void setChecked(boolean checked) {
+		this.checked = checked;
+	}
 
-		public void setOutCount(String outCount) {
-			this.outCount = outCount;
-		}
+	public String getOutCount() {
+		return outCount;
+	}
 
-		public String getOutRemainingNumber() {
-			return outRemainingNumber;
-		}
+	public void setOutCount(String outCount) {
+		this.outCount = outCount;
+	}
 
-		public void setOutRemainingNumber(String outRemainingNumber) {
-			this.outRemainingNumber = outRemainingNumber;
-		}
-		
-		//表里面新增的字段
-		private Integer grainAnnual;//收获年度
-		private Integer productiveYear;//生产年份
-		private Integer grainProducingArea;//粮油产地
-		@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-		private Date inputTime;//入库时间
-		
-		
-		 public Integer getGrainAnnual() {
-		        return grainAnnual;
-		 }
-
-		 public void setGrainAnnual(Integer grainAnnual) {
-		        this.grainAnnual = grainAnnual;
-		 }
-		 public Integer getProductiveYear() {
-		        return productiveYear;
-		 }
-
-		 public void setProductiveYear(Integer productiveYear) {
-		        this.productiveYear = productiveYear;
-		 }
-		 public Integer getGrainProducingArea() {
-		        return grainProducingArea;
-		 }
-
-		 public void setGrainProducingArea(Integer grainProducingArea) {
-		        this.grainProducingArea = grainProducingArea;
-		 }
-
-		 public Date getInputTime() {
-		        return inputTime;
-		 }
-
-		 public void setInputTime(Date inputTime) {
-		        this.inputTime = inputTime;
-		 }
+	public String getOutRemainingNumber() {
+		return outRemainingNumber;
+	}
+
+	public void setOutRemainingNumber(String outRemainingNumber) {
+		this.outRemainingNumber = outRemainingNumber;
+	}
+	
+	//表里面新增的字段
+	private Integer grainAnnual;//收获年度
+	private Integer productiveYear;//生产年份
+	private Integer grainProducingArea;//粮油产地
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date inputTime;//入库时间
+	
+	/**
+	 * 收获年度
+	 * @return
+	 */
+	public Integer getGrainAnnual() {
+	    return grainAnnual;
+	}
+
+	/**
+	 * 收获年度
+	 * @param grainAnnual
+	 */
+	public void setGrainAnnual(Integer grainAnnual) {
+	    this.grainAnnual = grainAnnual;
+	}
+
+	/**
+	 * 生产年份
+	 * @return
+	 */
+	public Integer getProductiveYear() {
+	    return productiveYear;
+	}
+
+	 /**
+	  * 生产年份
+	  * @param productiveYear
+	  */
+	 public void setProductiveYear(Integer productiveYear) {
+	        this.productiveYear = productiveYear;
+	 }
+
+	 /**
+	  * 产地
+	  * @return
+	  */
+	 public Integer getGrainProducingArea() {
+	        return grainProducingArea;
+	 }
+
+	 /**
+	  * 产地
+	  * @param grainProducingArea
+	  */
+	 public void setGrainProducingArea(Integer grainProducingArea) {
+	        this.grainProducingArea = grainProducingArea;
+	 }
+
+	 /**
+	  * 入库时间
+	  * @return
+	  */
+	 public Date getInputTime() {
+	        return inputTime;
+	 }
+
+	 /**
+	  * 入库时间
+	  * @param inputTime
+	  */
+	 public void setInputTime(Date inputTime) {
+	        this.inputTime = inputTime;
+	 }
 		    
 		
 		
@@ -439,96 +523,60 @@ public class BusinessNoticeReceive {
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.crktype
-     *
-     * @return the value of business_notice_receive.crktype
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 出入库类型(1:入库,3:出库,13:出入库)
      */
     public String getCrktype() {
         return crktype;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.crktype
-     *
-     * @param crktype the value for business_notice_receive.crktype
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 出入库类型(1:入库,3:出库,13:出入库)
+     * @param crktype
      */
     public void setCrktype(String crktype) {
         this.crktype = crktype == null ? null : crktype.trim();
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.contract_number
-     *
-     * @return the value of business_notice_receive.contract_number
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 协议编号/合同编号
      */
     public String getContractNumber() {
         return contractNumber;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.contract_number
-     *
-     * @param contractNumber the value for business_notice_receive.contract_number
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 协议编号/合同编号
+     * @param contractNumber 协议编号/合同编号
      */
     public void setContractNumber(String contractNumber) {
         this.contractNumber = contractNumber == null ? null : contractNumber.trim();
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.ywtype
-     *
-     * @return the value of business_notice_receive.ywtype
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 业务类型 (6:竞买=入库竞价；7：销售=出库竞价  4：轮换=出库包干)
      */
     public String getYwtype() {
         return ywtype;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.ywtype
-     *
-     * @param ywtype the value for business_notice_receive.ywtype
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 业务类型 (6:竞买=入库竞价；7：销售=出库竞价  4：轮换=出库包干)
+     * @param ywtype 
      */
     public void setYwtype(String ywtype) {
         this.ywtype = ywtype == null ? null : ywtype.trim();
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.house_id
-     *
-     * @return the value of business_notice_receive.house_id
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 仓房
      */
     public Integer getHouseId() {
         return houseId;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.house_id
-     *
-     * @param houseId the value for business_notice_receive.house_id
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 仓房
+     * @param houseId 仓房
      */
     public void setHouseId(Integer houseId) {
         this.houseId = houseId;
@@ -547,36 +595,24 @@ public class BusinessNoticeReceive {
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.ware_house_id
-     *
-     * @param wareHouseId the value for business_notice_receive.ware_house_id
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 货位
+     * @param wareHouseId 货位
      */
     public void setWareHouseId(Integer wareHouseId) {
         this.wareHouseId = wareHouseId;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.grain_kind
-     *
-     * @return the value of business_notice_receive.grain_kind
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 粮食品种
+     * @return
      */
     public Integer getGrainKind() {
         return grainKind;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.grain_kind
-     *
-     * @param grainKind the value for business_notice_receive.grain_kind
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 粮食品种
+     * @param grainKind 粮食品种
      */
     public void setGrainKind(Integer grainKind) {
         this.grainKind = grainKind;
@@ -607,96 +643,62 @@ public class BusinessNoticeReceive {
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.count
-     *
-     * @return the value of business_notice_receive.count
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 计划数量（吨）
+     * @return
      */
     public String getCount() {
         return count;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.count
-     *
-     * @param count the value for business_notice_receive.count
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 计划数量（吨）
+     * @param count
      */
     public void setCount(String count) {
         this.count = count == null ? null : count.trim();
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.outgoing_period
-     *
-     * @return the value of business_notice_receive.outgoing_period
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 出库期限(日期格式)
+     * @return
      */
     public String getOutgoingPeriod() {
         return outgoingPeriod;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.outgoing_period
-     *
-     * @param outgoingPeriod the value for business_notice_receive.outgoing_period
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 出库期限(日期格式)
+     * @param outgoingPeriod
      */
     public void setOutgoingPeriod(String outgoingPeriod) {
         this.outgoingPeriod = outgoingPeriod == null ? null : outgoingPeriod.trim();
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.forwarding_unit
-     *
-     * @return the value of business_notice_receive.forwarding_unit
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 发货单位
      */
     public String getForwardingUnit() {
         return forwardingUnit;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.forwarding_unit
-     *
-     * @param forwardingUnit the value for business_notice_receive.forwarding_unit
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 发货单位
+     * @param forwardingUnit
      */
     public void setForwardingUnit(String forwardingUnit) {
         this.forwardingUnit = forwardingUnit == null ? null : forwardingUnit.trim();
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.receive_unit
-     *
-     * @return the value of business_notice_receive.receive_unit
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 收货单位
      */
     public String getReceiveUnit() {
         return receiveUnit;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.receive_unit
-     *
-     * @param receiveUnit the value for business_notice_receive.receive_unit
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 收货单位
+     * @param receiveUnit 收货单位
      */
     public void setReceiveUnit(String receiveUnit) {
         this.receiveUnit = receiveUnit == null ? null : receiveUnit.trim();
@@ -727,122 +729,97 @@ public class BusinessNoticeReceive {
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.in_application
-     *
-     * @return the value of business_notice_receive.in_application
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 启用(默认1，其实不用)
+     * @return
      */
     public Integer getInApplication() {
         return inApplication;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.in_application
-     *
-     * @param inApplication the value for business_notice_receive.in_application
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 启用(默认1，其实不用)
+     * @param inApplication
      */
     public void setInApplication(Integer inApplication) {
         this.inApplication = inApplication;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.org_id
-     *
-     * @return the value of business_notice_receive.org_id
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 组织机构id
      */
     public Integer getOrgId() {
         return orgId;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.org_id
-     *
-     * @param orgId the value for business_notice_receive.org_id
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 组织机构id
+     * @param orgId 组织机构id
      */
     public void setOrgId(Integer orgId) {
         this.orgId = orgId;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.grain_attribute
-     *
-     * @return the value of business_notice_receive.grain_attribute
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 粮油性质
+     * @return
      */
     public Integer getGrainAttribute() {
         return grainAttribute;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.grain_attribute
-     *
-     * @param grainAttribute the value for business_notice_receive.grain_attribute
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 粮油性质
+     * @param grainAttribute
      */
     public void setGrainAttribute(Integer grainAttribute) {
         this.grainAttribute = grainAttribute;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.grain_detail_kind
-     *
-     * @return the value of business_notice_receive.grain_detail_kind
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 明细品种
+     * @return
      */
     public Integer getGrainDetailKind() {
         return grainDetailKind;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.grain_detail_kind
-     *
-     * @param grainDetailKind the value for business_notice_receive.grain_detail_kind
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 明细品种
+     * @param grainDetailKind
      */
     public void setGrainDetailKind(Integer grainDetailKind) {
         this.grainDetailKind = grainDetailKind;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column business_notice_receive.receive_time
-     *
-     * @return the value of business_notice_receive.receive_time
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 接收数据的时间
+     * @return
      */
     public Date getReceiveTime() {
         return receiveTime;
     }
 
     /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column business_notice_receive.receive_time
-     *
-     * @param receiveTime the value for business_notice_receive.receive_time
-     *
-     * @mbggenerated Wed Jul 08 09:57:43 CST 2020
+     * 接收数据的时间
+     * @param receiveTime
      */
     public void setReceiveTime(Date receiveTime) {
         this.receiveTime = receiveTime;
     }
+
+    /**
+     * 合同编号(包干类型使用)
+     * @return
+     */
+	public String getHtbh() {
+		return htbh;
+	}
+
+	/**
+	 * 合同编号(包干类型使用)
+	 * @param htbh
+	 */
+	public void setHtbh(String htbh) {
+		this.htbh = htbh;
+	}
 }

src/main/java/com/chinaitop/depot/business/service/BusinessContractReceiveService.java

@@ -21,9 +21,10 @@ public interface BusinessContractReceiveService {
 	 * @param orgId 组织机构ID
 	 * @param houseId 仓房ID
 	 * @param warehouseId 货位ID
+	 * @param htlx 合同类型(0:采购,1:销售)
 	 * @return
 	 */
-	List<BusinessContractReceive> queryByExample(String htbh, Integer orgId, Integer houseId, Integer warehouseId) throws Exception;
+	List<BusinessContractReceive> queryByExample(String htbh, Integer orgId, Integer houseId, Integer warehouseId, String htlx) throws Exception;
 
 	/**
 	 * 主键查询一条数据

src/main/java/com/chinaitop/depot/business/service/ReceiveNoticeService.java

@@ -30,5 +30,12 @@ public interface ReceiveNoticeService {
 
 	void saveDataRk(String orgId, Integer storehouseId, Integer warehouseId, String grainVarietyName, BigDecimal rksl,
 			String lsxzzbdh,String xyh);
+
+	/**
+	 * 修改下发的通知单数据
+	 * @param notice
+	 * @return
+	 */
+	Map<String, Object> updateReceiveNotice(String notice) throws Exception;
 			
 }

src/main/java/com/chinaitop/depot/business/service/impl/BusinessContractReceiveServiceImpl.java

@@ -220,7 +220,7 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 	}
 
 	@Override
-	public List<BusinessContractReceive> queryByExample(String htbh, Integer orgId, Integer houseId, Integer warehouseId)
+	public List<BusinessContractReceive> queryByExample(String htbh, Integer orgId, Integer houseId, Integer warehouseId, String htlx)
 			throws Exception {
 		List<BusinessContractReceive> list = null;
 		BusinessContractReceiveExample example = new BusinessContractReceiveExample();
@@ -237,6 +237,9 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		if (null != warehouseId) {
 			criteria.andWarehouseIdEqualTo(warehouseId);
 		}
+		if (StringUtils.isNotBlank(htlx)) {
+			criteria.andHtlxEqualTo(htlx);
+		}
 		example.setOrderByClause("input_time desc");
 		list = businessContractReceiveMapper.selectByExample(example);
 		return list;

src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -11,6 +11,8 @@ import javax.annotation.Resource;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +27,7 @@ import com.chinaitop.depot.business.service.FeignAgileService;
 import com.chinaitop.depot.business.service.FeignBasicService;
 import com.chinaitop.depot.business.service.ReceiveNoticeService;
 import com.chinaitop.depot.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 
 @Service
@@ -38,6 +41,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	private FeignAgileService feignAgileService;
 	@Resource
     private BusinessApprovalService businessApprovalService;
+
+	public static final Logger logger = LoggerFactory.getLogger(ReceiveNoticeServiceImpl.class);
     /*@Resource
     private BusinessApprovalMapper approvalMapper;*/
 
@@ -195,8 +200,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                         businessNoticeReceive.setForwardingUnit(jsonObject.getString("khssyqmc")); //发货单位
                     }
 
-                    if(ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){  //业务类型 (6:竞买；7：销售  4：轮换)
-                        businessNoticeReceive.setYwtype("1"); //1收储 2 销售 3轮换
+                    if(ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){  //业务类型 (6:竞买=入库竞价；7：销售=出库竞价  4：轮换=出库包干)
+                        businessNoticeReceive.setYwtype("1"); //1收储=竞买=竞价 2 销售=竞价 3轮换=包干
                     }else if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("4")){
                         businessNoticeReceive.setYwtype("3");
                     }else if (ObjectUtils.toString(jsonObject.getString("ywlx")).equals("7")){
@@ -211,9 +216,16 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                         Integer grainKind = 0;
                         //根据仓房编码查询仓房、货位、组织机构数据
                         Map<String, Object> wareDataMap = feignBasicService.getWareDataByHwbm(hwbm);
-                        if (null == wareDataMap) {
-                            modelMap.put("msg", "未获取到对应仓房和货位信息");
+                        logger.info("根据值"+hwbm+"获取到的货位数据如下：");
+            			logger.info(wareDataMap+"");
+                        if (null == wareDataMap || 
+                        		"0".equals(wareDataMap.get("houseId").toString()) || 
+                        		"0".equals(wareDataMap.get("wareHouseId").toString()) || 
+                        		"0".equals(wareDataMap.get("orgId").toString())) {
+
+                            modelMap.put("msg", "根据值"+hwbm+"未获取到对应仓房货位信息，请核对数据");
                             modelMap.put("status", "error");
+
                         } else {
                             Integer houseId = (Integer) wareDataMap.get("houseId");
                             Integer wareHouseId = (Integer) wareDataMap.get("wareHouseId");
@@ -221,12 +233,14 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                             businessNoticeReceive.setHouseId(houseId); //仓房
                             businessNoticeReceive.setWareHouseId(wareHouseId); //货位
                             businessNoticeReceive.setOrgId(orgId);  //组织id
-                            if(ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){//竞买的业务类型
+                            if(ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){//入库竞价的业务类型
                                 if(jsonObject.getString("pz")!=null){
                                     String code = jsonObject.getString("pzbm");//品种编码
                                     if (StringUtils.isNotBlank(code)) {
                                         code = code.substring(0,3);//获取前三位
-                                        Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1061, null, code);//1004是生产年份的父ID
+                                        Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1061, null, code);//1061是粮食品种的父ID
+                                        logger.info("获取到的品种数据如下：");
+                            			logger.info(basicMap.toString());
                                         businessNoticeReceive.setGrainKind((Integer) basicMap.get("enumId")); //接收的品种大类
                                     }
                                 }
@@ -265,10 +279,10 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                                 
                                 businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
                                 
-                                businessNoticeReceive.setHzqlsxzdm(3052);//商品粮 转后
-                                businessNoticeReceive.setLsxzzbdh(jsonObject.getString("tzdid"));
+                                businessNoticeReceive.setHzqlsxzdm(3052);//商品粮 转后,划转后粮食性质
+                                businessNoticeReceive.setLsxzzbdh(jsonObject.getString("tzdid"));//粮食性质转变单单号
                                 //SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
-                                businessNoticeReceive.setHzrq(new Date());
+                                businessNoticeReceive.setHzrq(new Date());//划转时间
 
                             }
                             String  lsyqsl = jsonObject.getString("lsyqsl");
@@ -289,46 +303,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                            
                         }
 
-
-                       /**
-                        * 修改粮食性质(轮换或者销售进行修改)
-                        *   parameters[0] = ;     //单位ID
-                            parameters[1] = ;     //粮食品种
-                            parameters[2] = null; //空就行
-                            parameters[3] = ;     //仓房ID
-                            parameters[4] = ;     //货位ID
-                            parameters[5] = ;     //需要改变成的粮食性质
-                            parameters[6] = ;     //原来的粮食性质
-                            parameters[7] = ;     //库存数量或者要改变的数量
-                            parameters[8]=;      //批准文号(山西用)
-                            parameters[9]=;      //性质变动原因
-                            parameters[10] = ;  //1:新增；2：修改；3：删除
-                        */
-                       /*if(!ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){
-                           Object parameters[] = new Object[11];
-                           parameters[0] = orgId+"";//组织id
-                           parameters[1] = grainKind+"";//粮食品种
-                           parameters[2] = null;//
-                           parameters[3] = houseId+"";//仓房id
-                           parameters[4] = wareHouseId+"";//货位id
-                           parameters[5] = 6871+"";//需要改变成的粮食性质(其他商品粮)
-                           parameters[6] = grainAttribute+"";//原来的粮食性质
-                           parameters[7] = count+"";//原来的粮食性质
-                           parameters[8] = jsonObject.getString("tzdid")+"";//原来的粮食性质
-                           parameters[9] = "转储性质变动";
-                           parameters[10] = 2+"";
-                           String str = createKC.createKC("ChangeGrainAttribute", url, parameters);
-                            if ("true".equals(str)) {
-                                modelMap.put("status", "success");
-                            } else {
-                                modelMap.put("status", "error");
-                                modelMap.put("msg", "保存失败，库存同步异常，请联系管理员！");
-                                return modelMap;
-                            }
-                       }*/
-
                     }else{
-                        modelMap.put("msg", "仓房编码为空");
+                        modelMap.put("msg", "cfbm编码为空");
                         modelMap.put("status", "error");
                     }
 
@@ -340,7 +316,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
             
 
         }else{
-            modelMap.put("msg", "参数为空");
+            modelMap.put("msg", "所传数据不能为空");
             modelMap.put("status", "error");
         }
 
@@ -528,4 +504,17 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         
 	}
 
+	@Override
+	public Map<String, Object> updateReceiveNotice(String notice) throws Exception {
+		Map<String, Object> map = new HashMap<>();
+		
+		ObjectMapper objectMapper = new ObjectMapper();
+		BusinessNoticeReceive businessNoticeReceive = objectMapper.readValue(notice, BusinessNoticeReceive.class);
+		businessNoticeReceiveMapper.updateByPrimaryKey(businessNoticeReceive);
+		map.put("status", 200);
+		map.put("msg", "操作成功");
+		
+		return map;
+	}
+
 }