增加性质转变单

src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

@@ -78,6 +78,7 @@ public class DatePermissionInterceptor implements Interceptor {
 						!"com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper.selectByPrimaryKey".equals(mappedStatement.getId()) &&
 						!"com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper.selectByExample_COUNT".equals(mappedStatement.getId()) &&
 						!"com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper.selectByExample".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.BusinessNoticeReceiveMapper.getUserRole_COUNT".equals(mappedStatement.getId()) &&
 						!"com.chinaitop.depot.business.mapper.BusinessMovelibraryMapper.selectList".equals(mappedStatement.getId())
 						){
 					//解析sql中的表名

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

@@ -77,10 +77,10 @@ public class ReceiveNoticeController {
 	
 	
 	/**
-	 * 启用、暂停、终止
+	 * 修改
 	 */
 	@RequestMapping(value="/update", produces = MediaType.APPLICATION_JSON_VALUE,method=RequestMethod.POST)
-    @ApiOperation(value="启用、暂停、终止", notes = "根据id修改状态(启用、暂停、终止)")
+    @ApiOperation(value="修改内容", notes = "修改内容")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "BusinessNoticeReceive", value = "接收到的通知单对象", paramType = "query")
     })
@@ -117,5 +117,32 @@ public class ReceiveNoticeController {
 		}
 		return modelMap;
     }
+	
+	
+	/**
+	 * 未进行审核完成的【性质转变单】，该仓再下一次申请入库验收的时候，
+	 * 会提示，需要将上一次的粮食性质转变单审核完成，才能进行提交
+	 */
+	@RequestMapping(value="/getList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="入库验收申请时查询上一次性质转变单是否审批完成", notes = "入库验收申请时查询上一次性质转变单是否审批完成")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "xybh", value = "协议编号", paramType = "query"),
+            @ApiImplicitParam(name = "sptDataId", value = "和市平台对接的货位编码", paramType = "query"),
+            @ApiImplicitParam(name = "flag", value = "是油罐还是仓房", paramType = "query")
+    })
+    public int getList(String xybh,String sptDataId,Integer flag) throws Exception {
+        return receiveNoticeService.queryIsOrAudit(xybh,sptDataId,flag);
+    }
+	
+	
+	@RequestMapping(value="/saveDataRk", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="增加性质转变单数据(入库)", notes = "增加性质转变单数据(入库)")
+	@ApiImplicitParams({
+        @ApiImplicitParam(name = "paramMap", value = "接收的数据", paramType = "query")
+    })
+    public void updateNoticeStatus(Map<String, Object> paramMap) {
+		receiveNoticeService.saveDataRk(paramMap);
+    	
+    }
     
 }

src/main/java/com/chinaitop/depot/business/controller/audit/BusinessProSheetAuditController.java

