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

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

@@ -80,7 +80,9 @@ public class DatePermissionInterceptor implements Interceptor {
 						!"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())&&
-						!"com.chinaitop.depot.system.mapper.SysCodeMapper.selectByPrimaryKey".equals(mappedStatement.getId())
+						!"com.chinaitop.depot.system.mapper.SysCodeMapper.selectByPrimaryKey".equals(mappedStatement.getId())&&
+						!"com.chinaitop.depot.rp.mapper.BusinessRpReportMapper.selectRecListByPageParam".equals(mappedStatement.getId())&&
+						!"com.chinaitop.depot.rp.mapper.BusinessRpReportMapper.selectByPageParam".equals(mappedStatement.getId())
 						){
 					//解析sql中的表名
 					Statement statement = CCJSqlParserUtil.parse(bouString);

src/main/java/com/chinaitop/depot/act/controller/ActDynamicFormController.java

@@ -7,7 +7,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import org.activiti.engine.FormService;
 import org.activiti.engine.HistoryService;

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

@@ -2,22 +2,26 @@ package com.chinaitop.depot.business.controller;
 
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 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 org.springframework.web.client.RestTemplate;
 
+import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.act.service.ActTaskService;
 import com.chinaitop.depot.business.model.BusinessContract;
 import com.chinaitop.depot.business.model.BusinessContractExample;
@@ -64,6 +68,12 @@ public class BusinessContractController {
     @Autowired
     private BusinessDeliveryStorageNoticeService businessNoticeService;
     
+    @Autowired
+    private RestTemplate restTemplate;
+    
+    @Value("${customerUrl}")
+    private String customerUrl;
+    
     /**
      * 合同申请列表.
      * @param pageNum 页码
@@ -242,14 +252,21 @@ public class BusinessContractController {
 		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query")
 	})
     public Map<String, Object> edit(Integer id) {
-        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<String, Object> returnMap = new HashMap<String, Object>();
+        
         if (id != null) {
+        	
             BusinessContract contract = contractService.findById(id);
-            modelMap.put("contract", contract);
-            List<BusinessFile> fileList= businessFileService.getByBid(id, "contract", null, null);
-            modelMap.put("fileList", fileList);
+            returnMap.put("contract", contract);
+            
+            Map<String,Integer> paramMap = new HashMap<String, Integer>();
+            paramMap.put("id", contract.getCustomerBid());
+            
+            Object forObject =  restTemplate.getForEntity(customerUrl+""+contract.getCustomerBid(), Object.class);
+            returnMap.put("customer",forObject);
+            
         }
-        return modelMap;
+        return returnMap;
     }
     
     /**
@@ -520,7 +537,7 @@ public class BusinessContractController {
     	@ApiImplicitParam(name="depotInfoOrgId", value="当前登录人的组织id", paramType="form")
     })
     public Map<String, Object> save(String contractJson, String businessStoreWareDetailJson,
-            HttpServletRequest request,Integer userId,String realName,Integer depotInfoOrgId,String fileIds, String deleteFileIds) 
+            HttpServletRequest request,Integer userId,String realName,Integer depotInfoOrgId) 
             throws JsonParseException, JsonMappingException, IOException {
         Map<String, Object> modelMap = new HashMap<String, Object>();
     	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
@@ -541,7 +558,7 @@ public class BusinessContractController {
                 storeWareDetailList = (List<BusinessStoreWareDetail>)mapper.readValue(businessStoreWareDetailJson, new TypeReference<List<BusinessStoreWareDetail>>(){});
             }
             if (contract.getId() == null) {
-                Map<String, Object> returnMap = contractService.add(contract, storeWareDetailList,  userId, realName, depotInfoOrgId,fileIds);
+                Map<String, Object> returnMap = contractService.add(contract, storeWareDetailList,  userId, realName, depotInfoOrgId);
                 if (returnMap != null && returnMap.get("error") != null) {
                     modelMap.put("status", "error");
                     modelMap.put("msg", returnMap.get("error"));
@@ -549,7 +566,7 @@ public class BusinessContractController {
                 }
                 modelMap.put("id", returnMap.get("id"));
             } else {
-                contractService.update(contract, storeWareDetailList,fileIds,deleteFileIds);
+                contractService.update(contract, storeWareDetailList);
             }
             modelMap.put("status", "success");
         } catch (Exception e) {
@@ -670,7 +687,7 @@ public class BusinessContractController {
             if (contract.getId() == null) {
                 throw new RuntimeException("合同id为空，保存失败！");
             } else {
-                contractService.update(contract, storeWareDetailList,fileIds,deleteFileIds);
+                contractService.update(contract, storeWareDetailList);
             }
             modelMap.put("status", "success");
         } catch (Exception e) {

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

@@ -9,10 +9,12 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 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 org.springframework.web.client.RestTemplate;
 
 import com.chinaitop.depot.act.model.HistoryList;
 import com.chinaitop.depot.act.service.ActTaskService;
@@ -58,6 +60,12 @@ public class BusinessContractAuditController {
     @Autowired
     private BusinessFileService businessFileService;
     
+    @Autowired
+    private RestTemplate restTemplate;
+    
+    @Value("${customerUrl}")
+    private String customerUrl;
+    
     /**
      * 获取审批列表.
      * @param pageNum  页码
@@ -147,6 +155,11 @@ public class BusinessContractAuditController {
         Map<String, Object> modelMap = new HashMap<String, Object>();
         BusinessContract contract = businessContractService.findById(id);
         modelMap.put("contract", contract);
+        
+        //客户
+        Object forObject =  restTemplate.getForEntity(customerUrl+""+contract.getCustomerBid(), Object.class);
+        modelMap.put("customer",forObject);
+        
        // 获取对应的文件.
         List<BusinessFile> fileList= businessFileService.getByBid(id,"contract", null, null);
         

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

@@ -7,7 +7,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Mon Jun 29 19:30:27 CST 2020.
     -->
-    <id column="id" property="id" jdbcType="INTEGER" />
+    <!-- <id column="id" property="id" jdbcType="INTEGER" />
     <result column="contract_number" property="contractNumber" jdbcType="VARCHAR" />
     <result column="contract_title" property="contractTitle" jdbcType="VARCHAR" />
     <result column="customer_id" property="customerId" jdbcType="VARCHAR" />
@@ -63,7 +63,72 @@
     <result column="lybzj" property="lybzj" jdbcType="VARCHAR" />
     <result column="khqyr" property="khqyr" jdbcType="VARCHAR" />
     <result column="bfkhh" property="bfkhh" jdbcType="VARCHAR" />
+    <result column="bfzh" property="bfzh" jdbcType="VARCHAR" /> -->
+    
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="contract_number" property="contractNumber" jdbcType="VARCHAR" />
+    <result column="plan_bid" property="planBid" jdbcType="INTEGER" />
+    <result column="contract_title" property="contractTitle" jdbcType="VARCHAR" />
+    <result column="contract_type" property="contractType" jdbcType="INTEGER" />
+    <result column="signing_time" property="signingTime" jdbcType="DATE" />
+    <result column="qddd" property="qddd" jdbcType="VARCHAR" />
+    <result column="money_quantity" property="moneyQuantity" jdbcType="VARCHAR" />
+    <result column="lybzj" property="lybzj" jdbcType="VARCHAR" />
+    <result column="customer_bid" property="customerBid" jdbcType="INTEGER" />
+    <result column="grain_quantity" property="grainQuantity" jdbcType="DECIMAL" />
+    <result column="customer_id" property="customerId" jdbcType="VARCHAR" />
+    <result column="customer_number" property="customerNumber" jdbcType="VARCHAR" />
+    <result column="customer_name" property="customerName" jdbcType="VARCHAR" />
+    <result column="signing_man" property="signingMan" jdbcType="VARCHAR" />
+    <result column="enable_date" property="enableDate" jdbcType="TIMESTAMP" />
+    <result column="performance_quantity" property="performanceQuantity" jdbcType="DECIMAL" />
+    <result column="performance_rate" property="performanceRate" jdbcType="DECIMAL" />
+    <result column="settle_contract_uniformity" property="settleContractUniformity" jdbcType="TINYINT" />
+    <result column="settle_contract_uniformity_reason" property="settleContractUniformityReason" jdbcType="VARCHAR" />
+    <result column="sign_comple_time" property="signCompleTime" jdbcType="TIMESTAMP" />
+    <result column="purchase_unit" property="purchaseUnit" jdbcType="VARCHAR" />
+    <result column="disable_date" property="disableDate" jdbcType="TIMESTAMP" />
+    <result column="original_contract" property="originalContract" jdbcType="VARCHAR" />
+    <result column="original_contract_bid" property="originalContractBid" jdbcType="INTEGER" />
+    <result column="root_contract_bid" property="rootContractBid" jdbcType="INTEGER" />
+    <result column="shipping_type" property="shippingType" jdbcType="INTEGER" />
+    <result column="contract_pay_type" property="contractPayType" jdbcType="INTEGER" />
+    <result column="finished_quantity" property="finishedQuantity" jdbcType="VARCHAR" />
+    <result column="money_of_finished_quantity" property="moneyOfFinishedQuantity" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="plant_acreage" property="plantAcreage" jdbcType="VARCHAR" />
+    <result column="plan_number" property="planNumber" jdbcType="VARCHAR" />
+    <result column="mobile" property="mobile" jdbcType="VARCHAR" />
+    <result column="bank_name" property="bankName" jdbcType="VARCHAR" />
+    <result column="account_name" property="accountName" jdbcType="VARCHAR" />
+    <result column="account_number" property="accountNumber" jdbcType="VARCHAR" />
+    <result column="breach_liability" property="breachLiability" jdbcType="VARCHAR" />
+    <result column="dissolution_conditions" property="dissolutionConditions" jdbcType="VARCHAR" />
+    <result column="identification" property="identification" jdbcType="VARCHAR" />
+    <result column="khqyr" property="khqyr" jdbcType="VARCHAR" />
+    <result column="bfkhh" property="bfkhh" jdbcType="VARCHAR" />
     <result column="bfzh" property="bfzh" jdbcType="VARCHAR" />
+    <result column="dispute_settlement_method" property="disputeSettlementMethod" jdbcType="VARCHAR" />
+    <result column="change_record_flag" property="changeRecordFlag" jdbcType="VARCHAR" />
+    <result column="change_reason" property="changeReason" jdbcType="VARCHAR" />
+    <result column="change_time" property="changeTime" jdbcType="TIMESTAMP" />
+    <result column="change_content" property="changeContent" jdbcType="VARCHAR" />
+    <result column="changing" property="changing" jdbcType="VARCHAR" />
+    <result column="audit_state" property="auditState" jdbcType="VARCHAR" />
+    <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR" />
+    <result column="process_definition_id" property="processDefinitionId" jdbcType="VARCHAR" />
+    <result column="agree_time" property="agreeTime" jdbcType="TIMESTAMP" />
+    <result column="create_man" property="createMan" jdbcType="VARCHAR" />
+    <result column="creater" property="creater" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="create_unit" property="createUnit" jdbcType="VARCHAR" />
+    <result column="create_depot" property="createDepot" jdbcType="VARCHAR" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="in_application" property="inApplication" jdbcType="INTEGER" />
+    <result column="creater_id" property="createrId" jdbcType="INTEGER" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+    <result column="attachment" property="attachment" jdbcType="VARCHAR" />
     
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -140,16 +205,18 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Mon Jun 29 19:30:27 CST 2020.
     -->
-    id, contract_number, contract_title, customer_id, customer_bid, customer_number, 
-    customer_name, grain_quantity, money_quantity, signing_man, signing_time, enable_date, 
-    disable_date, contract_type, original_contract, original_contract_bid, root_contract_bid, 
+    id, contract_number, plan_bid, contract_title, contract_type, signing_time, qddd, 
+    money_quantity, lybzj, customer_bid, grain_quantity, customer_id, customer_number, 
+    customer_name, signing_man, enable_date, performance_quantity, performance_rate, 
+    settle_contract_uniformity, settle_contract_uniformity_reason, sign_comple_time, 
+    purchase_unit, disable_date, original_contract, original_contract_bid, root_contract_bid, 
     shipping_type, contract_pay_type, finished_quantity, money_of_finished_quantity, 
     remark, plant_acreage, plan_number, mobile, bank_name, account_name, account_number, 
-    breach_liability, dissolution_conditions, dispute_settlement_method, change_record_flag, 
-    change_reason, change_time, change_content, changing, plan_bid, audit_state, process_instance_id, 
-    process_definition_id, agree_time, create_man, creater, create_time, create_unit, 
-    create_depot, update_time, org_id, in_application, creater_id, identification, updatetime, 
-    qddd, lybzj, khqyr, bfkhh, bfzh
+    breach_liability, dissolution_conditions, identification, khqyr, bfkhh, bfzh, dispute_settlement_method, 
+    change_record_flag, change_reason, change_time, change_content, changing, audit_state, 
+    process_instance_id, process_definition_id, agree_time, create_man, creater, create_time, 
+    create_unit, create_depot, update_time, org_id, in_application, creater_id, updatetime, 
+    attachment
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessContractExample" >
     <!--
@@ -202,58 +269,54 @@
     </if>
   </delete>
   <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.business.model.BusinessContract" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 29 19:30:27 CST 2020.
-    -->
-    insert into business_contract (id, contract_number, contract_title, 
-      customer_id, customer_bid, customer_number, 
-      customer_name, grain_quantity, money_quantity, 
-      signing_man, signing_time, enable_date, 
-      disable_date, contract_type, original_contract, 
-      original_contract_bid, root_contract_bid, shipping_type, 
-      contract_pay_type, finished_quantity, money_of_finished_quantity, 
+    insert into business_contract (id, contract_number, plan_bid, 
+      contract_title, contract_type, signing_time, 
+      qddd, money_quantity, lybzj, 
+      customer_bid, grain_quantity, customer_id, 
+      customer_number, customer_name, signing_man, 
+      enable_date, performance_quantity, performance_rate, 
+      settle_contract_uniformity, settle_contract_uniformity_reason, 
+      sign_comple_time, purchase_unit, disable_date, 
+      original_contract, original_contract_bid, 
+      root_contract_bid, shipping_type, contract_pay_type, 
+      finished_quantity, money_of_finished_quantity, 
       remark, plant_acreage, plan_number, 
       mobile, bank_name, account_name, 
       account_number, breach_liability, dissolution_conditions, 
-      dispute_settlement_method, change_record_flag, 
+      identification, khqyr, bfkhh, 
+      bfzh, dispute_settlement_method, change_record_flag, 
       change_reason, change_time, change_content, 
-      changing, plan_bid, audit_state, 
-      process_instance_id, process_definition_id, 
-      agree_time, create_man, creater, 
-      create_time, create_unit, create_depot, 
-      update_time, org_id, in_application, 
-      creater_id, identification, updatetime, 
-      qddd, lybzj, khqyr, 
-      bfkhh, bfzh)
-    values (#{id,jdbcType=INTEGER}, #{contractNumber,jdbcType=VARCHAR}, #{contractTitle,jdbcType=VARCHAR}, 
-      #{customerId,jdbcType=VARCHAR}, #{customerBid,jdbcType=INTEGER}, #{customerNumber,jdbcType=VARCHAR}, 
-      #{customerName,jdbcType=VARCHAR}, #{grainQuantity,jdbcType=VARCHAR}, #{moneyQuantity,jdbcType=VARCHAR}, 
-      #{signingMan,jdbcType=VARCHAR}, #{signingTime,jdbcType=TIMESTAMP}, #{enableDate,jdbcType=TIMESTAMP}, 
-      #{disableDate,jdbcType=TIMESTAMP}, #{contractType,jdbcType=INTEGER}, #{originalContract,jdbcType=VARCHAR}, 
-      #{originalContractBid,jdbcType=INTEGER}, #{rootContractBid,jdbcType=INTEGER}, #{shippingType,jdbcType=INTEGER}, 
-      #{contractPayType,jdbcType=INTEGER}, #{finishedQuantity,jdbcType=VARCHAR}, #{moneyOfFinishedQuantity,jdbcType=VARCHAR}, 
+      changing, audit_state, process_instance_id, 
+      process_definition_id, agree_time, create_man, 
+      creater, create_time, create_unit, 
+      create_depot, update_time, org_id, 
+      in_application, creater_id, updatetime, 
+      attachment)
+    values (#{id,jdbcType=INTEGER}, #{contractNumber,jdbcType=VARCHAR}, #{planBid,jdbcType=INTEGER}, 
+      #{contractTitle,jdbcType=VARCHAR}, #{contractType,jdbcType=INTEGER}, #{signingTime,jdbcType=DATE}, 
+      #{qddd,jdbcType=VARCHAR}, #{moneyQuantity,jdbcType=VARCHAR}, #{lybzj,jdbcType=VARCHAR}, 
+      #{customerBid,jdbcType=INTEGER}, #{grainQuantity,jdbcType=DECIMAL}, #{customerId,jdbcType=VARCHAR}, 
+      #{customerNumber,jdbcType=VARCHAR}, #{customerName,jdbcType=VARCHAR}, #{signingMan,jdbcType=VARCHAR}, 
+      #{enableDate,jdbcType=TIMESTAMP}, #{performanceQuantity,jdbcType=DECIMAL}, #{performanceRate,jdbcType=DECIMAL}, 
+      #{settleContractUniformity,jdbcType=TINYINT}, #{settleContractUniformityReason,jdbcType=VARCHAR}, 
+      #{signCompleTime,jdbcType=TIMESTAMP}, #{purchaseUnit,jdbcType=VARCHAR}, #{disableDate,jdbcType=TIMESTAMP}, 
+      #{originalContract,jdbcType=VARCHAR}, #{originalContractBid,jdbcType=INTEGER}, 
+      #{rootContractBid,jdbcType=INTEGER}, #{shippingType,jdbcType=INTEGER}, #{contractPayType,jdbcType=INTEGER}, 
+      #{finishedQuantity,jdbcType=VARCHAR}, #{moneyOfFinishedQuantity,jdbcType=VARCHAR}, 
       #{remark,jdbcType=VARCHAR}, #{plantAcreage,jdbcType=VARCHAR}, #{planNumber,jdbcType=VARCHAR}, 
       #{mobile,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, #{accountName,jdbcType=VARCHAR}, 
       #{accountNumber,jdbcType=VARCHAR}, #{breachLiability,jdbcType=VARCHAR}, #{dissolutionConditions,jdbcType=VARCHAR}, 
-      #{disputeSettlementMethod,jdbcType=VARCHAR}, #{changeRecordFlag,jdbcType=VARCHAR}, 
+      #{identification,jdbcType=VARCHAR}, #{khqyr,jdbcType=VARCHAR}, #{bfkhh,jdbcType=VARCHAR}, 
+      #{bfzh,jdbcType=VARCHAR}, #{disputeSettlementMethod,jdbcType=VARCHAR}, #{changeRecordFlag,jdbcType=VARCHAR}, 
       #{changeReason,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, #{changeContent,jdbcType=VARCHAR}, 
-      #{changing,jdbcType=VARCHAR}, #{planBid,jdbcType=INTEGER}, #{auditState,jdbcType=VARCHAR}, 
-      #{processInstanceId,jdbcType=VARCHAR}, #{processDefinitionId,jdbcType=VARCHAR}, 
-      #{agreeTime,jdbcType=TIMESTAMP}, #{createMan,jdbcType=VARCHAR}, #{creater,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{createUnit,jdbcType=VARCHAR}, #{createDepot,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{inApplication,jdbcType=INTEGER}, 
-      #{createrId,jdbcType=INTEGER}, #{identification,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, 
-      #{qddd,jdbcType=VARCHAR}, #{lybzj,jdbcType=VARCHAR}, #{khqyr,jdbcType=VARCHAR}, 
-      #{bfkhh,jdbcType=VARCHAR}, #{bfzh,jdbcType=VARCHAR})
+      #{changing,jdbcType=VARCHAR}, #{auditState,jdbcType=VARCHAR}, #{processInstanceId,jdbcType=VARCHAR}, 
+      #{processDefinitionId,jdbcType=VARCHAR}, #{agreeTime,jdbcType=TIMESTAMP}, #{createMan,jdbcType=VARCHAR}, 
+      #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUnit,jdbcType=VARCHAR}, 
+      #{createDepot,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, 
+      #{inApplication,jdbcType=INTEGER}, #{createrId,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}, 
+      #{attachment,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessContract" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 29 19:30:27 CST 2020.
-    -->
     insert into business_contract
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -262,42 +325,69 @@
       <if test="contractNumber != null" >
         contract_number,
       </if>
+      <if test="planBid != null" >
+        plan_bid,
+      </if>
       <if test="contractTitle != null" >
         contract_title,
       </if>
-      <if test="customerId != null" >
-        customer_id,
+      <if test="contractType != null" >
+        contract_type,
+      </if>
+      <if test="signingTime != null" >
+        signing_time,
+      </if>
+      <if test="qddd != null" >
+        qddd,
+      </if>
+      <if test="moneyQuantity != null" >
+        money_quantity,
+      </if>
+      <if test="lybzj != null" >
+        lybzj,
       </if>
       <if test="customerBid != null" >
         customer_bid,
       </if>
+      <if test="grainQuantity != null" >
+        grain_quantity,
+      </if>
+      <if test="customerId != null" >
+        customer_id,
+      </if>
       <if test="customerNumber != null" >
         customer_number,
       </if>
       <if test="customerName != null" >
         customer_name,
       </if>
-      <if test="grainQuantity != null" >
-        grain_quantity,
-      </if>
-      <if test="moneyQuantity != null" >
-        money_quantity,
-      </if>
       <if test="signingMan != null" >
         signing_man,
       </if>
-      <if test="signingTime != null" >
-        signing_time,
-      </if>
       <if test="enableDate != null" >
         enable_date,
       </if>
+      <if test="performanceQuantity != null" >
+        performance_quantity,
+      </if>
+      <if test="performanceRate != null" >
+        performance_rate,
+      </if>
+      <if test="settleContractUniformity != null" >
+        settle_contract_uniformity,
+      </if>
+      <if test="settleContractUniformityReason != null" >
+        settle_contract_uniformity_reason,
+      </if>
+      <if test="signCompleTime != null" >
+        sign_comple_time,
+      </if>
+      <if test="purchaseUnit != null" >
+        purchase_unit,
+      </if>
       <if test="disableDate != null" >
         disable_date,
       </if>
-      <if test="contractType != null" >
-        contract_type,
-      </if>
       <if test="originalContract != null" >
         original_contract,
       </if>
@@ -346,6 +436,18 @@
       <if test="dissolutionConditions != null" >
         dissolution_conditions,
       </if>
+      <if test="identification != null" >
+        identification,
+      </if>
+      <if test="khqyr != null" >
+        khqyr,
+      </if>
+      <if test="bfkhh != null" >
+        bfkhh,
+      </if>
+      <if test="bfzh != null" >
+        bfzh,
+      </if>
       <if test="disputeSettlementMethod != null" >
         dispute_settlement_method,
       </if>
@@ -364,9 +466,6 @@
       <if test="changing != null" >
         changing,
       </if>
-      <if test="planBid != null" >
-        plan_bid,
-      </if>
       <if test="auditState != null" >
         audit_state,
       </if>
@@ -406,28 +505,12 @@
       <if test="createrId != null" >
         creater_id,
       </if>
-      <if test="identification != null" >
-        identification,
-      </if>
       <if test="updatetime != null" >
         updatetime,
       </if>
-      <if test="qddd != null" >
-        qddd,
+      <if test="attachment != null" >
+        attachment,
       </if>
-      <if test="lybzj != null" >
-        lybzj,
-      </if>
-      <if test="khqyr != null" >
-        khqyr,
-      </if>
-      <if test="bfkhh != null" >
-        bfkhh,
-      </if>
-      <if test="bfzh != null" >
-        bfzh,
-      </if>
-      
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -436,42 +519,69 @@
       <if test="contractNumber != null" >
         #{contractNumber,jdbcType=VARCHAR},
       </if>
+      <if test="planBid != null" >
+        #{planBid,jdbcType=INTEGER},
+      </if>
       <if test="contractTitle != null" >
         #{contractTitle,jdbcType=VARCHAR},
       </if>
-      <if test="customerId != null" >
-        #{customerId,jdbcType=VARCHAR},
+      <if test="contractType != null" >
+        #{contractType,jdbcType=INTEGER},
+      </if>
+      <if test="signingTime != null" >
+        #{signingTime,jdbcType=DATE},
+      </if>
+      <if test="qddd != null" >
+        #{qddd,jdbcType=VARCHAR},
+      </if>
+      <if test="moneyQuantity != null" >
+        #{moneyQuantity,jdbcType=VARCHAR},
+      </if>
+      <if test="lybzj != null" >
+        #{lybzj,jdbcType=VARCHAR},
       </if>
       <if test="customerBid != null" >
         #{customerBid,jdbcType=INTEGER},
       </if>
+      <if test="grainQuantity != null" >
+        #{grainQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="customerId != null" >
+        #{customerId,jdbcType=VARCHAR},
+      </if>
       <if test="customerNumber != null" >
         #{customerNumber,jdbcType=VARCHAR},
       </if>
       <if test="customerName != null" >
         #{customerName,jdbcType=VARCHAR},
       </if>
-      <if test="grainQuantity != null" >
-        #{grainQuantity,jdbcType=VARCHAR},
-      </if>
-      <if test="moneyQuantity != null" >
-        #{moneyQuantity,jdbcType=VARCHAR},
-      </if>
       <if test="signingMan != null" >
         #{signingMan,jdbcType=VARCHAR},
       </if>
-      <if test="signingTime != null" >
-        #{signingTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="enableDate != null" >
         #{enableDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="performanceQuantity != null" >
+        #{performanceQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="performanceRate != null" >
+        #{performanceRate,jdbcType=DECIMAL},
+      </if>
+      <if test="settleContractUniformity != null" >
+        #{settleContractUniformity,jdbcType=TINYINT},
+      </if>
+      <if test="settleContractUniformityReason != null" >
+        #{settleContractUniformityReason,jdbcType=VARCHAR},
+      </if>
+      <if test="signCompleTime != null" >
+        #{signCompleTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="purchaseUnit != null" >
+        #{purchaseUnit,jdbcType=VARCHAR},
+      </if>
       <if test="disableDate != null" >
         #{disableDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="contractType != null" >
-        #{contractType,jdbcType=INTEGER},
-      </if>
       <if test="originalContract != null" >
         #{originalContract,jdbcType=VARCHAR},
       </if>
@@ -520,6 +630,18 @@
       <if test="dissolutionConditions != null" >
         #{dissolutionConditions,jdbcType=VARCHAR},
       </if>
+      <if test="identification != null" >
+        #{identification,jdbcType=VARCHAR},
+      </if>
+      <if test="khqyr != null" >
+        #{khqyr,jdbcType=VARCHAR},
+      </if>
+      <if test="bfkhh != null" >
+        #{bfkhh,jdbcType=VARCHAR},
+      </if>
+      <if test="bfzh != null" >
+        #{bfzh,jdbcType=VARCHAR},
+      </if>
       <if test="disputeSettlementMethod != null" >
         #{disputeSettlementMethod,jdbcType=VARCHAR},
       </if>
@@ -538,9 +660,6 @@
       <if test="changing != null" >
         #{changing,jdbcType=VARCHAR},
       </if>
-      <if test="planBid != null" >
-        #{planBid,jdbcType=INTEGER},
-      </if>
       <if test="auditState != null" >
         #{auditState,jdbcType=VARCHAR},
       </if>
@@ -580,28 +699,12 @@
       <if test="createrId != null" >
         #{createrId,jdbcType=INTEGER},
       </if>
-      <if test="identification != null" >
-        #{identification,jdbcType=VARCHAR},
-      </if>
       <if test="updatetime != null" >
         #{updatetime,jdbcType=TIMESTAMP},
       </if>
-      <if test="qddd != null" >
-        #{qddd,jdbcType=VARCHAR},
-      </if>
-      <if test="lybzj != null" >
-        #{lybzj,jdbcType=VARCHAR},
-      </if>
-      <if test="khqyr != null" >
-        #{khqyr,jdbcType=VARCHAR},
-      </if>
-      <if test="bfkhh != null" >
-        #{bfkhh,jdbcType=VARCHAR},
-      </if>
-      <if test="bfzh != null" >
-        #{bfzh,jdbcType=VARCHAR},
+      <if test="attachment != null" >
+        #{attachment,jdbcType=VARCHAR},
       </if>
-      
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessContractExample" resultType="java.lang.Integer" >
@@ -616,11 +719,6 @@
     </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 Mon Jun 29 19:30:27 CST 2020.
-    -->
     update business_contract
     <set >
       <if test="record.id != null" >
@@ -629,42 +727,69 @@
       <if test="record.contractNumber != null" >
         contract_number = #{record.contractNumber,jdbcType=VARCHAR},
       </if>
+      <if test="record.planBid != null" >
+        plan_bid = #{record.planBid,jdbcType=INTEGER},
+      </if>
       <if test="record.contractTitle != null" >
         contract_title = #{record.contractTitle,jdbcType=VARCHAR},
       </if>
-      <if test="record.customerId != null" >
-        customer_id = #{record.customerId,jdbcType=VARCHAR},
+      <if test="record.contractType != null" >
+        contract_type = #{record.contractType,jdbcType=INTEGER},
+      </if>
+      <if test="record.signingTime != null" >
+        signing_time = #{record.signingTime,jdbcType=DATE},
+      </if>
+      <if test="record.qddd != null" >
+        qddd = #{record.qddd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.moneyQuantity != null" >
+        money_quantity = #{record.moneyQuantity,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lybzj != null" >
+        lybzj = #{record.lybzj,jdbcType=VARCHAR},
       </if>
       <if test="record.customerBid != null" >
         customer_bid = #{record.customerBid,jdbcType=INTEGER},
       </if>
+      <if test="record.grainQuantity != null" >
+        grain_quantity = #{record.grainQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="record.customerId != null" >
+        customer_id = #{record.customerId,jdbcType=VARCHAR},
+      </if>
       <if test="record.customerNumber != null" >
         customer_number = #{record.customerNumber,jdbcType=VARCHAR},
       </if>
       <if test="record.customerName != null" >
         customer_name = #{record.customerName,jdbcType=VARCHAR},
       </if>
-      <if test="record.grainQuantity != null" >
-        grain_quantity = #{record.grainQuantity,jdbcType=VARCHAR},
-      </if>
-      <if test="record.moneyQuantity != null" >
-        money_quantity = #{record.moneyQuantity,jdbcType=VARCHAR},
-      </if>
       <if test="record.signingMan != null" >
         signing_man = #{record.signingMan,jdbcType=VARCHAR},
       </if>
-      <if test="record.signingTime != null" >
-        signing_time = #{record.signingTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="record.enableDate != null" >
         enable_date = #{record.enableDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.performanceQuantity != null" >
+        performance_quantity = #{record.performanceQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="record.performanceRate != null" >
+        performance_rate = #{record.performanceRate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.settleContractUniformity != null" >
+        settle_contract_uniformity = #{record.settleContractUniformity,jdbcType=TINYINT},
+      </if>
+      <if test="record.settleContractUniformityReason != null" >
+        settle_contract_uniformity_reason = #{record.settleContractUniformityReason,jdbcType=VARCHAR},
+      </if>
+      <if test="record.signCompleTime != null" >
+        sign_comple_time = #{record.signCompleTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.purchaseUnit != null" >
+        purchase_unit = #{record.purchaseUnit,jdbcType=VARCHAR},
+      </if>
       <if test="record.disableDate != null" >
         disable_date = #{record.disableDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.contractType != null" >
-        contract_type = #{record.contractType,jdbcType=INTEGER},
-      </if>
       <if test="record.originalContract != null" >
         original_contract = #{record.originalContract,jdbcType=VARCHAR},
       </if>
@@ -713,6 +838,18 @@
       <if test="record.dissolutionConditions != null" >
         dissolution_conditions = #{record.dissolutionConditions,jdbcType=VARCHAR},
       </if>
+      <if test="record.identification != null" >
+        identification = #{record.identification,jdbcType=VARCHAR},
+      </if>
+      <if test="record.khqyr != null" >
+        khqyr = #{record.khqyr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bfkhh != null" >
+        bfkhh = #{record.bfkhh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bfzh != null" >
+        bfzh = #{record.bfzh,jdbcType=VARCHAR},
+      </if>
       <if test="record.disputeSettlementMethod != null" >
         dispute_settlement_method = #{record.disputeSettlementMethod,jdbcType=VARCHAR},
       </if>
@@ -731,9 +868,6 @@
       <if test="record.changing != null" >
         changing = #{record.changing,jdbcType=VARCHAR},
       </if>
-      <if test="record.planBid != null" >
-        plan_bid = #{record.planBid,jdbcType=INTEGER},
-      </if>
       <if test="record.auditState != null" >
         audit_state = #{record.auditState,jdbcType=VARCHAR},
       </if>
@@ -773,54 +907,42 @@
       <if test="record.createrId != null" >
         creater_id = #{record.createrId,jdbcType=INTEGER},
       </if>
-      <if test="record.identification != null" >
-        identification = #{record.identification,jdbcType=VARCHAR},
-      </if>
       <if test="record.updatetime != null" >
         updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.qddd != null" >
-        qddd = #{record.qddd,jdbcType=VARCHAR},
+      <if test="record.attachment != null" >
+        attachment = #{record.attachment,jdbcType=VARCHAR},
       </if>
-      <if test="record.lybzj != null" >
-        lybzj = #{record.lybzj,jdbcType=VARCHAR},
-      </if>
-      <if test="record.khqyr != null" >
-        khqyr = #{record.khqyr,jdbcType=VARCHAR},
-      </if>
-      <if test="record.bfkhh != null" >
-        bfkhh = #{record.bfkhh,jdbcType=VARCHAR},
-      </if>
-      <if test="record.bfzh != null" >
-        bfzh = #{record.bfzh,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 Mon Jun 29 19:30:27 CST 2020.
-    -->
     update business_contract
     set id = #{record.id,jdbcType=INTEGER},
       contract_number = #{record.contractNumber,jdbcType=VARCHAR},
+      plan_bid = #{record.planBid,jdbcType=INTEGER},
       contract_title = #{record.contractTitle,jdbcType=VARCHAR},
-      customer_id = #{record.customerId,jdbcType=VARCHAR},
+      contract_type = #{record.contractType,jdbcType=INTEGER},
+      signing_time = #{record.signingTime,jdbcType=DATE},
+      qddd = #{record.qddd,jdbcType=VARCHAR},
+      money_quantity = #{record.moneyQuantity,jdbcType=VARCHAR},
+      lybzj = #{record.lybzj,jdbcType=VARCHAR},
       customer_bid = #{record.customerBid,jdbcType=INTEGER},
+      grain_quantity = #{record.grainQuantity,jdbcType=DECIMAL},
+      customer_id = #{record.customerId,jdbcType=VARCHAR},
       customer_number = #{record.customerNumber,jdbcType=VARCHAR},
       customer_name = #{record.customerName,jdbcType=VARCHAR},
-      grain_quantity = #{record.grainQuantity,jdbcType=VARCHAR},
-      money_quantity = #{record.moneyQuantity,jdbcType=VARCHAR},
       signing_man = #{record.signingMan,jdbcType=VARCHAR},
-      signing_time = #{record.signingTime,jdbcType=TIMESTAMP},
       enable_date = #{record.enableDate,jdbcType=TIMESTAMP},
+      performance_quantity = #{record.performanceQuantity,jdbcType=DECIMAL},
+      performance_rate = #{record.performanceRate,jdbcType=DECIMAL},
+      settle_contract_uniformity = #{record.settleContractUniformity,jdbcType=TINYINT},
+      settle_contract_uniformity_reason = #{record.settleContractUniformityReason,jdbcType=VARCHAR},
+      sign_comple_time = #{record.signCompleTime,jdbcType=TIMESTAMP},
+      purchase_unit = #{record.purchaseUnit,jdbcType=VARCHAR},
       disable_date = #{record.disableDate,jdbcType=TIMESTAMP},
-      contract_type = #{record.contractType,jdbcType=INTEGER},
       original_contract = #{record.originalContract,jdbcType=VARCHAR},
       original_contract_bid = #{record.originalContractBid,jdbcType=INTEGER},
       root_contract_bid = #{record.rootContractBid,jdbcType=INTEGER},
@@ -837,13 +959,16 @@
       account_number = #{record.accountNumber,jdbcType=VARCHAR},
       breach_liability = #{record.breachLiability,jdbcType=VARCHAR},
       dissolution_conditions = #{record.dissolutionConditions,jdbcType=VARCHAR},
+      identification = #{record.identification,jdbcType=VARCHAR},
+      khqyr = #{record.khqyr,jdbcType=VARCHAR},
+      bfkhh = #{record.bfkhh,jdbcType=VARCHAR},
+      bfzh = #{record.bfzh,jdbcType=VARCHAR},
       dispute_settlement_method = #{record.disputeSettlementMethod,jdbcType=VARCHAR},
       change_record_flag = #{record.changeRecordFlag,jdbcType=VARCHAR},
       change_reason = #{record.changeReason,jdbcType=VARCHAR},
       change_time = #{record.changeTime,jdbcType=TIMESTAMP},
       change_content = #{record.changeContent,jdbcType=VARCHAR},
       changing = #{record.changing,jdbcType=VARCHAR},
-      plan_bid = #{record.planBid,jdbcType=INTEGER},
       audit_state = #{record.auditState,jdbcType=VARCHAR},
       process_instance_id = #{record.processInstanceId,jdbcType=VARCHAR},
       process_definition_id = #{record.processDefinitionId,jdbcType=VARCHAR},
@@ -857,65 +982,81 @@
       org_id = #{record.orgId,jdbcType=INTEGER},
       in_application = #{record.inApplication,jdbcType=INTEGER},
       creater_id = #{record.createrId,jdbcType=INTEGER},
-      identification = #{record.identification,jdbcType=VARCHAR},
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      qddd = #{record.qddd,jdbcType=VARCHAR},
-      lybzj = #{record.lybzj,jdbcType=VARCHAR},
-      khqyr = #{record.khqyr,jdbcType=VARCHAR},
-      bfkhh = #{record.bfkhh,jdbcType=VARCHAR},
-      bfzh = #{record.bfzh,jdbcType=VARCHAR}
-      
+      attachment = #{record.attachment,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessContract" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 29 19:30:27 CST 2020.
-    -->
     update business_contract
     <set >
       <if test="contractNumber != null" >
         contract_number = #{contractNumber,jdbcType=VARCHAR},
       </if>
+      <if test="planBid != null" >
+        plan_bid = #{planBid,jdbcType=INTEGER},
+      </if>
       <if test="contractTitle != null" >
         contract_title = #{contractTitle,jdbcType=VARCHAR},
       </if>
-      <if test="customerId != null" >
-        customer_id = #{customerId,jdbcType=VARCHAR},
+      <if test="contractType != null" >
+        contract_type = #{contractType,jdbcType=INTEGER},
+      </if>
+      <if test="signingTime != null" >
+        signing_time = #{signingTime,jdbcType=DATE},
+      </if>
+      <if test="qddd != null" >
+        qddd = #{qddd,jdbcType=VARCHAR},
+      </if>
+      <if test="moneyQuantity != null" >
+        money_quantity = #{moneyQuantity,jdbcType=VARCHAR},
+      </if>
+      <if test="lybzj != null" >
+        lybzj = #{lybzj,jdbcType=VARCHAR},
       </if>
       <if test="customerBid != null" >
         customer_bid = #{customerBid,jdbcType=INTEGER},
       </if>
+      <if test="grainQuantity != null" >
+        grain_quantity = #{grainQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="customerId != null" >
+        customer_id = #{customerId,jdbcType=VARCHAR},
+      </if>
       <if test="customerNumber != null" >
         customer_number = #{customerNumber,jdbcType=VARCHAR},
       </if>
       <if test="customerName != null" >
         customer_name = #{customerName,jdbcType=VARCHAR},
       </if>
-      <if test="grainQuantity != null" >
-        grain_quantity = #{grainQuantity,jdbcType=VARCHAR},
-      </if>
-      <if test="moneyQuantity != null" >
-        money_quantity = #{moneyQuantity,jdbcType=VARCHAR},
-      </if>
       <if test="signingMan != null" >
         signing_man = #{signingMan,jdbcType=VARCHAR},
       </if>
-      <if test="signingTime != null" >
-        signing_time = #{signingTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="enableDate != null" >
         enable_date = #{enableDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="performanceQuantity != null" >
+        performance_quantity = #{performanceQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="performanceRate != null" >
+        performance_rate = #{performanceRate,jdbcType=DECIMAL},
+      </if>
+      <if test="settleContractUniformity != null" >
+        settle_contract_uniformity = #{settleContractUniformity,jdbcType=TINYINT},
+      </if>
+      <if test="settleContractUniformityReason != null" >
+        settle_contract_uniformity_reason = #{settleContractUniformityReason,jdbcType=VARCHAR},
+      </if>
+      <if test="signCompleTime != null" >
+        sign_comple_time = #{signCompleTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="purchaseUnit != null" >
+        purchase_unit = #{purchaseUnit,jdbcType=VARCHAR},
+      </if>
       <if test="disableDate != null" >
         disable_date = #{disableDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="contractType != null" >
-        contract_type = #{contractType,jdbcType=INTEGER},
-      </if>
       <if test="originalContract != null" >
         original_contract = #{originalContract,jdbcType=VARCHAR},
       </if>
@@ -964,6 +1105,18 @@
       <if test="dissolutionConditions != null" >
         dissolution_conditions = #{dissolutionConditions,jdbcType=VARCHAR},
       </if>
+      <if test="identification != null" >
+        identification = #{identification,jdbcType=VARCHAR},
+      </if>
+      <if test="khqyr != null" >
+        khqyr = #{khqyr,jdbcType=VARCHAR},
+      </if>
+      <if test="bfkhh != null" >
+        bfkhh = #{bfkhh,jdbcType=VARCHAR},
+      </if>
+      <if test="bfzh != null" >
+        bfzh = #{bfzh,jdbcType=VARCHAR},
+      </if>
       <if test="disputeSettlementMethod != null" >
         dispute_settlement_method = #{disputeSettlementMethod,jdbcType=VARCHAR},
       </if>
@@ -982,9 +1135,6 @@
       <if test="changing != null" >
         changing = #{changing,jdbcType=VARCHAR},
       </if>
-      <if test="planBid != null" >
-        plan_bid = #{planBid,jdbcType=INTEGER},
-      </if>
       <if test="auditState != null" >
         audit_state = #{auditState,jdbcType=VARCHAR},
       </if>
@@ -1024,51 +1174,39 @@
       <if test="createrId != null" >
         creater_id = #{createrId,jdbcType=INTEGER},
       </if>
-      <if test="identification != null" >
-        identification = #{identification,jdbcType=VARCHAR},
-      </if>
       <if test="updatetime != null" >
         updatetime = #{updatetime,jdbcType=TIMESTAMP},
       </if>
-      <if test="qddd != null" >
-        qddd = #{qddd,jdbcType=VARCHAR},
+      <if test="attachment != null" >
+        attachment = #{attachment,jdbcType=VARCHAR},
       </if>
-      <if test="lybzj != null" >
-        lybzj = #{lybzj,jdbcType=VARCHAR},
-      </if>
-      <if test="khqyr != null" >
-        khqyr = #{khqyr,jdbcType=VARCHAR},
-      </if>
-      <if test="bfkhh != null" >
-        bfkhh = #{bfkhh,jdbcType=VARCHAR},
-      </if>
-      <if test="bfzh != null" >
-        bfzh = #{bfzh,jdbcType=VARCHAR},
-      </if>
-      
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessContract" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 29 19:30:27 CST 2020.
-    -->
     update business_contract
     set contract_number = #{contractNumber,jdbcType=VARCHAR},
+      plan_bid = #{planBid,jdbcType=INTEGER},
       contract_title = #{contractTitle,jdbcType=VARCHAR},
-      customer_id = #{customerId,jdbcType=VARCHAR},
+      contract_type = #{contractType,jdbcType=INTEGER},
+      signing_time = #{signingTime,jdbcType=DATE},
+      qddd = #{qddd,jdbcType=VARCHAR},
+      money_quantity = #{moneyQuantity,jdbcType=VARCHAR},
+      lybzj = #{lybzj,jdbcType=VARCHAR},
       customer_bid = #{customerBid,jdbcType=INTEGER},
+      grain_quantity = #{grainQuantity,jdbcType=DECIMAL},
+      customer_id = #{customerId,jdbcType=VARCHAR},
       customer_number = #{customerNumber,jdbcType=VARCHAR},
       customer_name = #{customerName,jdbcType=VARCHAR},
-      grain_quantity = #{grainQuantity,jdbcType=VARCHAR},
-      money_quantity = #{moneyQuantity,jdbcType=VARCHAR},
       signing_man = #{signingMan,jdbcType=VARCHAR},
-      signing_time = #{signingTime,jdbcType=TIMESTAMP},
       enable_date = #{enableDate,jdbcType=TIMESTAMP},
+      performance_quantity = #{performanceQuantity,jdbcType=DECIMAL},
+      performance_rate = #{performanceRate,jdbcType=DECIMAL},
+      settle_contract_uniformity = #{settleContractUniformity,jdbcType=TINYINT},
+      settle_contract_uniformity_reason = #{settleContractUniformityReason,jdbcType=VARCHAR},
+      sign_comple_time = #{signCompleTime,jdbcType=TIMESTAMP},
+      purchase_unit = #{purchaseUnit,jdbcType=VARCHAR},
       disable_date = #{disableDate,jdbcType=TIMESTAMP},
-      contract_type = #{contractType,jdbcType=INTEGER},
       original_contract = #{originalContract,jdbcType=VARCHAR},
       original_contract_bid = #{originalContractBid,jdbcType=INTEGER},
       root_contract_bid = #{rootContractBid,jdbcType=INTEGER},
@@ -1085,13 +1223,16 @@
       account_number = #{accountNumber,jdbcType=VARCHAR},
       breach_liability = #{breachLiability,jdbcType=VARCHAR},
       dissolution_conditions = #{dissolutionConditions,jdbcType=VARCHAR},
+      identification = #{identification,jdbcType=VARCHAR},
+      khqyr = #{khqyr,jdbcType=VARCHAR},
+      bfkhh = #{bfkhh,jdbcType=VARCHAR},
+      bfzh = #{bfzh,jdbcType=VARCHAR},
       dispute_settlement_method = #{disputeSettlementMethod,jdbcType=VARCHAR},
       change_record_flag = #{changeRecordFlag,jdbcType=VARCHAR},
       change_reason = #{changeReason,jdbcType=VARCHAR},
       change_time = #{changeTime,jdbcType=TIMESTAMP},
       change_content = #{changeContent,jdbcType=VARCHAR},
       changing = #{changing,jdbcType=VARCHAR},
-      plan_bid = #{planBid,jdbcType=INTEGER},
       audit_state = #{auditState,jdbcType=VARCHAR},
       process_instance_id = #{processInstanceId,jdbcType=VARCHAR},
       process_definition_id = #{processDefinitionId,jdbcType=VARCHAR},
@@ -1105,14 +1246,8 @@
       org_id = #{orgId,jdbcType=INTEGER},
       in_application = #{inApplication,jdbcType=INTEGER},
       creater_id = #{createrId,jdbcType=INTEGER},
-      identification = #{identification,jdbcType=VARCHAR},
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
-      qddd = #{qddd,jdbcType=VARCHAR},
-      lybzj = #{lybzj,jdbcType=VARCHAR},
-      khqyr = #{khqyr,jdbcType=VARCHAR},
-      bfkhh = #{bfkhh,jdbcType=VARCHAR},
-      bfzh = #{bfzh,jdbcType=VARCHAR}
-      
+      attachment = #{attachment,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

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

@@ -16,7 +16,7 @@ public interface BusinessContractService {
 	
 	BusinessContract findById(Integer id);
 	
-	void update(BusinessContract contract, List<BusinessStoreWareDetail> storeWareDetailList, String fileIds, String deleteFileIds);
+	void update(BusinessContract contract, List<BusinessStoreWareDetail> storeWareDetailList);
 	
 	void remove(Integer id,String processInstanceId,String deleteReason, Integer planBid);
 	
@@ -154,7 +154,7 @@ public interface BusinessContractService {
      */
     Map<String, Object> add(BusinessContract contract,
             List<BusinessStoreWareDetail> storeWareDetailList, Integer userId,
-            String realName,Integer depotInfoOrgId, String fileIds);
+            String realName,Integer depotInfoOrgId);
 
     /**
      * 根据计划id修改应用状态.

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

@@ -100,7 +100,7 @@ public class BusinessContractServiceImpl implements BusinessContractService {
      */
     @Transactional(readOnly = false)
     public Map<String, Object> add(BusinessContract contract, List<BusinessStoreWareDetail> storeWareDetailList,
-            Integer userId,String realName,Integer depotInfoOrgId,String fileIds) {
+            Integer userId,String realName,Integer depotInfoOrgId) {
         Map<String, Object> returnMap = new HashMap<String, Object>();
         
         /*// 通过规则，获取合同编号.
@@ -112,8 +112,10 @@ public class BusinessContractServiceImpl implements BusinessContractService {
             return returnMap;
         }*/
         // 合同数量.
-        String grainQuantity = contract.getGrainQuantity();
-        BigDecimal grainQuantityB = new BigDecimal(grainQuantity);
+        /*String grainQuantity = contract.getGrainQuantity()+"";
+        BigDecimal grainQuantityB = new BigDecimal(grainQuantity);*/
+        
+        BigDecimal grainQuantityB = contract.getGrainQuantity();
         // 合同单价.
        // String grainPrice = contract.getGrainPrice();
         //BigDecimal grainPriceB = new BigDecimal(grainPrice);
@@ -173,19 +175,19 @@ public class BusinessContractServiceImpl implements BusinessContractService {
             }
         }
        // 修改fileIds对应附件的bid为当前计划的id.
-        businessFileService.updateFileByFileIdsAndBid(fileIds, contract.getId(),"contract");
+       // businessFileService.updateFileByFileIdsAndBid(fileIds, contract.getId(),"contract");
         return returnMap;
     }
 
     /**
      * 修改.
      */
