Merge branch 'dev' of depot-qinghai/depot-business-qinghai into master

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

@@ -79,8 +79,10 @@ public class DatePermissionInterceptor implements Interceptor {
 						!"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())&&
-						!"com.chinaitop.depot.system.mapper.SysCodeMapper.selectByPrimaryKey".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.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/BusinessDeliveryStorageNoticeController.java

@@ -315,12 +315,12 @@ public class BusinessDeliveryStorageNoticeController {
             if (businessStoreWareDetailJson != null) {
                 storeWareDetailList = (List<BusinessStoreWareDetail>)mapper.readValue(businessStoreWareDetailJson, new TypeReference<List<BusinessStoreWareDetail>>(){});
                 
-                 //通知单的明细 库点名称都是一样的，所以取第一个
+                 /*//通知单的明细 库点名称都是一样的，所以取第一个
 					if(storeWareDetailList.get(0).getState() != storeWareDetailList.get(0).getOrgId()){ //代储库的
 						businessDeliveryStorageNotice.setHouseId(storeWareDetailList.get(0).getState());
 					}else{
 						businessDeliveryStorageNotice.setHouseId(storeWareDetailList.get(0).getOrgId());
-					}
+					}*/
             
             }
             

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/grainReserves/common/PageParam.java

@@ -23,4 +23,8 @@ public class PageParam {
     @NotNull(message = "页码非空")
     @Min(value = 1, message = "每页条数>=1")
     private Integer pageSize;
+
+    @ApiModelProperty(value = "库区编码")
+    @NotNull(message = "库区编码非空")
+    private Integer orgId;
 }

src/main/java/com/chinaitop/depot/grainReserves/mapper/BizGopsPlanMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 @Repository
 public interface BizGopsPlanMapper {
-    List<BizGopsPlan> getPageList(@Param("orgName") String orgName);
+    List<BizGopsPlan> getPageList(@Param("planName") String planName, @Param("orgId") Integer orgId);
 
     List<GopsPlanObject> getPlanSaleList(@Param("id") String id);
 

src/main/java/com/chinaitop/depot/grainReserves/mapper/BizGopsPlanMapper.xml

@@ -19,8 +19,9 @@
         LEFT JOIN org_info oi ON bfp.org_id = oi.org_id
         <where>
             bfp.`status` = 1
-            <if test="orgName != null and orgName != ''">
-                oi.org_name LIKE CONCAT("%", orgName, "%")
+            and bfp.org_id = #{orgId}
+            <if test="planName != null and planName != ''">
+               and bfp.plan_name LIKE CONCAT("%", #{planName}, "%")
             </if>
         </where>
     </select>

src/main/java/com/chinaitop/depot/grainReserves/model/BizGopsPlan.java

@@ -42,7 +42,7 @@ public class BizGopsPlan {
     private Integer planType;
 
     @ApiModelProperty(value = "计划下达时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date planReleaseTime;
 
     @ApiModelProperty(value = "状态 0：保存；1：下发；")

src/main/java/com/chinaitop/depot/grainReserves/model/BizGopsPlanPage.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 public class BizGopsPlanPage extends PageParam implements Serializable {
     private static final long serialVersionUID = 4988791677403961372L;
 
-    @ApiModelProperty(value = "库区名称")
-    private String orgName;
+    @ApiModelProperty(value = "计划名称")
+    private String planName;
 
 }

src/main/java/com/chinaitop/depot/grainReserves/model/GopsPlanObject.java

@@ -50,28 +50,28 @@ public class GopsPlanObject {
     private Integer warehouseId;
 
     @ApiModelProperty(value = "货位名称", position = 6)
-    private Integer warehouseName;
+    private String warehouseName;
 
     /** 粮食品种；外库depot_qh.basic_enum的id； */
     @ApiModelProperty(value = "粮食品种id", position = 7)
     private Integer grainVarietyId;
 
     @ApiModelProperty(value = "粮食品种名称", position = 8)
-    private Integer grainVarietyName;
+    private String grainVarietyName;
 
     /** 粮食性质；外库depot_qh.basic_enum的id； */
     @ApiModelProperty(value = "粮食性质id", position = 9)
     private Integer grainNatureId;
 
     @ApiModelProperty(value = "粮食性质名称", position = 10)
-    private Integer grainNatureName;
+    private String grainNatureName;
 
     /** 粮食等级；外库depot_qh.basic_enum的id； */
     @ApiModelProperty(value = "粮食等级id", position = 11)
     private Integer grainGradeId;
 
     @ApiModelProperty(value = "粮食等级名称", position = 12)
-    private Integer grainGradeName;
+    private String grainGradeName;
 
     /** 计划数量 */
     @ApiModelProperty(value = "计划数量", position = 13)

src/main/java/com/chinaitop/depot/grainReserves/service/BizGopsPlanService.java

@@ -31,7 +31,7 @@ public interface BizGopsPlanService {
         @Override
         public PageInfo<BizGopsPlan> getPageList(BizGopsPlanPage pageParam) {
             PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
-            List<BizGopsPlan> list = gopsPlanMapper.getPageList(pageParam.getOrgName());
+            List<BizGopsPlan> list = gopsPlanMapper.getPageList(pageParam.getPlanName(), pageParam.getOrgId());
             return new PageInfo<>(list);
         }
 

src/main/java/com/chinaitop/depot/pg/controller/BusinessPgGopsPlanController.java

@@ -0,0 +1,152 @@
+package com.chinaitop.depot.pg.controller;
+
+
+import com.chinaitop.depot.business.model.OrgInfo;
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlan;
+import com.chinaitop.depot.pg.model.vo.BusinessPgGopsPlanVO;
+import com.chinaitop.depot.pg.model.vo.DataCrkywCplspDefaultVO;
+import com.chinaitop.depot.pg.param.BusinessPgGopsPlanPageParam;
+import com.chinaitop.depot.pg.service.BusinessPgGopsPlanService;
+import com.chinaitop.depot.rp.model.BusinessQcQualityInspection;
+import com.chinaitop.depot.rp.model.BusinessRpReport;
+import com.chinaitop.depot.rp.model.vo.BusinessRpOutboundVO;
+import com.chinaitop.depot.rp.model.vo.BusinessRpReportRecVO;
+import com.chinaitop.depot.rp.model.vo.BusinessRpReportVO;
+import com.chinaitop.depot.rp.param.BusinessRpBiweeklyReportPageParam;
+import com.chinaitop.depot.rp.param.BusinessRpReportPageParam;
+import com.chinaitop.depot.rp.service.BusinessRpReportService;
+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.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 成品粮购销计划 前端控制器
+ *
+ *
+ * @author TS
+ * @since 2024-06-11
+ */
+@RestController
+@RequestMapping("/pgGopsPlan")
+@Api(value= "BusinessPgGopsPlanController", description = "成品粮购销计划")
+public class BusinessPgGopsPlanController {
+
+    @Resource
+    private BusinessRpReportService businessRpReportService;
+
+    @Resource
+    private BusinessPgGopsPlanService businessPgGopsPlanService;
+
+
+
+    /**
+     * 成品粮购销计划列表
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/getList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="成品粮购销计划列表", notes = "查询数据列表，支持分页")
+    public PageInfo<Map<String,Object>> getList(BusinessPgGopsPlanPageParam businessPgGopsPlanPageParam){
+
+        List<Map<String,Object>> list = businessPgGopsPlanService.queryByExample(businessPgGopsPlanPageParam);
+        PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+
+    /**
+     * 获取本库区对应的商品列表
+     * @return
+     * @throws
+     */
+    @GetMapping("/getCplSpList")
+    @ApiOperation(value="获取本库区对应的商品列表", notes = "获取本库区对应的商品列表")
+    public List<DataCrkywCplspDefaultVO> getCplSpList(@RequestParam("orgId") @NotBlank(message = "不能为空") String orgId) {
+
+        List<DataCrkywCplspDefaultVO> list = businessPgGopsPlanService.getCplSpList(orgId);
+        return list;
+    }
+
+
+    /**
+     * 保存或修改成品粮购销计划
+     * @param
+     * @return
+     */
+    @RequestMapping(value="/add",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
+    @ApiOperation(value="保存或修改成品粮购销计划", notes = "保存")
+    public Map<String, Object> add(@RequestBody BusinessPgGopsPlan businessPgGopsPlan) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        try {
+            modelMap = businessPgGopsPlanService.add(businessPgGopsPlan);
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("msg", "失败！");
+            modelMap.put("status", "error");
+            return modelMap;
+        }
+        return modelMap;
+    }
+
+
+
+
+    /**
+     * 删除成品粮购销计划
+     * @param
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/removeById",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
+    @ApiOperation(value="删除成品粮购销计划", notes = "保存")
+    public Map<String, Object> removeById(@RequestParam("id")@NotNull(message = "Id不能为空")Integer  id)
+            throws Exception {
+        Map<String, Object> modelMap = new HashMap<>();
+        try {
+            modelMap = businessPgGopsPlanService.removeById(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("msg", "删除失败！");
+            modelMap.put("status", "error");
+            return modelMap;
+        }
+        return modelMap;
+    }
+
+
+
+
+
+    /**
+     * 得到成品粮购销计划
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/getPgPlanDetail",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="得到成品粮购销计划", notes = "得到轮换计划接收详情")
+    public BusinessPgGopsPlanVO getPgPlanDetail(@RequestParam("id")@NotNull(message = "Id不能为空") Integer id)   {
+
+        BusinessPgGopsPlanVO gopsPlanVO = businessPgGopsPlanService.getPgPlanDetail(id);
+        return gopsPlanVO;
+    }
+
+
+
+
+
+
+
+}

src/main/java/com/chinaitop/depot/pg/mapper/BusinessPgGopsPlanDetailMapper.java

@@ -0,0 +1,36 @@
+package com.chinaitop.depot.pg.mapper;
+
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetail;
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetailExample;
+import java.util.List;
+
+import com.chinaitop.depot.pg.model.vo.BusinessPgGopsPlanDetailVO;
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessPgGopsPlanDetailMapper {
+    int countByExample(BusinessPgGopsPlanDetailExample example);
+
+    int deleteByExample(BusinessPgGopsPlanDetailExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessPgGopsPlanDetail record);
+
+    int insertSelective(BusinessPgGopsPlanDetail record);
+
+    List<BusinessPgGopsPlanDetail> selectByExample(BusinessPgGopsPlanDetailExample example);
+
+    BusinessPgGopsPlanDetail selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessPgGopsPlanDetail record, @Param("example") BusinessPgGopsPlanDetailExample example);
+
+    int updateByExample(@Param("record") BusinessPgGopsPlanDetail record, @Param("example") BusinessPgGopsPlanDetailExample example);
+
+    int updateByPrimaryKeySelective(BusinessPgGopsPlanDetail record);
+
+    int updateByPrimaryKey(BusinessPgGopsPlanDetail record);
+
+    int deleteByMainId(@Param("planId") Integer planId);
+
+    List<BusinessPgGopsPlanDetailVO> findPlanDetailList(@Param("planId") Integer planId);
+}

src/main/java/com/chinaitop/depot/pg/mapper/BusinessPgGopsPlanDetailMapper.xml

@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.pg.mapper.BusinessPgGopsPlanDetailMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetail" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="createdate" property="createdate" jdbcType="TIMESTAMP" />
+    <result column="updatename" property="updatename" jdbcType="VARCHAR" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="pg_gops_plan_id" property="pgGopsPlanId" jdbcType="INTEGER" />
+    <result column="crkyw_cplsp_default_id" property="crkywCplspDefaultId" jdbcType="VARCHAR" />
+    <result column="grain_nature_id" property="grainNatureId" jdbcType="VARCHAR" />
+    <result column="quantity" property="quantity" jdbcType="DECIMAL" />
+    <result column="weight" property="weight" jdbcType="DECIMAL" />
+    <result column="unit_price" property="unitPrice" jdbcType="DECIMAL" />
+    <result column="amount" property="amount" jdbcType="DECIMAL" />
+    <result column="completion_quantity" property="completionQuantity" jdbcType="DECIMAL" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, createdate, updatename, updatedate, pg_gops_plan_id, crkyw_cplsp_default_id, 
+    grain_nature_id, quantity, weight, unit_price, amount
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetailExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_pg_gops_plan_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_pg_gops_plan_detail
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_pg_gops_plan_detail
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetailExample" >
+    delete from business_pg_gops_plan_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetail" >
+    insert into business_pg_gops_plan_detail (id, createdate, updatename, 
+      updatedate, pg_gops_plan_id, crkyw_cplsp_default_id, 
+      grain_nature_id, quantity, weight, 
+      unit_price, amount)
+    values (#{id,jdbcType=INTEGER}, #{createdate,jdbcType=TIMESTAMP}, #{updatename,jdbcType=VARCHAR}, 
+      #{updatedate,jdbcType=TIMESTAMP}, #{pgGopsPlanId,jdbcType=INTEGER}, #{crkywCplspDefaultId,jdbcType=VARCHAR}, 
+      #{grainNatureId,jdbcType=VARCHAR}, #{quantity,jdbcType=DECIMAL}, #{weight,jdbcType=DECIMAL}, 
+      #{unitPrice,jdbcType=DECIMAL}, #{amount,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetail" >
+    insert into business_pg_gops_plan_detail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="createdate != null" >
+        createdate,
+      </if>
+      <if test="updatename != null" >
+        updatename,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="pgGopsPlanId != null" >
+        pg_gops_plan_id,
+      </if>
+      <if test="crkywCplspDefaultId != null" >
+        crkyw_cplsp_default_id,
+      </if>
+      <if test="grainNatureId != null" >
+        grain_nature_id,
+      </if>
+      <if test="quantity != null" >
+        quantity,
+      </if>
+      <if test="weight != null" >
+        weight,
+      </if>
+      <if test="unitPrice != null" >
+        unit_price,
+      </if>
+      <if test="amount != null" >
+        amount,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="createdate != null" >
+        #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatename != null" >
+        #{updatename,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pgGopsPlanId != null" >
+        #{pgGopsPlanId,jdbcType=INTEGER},
+      </if>
+      <if test="crkywCplspDefaultId != null" >
+        #{crkywCplspDefaultId,jdbcType=VARCHAR},
+      </if>
+      <if test="grainNatureId != null" >
+        #{grainNatureId,jdbcType=VARCHAR},
+      </if>
+      <if test="quantity != null" >
+        #{quantity,jdbcType=DECIMAL},
+      </if>
+      <if test="weight != null" >
+        #{weight,jdbcType=DECIMAL},
+      </if>
+      <if test="unitPrice != null" >
+        #{unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="amount != null" >
+        #{amount,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetailExample" resultType="java.lang.Integer" >
+    select count(*) from business_pg_gops_plan_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_pg_gops_plan_detail
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.createdate != null" >
+        createdate = #{record.createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatename != null" >
+        updatename = #{record.updatename,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatedate != null" >
+        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.pgGopsPlanId != null" >
+        pg_gops_plan_id = #{record.pgGopsPlanId,jdbcType=INTEGER},
+      </if>
+      <if test="record.crkywCplspDefaultId != null" >
+        crkyw_cplsp_default_id = #{record.crkywCplspDefaultId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.grainNatureId != null" >
+        grain_nature_id = #{record.grainNatureId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.quantity != null" >
+        quantity = #{record.quantity,jdbcType=DECIMAL},
+      </if>
+      <if test="record.weight != null" >
+        weight = #{record.weight,jdbcType=DECIMAL},
+      </if>
+      <if test="record.unitPrice != null" >
+        unit_price = #{record.unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.amount != null" >
+        amount = #{record.amount,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_pg_gops_plan_detail
+    set id = #{record.id,jdbcType=INTEGER},
+      createdate = #{record.createdate,jdbcType=TIMESTAMP},
+      updatename = #{record.updatename,jdbcType=VARCHAR},
+      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      pg_gops_plan_id = #{record.pgGopsPlanId,jdbcType=INTEGER},
+      crkyw_cplsp_default_id = #{record.crkywCplspDefaultId,jdbcType=VARCHAR},
+      grain_nature_id = #{record.grainNatureId,jdbcType=VARCHAR},
+      quantity = #{record.quantity,jdbcType=DECIMAL},
+      weight = #{record.weight,jdbcType=DECIMAL},
+      unit_price = #{record.unitPrice,jdbcType=DECIMAL},
+      amount = #{record.amount,jdbcType=DECIMAL}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetail" >
+    update business_pg_gops_plan_detail
+    <set >
+      <if test="createdate != null" >
+        createdate = #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatename != null" >
+        updatename = #{updatename,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pgGopsPlanId != null" >
+        pg_gops_plan_id = #{pgGopsPlanId,jdbcType=INTEGER},
+      </if>
+      <if test="crkywCplspDefaultId != null" >
+        crkyw_cplsp_default_id = #{crkywCplspDefaultId,jdbcType=VARCHAR},
+      </if>
+      <if test="grainNatureId != null" >
+        grain_nature_id = #{grainNatureId,jdbcType=VARCHAR},
+      </if>
+      <if test="quantity != null" >
+        quantity = #{quantity,jdbcType=DECIMAL},
+      </if>
+      <if test="weight != null" >
+        weight = #{weight,jdbcType=DECIMAL},
+      </if>
+      <if test="unitPrice != null" >
+        unit_price = #{unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="amount != null" >
+        amount = #{amount,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetail" >
+    update business_pg_gops_plan_detail
+    set createdate = #{createdate,jdbcType=TIMESTAMP},
+      updatename = #{updatename,jdbcType=VARCHAR},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      pg_gops_plan_id = #{pgGopsPlanId,jdbcType=INTEGER},
+      crkyw_cplsp_default_id = #{crkywCplspDefaultId,jdbcType=VARCHAR},
+      grain_nature_id = #{grainNatureId,jdbcType=VARCHAR},
+      quantity = #{quantity,jdbcType=DECIMAL},
+      weight = #{weight,jdbcType=DECIMAL},
+      unit_price = #{unitPrice,jdbcType=DECIMAL},
+      amount = #{amount,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <delete id="deleteByMainId" parameterType="java.lang.Integer" >
+    DELETE
+    FROM
+        business_pg_gops_plan_detail
+    WHERE
+    pg_gops_plan_id = #{planId,jdbcType=INTEGER}
+  </delete>
+  <select id="findPlanDetailList"  resultType="com.chinaitop.depot.pg.model.vo.BusinessPgGopsPlanDetailVO"  >
+     SELECT
+    a.id,
+    a.createdate,
+    a.updatename,
+    a.updatedate,
+    a.pg_gops_plan_id as pgGopsPlanId,
+    a.crkyw_cplsp_default_id as crkywCplspDefaultId,
+    a.grain_nature_id as grainNatureId,
+    e.enumname as grainNatureName,
+    a.quantity,
+    a.weight,
+    a.unit_price as unitPrice,
+    a.amount,
+    c.enumName as sjjlpzmc,
+    b.sjjlpzbh,
+    b.sjjlppmc,
+    b.dj,
+    n.enumname as djmc,
+    b.sjjlspmc,
+    b.sjjlspmcbh,
+    b.gg,
+    b.jldw,
+    f.enumname as jldwmc,
+    b.bzq
+    FROM
+    depot_qh.business_pg_gops_plan_detail a
+    LEFT JOIN depot_qh.data_crkyw_cplsp_default b ON a.crkyw_cplsp_default_id = b.dataId
+    LEFT JOIN depot_qh.basic_enum e on e.enumId = a.grain_nature_id
+    left join depot_qh.basic_enum f on f.enumId = b.jldw
+    LEFT JOIN  basic_enum c on b.sjjlpzbh = c.enumId
+    LEFT JOIN  basic_enum n on b.dj = n.enumId
+    where a.pg_gops_plan_id = #{planId}
+  </select>
+
+</mapper>

src/main/java/com/chinaitop/depot/pg/mapper/BusinessPgGopsPlanMapper.java

@@ -0,0 +1,41 @@
+package com.chinaitop.depot.pg.mapper;
+
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlan;
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlanExample;
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.pg.model.vo.BusinessPgGopsPlanVO;
+import com.chinaitop.depot.pg.model.vo.DataCrkywCplspDefaultVO;
+import com.chinaitop.depot.pg.param.BusinessPgGopsPlanPageParam;
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessPgGopsPlanMapper {
+    int countByExample(BusinessPgGopsPlanExample example);
+
+    int deleteByExample(BusinessPgGopsPlanExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessPgGopsPlan record);
+
+    int insertSelective(BusinessPgGopsPlan record);
+
+    List<BusinessPgGopsPlan> selectByExample(BusinessPgGopsPlanExample example);
+
+    BusinessPgGopsPlan selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessPgGopsPlan record, @Param("example") BusinessPgGopsPlanExample example);
+
+    int updateByExample(@Param("record") BusinessPgGopsPlan record, @Param("example") BusinessPgGopsPlanExample example);
+
+    int updateByPrimaryKeySelective(BusinessPgGopsPlan record);
+
+    int updateByPrimaryKey(BusinessPgGopsPlan record);
+
+    List<Map<String,Object>> selectByPageParam(@Param("pageParam")BusinessPgGopsPlanPageParam pageParam);
+
+    BusinessPgGopsPlanVO getPgPlan(@Param("id") Integer id);
+
+    List<DataCrkywCplspDefaultVO> getCplSpList(@Param("orgId")String orgId);
+}

src/main/java/com/chinaitop/depot/pg/mapper/BusinessPgGopsPlanMapper.xml

@@ -0,0 +1,467 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.pg.mapper.BusinessPgGopsPlanMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.pg.model.BusinessPgGopsPlan" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="createdate" property="createdate" jdbcType="TIMESTAMP" />
+    <result column="updatename" property="updatename" jdbcType="VARCHAR" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="plan_code" property="planCode" jdbcType="VARCHAR" />
+    <result column="plan_type" property="planType" jdbcType="TINYINT" />
+    <result column="plan_start_time" property="planStartTime" jdbcType="TIMESTAMP" />
+    <result column="plan_end_time" property="planEndTime" jdbcType="TIMESTAMP" />
+    <result column="customer_name" property="customerName" jdbcType="VARCHAR" />
+    <result column="contact_information" property="contactInformation" jdbcType="VARCHAR" />
+    <result column="total_amount" property="totalAmount" jdbcType="DECIMAL" />
+    <result column="completion_amount" property="completionAmount" jdbcType="DECIMAL" />
+    <result column="remaining_amount" property="remainingAmount" jdbcType="DECIMAL" />
+    <result column="plan_quantity" property="planQuantity" jdbcType="DECIMAL" />
+    <result column="completion_quantity" property="completionQuantity" jdbcType="DECIMAL" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, createdate, updatename, updatedate, org_id, plan_code, plan_type, plan_start_time, 
+    plan_end_time, customer_name, contact_information, total_amount, completion_amount, 
+    remaining_amount, plan_quantity, completion_quantity
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_pg_gops_plan
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_pg_gops_plan
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_pg_gops_plan
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanExample" >
+    delete from business_pg_gops_plan
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlan" >
+    insert into business_pg_gops_plan (id, createdate, updatename, 
+      updatedate, org_id, plan_code, 
+      plan_type, plan_start_time, plan_end_time, 
+      customer_name, contact_information, total_amount, 
+      completion_amount, remaining_amount, plan_quantity, 
+      completion_quantity)
+    values (#{id,jdbcType=INTEGER}, #{createdate,jdbcType=TIMESTAMP}, #{updatename,jdbcType=VARCHAR}, 
+      #{updatedate,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{planCode,jdbcType=VARCHAR}, 
+      #{planType,jdbcType=TINYINT}, #{planStartTime,jdbcType=TIMESTAMP}, #{planEndTime,jdbcType=TIMESTAMP}, 
+      #{customerName,jdbcType=VARCHAR}, #{contactInformation,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, 
+      #{completionAmount,jdbcType=DECIMAL}, #{remainingAmount,jdbcType=DECIMAL}, #{planQuantity,jdbcType=INTEGER}, 
+      #{completionQuantity,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlan" >
+    insert into business_pg_gops_plan
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="createdate != null" >
+        createdate,
+      </if>
+      <if test="updatename != null" >
+        updatename,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="planCode != null" >
+        plan_code,
+      </if>
+      <if test="planName != null" >
+        plan_name,
+      </if>
+      <if test="planType != null" >
+        plan_type,
+      </if>
+      <if test="planStartTime != null" >
+        plan_start_time,
+      </if>
+      <if test="planEndTime != null" >
+        plan_end_time,
+      </if>
+      <if test="customerName != null" >
+        customer_name,
+      </if>
+      <if test="contactInformation != null" >
+        contact_information,
+      </if>
+      <if test="totalAmount != null" >
+        total_amount,
+      </if>
+      <if test="completionAmount != null" >
+        completion_amount,
+      </if>
+      <if test="remainingAmount != null" >
+        remaining_amount,
+      </if>
+      <if test="planQuantity != null" >
+        plan_quantity,
+      </if>
+      <if test="completionQuantity != null" >
+        completion_quantity,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="createdate != null" >
+        #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatename != null" >
+        #{updatename,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="planCode != null" >
+        #{planCode,jdbcType=VARCHAR},
+      </if>
+      <if test="planName != null" >
+        #{planName,jdbcType=VARCHAR},
+      </if>
+      <if test="planType != null" >
+        #{planType,jdbcType=TINYINT},
+      </if>
+      <if test="planStartTime != null" >
+        #{planStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="planEndTime != null" >
+        #{planEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="customerName != null" >
+        #{customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="contactInformation != null" >
+        #{contactInformation,jdbcType=VARCHAR},
+      </if>
+      <if test="totalAmount != null" >
+        #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="completionAmount != null" >
+        #{completionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="remainingAmount != null" >
+        #{remainingAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="planQuantity != null" >
+        #{planQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="completionQuantity != null" >
+        #{completionQuantity,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlanExample" resultType="java.lang.Integer" >
+    select count(*) from business_pg_gops_plan
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_pg_gops_plan
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.createdate != null" >
+        createdate = #{record.createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatename != null" >
+        updatename = #{record.updatename,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatedate != null" >
+        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.planCode != null" >
+        plan_code = #{record.planCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.planType != null" >
+        plan_type = #{record.planType,jdbcType=TINYINT},
+      </if>
+      <if test="record.planStartTime != null" >
+        plan_start_time = #{record.planStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.planEndTime != null" >
+        plan_end_time = #{record.planEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.customerName != null" >
+        customer_name = #{record.customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contactInformation != null" >
+        contact_information = #{record.contactInformation,jdbcType=VARCHAR},
+      </if>
+      <if test="record.totalAmount != null" >
+        total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.completionAmount != null" >
+        completion_amount = #{record.completionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.remainingAmount != null" >
+        remaining_amount = #{record.remainingAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.planQuantity != null" >
+        plan_quantity = #{record.planQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.completionQuantity != null" >
+        completion_quantity = #{record.completionQuantity,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_pg_gops_plan
+    set id = #{record.id,jdbcType=INTEGER},
+      createdate = #{record.createdate,jdbcType=TIMESTAMP},
+      updatename = #{record.updatename,jdbcType=VARCHAR},
+      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      plan_code = #{record.planCode,jdbcType=VARCHAR},
+      plan_type = #{record.planType,jdbcType=TINYINT},
+      plan_start_time = #{record.planStartTime,jdbcType=TIMESTAMP},
+      plan_end_time = #{record.planEndTime,jdbcType=TIMESTAMP},
+      customer_name = #{record.customerName,jdbcType=VARCHAR},
+      contact_information = #{record.contactInformation,jdbcType=VARCHAR},
+      total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      completion_amount = #{record.completionAmount,jdbcType=DECIMAL},
+      remaining_amount = #{record.remainingAmount,jdbcType=DECIMAL},
+      plan_quantity = #{record.planQuantity,jdbcType=INTEGER},
+      completion_quantity = #{record.completionQuantity,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective"  parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlan" >
+    update business_pg_gops_plan
+    <set >
+      <if test="createdate != null" >
+        createdate = #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatename != null" >
+        updatename = #{updatename,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="planCode != null" >
+        plan_code = #{planCode,jdbcType=VARCHAR},
+      </if>
+      <if test="planType != null" >
+        plan_type = #{planType,jdbcType=TINYINT},
+      </if>
+      <if test="planStartTime != null" >
+        plan_start_time = #{planStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="planEndTime != null" >
+        plan_end_time = #{planEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="customerName != null" >
+        customer_name = #{customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="contactInformation != null" >
+        contact_information = #{contactInformation,jdbcType=VARCHAR},
+      </if>
+      <if test="totalAmount != null" >
+        total_amount = #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="completionAmount != null" >
+        completion_amount = #{completionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="remainingAmount != null" >
+        remaining_amount = #{remainingAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="planQuantity != null" >
+        plan_quantity = #{planQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="completionQuantity != null" >
+        completion_quantity = #{completionQuantity,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.pg.model.BusinessPgGopsPlan" >
+    update business_pg_gops_plan
+    set createdate = #{createdate,jdbcType=TIMESTAMP},
+      updatename = #{updatename,jdbcType=VARCHAR},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER},
+      plan_code = #{planCode,jdbcType=VARCHAR},
+      plan_type = #{planType,jdbcType=TINYINT},
+      plan_start_time = #{planStartTime,jdbcType=TIMESTAMP},
+      plan_end_time = #{planEndTime,jdbcType=TIMESTAMP},
+      customer_name = #{customerName,jdbcType=VARCHAR},
+      contact_information = #{contactInformation,jdbcType=VARCHAR},
+      total_amount = #{totalAmount,jdbcType=DECIMAL},
+      completion_amount = #{completionAmount,jdbcType=DECIMAL},
+      remaining_amount = #{remainingAmount,jdbcType=DECIMAL},
+      plan_quantity = #{planQuantity,jdbcType=INTEGER},
+      completion_quantity = #{completionQuantity,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectByPageParam" resultType="java.util.Map">
+    SELECT
+    a.id as "id",
+    a.plan_code as "planCode",
+    a.plan_name as "planName",
+    a.plan_type as "planType",
+    DATE_FORMAT(a.plan_start_time,'%Y') as "planYear",
+    a.plan_quantity as "planQuantity",
+    a.completion_quantity as "completionQuantity",
+    a.completion_quantity/a.plan_quantity*100 as "planRate",
+    b.dwmc as "dwmc",
+    d.org_name as "orgName",
+    DATE_FORMAT(a.plan_start_time,'%Y-%m-%d %T') AS "planStartTime"
+    FROM
+    depot_qh.business_pg_gops_plan a
+    LEFT JOIN depot_qh.org_info d on a.org_id = d.org_id
+    LEFT JOIN province_all.biz_unit_info b on d.unit_info_id = b.id
+    where 1=1
+    <if test="pageParam.unitName !=null and pageParam.unitName!=''">
+      and b.dwmc like concat("%",#{pageParam.unitName},"%")
+    </if>
+    <if test="pageParam.year !=null and pageParam.year!=''">
+      and  DATE_FORMAT(a.plan_start_time,'%Y') = #{pageParam.year}
+    </if>
+    ORDER BY a.plan_start_time  desc
+  </select>
+  <select id="getPgPlan" resultType="com.chinaitop.depot.pg.model.vo.BusinessPgGopsPlanVO">
+  SELECT
+	a.id,
+	a.createdate,
+	a.updatename,
+	a.updatedate,
+	a.org_id as orgId,
+	a.plan_code as planCode,
+	a.plan_name as planName,
+	a.plan_type as planType,
+	a.plan_start_time as planStartTime,
+	a.plan_end_time as planEndTime,
+	a.customer_name as customerName,
+	a.contact_information as contactInformation,
+	a.total_amount as totalAmount,
+	a.completion_amount as completionAmount,
+	a.remaining_amount as remainingAmount,
+	a.plan_quantity as planQuantity,
+	a.completion_quantity as completionQuantity,
+	d.org_name AS orgName
+FROM
+	depot_qh.business_pg_gops_plan a
+LEFT JOIN depot_qh.org_info d ON a.org_id = d.org_id
+where a.id= #{id}
+  </select>
+  <select id="getCplSpList" resultType="com.chinaitop.depot.pg.model.vo.DataCrkywCplspDefaultVO">
+  SELECT
+	b.dataId AS dataId,
+	b.cjsj,
+	c.enumName AS sjjlpzmc,
+	b.sjjlpzbh,
+	b.sjjlppmc,
+	b.dj,
+	n.enumname AS djmc,
+	b.sjjlspmc,
+	b.sjjlspmcbh,
+	b.gg,
+	b.jldw,
+	f.enumname AS jldwmc,
+	b.bzq
+FROM
+	depot_qh.data_crkyw_cplsp_default b
+LEFT JOIN depot_qh.basic_enum f ON f.enumId = b.jldw
+LEFT JOIN basic_enum c ON b.sjjlpzbh = c.enumId
+LEFT JOIN basic_enum n ON b.dj = n.enumId
+WHERE
+	b.unitid = #{orgId}
+ORDER BY b.cjsj
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/pg/model/BusinessPgGopsPlan.java

@@ -0,0 +1,97 @@
+package com.chinaitop.depot.pg.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 成品粮监管-购销计划管理表实体
+ *
+ * @author TS
+ * @date  2024/06/11 15:41
+ **/
+@Getter
+@Setter
+public class BusinessPgGopsPlan {
+
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 2)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 3)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 4)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updatedate;
+
+    /** 库区；org_info的id； */
+    @ApiModelProperty(value = "库区；org_info的id；", position = 5)
+    private Integer orgId;
+
+    /** 计划编号 */
+    @ApiModelProperty(value = "计划编号", position = 6)
+    private String planCode;
+
+    /** 计划名称 */
+    @ApiModelProperty(value = "计划名称", position = 6)
+    private String planName;
+
+
+    /** 计划类型，1：销售计划；2：收购计划； */
+    @ApiModelProperty(value = "计划类型，1：销售计划；2：收购计划；", position = 7)
+    private Integer planType;
+
+    /** 计划开始时间 */
+    @ApiModelProperty(value = "计划开始时间", position = 8)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date planStartTime;
+
+    /** 计划结束时间 */
+    @ApiModelProperty(value = "计划结束时间", position = 9)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date planEndTime;
+
+    /** 客户名称 */
+    @ApiModelProperty(value = "客户名称", position = 10)
+    private String customerName;
+
+    /** 联系方式 */
+    @ApiModelProperty(value = "联系方式", position = 11)
+    private String contactInformation;
+
+    /** 总金额 */
+    @ApiModelProperty(value = "总金额", position = 12)
+    private BigDecimal totalAmount;
+
+    /** 完成金额 */
+    @ApiModelProperty(value = "完成金额", position = 13)
+    private BigDecimal completionAmount;
+
+    /** 剩余金额 */
+    @ApiModelProperty(value = "剩余金额", position = 14)
+    private BigDecimal remainingAmount;
+
+    /** 计划数量 */
+    @ApiModelProperty(value = "计划数量", position = 15)
+    private BigDecimal planQuantity;
+
+    /** 完成数量 */
+    @ApiModelProperty(value = "完成数量", position = 16)
+    private BigDecimal completionQuantity;
+
+    @ApiModelProperty(value = "成品粮明细数据", position = 17)
+    List<BusinessPgGopsPlanDetail> detailList;
+}

src/main/java/com/chinaitop/depot/pg/model/BusinessPgGopsPlanDetail.java

@@ -0,0 +1,70 @@
+package com.chinaitop.depot.pg.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 成品粮监管-购销计划管理-明细表实体
+ *
+ * @author TS
+ * @date  2024/06/11 15:42
+ **/
+@Getter
+@Setter
+public class BusinessPgGopsPlanDetail {
+
+    /** 明细记录唯一标识符 */
+    @ApiModelProperty(value = "明细记录唯一标识符", position = 1)
+    private Integer id;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 2)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 3)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 4)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updatedate;
+
+    /** business_pg_gops_plan的id； */
+    @ApiModelProperty(value = "business_pg_gops_plan的id；", position = 5)
+    private Integer pgGopsPlanId;
+
+    /** 商品；data_crkyw_cplsp_default的id； */
+    @ApiModelProperty(value = "商品；data_crkyw_cplsp_default的id；", position = 6)
+    private String crkywCplspDefaultId;
+
+    /** 性质 */
+    @ApiModelProperty(value = "性质", position = 7)
+    private String grainNatureId;
+
+    /** 数量 */
+    @ApiModelProperty(value = "数量", position = 8)
+    private BigDecimal quantity;
+
+    /** 重量，单位：吨 */
+    @ApiModelProperty(value = "重量，单位：吨", position = 9)
+    private BigDecimal weight;
+
+    /** 单价，单位：元 */
+    @ApiModelProperty(value = "单价，单位：元", position = 10)
+    private BigDecimal unitPrice;
+
+    /** 金额，单位：万元 */
+    @ApiModelProperty(value = "金额，单位：万元", position = 11)
+    private BigDecimal amount;
+
+    /** 完成数量 */
+    @ApiModelProperty(value = "完成数量", position = 16)
+    private BigDecimal completionQuantity;
+}

src/main/java/com/chinaitop/depot/pg/model/BusinessPgGopsPlanDetailExample.java

@@ -0,0 +1,910 @@
+package com.chinaitop.depot.pg.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BusinessPgGopsPlanDetailExample {
+    /**
+     * business_pg_gops_plan_detail
+     */
+    protected String orderByClause;
+
+    /**
+     * business_pg_gops_plan_detail
+     */
+    protected boolean distinct;
+
+    /**
+     * business_pg_gops_plan_detail
+     */
+    protected List<Criteria> oredCriteria;
+
+    public BusinessPgGopsPlanDetailExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * business_pg_gops_plan_detail 2024-06-11
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateIsNull() {
+            addCriterion("createdate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateIsNotNull() {
+            addCriterion("createdate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateEqualTo(Date value) {
+            addCriterion("createdate =", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateNotEqualTo(Date value) {
+            addCriterion("createdate <>", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateGreaterThan(Date value) {
+            addCriterion("createdate >", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateGreaterThanOrEqualTo(Date value) {
+            addCriterion("createdate >=", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateLessThan(Date value) {
+            addCriterion("createdate <", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateLessThanOrEqualTo(Date value) {
+            addCriterion("createdate <=", value, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateIn(List<Date> values) {
+            addCriterion("createdate in", values, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateNotIn(List<Date> values) {
+            addCriterion("createdate not in", values, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateBetween(Date value1, Date value2) {
+            addCriterion("createdate between", value1, value2, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedateNotBetween(Date value1, Date value2) {
+            addCriterion("createdate not between", value1, value2, "createdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameIsNull() {
+            addCriterion("updatename is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameIsNotNull() {
+            addCriterion("updatename is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameEqualTo(String value) {
+            addCriterion("updatename =", value, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameNotEqualTo(String value) {
+            addCriterion("updatename <>", value, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameGreaterThan(String value) {
+            addCriterion("updatename >", value, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameGreaterThanOrEqualTo(String value) {
+            addCriterion("updatename >=", value, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameLessThan(String value) {
+            addCriterion("updatename <", value, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameLessThanOrEqualTo(String value) {
+            addCriterion("updatename <=", value, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameLike(String value) {
+            addCriterion("updatename like", value, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameNotLike(String value) {
+            addCriterion("updatename not like", value, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameIn(List<String> values) {
+            addCriterion("updatename in", values, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameNotIn(List<String> values) {
+            addCriterion("updatename not in", values, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameBetween(String value1, String value2) {
+            addCriterion("updatename between", value1, value2, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatenameNotBetween(String value1, String value2) {
+            addCriterion("updatename not between", value1, value2, "updatename");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateIsNull() {
+            addCriterion("updatedate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateIsNotNull() {
+            addCriterion("updatedate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateEqualTo(Date value) {
+            addCriterion("updatedate =", value, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateNotEqualTo(Date value) {
+            addCriterion("updatedate <>", value, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateGreaterThan(Date value) {
+            addCriterion("updatedate >", value, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatedate >=", value, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateLessThan(Date value) {
+            addCriterion("updatedate <", value, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateLessThanOrEqualTo(Date value) {
+            addCriterion("updatedate <=", value, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateIn(List<Date> values) {
+            addCriterion("updatedate in", values, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateNotIn(List<Date> values) {
+            addCriterion("updatedate not in", values, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateBetween(Date value1, Date value2) {
+            addCriterion("updatedate between", value1, value2, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedateNotBetween(Date value1, Date value2) {
+            addCriterion("updatedate not between", value1, value2, "updatedate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdIsNull() {
+            addCriterion("pg_gops_plan_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdIsNotNull() {
+            addCriterion("pg_gops_plan_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdEqualTo(Integer value) {
+            addCriterion("pg_gops_plan_id =", value, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdNotEqualTo(Integer value) {
+            addCriterion("pg_gops_plan_id <>", value, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdGreaterThan(Integer value) {
+            addCriterion("pg_gops_plan_id >", value, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pg_gops_plan_id >=", value, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdLessThan(Integer value) {
+            addCriterion("pg_gops_plan_id <", value, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdLessThanOrEqualTo(Integer value) {
+            addCriterion("pg_gops_plan_id <=", value, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdIn(List<Integer> values) {
+            addCriterion("pg_gops_plan_id in", values, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdNotIn(List<Integer> values) {
+            addCriterion("pg_gops_plan_id not in", values, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdBetween(Integer value1, Integer value2) {
+            addCriterion("pg_gops_plan_id between", value1, value2, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPgGopsPlanIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("pg_gops_plan_id not between", value1, value2, "pgGopsPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdIsNull() {
+            addCriterion("crkyw_cplsp_default_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdIsNotNull() {
+            addCriterion("crkyw_cplsp_default_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdEqualTo(String value) {
+            addCriterion("crkyw_cplsp_default_id =", value, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdNotEqualTo(String value) {
+            addCriterion("crkyw_cplsp_default_id <>", value, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdGreaterThan(String value) {
+            addCriterion("crkyw_cplsp_default_id >", value, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdGreaterThanOrEqualTo(String value) {
+            addCriterion("crkyw_cplsp_default_id >=", value, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdLessThan(String value) {
+            addCriterion("crkyw_cplsp_default_id <", value, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdLessThanOrEqualTo(String value) {
+            addCriterion("crkyw_cplsp_default_id <=", value, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdLike(String value) {
+            addCriterion("crkyw_cplsp_default_id like", value, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdNotLike(String value) {
+            addCriterion("crkyw_cplsp_default_id not like", value, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdIn(List<String> values) {
+            addCriterion("crkyw_cplsp_default_id in", values, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdNotIn(List<String> values) {
+            addCriterion("crkyw_cplsp_default_id not in", values, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdBetween(String value1, String value2) {
+            addCriterion("crkyw_cplsp_default_id between", value1, value2, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCrkywCplspDefaultIdNotBetween(String value1, String value2) {
+            addCriterion("crkyw_cplsp_default_id not between", value1, value2, "crkywCplspDefaultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdIsNull() {
+            addCriterion("grain_nature_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdIsNotNull() {
+            addCriterion("grain_nature_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdEqualTo(String value) {
+            addCriterion("grain_nature_id =", value, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdNotEqualTo(String value) {
+            addCriterion("grain_nature_id <>", value, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdGreaterThan(String value) {
+            addCriterion("grain_nature_id >", value, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdGreaterThanOrEqualTo(String value) {
+            addCriterion("grain_nature_id >=", value, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdLessThan(String value) {
+            addCriterion("grain_nature_id <", value, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdLessThanOrEqualTo(String value) {
+            addCriterion("grain_nature_id <=", value, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdLike(String value) {
+            addCriterion("grain_nature_id like", value, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdNotLike(String value) {
+            addCriterion("grain_nature_id not like", value, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdIn(List<String> values) {
+            addCriterion("grain_nature_id in", values, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdNotIn(List<String> values) {
+            addCriterion("grain_nature_id not in", values, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdBetween(String value1, String value2) {
+            addCriterion("grain_nature_id between", value1, value2, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGrainNatureIdNotBetween(String value1, String value2) {
+            addCriterion("grain_nature_id not between", value1, value2, "grainNatureId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityIsNull() {
+            addCriterion("quantity is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityIsNotNull() {
+            addCriterion("quantity is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityEqualTo(BigDecimal value) {
+            addCriterion("quantity =", value, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityNotEqualTo(BigDecimal value) {
+            addCriterion("quantity <>", value, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityGreaterThan(BigDecimal value) {
+            addCriterion("quantity >", value, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("quantity >=", value, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityLessThan(BigDecimal value) {
+            addCriterion("quantity <", value, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("quantity <=", value, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityIn(List<BigDecimal> values) {
+            addCriterion("quantity in", values, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityNotIn(List<BigDecimal> values) {
+            addCriterion("quantity not in", values, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("quantity between", value1, value2, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuantityNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("quantity not between", value1, value2, "quantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNull() {
+            addCriterion("weight is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNotNull() {
+            addCriterion("weight is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEqualTo(BigDecimal value) {
+            addCriterion("weight =", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotEqualTo(BigDecimal value) {
+            addCriterion("weight <>", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThan(BigDecimal value) {
+            addCriterion("weight >", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight >=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThan(BigDecimal value) {
+            addCriterion("weight <", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("weight <=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIn(List<BigDecimal> values) {
+            addCriterion("weight in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotIn(List<BigDecimal> values) {
+            addCriterion("weight not in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("weight not between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceIsNull() {
+            addCriterion("unit_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceIsNotNull() {
+            addCriterion("unit_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceEqualTo(BigDecimal value) {
+            addCriterion("unit_price =", value, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceNotEqualTo(BigDecimal value) {
+            addCriterion("unit_price <>", value, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceGreaterThan(BigDecimal value) {
+            addCriterion("unit_price >", value, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("unit_price >=", value, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceLessThan(BigDecimal value) {
+            addCriterion("unit_price <", value, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("unit_price <=", value, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceIn(List<BigDecimal> values) {
+            addCriterion("unit_price in", values, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceNotIn(List<BigDecimal> values) {
+            addCriterion("unit_price not in", values, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("unit_price between", value1, value2, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("unit_price not between", value1, value2, "unitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountIsNull() {
+            addCriterion("amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountIsNotNull() {
+            addCriterion("amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountEqualTo(BigDecimal value) {
+            addCriterion("amount =", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountNotEqualTo(BigDecimal value) {
+            addCriterion("amount <>", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountGreaterThan(BigDecimal value) {
+            addCriterion("amount >", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("amount >=", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountLessThan(BigDecimal value) {
+            addCriterion("amount <", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("amount <=", value, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountIn(List<BigDecimal> values) {
+            addCriterion("amount in", values, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountNotIn(List<BigDecimal> values) {
+            addCriterion("amount not in", values, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("amount between", value1, value2, "amount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("amount not between", value1, value2, "amount");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * business_pg_gops_plan_detail
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * business_pg_gops_plan_detail 2024-06-11
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/chinaitop/depot/pg/model/vo/BusinessPgGopsPlanDetailVO.java

@@ -0,0 +1,59 @@
+package com.chinaitop.depot.pg.model.vo;
+
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 成品粮监管-购销计划管理-明细表实体
+ *
+ * @author TS
+ * @date  2024/06/11 15:42
+ **/
+@Getter
+@Setter
+public class BusinessPgGopsPlanDetailVO extends BusinessPgGopsPlanDetail {
+
+
+    @ApiModelProperty(value = "实际军粮品种名称")
+    private String sjjlpzmc;
+
+    @ApiModelProperty(value = "实际军粮品种编号")
+    private String sjjlpzbh;
+
+    @ApiModelProperty(value = "实际军粮品牌名称")
+    private String sjjlppmc;
+
+
+    @ApiModelProperty(value = "等级")
+    private String dj;
+
+    @ApiModelProperty(value = "等级名称")
+    private String djmc;
+
+    @ApiModelProperty(value = "实际军粮商品名称")
+    private String sjjlspmc;
+
+    @ApiModelProperty(value = "实际军粮商品名称编号")
+    private String sjjlspmcbh;
+
+    @ApiModelProperty(value = "规格")
+    private String gg;
+
+    @ApiModelProperty(value = "计量单位")
+    private String jldw;
+
+    @ApiModelProperty(value = "计量单位名称")
+    private String jldwmc;
+
+    @ApiModelProperty(value = "保质期")
+    private String bzq;
+
+    @ApiModelProperty(value = "性质名称", position = 7)
+    private String grainNatureName;
+
+}

src/main/java/com/chinaitop/depot/pg/model/vo/BusinessPgGopsPlanVO.java

@@ -0,0 +1,29 @@
+package com.chinaitop.depot.pg.model.vo;
+
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlan;
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 成品粮监管-购销计划管理表VO
+ *
+ * @author TS
+ * @date  2024/06/11 15:41
+ **/
+@Getter
+@Setter
+public class BusinessPgGopsPlanVO extends BusinessPgGopsPlan {
+
+
+    @ApiModelProperty(value = "库区名称", position = 2)
+    private String orgName;
+
+    @ApiModelProperty(value = "回显成品粮明细数据", position = 3)
+    List<BusinessPgGopsPlanDetailVO> detailVoList;
+}

src/main/java/com/chinaitop/depot/pg/model/vo/DataCrkywCplspDefaultVO.java

@@ -0,0 +1,68 @@
+package com.chinaitop.depot.pg.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 成品粮商品表
+ * </p>
+ *
+ * @author TangSong
+ * @since 2024-06-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="DataCrkywCplspDefault对象", description="成品粮商品表")
+public class DataCrkywCplspDefaultVO implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "ID")
+    private String dataId;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cjsj;
+
+    @ApiModelProperty(value = "实际军粮品种名称")
+    private String sjjlpzmc;
+
+    @ApiModelProperty(value = "实际军粮品种编号")
+    private String sjjlpzbh;
+
+    @ApiModelProperty(value = "实际军粮品牌名称")
+    private String sjjlppmc;
+
+    @ApiModelProperty(value = "等级")
+    private String dj;
+
+    @ApiModelProperty(value = "等级名称")
+    private String djmc;
+
+    @ApiModelProperty(value = "实际军粮商品名称")
+    private String sjjlspmc;
+
+    @ApiModelProperty(value = "实际军粮商品名称编号")
+    private String sjjlspmcbh;
+
+    @ApiModelProperty(value = "规格")
+    private String gg;
+
+    @ApiModelProperty(value = "计量单位")
+    private String jldw;
+
+    @ApiModelProperty(value = "计量单位名称")
+    private String jldwmc;
+
+    @ApiModelProperty(value = "保质期")
+    private String bzq;
+}

src/main/java/com/chinaitop/depot/pg/param/BusinessPgGopsPlanPageParam.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.pg.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BusinessPgGopsPlanPageParam {
+
+    /** 当前页 */
+    @ApiModelProperty(value = "当前页码")
+    private Integer current;
+
+    /** 每页条数 */
+    @ApiModelProperty(value = "每页条数")
+    private Integer size;
+
+    @ApiModelProperty(value = "库区名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "企业名称")
+    private String unitName;
+    /** 性质id */
+    @ApiModelProperty(value = "性质id")
+    private String grainNatureId;
+
+    @ApiModelProperty(value = "年度")
+    private String year;
+
+
+}

src/main/java/com/chinaitop/depot/pg/service/BusinessPgGopsPlanDetailService.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.pg.service;
+
+/**
+ * <p>
+ * 轮换计划-入库信息表 服务类
+ * </p>
+ *
+ * @author TS
+ * @since 2024-06-11
+ */
+public interface BusinessPgGopsPlanDetailService {
+
+
+
+
+}

src/main/java/com/chinaitop/depot/pg/service/BusinessPgGopsPlanService.java

@@ -0,0 +1,55 @@
+package com.chinaitop.depot.pg.service;
+
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlan;
+import com.chinaitop.depot.pg.model.vo.BusinessPgGopsPlanVO;
+import com.chinaitop.depot.pg.model.vo.DataCrkywCplspDefaultVO;
+import com.chinaitop.depot.pg.param.BusinessPgGopsPlanPageParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 轮换计划-入库信息表 服务类
+ * </p>
+ *
+ * @author TS
+ * @since 2024-06-11
+ */
+public interface BusinessPgGopsPlanService {
+
+    /**
+     * 成品粮购销计划列表
+     * @param businessPgGopsPlanPageParam
+     * @return
+     */
+    List<Map<String,Object>> queryByExample(BusinessPgGopsPlanPageParam businessPgGopsPlanPageParam);
+
+    /**
+     * 保存或修改成品粮购销计划
+     * @param businessPgGopsPlan
+     * @return
+     */
+    Map<String,Object> add(BusinessPgGopsPlan businessPgGopsPlan);
+
+    /**
+     * 删除成品粮购销计划
+     * @param id
+     * @return
+     */
+    Map<String,Object> removeById(Integer id);
+
+    /**
+     * 得到成品粮购销计划
+     * @param id
+     * @return
+     */
+    BusinessPgGopsPlanVO getPgPlanDetail(Integer id);
+
+    /**
+     * 获取本库区对应的商品列表
+     * @param orgId
+     * @return
+     */
+    List<DataCrkywCplspDefaultVO> getCplSpList(String orgId);
+}

src/main/java/com/chinaitop/depot/pg/service/impl/BusinessPgGopsPlanDetailServiceImpl.java

@@ -0,0 +1,17 @@
+package com.chinaitop.depot.pg.service.impl;
+
+import com.chinaitop.depot.pg.service.BusinessPgGopsPlanDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 成品粮购销计划明细 服务实现类 * </p>
+ *
+ * @author TS
+ * @since 2024-06-11
+ */
+@Service
+public class BusinessPgGopsPlanDetailServiceImpl implements BusinessPgGopsPlanDetailService {
+
+
+}

src/main/java/com/chinaitop/depot/pg/service/impl/BusinessPgGopsPlanServiceImpl.java

@@ -0,0 +1,142 @@
+package com.chinaitop.depot.pg.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.chinaitop.depot.pg.mapper.BusinessPgGopsPlanDetailMapper;
+import com.chinaitop.depot.pg.mapper.BusinessPgGopsPlanMapper;
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlan;
+import com.chinaitop.depot.pg.model.BusinessPgGopsPlanDetail;
+import com.chinaitop.depot.pg.model.vo.BusinessPgGopsPlanDetailVO;
+import com.chinaitop.depot.pg.model.vo.BusinessPgGopsPlanVO;
+import com.chinaitop.depot.pg.model.vo.DataCrkywCplspDefaultVO;
+import com.chinaitop.depot.pg.param.BusinessPgGopsPlanPageParam;
+import com.chinaitop.depot.pg.service.BusinessPgGopsPlanDetailService;
+import com.chinaitop.depot.pg.service.BusinessPgGopsPlanService;
+import com.chinaitop.depot.rp.model.BusinessRpBiweeklyReportGrain;
+import com.github.pagehelper.PageHelper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 成品粮粮购销计划 服务实现类
+ * </p>
+ *
+ * @author TS
+ * @since 2024-06-11
+ */
+@Service
+public class BusinessPgGopsPlanServiceImpl implements BusinessPgGopsPlanService {
+
+    @Resource
+    private BusinessPgGopsPlanDetailMapper businessPgGopsPlanDetailMapper;
+    @Resource
+    private BusinessPgGopsPlanMapper businessPgGopsPlanMapper;
+
+    /**
+     * 成品粮购销计划列表
+     *
+     * @param pageParam
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> queryByExample(BusinessPgGopsPlanPageParam pageParam) {
+        PageHelper.startPage(pageParam.getCurrent(), pageParam.getSize());
+        List<Map<String, Object>> list = businessPgGopsPlanMapper.selectByPageParam(pageParam);
+        return list;
+    }
+
+    /**
+     * 保存或修改成品粮购销计划
+     *
+     * @param businessPgGopsPlan
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> add(BusinessPgGopsPlan businessPgGopsPlan) {
+            Map<String,Object> result = new HashMap<>();
+            result.put("status", "error");
+            //保存明细品种
+            List<BusinessPgGopsPlanDetail>  detailList  =businessPgGopsPlan.getDetailList();
+            if (detailList.size() <= 0){
+                result.put("msg", "商品明细不能为空");
+                return result;
+            }
+            boolean isAdd = businessPgGopsPlan.getId() == null || businessPgGopsPlan.getId() == 0;
+            businessPgGopsPlan.setUpdatedate(new Date());
+            if (isAdd){
+                businessPgGopsPlan.setCreatedate(new Date());
+                businessPgGopsPlanMapper.insertSelective(businessPgGopsPlan); //保存主表信息
+            }else{
+                businessPgGopsPlanMapper.updateByPrimaryKeySelective(businessPgGopsPlan); //修改主表信息
+                //删除明细表数据
+                businessPgGopsPlanDetailMapper.deleteByMainId(businessPgGopsPlan.getId());
+            }
+        for (int i = 0; i < detailList.size(); i++) {
+            BusinessPgGopsPlanDetail detail = detailList.get(i);
+            detail.setPgGopsPlanId(businessPgGopsPlan.getId());
+            detail.setCreatedate(new Date());
+            detail.setUpdatedate(new Date());
+            businessPgGopsPlanDetailMapper.insertSelective(detail);
+        }
+
+            result.put("status", "success");
+            result.put("msg", "保存成功");
+            return result;
+    }
+
+    /**
+     * 删除成品粮购销计划
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public Map<String, Object> removeById(Integer id) {
+            Map<String,Object> result = new HashMap<>();
+            result.put("status", "error");
+            if (businessPgGopsPlanMapper.selectByPrimaryKey(id) == null){
+                result.put("msg", "数据不存在，已被删除");
+                return result;
+            }
+            //删除明细表数据
+            businessPgGopsPlanDetailMapper.deleteByMainId(id);
+            //删除主表数据
+            businessPgGopsPlanMapper.deleteByPrimaryKey(id);
+
+            result.put("status", "success");
+            result.put("msg", "删除成功");
+            return result;
+    }
+
+    /**
+     * 得到成品粮购销计划
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public BusinessPgGopsPlanVO getPgPlanDetail(Integer id) {
+        BusinessPgGopsPlanVO businessPgGopsPlanVO = businessPgGopsPlanMapper.getPgPlan(id);
+        List<BusinessPgGopsPlanDetailVO> detailVoList = businessPgGopsPlanDetailMapper.findPlanDetailList(id);
+        businessPgGopsPlanVO.setDetailVoList(detailVoList);
+        return businessPgGopsPlanVO;
+    }
+
+    /**
+     * 获取本库区对应的商品列表
+     *
+     * @param orgId
+     * @return
+     */
+    @Override
+    public List<DataCrkywCplspDefaultVO> getCplSpList(String orgId) {
+        return businessPgGopsPlanMapper.getCplSpList(orgId);
+    }
+}

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/BusinessRpBiweeklyReportMapper.xml

@@ -272,6 +272,9 @@
         LEFT JOIN depot_qh.business_rp_biweekly_report_grain f on f.rp_biweekly_report_id = a.id
         LEFT JOIN depot_qh.basic_enum g on g.enumId = f.grain_variety_id
         where 1=1
+        <if test="pageParam.orgId !=null and pageParam.orgId!=''">
+            and a.org_id = #{pageParam.orgId}
+        </if>
         <if test="pageParam.unitName !=null and pageParam.unitName!=''">
             and b.dwmc like concat("%",#{pageParam.unitName},"%")
         </if>

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

@@ -20,6 +20,7 @@
     <resultMap id="BaseResultMap2" extends="BaseResultMap" type="com.chinaitop.depot.rp.model.BusinessRpInbound">
         <result column="grainVarietyName" property="grainVarietyName" />
         <result column="grainNatureName" property="grainNatureName" />
+        <result column="orgName" property="orgName" />
     </resultMap>
 
     <sql id="Example_Where_Clause" >

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

@@ -45,11 +45,14 @@
     <resultMap id="BaseResultMap2" extends="BaseResultMap" type="com.chinaitop.depot.rp.model.BusinessRpOutbound">
 
         <result column="basicStorehouseName" property="basicStorehouseName" />
+        <result column="storehouseName" property="storehouseName" />
         <result column="grainVarietyName" property="grainVarietyName" />
         <result column="grainNatureName" property="grainNatureName" />
         <result column="grainGradeName" property="grainGradeName" />
         <result column="warehouseName" property="warehouseName" />
         <result column="remarks" property="remarks" jdbcType="LONGVARCHAR" />
+        <result column="orgName" property="orgName" />
+
 
     </resultMap>
     <resultMap id="ResultMapWithBLOBs" type="com.chinaitop.depot.rp.model.BusinessRpOutbound" extends="BaseResultMap" >
@@ -623,7 +626,8 @@
     d.inspection_report_id,
     d.regular_inspection_report_ids,
     d.plan_quantity,
-        o.org_name orgName,
+    o.org_name as "orgName",
+    st.storehouse_name as "basicStorehouseName",
     st.storehouse_name as "storehouseName",
     wa.warehouse_name  as "warehouseName",
     pz.enumname as "grainVarietyName",

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/model/BusinessRpInbound.java

@@ -71,4 +71,6 @@ public class BusinessRpInbound implements Serializable {
     @ApiModelProperty(value = "粮食性质；basic_enum的id；粮食性质名称")
     private String grainNatureName;
 
+    private String orgName;
+
 }

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

@@ -105,4 +105,7 @@ public class BusinessRpOutbound implements Serializable {
 
     @ApiModelProperty(value = "粮食等级；basic_enum的id；粮食等级名称")
     private String grainGradeName;
+
+    private String orgName;
+    private String storehouseName;
 }

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

@@ -42,6 +42,10 @@ public class BusinessRpBiweeklyReportPageParam {
     @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
     private String sortOrder;
 
+    /** 库区id */
+    @ApiModelProperty(value = "库区id")
+    private String orgId;
+
     /** 企业名称 */
     @ApiModelProperty(value = "企业名称")
     private String unitName;

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

@@ -113,18 +113,14 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
 
         return businessRpReportVO;
     }
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     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) {
@@ -244,7 +242,7 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
         businessRpReportMapper.deleteByPrimaryKey(id);
 
         result.put("status", "success");
-        result.put("msg", "保存成功");
+        result.put("msg", "删除成功");
         return result;
     }
 
@@ -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=
+