@@ -0,0 +1,189 @@
+package com.chinaitop.depot.business.controller.audit;
+
+
+import com.chinaitop.depot.act.model.HistoryList;
+import com.chinaitop.depot.act.service.ActTaskService;
+import com.chinaitop.depot.business.model.BusinessApproval;
+import com.chinaitop.depot.business.model.BusinessFile;
+import com.chinaitop.depot.business.model.BusinessNoticeReceive;
+import com.chinaitop.depot.business.model.BusinessPlan;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.enums.StoreWareType;
+import com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO;
+import com.chinaitop.depot.business.service.BusinessApprovalService;
+import com.chinaitop.depot.business.service.BusinessFileService;
+import com.chinaitop.depot.business.service.BusinessPlanService;
+import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
+import com.chinaitop.depot.business.service.ReceiveNoticeService;
+import com.chinaitop.depot.utils.activiti.StringUtils;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 性质转变单审批
+ * @author My Sunshine
+ *
+ */
+@RestController
+@RequestMapping(value="/depot/business/propSheet/audit")
+@Api(value= "BusinessProSheetAuditController", description = "性质转变单审批管理")
+public class BusinessProSheetAuditController {
+    
+	@Resource
+	private ReceiveNoticeService receiveNoticeService;
+	
+    @Resource
+    private BusinessApprovalService businessApprovalService;
+    @Resource
+    private ActTaskService actTaskService;
+    
+    /**
+     * 获取审批列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getList",  method=RequestMethod.GET)
+	@ApiOperation(value="获取性质转变单审批列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人的id", paramType = "query")
+	})
+    public PageInfo<BusinessNoticeReceive> getList(Integer pageNum, Integer pageSize,HttpServletRequest request,BusinessNoticeReceive businessNoticeReceive,Integer userId) {
+    	
+    	PageHelper.startPage(pageNum, pageSize);
+    	List<BusinessNoticeReceive> list = new ArrayList<BusinessNoticeReceive>();
+        
+        
+        List<Map<String,String>> userRoleList = receiveNoticeService.getUserRole(userId);
+        String roleNames = "";
+        for (Map<String, String> map : userRoleList) {
+        	String roleName =  map.get("role_name");
+        	roleNames = roleNames + roleName+",";
+		}
+       // System.out.println(roleNames);
+        List<BusinessNoticeReceive> listAll = receiveNoticeService.queryByExample(businessNoticeReceive);
+        for (BusinessNoticeReceive businessNoticeReceive2 : listAll) {
+        	//0仓储部经理审批 1质检部经理审批 2统计经理审批 3会计审批 4库领导审批
+			if(businessNoticeReceive2.getAuditState().equals(0)){
+				if(roleNames.contains("仓储部经理")){
+					list.add(businessNoticeReceive2);
+				}
+			 }
+			if(businessNoticeReceive2.getAuditState().equals(1)){
+				if(roleNames.contains("质检部经理")){
+					list.add(businessNoticeReceive2);
+				}
+			 }
+			if(businessNoticeReceive2.getAuditState().equals(2)){
+				if(roleNames.contains("统计部经理")){
+					list.add(businessNoticeReceive2);
+				}
+			 }
+			if(businessNoticeReceive2.getAuditState().equals(3)){
+				if(roleNames.contains("会计")){
+					list.add(businessNoticeReceive2);
+				}
+			 }
+			if(businessNoticeReceive2.getAuditState().equals(4)){
+				if(roleNames.contains("库领导")){
+					list.add(businessNoticeReceive2);
+				}
+			 }
+		}
+        
+        //PageHelper.startPage(pageNum, pageSize);
+        PageInfo<BusinessNoticeReceive> pageInfo = new PageInfo<BusinessNoticeReceive>(list);
+        /*if(pageInfo.getTotal()>0){
+        	pageInfo.setStartRow(pageInfo.getStartRow()+1);
+        	pageInfo.setEndRow(pageInfo.getEndRow()+1);
+        }*/
+        return pageInfo;
+    }
+    
+    /**
+     * 获取审批页面详情.
+     * @param id  业务主键
+     * @param processInstanceId 流程实例id
+     * @return
+     */
+    @RequestMapping(value="/getAudit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取审批页面详情", notes = "获取审批页面详情")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "原数据的id", paramType = "query")
+	})
+    public Map<String, Object> getAduit(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // 详情.
+        BusinessNoticeReceive businessNoticeReceive = receiveNoticeService.findById(id);
+        modelMap.put("businessNoticeReceive", businessNoticeReceive);
+        
+        modelMap.put("xzzbdh", businessNoticeReceive.getLsxzzbdh());
+        // 审批历史.
+        List<HistoryList> auditList = businessApprovalService.getAudit(modelMap);//该id是元数据的id 是中间表的project_id
+        modelMap.put("auditList", auditList);
+        
+        return modelMap;
+    }
+
+    /**
+     * 审批.
+     * @param planId 业务主键
+     * @param businessApproval 中间表
+     * @param assignee 下一个环节审批人
+     * @param result 当前环节审批结果
+     * @return
+     */
+    @RequestMapping(value="/audit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="审批", notes = "审批")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="receiveNoticeJson", value="原数据", paramType="form"),
+    	@ApiImplicitParam(name="content", value="审批意见", paramType="form"),
+    	@ApiImplicitParam(name="userId", value="当前登录人id", paramType="form"),
+    	@ApiImplicitParam(name="realName", value="前登录人姓名", paramType="form")
+    })
+    public Map<String, Object> audit(HttpServletRequest request, 
+    		String receiveNoticeJson, Integer userId, String realName,String orgName,String content) {
+        //UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        ObjectMapper mapper = new ObjectMapper();
+        BusinessNoticeReceive receiveNotice;
+		try {
+			receiveNotice = (BusinessNoticeReceive)mapper.readValue(receiveNoticeJson, BusinessNoticeReceive.class);
+			 receiveNoticeService.audit(receiveNotice, userId,  realName,orgName,content);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+       
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+ 
+
+    
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessApprovalMapper.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.business.mapper;
 
+import com.chinaitop.depot.act.model.HistoryList;
 import com.chinaitop.depot.business.model.BusinessApproval;
 import com.chinaitop.depot.business.model.BusinessApprovalExample;
 import org.apache.ibatis.annotations.Param;
@@ -31,4 +32,6 @@ public interface BusinessApprovalMapper {
     int updateByPrimaryKey(BusinessApproval record);
 
 	List<BusinessApproval> queryByMap(Map<String, Object> map);
+
+	List<HistoryList> getAudit(Map<String, Object> modelMap);
 }

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

@@ -739,6 +739,25 @@
          </if>
      </where>
      ORDER BY apply_time desc		
-
 	</select>
+	
+	<!-- <resultMap id="getAuditResultMap" type="com.chinaitop.depot.act.model.HistoryList" extends="BaseResultMap">
+    <result column="operator" property="assigneeName" jdbcType="VARCHAR" />
+    <result column="content" property="comment" jdbcType="VARCHAR" />
+    <result column="task_name" property="activityName" jdbcType="VARCHAR" />
+    <result column="apply_name" property="applyName" jdbcType="VARCHAR" />
+    <result column="from_department" property="department" jdbcType="VARCHAR" />
+   </resultMap> -->
+  <select id="getAudit" resultMap="BaseResultMap" parameterType="java.util.Map" >
+    SELECT
+      <include refid="Base_Column_List" />
+      FROM
+      business_approval 
+      <where>
+        <if test="xzzbdh != null">
+          task_type_name = #{xzzbdh,jdbcType=VARCHAR}
+        </if>
+        ORDER BY create_time ASC
+      </where>
+  </select>
 </mapper>

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

@@ -3,6 +3,8 @@ package com.chinaitop.depot.business.mapper;
 import com.chinaitop.depot.business.model.BusinessNoticeReceive;
 import com.chinaitop.depot.business.model.BusinessNoticeReceiveExample;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface BusinessNoticeReceiveMapper {
@@ -93,4 +95,6 @@ public interface BusinessNoticeReceiveMapper {
      * @mbggenerated Wed Jul 08 09:57:43 CST 2020
      */
     int updateByPrimaryKey(BusinessNoticeReceive record);
+
+	List<Map<String, String>> getUserRole(Integer userId);
 }

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

@@ -27,9 +27,24 @@
     <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="grain_annual" property="grainAnnual" jdbcType="INTEGER" />
+    <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" />
+    <result column="grain_producing_area" property="grainProducingArea" jdbcType="INTEGER" />
+     
+    <result column="lsxzzbdh" property="lsxzzbdh" jdbcType="VARCHAR" />
+    <result column="lssl" property="lssl" jdbcType="VARCHAR" />
+    <result column="hzqlsxzdm" property="hzqlsxzdm" jdbcType="INTEGER" />
+    <result column="hzrq" property="hzrq" jdbcType="TIMESTAMP" />
+    <result column="ccshr" property="ccshr" jdbcType="VARCHAR" />
+    <result column="zjshr" property="zjshr" jdbcType="VARCHAR" /> 
+    <result column="tjshr" property="tjshr" jdbcType="VARCHAR" /> 
+    <result column="kjshr" property="kjshr" jdbcType="VARCHAR" />  
+    <result column="ldshr" property="ldshr" jdbcType="VARCHAR" />
+    <result column="bz" property="bz" jdbcType="VARCHAR" />
+    <result column="audit_state" property="auditState" jdbcType="INTEGER" />
+    <result column="is_notice" property="isNotice" jdbcType="INTEGER" />
+    <result column="pzmc" property="pzmc" jdbcType="VARCHAR" />
+     
   </resultMap>
   <sql id="Example_Where_Clause" >
     <!--
@@ -107,7 +122,8 @@
     -->
     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
+    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
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" >
     <!--
@@ -171,7 +187,8 @@
       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)
+      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)
     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}, 