-    public void update(BusinessContract contract, List<BusinessStoreWareDetail> storeWareDetailList,String fileIds, String deleteFileIds) {
+    public void update(BusinessContract contract, List<BusinessStoreWareDetail> storeWareDetailList) {
         contractMapper.updateByPrimaryKey(contract);
-        // 修改fileIds对应附件的bid为当前计划的id.
+       /* // 修改fileIds对应附件的bid为当前计划的id.
         businessFileService.updateFileByFileIdsAndBid(fileIds, contract.getId(),"contract");
         // 删除附件.
-        businessFileService.deleteFileByFileIdArrayString(deleteFileIds);
+        businessFileService.deleteFileByFileIdArrayString(deleteFileIds);*/
         // 修改仓房货位数量质量标准子表.
         if (storeWareDetailList != null && storeWareDetailList.size() > 0) {
             for (BusinessStoreWareDetail storeWareDetail : storeWareDetailList) {
@@ -1073,8 +1075,9 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                                 businessContractV.setCompleteAmount(sumRkslD.stripTrailingZeros().toPlainString());
                                 
                                 // 要求数量.
-                                String demandAmount = businessContractV.getGrainQuantity();
-                                BigDecimal demandAmountD = new BigDecimal(demandAmount.toString());
+                                /*String demandAmount = businessContractV.getGrainQuantity()+"";
+                                BigDecimal demandAmountD = new BigDecimal(demandAmount.toString());*/
+                                BigDecimal demandAmountD = businessContractV.getGrainQuantity();
                                 
                                 // 除法. 已完成数量/要求数量
                                 BigDecimal complete = sumRkslD.divide(demandAmountD, 4, BigDecimal.ROUND_HALF_DOWN);
@@ -1098,8 +1101,10 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                                 businessContractV.setCompleteAmount(sumCkslD.stripTrailingZeros().toPlainString());
                                 
                                 // 要求数量.
-                                String demandAmount = businessContractV.getGrainQuantity();
-                                BigDecimal demandAmountD = new BigDecimal(demandAmount.toString());
+                                /*String demandAmount = businessContractV.getGrainQuantity();
+                                BigDecimal demandAmountD = new BigDecimal(demandAmount.toString());*/
+                                
+                                BigDecimal demandAmountD = businessContractV.getGrainQuantity();
                                 
                                 // 除法. 已完成数量/要求数量
                                 BigDecimal complete = sumCkslD.divide(demandAmountD, 4, BigDecimal.ROUND_HALF_DOWN);

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

@@ -89,8 +89,7 @@ public class GrainContractServiceImpl implements GrainContractService {
         Map<String, Object> returnMap = new HashMap<String, Object>();
         
         // 合同数量.
-        String grainQuantity = contract.getGrainQuantity();
-        BigDecimal grainQuantityB = new BigDecimal(grainQuantity);
+        BigDecimal grainQuantityB = contract.getGrainQuantity();
         // 合同单价.
        // String grainPrice = contract.getGrainPrice();
         //BigDecimal grainPriceB = new BigDecimal(grainPrice);
@@ -999,8 +998,7 @@ public class GrainContractServiceImpl implements GrainContractService {
                                 businessContractV.setCompleteAmount(sumRkslD.stripTrailingZeros().toPlainString());
                                 
                                 // 要求数量.
-                                String demandAmount = businessContractV.getGrainQuantity();
-                                BigDecimal demandAmountD = new BigDecimal(demandAmount.toString());
+                                BigDecimal demandAmountD = businessContractV.getGrainQuantity();
                                 
                                 // 除法. 已完成数量/要求数量
                                 BigDecimal complete = sumRkslD.divide(demandAmountD, 4, BigDecimal.ROUND_HALF_DOWN);
@@ -1020,8 +1018,7 @@ public class GrainContractServiceImpl implements GrainContractService {
                                 businessContractV.setCompleteAmount(sumCkslD.stripTrailingZeros().toPlainString());
                                 
                                 // 要求数量.
-                                String demandAmount = businessContractV.getGrainQuantity();
-                                BigDecimal demandAmountD = new BigDecimal(demandAmount.toString());
+                                BigDecimal demandAmountD = businessContractV.getGrainQuantity();
                                 
                                 // 除法. 已完成数量/要求数量
                                 BigDecimal complete = sumCkslD.divide(demandAmountD, 4, BigDecimal.ROUND_HALF_DOWN);

src/main/java/com/chinaitop/depot/rp/controller/BusinessRpReportController.java

@@ -125,6 +125,7 @@ public class BusinessRpReportController {
 
 
 
+
     //
     /**
      * 新增时得到轮换计划详情
@@ -166,6 +167,20 @@ public class BusinessRpReportController {
         return list;
     }
 
+    /**
+     * 根据质检单号查询质检报告
+     * @return
+     * @throws
+     */
+    @GetMapping("/getFindByReportIds")
+    @ApiOperation(value="根据质检单号查询质检报告", notes = "根据质检单号查询质检报告")
+    public List<BusinessQcQualityInspection> getFindByReportIds(@RequestParam("ids") String ids) throws Exception {
+
+        List<BusinessQcQualityInspection> list = businessRpReportService.getFindByReportIds(ids);
+        return list;
+    }
+
+
 
     //保存
 
@@ -213,6 +228,7 @@ public class BusinessRpReportController {
     @RequestMapping(value="/getRecList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
     @ApiOperation(value="轮换计划接收列表", notes = "查询数据列表，支持分页")
     public PageInfo<Map<String,Object>> getRecList(BusinessRpReportPageParam businessRpReportPageParam) throws Exception {
+        System.out.println("----------------------------");
 
         List<Map<String,Object>> list = businessRpReportService.getRecList(businessRpReportPageParam);
         PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(list);

src/main/java/com/chinaitop/depot/rp/mapper/BusinessQcQualityInspectionMapper.java

@@ -35,5 +35,4 @@ public interface BusinessQcQualityInspectionMapper {
 	List<BusinessQcQualityInspection> getQualityInspectionFindByWarehouseId(Map<String, Object> map);
 
 
-
 }

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

@@ -14,7 +14,7 @@
     <result column="grain_variety_id" property="grainVarietyId" jdbcType="INTEGER" />
     <result column="grain_grade_id" property="grainGradeId" jdbcType="INTEGER" />
     <result column="rkrq" property="rkrq" jdbcType="DATE" />
-    <result column="receive_year" property="receiveYear" jdbcType="DATE" />
+    <result column="receive_year" property="receiveYear" jdbcType="VARCHAR" />
     <result column="produce_area" property="produceArea" jdbcType="VARCHAR" />
     <result column="jysj" property="jysj" jdbcType="TIMESTAMP" />
     <result column="check_result" property="checkResult" jdbcType="TINYINT" />

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

@@ -427,6 +427,9 @@
         <if test="pageParam.rotationYear !=null and pageParam.rotationYear!=''">
             and a.rotation_year like concat("%",#{pageParam.rotationYear},"%")
         </if>
+        <if test="pageParam.unitId !=null and pageParam.unitId!=''">
+            and a.unit_info_id=#{pageParam.unitId}
+        </if>
 
     </select>
 
@@ -461,7 +464,7 @@
         inner JOIN province_all.biz_rp_issuance a ON c.id = a.rp_report_id
         LEFT JOIN  depot_qh.business_rp_outbound d on d.rp_report_id = c.id
         LEFT JOIN province_all.biz_unit_info b on c.unit_info_id = b.id
-        where 1=1
+        where c.status =1
         <if test="pageParam.unitName !=null and pageParam.unitName!=''">
             and b.dwmc like concat("%",#{pageParam.unitName},"%")
         </if>
@@ -474,12 +477,13 @@
         <if test="pageParam.unitId !=null and pageParam.unitId!=''">
             and c.unit_info_id = #{pageParam.unitId}
         </if>
-        <if test="pageParam.unitId !=null and pageParam.unitId!=''">
+        <if test="pageParam.orgId !=null and pageParam.orgId!=''">
             and d.org_Id = #{pageParam.orgId}
         </if>
         <!-- <if test="pageParam.lsxzName !=null and pageParam.lsxzName!=''">
              and a.dwmc like concat("%",#{pageParam.lsxzName},"%")
          </if>-->
+        group by  cast(c.rotation_year as char)
         ORDER BY c.report_time desc
     </select>
     <select id="getRpReportByById" resultMap="BaseResultMap2">

src/main/java/com/chinaitop/depot/rp/model/BusinessQcQualityInspection.java

@@ -34,8 +34,7 @@ public class BusinessQcQualityInspection {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date rkrq;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
-    private Date receiveYear;
+    private String receiveYear;
 
     private String produceArea;
 
@@ -282,19 +281,11 @@ public class BusinessQcQualityInspection {
         this.rkrq = rkrq;
     }
 
-    /**
-     * 收获年度
-     * @return receive_year 收获年度
-     */
-    public Date getReceiveYear() {
+    public String getReceiveYear() {
         return receiveYear;
     }
 
-    /**
-     * 收获年度
-     * @param receiveYear 收获年度
-     */
-    public void setReceiveYear(Date receiveYear) {
+    public void setReceiveYear(String receiveYear) {
         this.receiveYear = receiveYear;
     }
 

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

@@ -17,13 +17,6 @@ public class BusinessRpReportPageParam {
     @ApiModelProperty(value = "每页条数")
     private Integer size;
 
-    /** 排序字段 */
-    @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
-    private String sortField;
-
-    /** 排序方式 */
-    @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
-    private String sortOrder;
 
     /** 企业名称 */
     @ApiModelProperty(value = "企业名称")

src/main/java/com/chinaitop/depot/rp/service/BusinessRpReportService.java

@@ -69,4 +69,6 @@ public interface BusinessRpReportService  {
     List<BusinessQcQualityInspection> getQualityInspectionFindById(String rpReportId, Integer warehouseId, String jylb,Integer inspectionReportId);
 
     List<BusinessQcQualityInspection> getQualityInspectionFindByWarehouseId(String jylb,Integer warehouseId);
+
+    List<BusinessQcQualityInspection> getFindByReportIds(String ids);
 }

src/main/java/com/chinaitop/depot/rp/service/impl/BusinessRpReportServiceImpl.java

@@ -118,13 +118,9 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
     public Map<String, Object> add(BusinessRpReport businessRpReport) {
         Map<String,Object> result = new HashMap<>();
         List<BusinessRpInbound>  businessRpInbound = businessRpReport.getBusinessRpInboundList();
-//        if (businessRpInbound.size() <= 0){
-//            result.put("msg", "出库信息不能为空");
-//            return result;
-//        }
         BusinessRpInboundExample businessRpInboundExample =new BusinessRpInboundExample();
        businessRpReport.setUpdateTime(new Date());
-        if(businessRpReport.getStatus()==0){ //保存
+        if(businessRpReport.getStatus()==0){
             if(businessRpReport.getId()!=null){//修改
                 businessRpReportMapper.updateByPrimaryKeySelective(businessRpReport);
                 businessRpInboundMapper.deleteByReportId(businessRpReport.getId());
@@ -165,13 +161,14 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
 
         }else{//提交
 
-            if(businessRpReport.getId()!=null){//修改
+            if(businessRpReport.getId()!=null){
                 //根据id查找主表数据
                 BusinessRpReportVO businessRpReportVO =businessRpReportMapper.getRpReportFindByById(businessRpReport.getId());
                 if(businessRpReportVO!=null){
                     result.put("status", "error");
                     result.put("msg", "请填写数据后再执行上传操作");
                 }
+                businessRpReport.setReportTime(new Date());
                 businessRpReportMapper.updateByPrimaryKeySelective(businessRpReport);
                 List<BusinessRpInbound> inList =businessRpReport.getBusinessRpInboundList();
                 if(inList != null && !inList.isEmpty()){
@@ -199,6 +196,7 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
 
                 businessRpReport.setCreateTime(new Date());
                 businessRpReport.setUpdateTime(new Date());
+                businessRpReport.setReportTime(new Date());
                 businessRpReportMapper.insert(businessRpReport);
                 List<BusinessRpInbound> inList =businessRpReport.getBusinessRpInboundList();
                 for (BusinessRpInbound br: inList) {
@@ -300,5 +298,29 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
         return list;
     }
 
+    @Override
+    public List<BusinessQcQualityInspection> getFindByReportIds(String ids) {
+        List<BusinessQcQualityInspection> list = new ArrayList<>();
+        try {
+            if (ids.contains(",")) {
+                String[] idArray = ids.split(",");
+                for (String idStr : idArray) {
+                    int id = Integer.parseInt(idStr);
+                    BusinessQcQualityInspection inspection = businessQcQualityInspectionMapper.selectByPrimaryKey(id);
+                    list.add(inspection);
+                }
+            } else {
+                int id = Integer.parseInt(ids);
+                list.add(businessQcQualityInspectionMapper.selectByPrimaryKey(id));
+            }
+        } catch (NumberFormatException e) {
+            // 处理ID转换失败的情况
+            // 可以记录日志、抛出自定义异常或返回错误信息
+            System.err.println("Failed to parse ID from string: " + ids);
+        }
+
+        return list;
+    }
+
 
 }

src/main/resources/bootstrap-dev.yml

@@ -69,3 +69,5 @@ logging:
     com.chinaitop.depot.system.mapper: debug
 
 jsgjjsjUrl: http://localhost:9022/recPublish/sendMessage
+customerUrl: http://localhost:9016/depot/business/customer/edit?id=
+

src/main/resources/bootstrap-prod.yml

@@ -65,3 +65,5 @@ cxf:
 crk-webservice: http://10.223.3.62:9025/Base/webServices/StoreChangeServer?wsdl
 
 jsgjjsjUrl: http://localhost:9022/recPublish/sendMessage
+customerUrl: http://localhost:9016/depot/business/customer/edit?id=
+