@@ -179,7 +196,11 @@
       #{receiveUnit,jdbcType=VARCHAR}, #{resion,jdbcType=VARCHAR}, #{inApplication,jdbcType=INTEGER}, 
       #{orgId,jdbcType=INTEGER}, #{grainAttribute,jdbcType=INTEGER}, #{grainDetailKind,jdbcType=INTEGER}, 
       #{receiveTime,jdbcType=TIMESTAMP},#{inputTime,jdbcType=TIMESTAMP},#{grainAnnual,jdbcType=INTEGER},
-      #{productiveYear,jdbcType=INTEGER},#{grainProducingArea,jdbcType=INTEGER})
+      #{productiveYear,jdbcType=INTEGER},#{grainProducingArea,jdbcType=INTEGER},
+      #{lsxzzbdh,jdbcType=VARCHAR},#{lssl,jdbcType=VARCHAR},#{hzqlsxzdm,jdbcType=INTEGER},
+      #{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})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
     <!--
@@ -258,6 +279,46 @@
       <if test="grainProducingArea != null" >
         grain_producing_area,
       </if>
+      <if test="lsxzzbdh != null" >
+        lsxzzbdh,
+      </if>
+      <if test="lssl != null" >
+        lssl,
+      </if>
+      <if test="hzqlsxzdm != null" >
+        hzqlsxzdm,
+      </if>
+      <if test="hzrq != null" >
+        hzrq,
+      </if>
+      <if test="ccshr != null" >
+        ccshr,
+      </if>
+      <if test="zjshr != null" >
+        zjshr,
+      </if>
+      <if test="tjshr != null" >
+        tjshr,
+      </if>
+      <if test="kjshr != null" >
+        kjshr,
+      </if>
+      <if test="ldshr != null" >
+        ldshr,
+      </if>
+      <if test="bz != null" >
+        bz,
+      </if>
+      <if test="auditState != null" >
+        audit_state,
+      </if>
+       <if test="isNotice != null" >
+        is_notice,
+      </if>
+      <if test="pzmc != null" >
+        pzmc,
+      </if>
+      
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -329,6 +390,45 @@
       <if test="grainProducingArea != null" >
         #{grainProducingArea,jdbcType=INTEGER},
       </if>
+      <if test="lsxzzbdh != null" >
+        #{lsxzzbdh,jdbcType=VARCHAR},
+      </if>
+      <if test="lssl != null" >
+        #{lssl,jdbcType=VARCHAR},
+      </if>
+      <if test="hzqlsxzdm != null" >
+        #{hzqlsxzdm,jdbcType=INTEGER},
+      </if>
+      <if test="hzrq != null" >
+        #{hzrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ccshr != null" >
+        #{ccshr,jdbcType=VARCHAR},
+      </if>
+      <if test="zjshr != null" >
+         #{zjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="tjshr != null" >
+         #{tjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="kjshr != null" >
+         #{kjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="ldshr != null" >
+         #{ldshr,jdbcType=VARCHAR},
+      </if>
+      <if test="bz != null" >
+         #{bz,jdbcType=VARCHAR},
+      </if>
+      <if test="auditState != null" >
+         #{auditState,jdbcType=INTEGER},
+      </if>
+      <if test="isNotice != null" >
+         #{isNotice,jdbcType=INTEGER},
+      </if>
+      <if test="pzmc != null" >
+         #{pzmc,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" resultType="java.lang.Integer" >
@@ -419,6 +519,46 @@
       <if test="record.grainProducingArea != null" >
         grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
       </if>
+      
+      <if test="record.lsxzzbdh != null" >
+        lsxzzbdh = #{record.lsxzzbdh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lssl != null" >
+        lssl = #{record.lssl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hzqlsxzdm != null" >
+        hzqlsxzdm = #{record.hzqlsxzdm,jdbcType=INTEGER},
+      </if>
+      <if test="record.hzrq != null" >
+        hzrq = #{record.hzrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.ccshr != null" >
+        ccshr = #{record.ccshr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zjshr != null" >
+        zjshr = #{record.zjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tjshr != null" >
+        tjshr = #{record.tjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.kjshr != null" >
+        kjshr = #{record.kjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ldshr != null" >
+        ldshr = #{record.ldshr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bz != null" >
+        bz = #{record.bz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditState != null" >
+        audit_state = #{record.auditState,jdbcType=INTEGER},
+      </if>
+      <if test="record.isNotice != null" >
+        is_notice = #{record.isNotice,jdbcType=INTEGER},
+      </if>
+      <if test="record.pzmc != null" >
+        pzmc = #{record.pzmc,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -453,7 +593,20 @@
       input_time = #{record.inputTime,jdbcType=TIMESTAMP},
       grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
       productive_year = #{record.productiveYear,jdbcType=INTEGER},
-      grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER}
+      grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
+      lsxzzbdh = #{record.lsxzzbdh,jdbcType=VARCHAR},
+      lssl = #{record.lssl,jdbcType=VARCHAR},
+      hzqlsxzdm = #{record.hzqlsxzdm,jdbcType=INTEGER},
+      hzrq = #{record.hzrq,jdbcType=TIMESTAMP},
+      ccshr = #{record.ccshr,jdbcType=VARCHAR},
+      zjshr = #{record.zjshr,jdbcType=VARCHAR},
+      tjshr = #{record.tjshr,jdbcType=VARCHAR},
+      kjshr = #{record.kjshr,jdbcType=VARCHAR},
+      ldshr = #{record.ldshr,jdbcType=VARCHAR},
+      bz = #{record.bz,jdbcType=VARCHAR},
+      audit_state = #{record.auditState,jdbcType=INTEGER},
+      is_notice = #{record.isNotice,jdbcType=INTEGER},
+      pzmc = #{record.pzmc,jdbcType=VARCHAR}
       
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -533,6 +686,46 @@
       <if test="grainProducingArea != null" >
         grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
       </if>
+      
+       <if test="lsxzzbdh != null" >
+        lsxzzbdh = #{lsxzzbdh,jdbcType=VARCHAR},
+      </if>
+      <if test="lssl != null" >
+        lssl = #{lssl,jdbcType=VARCHAR},
+      </if>
+      <if test="hzqlsxzdm != null" >
+        hzqlsxzdm = #{hzqlsxzdm,jdbcType=INTEGER},
+      </if>
+      <if test="hzrq != null" >
+        hzrq = #{hzrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ccshr != null" >
+        ccshr = #{ccshr,jdbcType=VARCHAR},
+      </if>
+      <if test="zjshr != null" >
+        zjshr = #{zjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="tjshr != null" >
+        tjshr = #{tjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="kjshr != null" >
+        kjshr = #{kjshr,jdbcType=VARCHAR},
+      </if>
+      <if test="ldshr != null" >
+        ldshr = #{ldshr,jdbcType=VARCHAR},
+      </if>
+      <if test="bz != null" >
+        bz = #{bz,jdbcType=VARCHAR},
+      </if>
+      <if test="auditState != null" >
+        audit_state = #{auditState,jdbcType=INTEGER},
+      </if>
+      <if test="isNotice != null" >
+        is_notice = #{isNotice,jdbcType=INTEGER},
+      </if>
+      <if test="pzmc != null" >
+        pzmc = #{pzmc,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -564,7 +757,36 @@
       input_time = #{inputTime,jdbcType=TIMESTAMP},
       grain_annual = #{grainAnnual,jdbcType=INTEGER},
       productive_year = #{productiveYear,jdbcType=INTEGER},
-      grain_producing_area = #{grainProducingArea,jdbcType=INTEGER}
+      grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
+      lsxzzbdh = #{lsxzzbdh,jdbcType=VARCHAR},
+      lssl = #{lssl,jdbcType=VARCHAR},
+      hzqlsxzdm = #{hzqlsxzdm,jdbcType=INTEGER},
+      hzrq = #{hzrq,jdbcType=TIMESTAMP},
+      ccshr = #{ccshr,jdbcType=VARCHAR},
+      zjshr = #{zjshr,jdbcType=VARCHAR},
+      tjshr = #{tjshr,jdbcType=VARCHAR},
+      kjshr = #{kjshr,jdbcType=VARCHAR},
+      ldshr = #{ldshr,jdbcType=VARCHAR},
+      bz = #{bz,jdbcType=VARCHAR},
+      audit_state = #{auditState,jdbcType=INTEGER},
+      is_notice = #{isNotice,jdbcType=INTEGER},
+      pzmc = #{pzmc,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  
+   <select id="getUserRole" parameterType="java.lang.Integer" resultType="java.util.HashMap">
+  		SELECT
+			role_name
+		FROM
+			role_info
+		WHERE
+			role_id IN (
+				SELECT
+					role_id
+				FROM
+					user_role
+				WHERE
+					user_id = #{userId,jdbcType=INTEGER}
+			)
+  </select>
 </mapper>

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

@@ -5,8 +5,130 @@ 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", 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;
+	  
+	
 	
-	    //业务字段
+	public String getPzmc() {
+		return pzmc;
+	}
+
+	public void setPzmc(String pzmc) {
+		this.pzmc = pzmc;
+	}
+
+	public Integer getIsNotice() {
+		return isNotice;
+	}
+
+	public void setIsNotice(Integer isNotice) {
+		this.isNotice = isNotice;
+	}
+
+	public String getLsxzzbdh() {
+		return lsxzzbdh;
+	}
+
+	public void setLsxzzbdh(String lsxzzbdh) {
+		this.lsxzzbdh = lsxzzbdh;
+	}
+
+	public String getLssl() {
+		return lssl;
+	}
+
+	public void setLssl(String lssl) {
+		this.lssl = lssl;
+	}
+
+	public Integer getHzqlsxzdm() {
+		return hzqlsxzdm;
+	}
+
+	public void setHzqlsxzdm(Integer hzqlsxzdm) {
+		this.hzqlsxzdm = hzqlsxzdm;
+	}
+
+	public Date getHzrq() {
+		return hzrq;
+	}
+
+	public void setHzrq(Date hzrq) {
+		this.hzrq = hzrq;
+	}
+
+	public String getCcshr() {
+		return ccshr;
+	}
+
+	public void setCcshr(String ccshr) {
+		this.ccshr = ccshr;
+	}
+
+	public String getZjshr() {
+		return zjshr;
+	}
+
+	public void setZjshr(String zjshr) {
+		this.zjshr = zjshr;
+	}
+
+	public String getTjshr() {
+		return tjshr;
+	}
+
+	public void setTjshr(String tjshr) {
+		this.tjshr = tjshr;
+	}
+
+	public String getKjshr() {
+		return kjshr;
+	}
+
+	public void setKjshr(String kjshr) {
+		this.kjshr = kjshr;
+	}
+
+	public String getLdshr() {
+		return ldshr;
+	}
+
+	public void setLdshr(String ldshr) {
+		this.ldshr = ldshr;
+	}
+
+	public String getBz() {
+		return bz;
+	}
+
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+
+	public Integer getAuditState() {
+		return auditState;
+	}
+
+	public void setAuditState(Integer auditState) {
+		this.auditState = auditState;
+	}
+
+		//业务字段
 		private String outCount;
 		private String outRemainingNumber;
 		private boolean checked;

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

@@ -195,6 +195,39 @@ public class BusinessNoticeReceiveExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
+        
+        
+        public Criteria andCcshrEqualTo(String value) {
+            addCriterion("ccshr =", value, "ccshr");
+            return (Criteria) this;
+        }
+        
+        public Criteria andZjshrEqualTo(String value) {
+            addCriterion("zjshr =", value, "zjshr");
+            return (Criteria) this;
+        }
+        public Criteria andTjshrEqualTo(String value) {
+            addCriterion("tjshr =", value, "tjshr");
+            return (Criteria) this;
+        }
+        public Criteria andKjshrEqualTo(String value) {
+            addCriterion("kjshr =", value, "kjshr");
+            return (Criteria) this;
+        }
+        public Criteria andLdshrEqualTo(String value) {
+            addCriterion("ldshr =", value, "ldshr");
+            return (Criteria) this;
+        }
+        public Criteria andAuditStateEqualTo(Integer value) {
+            addCriterion("audit_state =", value, "auditState");
+            return (Criteria) this;
+        }
+        public Criteria andIsNoticeEqualTo(Integer value) {
+            addCriterion("is_notice =", value, "isNotice");
+            return (Criteria) this;
+        }
+        
+        
         public Criteria andIdIsNull() {
             addCriterion("id is null");
             return (Criteria) this;

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

@@ -114,6 +114,18 @@ public class BusinessStoreWareDetail {
     private int expiredOrNot;//是否超过出入库期限 1是0否
     private String outboundExpirationDate;//出库期限(区间)
     
+    private String lsxzzbdh;
+    private String lssl;
+    private Integer hzqlsxzdm;
+    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;
     
     
     
@@ -121,8 +133,109 @@ public class BusinessStoreWareDetail {
     
     
     
+    
+    
+    
+    
+    
+
+    public String getLsxzzbdh() {
+		return lsxzzbdh;
+	}
+
+	public void setLsxzzbdh(String lsxzzbdh) {
+		this.lsxzzbdh = lsxzzbdh;
+	}
+
+	public String getLssl() {
+		return lssl;
+	}
+
+	public void setLssl(String lssl) {
+		this.lssl = lssl;
+	}
+
+	public Integer getHzqlsxzdm() {
+		return hzqlsxzdm;
+	}
+
+	public void setHzqlsxzdm(Integer hzqlsxzdm) {
+		this.hzqlsxzdm = hzqlsxzdm;
+	}
+
+	public Date getHzrq() {
+		return hzrq;
+	}
+
+	public void setHzrq(Date hzrq) {
+		this.hzrq = hzrq;
+	}
+
+	public String getCcshr() {
+		return ccshr;
+	}
+
+	public void setCcshr(String ccshr) {
+		this.ccshr = ccshr;
+	}
+
+	public String getZjshr() {
+		return zjshr;
+	}
+
+	public void setZjshr(String zjshr) {
+		this.zjshr = zjshr;
+	}
+
+	public String getTjshr() {
+		return tjshr;
+	}
+
+	public void setTjshr(String tjshr) {
+		this.tjshr = tjshr;
+	}
+
+	public String getKjshr() {
+		return kjshr;
+	}
+
+	public void setKjshr(String kjshr) {
+		this.kjshr = kjshr;
+	}
+
+	public String getLdshr() {
+		return ldshr;
+	}
+
+	public void setLdshr(String ldshr) {
+		this.ldshr = ldshr;
+	}
+
+	public String getBz() {
+		return bz;
+	}
+
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+
+	public Integer getAuditState() {
+		return auditState;
+	}
+
+	public void setAuditState(Integer auditState) {
+		this.auditState = auditState;
+	}
+
+	public Integer getIsNotice() {
+		return isNotice;
+	}
+
+	public void setIsNotice(Integer isNotice) {
+		this.isNotice = isNotice;
+	}
 
-    public String getOutboundExpirationDate() {
+	public String getOutboundExpirationDate() {
 		return outboundExpirationDate;
 	}
 

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

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.business.service;
 
+import com.chinaitop.depot.act.model.HistoryList;
 import com.chinaitop.depot.business.model.BusinessApproval;
 import com.chinaitop.depot.business.model.BusinessApprovalExample;
 
@@ -33,4 +34,7 @@ public interface BusinessApprovalService {
     //待办已办
 	List<BusinessApproval> queryByMap(Map<String, Object> map);
 
+	List<HistoryList> getAudit(Map<String, Object> modelMap);
+
+
 }

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

@@ -20,4 +20,12 @@ public interface FeignBasicService {
     @RequestMapping(value = "/Enum/getIdByNameAndParentId", method = RequestMethod.GET)
     Map<String, Object> getIdByNameAndParentId(@RequestParam(value = "parentId") Integer parentId,@RequestParam(value = "enumName") String enumName, @RequestParam(value = "gbCode") String gbCode);
 
+    
+    @RequestMapping(value = "/Warehouse/getHouseIdBySptDataID", method = RequestMethod.GET)
+    String getHouseIdBySptDataID(@RequestParam(value = "sptDataId") String sptDataId);
+    
+    @RequestMapping(value = "/Tank/getTankIdBySptDataID", method = RequestMethod.GET)
+    String getTankIdBySptDataID(@RequestParam(value = "sptDataId") String sptDataId);
+
+
 }

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

@@ -17,6 +17,14 @@ public interface ReceiveNoticeService {
 
 	Map<String, Object> receiveNotice(String notice) throws Exception;
 
-	
+	List<BusinessNoticeReceive> queryByExample(BusinessNoticeReceive businessNoticeReceive);
 
+	List<Map<String, String>> getUserRole(Integer userId);
+
+	void audit(BusinessNoticeReceive receiveNotice, Integer userId, String realName,String orgName,String content);
+
+	int queryIsOrAudit(String xybh, String sptDataId,Integer flag);
+
+	void saveDataRk(Map<String, Object> paramMap);
+			
 }

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

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.business.service.impl;
 
+import com.chinaitop.depot.act.model.HistoryList;
 import com.chinaitop.depot.business.mapper.BusinessApprovalMapper;
 import com.chinaitop.depot.business.model.BusinessApproval;
 import com.chinaitop.depot.business.model.BusinessApprovalExample;
@@ -57,4 +58,10 @@ public class BusinessApprovalServiceImpl implements BusinessApprovalService {
 		return businessApprovalMapper.queryByMap(map);
 	}
 
+	@Override
+	public List<HistoryList> getAudit(Map<String, Object> modelMap) {
+		// TODO Auto-generated method stub
+		return businessApprovalMapper.getAudit(modelMap);
+	}
+
 }

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

@@ -1,5 +1,7 @@
 package com.chinaitop.depot.business.service.impl;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -14,9 +16,11 @@ import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.business.mapper.BusinessNoticeReceiveMapper;
+import com.chinaitop.depot.business.model.BusinessApproval;
 import com.chinaitop.depot.business.model.BusinessNoticeReceive;
 import com.chinaitop.depot.business.model.BusinessNoticeReceiveExample;
 import com.chinaitop.depot.business.model.BusinessNoticeReceiveExample.Criteria;
+import com.chinaitop.depot.business.service.BusinessApprovalService;
 import com.chinaitop.depot.business.service.FeignAgileService;
 import com.chinaitop.depot.business.service.FeignBasicService;
 import com.chinaitop.depot.business.service.ReceiveNoticeService;
@@ -32,6 +36,11 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	private FeignBasicService feignBasicService;
 	@Resource
 	private FeignAgileService feignAgileService;
+	@Resource
+    private BusinessApprovalService businessApprovalService;
+    /*@Resource
+    private BusinessApprovalMapper approvalMapper;*/
+
 	
 	// 获取ip地址
     @Value("${crk-webservice}")
@@ -99,6 +108,14 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         if(businessNoticeReceive.getGrainGrade()!=null){
         	createCriteria.andGrainGradeEqualTo(businessNoticeReceive.getGrainGrade());
         }
+        //审批通过的
+        if(businessNoticeReceive.getAuditState() != null){
+        	createCriteria.andAuditStateEqualTo(businessNoticeReceive.getAuditState());
+        }
+        //是否是可以引用的通知单
+        if(businessNoticeReceive.getIsNotice()!=null){
+        	createCriteria.andIsNoticeEqualTo(businessNoticeReceive.getIsNotice());
+        }
         if(pageNum!=null && pageSize!=null){
         	PageHelper.startPage(pageNum, pageSize);
         }
@@ -215,6 +232,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                                 Integer grainGrade = (Integer) map.get("dj"); //等级
                                 String inputTime = map.get("rq")+""; //入库时间
                                 Integer scnf = Integer.parseInt(map.get("scnf")+"");
+                                Double kcsl = (Double) map.get("kcsl");//千克
                                 Date date = null;
                                 if(inputTime!=null){
                                     date = ParameterUtil.string2datetime(inputTime);
@@ -230,6 +248,20 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                                 businessNoticeReceive.setGrainGrade(grainGrade); //等级
                                 businessNoticeReceive.setGrainAttribute(grainAttribute); //粮油性质
                                 businessNoticeReceive.setGrainProducingArea(grainProducingArea);//产地
+                                
+                                /**
+                                 * 库存数量转化为吨
+                                 */
+                                BigDecimal s = new BigDecimal(1000);
+                                BigDecimal kcslBig = new BigDecimal(kcsl);
+                                BigDecimal kcslKg = kcslBig.multiply(s);
+                                
+                                businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
+                                
+                                businessNoticeReceive.setHzqlsxzdm(3052);//商品粮
+                                businessNoticeReceive.setLsxzzbdh(jsonObject.getString("tzdid"));
+                                //SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+                                businessNoticeReceive.setHzrq(new Date());
 
                             }
                             String  lsyqsl = jsonObject.getString("lsyqsl");
@@ -242,7 +274,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                             businessNoticeReceive.setOutgoingPeriod(jsonObject.getString("ckqx")); //出库期限(日期格式)
 
                             businessNoticeReceive.setInApplication(1); //启用
-
+                            businessNoticeReceive.setIsNotice(0);//0是可以引用的通知单
                             businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
                             businessNoticeReceiveMapper.insert(businessNoticeReceive);
                         }
@@ -305,4 +337,171 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		return modelMap;
 	}
 
+
+
+	@Override
+	public List<BusinessNoticeReceive> queryByExample(BusinessNoticeReceive businessNoticeReceive) {
+		// TODO Auto-generated method stub
+		
+		
+		BusinessNoticeReceiveExample example = new BusinessNoticeReceiveExample();
+        Criteria createCriteria = example.createCriteria();
+        
+        //仓房
+        if(businessNoticeReceive.getHouseId()!=null){
+        	createCriteria.andHouseIdEqualTo(businessNoticeReceive.getHouseId());
+        }
+        //货位
+        if(businessNoticeReceive.getWareHouseId()!=null){
+        	createCriteria.andWareHouseIdEqualTo(businessNoticeReceive.getWareHouseId());
+        }
+        
+      //货位
+        if(businessNoticeReceive.getOrgId()!=null){
+        	createCriteria.andOrgIdEqualTo(businessNoticeReceive.getOrgId());
+        }
+        
+        example.setOrderByClause("receive_time desc");
+        List<BusinessNoticeReceive> selectByExample = businessNoticeReceiveMapper.selectByExample(example);
+        return selectByExample;
+        
+	}
+
+
+
+	@Override
+	public List<Map<String, String>> getUserRole(Integer userId) {
+		// TODO Auto-generated method stub
+		return businessNoticeReceiveMapper.getUserRole(userId);
+	}
+
+
+
+	@Override
+	public void audit(BusinessNoticeReceive receiveNotice, Integer userId, String realName,String orgName,String content) {
+		// TODO Auto-generated method stub
+		
+        //businessApproval.setContent(jsonUserInfo.getString("realName") + "提交"); //提交人
+        
+		BusinessApproval businessApproval = new BusinessApproval();
+		businessApproval.setOperateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));//操作时间
+        businessApproval.setOperator(userId+"");//已选择的审批人id
+        businessApproval.setOperatorName(realName);//已选择的审批人姓名
+        businessApproval.setCreateTime(new Date()); //创建时间
+        businessApproval.setFromDepartment(orgName); //部门 orgName
+    	businessApproval.setProjectName("性质转变单审批");//名称
+        businessApproval.setTaskType("propertyTS");//任务类型
+    	businessApproval.setResult("同意");//审批结果
+    	businessApproval.setApplyTime(receiveNotice.getReceiveTime());//申请时间
+        businessApproval.setTaskTypeName(receiveNotice.getLsxzzbdh());//任务类型名
+        businessApproval.setIsHide(0);//
+        businessApproval.setContent(content);//审批意见
+        businessApproval.setProjectId(receiveNotice.getId());
+        if(receiveNotice.getAuditState().equals(0)){//仓储部审批
+        	//更改该条数据
+        	receiveNotice.setCcshr(userId+"");
+        	receiveNotice.setAuditState(1);
+        	businessNoticeReceiveMapper.updateByPrimaryKeySelective(receiveNotice);
+        	
+        	//审批表数据的新增
+            businessApproval.setTaskName("仓储部经理审批");//任务名称
+
+        }else{
+        	
+        	if(receiveNotice.getAuditState().equals(1)){//质检审批
+        		receiveNotice.setAuditState(2);
+        		receiveNotice.setZjshr(userId+"");
+        		businessApproval.setTaskName("质检部经理审批");//任务名称
+        		
+        	}else if(receiveNotice.getAuditState().equals(2)){//统计审批
+        		receiveNotice.setAuditState(3);
+        		receiveNotice.setTjshr(userId+"");
+        		businessApproval.setTaskName("统计部经理审批");//任务名称
+        		
+        	}else if(receiveNotice.getAuditState().equals(3)){//会计审批
+        		receiveNotice.setAuditState(4);
+        		receiveNotice.setKjshr(userId+"");
+        		businessApproval.setTaskName("会计部经理审批");//任务名称
+        	}else if(receiveNotice.getAuditState().equals(4)){//库领导审批
+        		receiveNotice.setAuditState(5);//审批完毕
+        		receiveNotice.setLdshr(userId+"");
+        		businessApproval.setTaskName("库领导审批");//任务名称
+        	}
+        	
+        	//修改本条数据
+        	businessNoticeReceiveMapper.updateByPrimaryKeySelective(receiveNotice);
+
+        }
+       //增加审批表数据
+    	businessApprovalService.add(businessApproval);
+        
+		
+	}
+
+
+
+	@Override
+	public int queryIsOrAudit(String xybh, String sptDataId,Integer flag) {
+		// TODO Auto-generated method stub
+		String houseId = "0";
+		if(flag.equals(0)){//油罐
+			 houseId =feignBasicService.getTankIdBySptDataID(sptDataId);
+		}else if(flag.equals(1)){//仓房
+			 houseId = feignBasicService.getHouseIdBySptDataID(sptDataId);
+		}
+		
+		//根据仓房或者油罐id 查询是否有为完成审批的性质转变单
+		BusinessNoticeReceiveExample example = new BusinessNoticeReceiveExample();
+        Criteria createCriteria = example.createCriteria();
+        createCriteria.andHouseIdEqualTo(Integer.valueOf(houseId));
+        createCriteria.andContractNumberEqualTo(xybh);
+        example.setOrderByClause("receive_time desc");
+        List<BusinessNoticeReceive> list = businessNoticeReceiveMapper.selectByExample(example);
+		if(list.size()>0 && !list.get(0).getAuditState().equals(5)){
+			return 0;//存在
+		}else{
+			return 1;//不存在
+		}
+		
+	}
+
+
+
+	@Override
+	public void saveDataRk(Map<String, Object> paramMap) {
+		// TODO Auto-generated method stub
+        
+		BusinessNoticeReceive businessNoticeReceive = new BusinessNoticeReceive();
+        String orgId = (String) paramMap.get("orgId");
+        Integer storehouseId =  (Integer) paramMap.get("storehouseId");
+        Integer warehouseId =  (Integer) paramMap.get("warehouseId");
+        String pzmc = (String) paramMap.get("pzmc");
+        String hzsl = (String) paramMap.get("hzsl");
+        String lsxzzbdh = (String) paramMap.get("lsxzzbdh");
+		Map<String, Object> map = feignAgileService.getDateByChHwh(Integer.valueOf(orgId), storehouseId, warehouseId);
+		Integer grainKind = (Integer) map.get("pz"); //品种
+        Double kcsl = (Double) map.get("kcsl");//千克
+        
+        businessNoticeReceive.setAuditState(0);//下发未审批
+        businessNoticeReceive.setIsNotice(1);//0是1否  是否是可以引用的通知单
+        businessNoticeReceive.setOrgId(Integer.valueOf(orgId));
+        businessNoticeReceive.setHouseId(storehouseId);
+        businessNoticeReceive.setWareHouseId(warehouseId);
+        businessNoticeReceive.setCount(hzsl);
+        businessNoticeReceive.setPzmc(pzmc);
+        businessNoticeReceive.setGrainKind(grainKind);
+        businessNoticeReceive.setGrainAttribute(3045); 
+        businessNoticeReceive.setHzqlsxzdm(3052);
+        businessNoticeReceive.setLsxzzbdh(lsxzzbdh);
+        businessNoticeReceive.setNoticeNumber(lsxzzbdh);
+        businessNoticeReceive.setCrktype("1"); //1入 3出
+        BigDecimal s = new BigDecimal(1000);
+        BigDecimal kcslBig = new BigDecimal(kcsl);
+        BigDecimal kcslKg = kcslBig.multiply(s);
+        businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
+        businessNoticeReceive.setHzrq(new Date());
+        businessNoticeReceiveMapper.insertSelective(businessNoticeReceive);
+		
+	}
+
 }

src/main/java/com/chinaitop/depot/utils/HelloServiceHystrix.java

@@ -85,4 +85,18 @@ public class HelloServiceHystrix implements FeignAgileService,FeignBasicService{
 		return null;
 	}
 
+	@Override
+	public String getHouseIdBySptDataID(String sptDataId) {
+		// TODO Auto-generated method stub
+		logger.info("获取仓房ID失败!");
+		return null;
+	}
+
+	@Override
+	public String getTankIdBySptDataID(String sptDataId) {
+		// TODO Auto-generated method stub
+		logger.info("获取油罐ID失败!");
+		return null;
+	}
+
 }