1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/StorageFeeRecordChargeController.java

@@ -4,13 +4,10 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 import com.yh.saas.plugin.yiliangyiyun.entity.StorageFeeRecordCharge;
 import com.yh.saas.plugin.yiliangyiyun.service.IStorageFeeRecordChargeService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -33,5 +30,12 @@ public class StorageFeeRecordChargeController {
     public String addCharge(@RequestBody @Valid StorageFeeRecordCharge storageFeeRecordCharge) {
         return storageFeeRecordChargeService.addCharge(storageFeeRecordCharge);
     }
+    /**
+     * 收费记录
+     */
+    @GetMapping("/feeRecord")
+    public List<StorageFeeRecordCharge> feeRecord(@RequestParam String contractId){
+        return storageFeeRecordChargeService.feeRecord(contractId);
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/StorageFeeRecordController.java

@@ -1,10 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
-import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IStorageFeeRecordService;
-import com.yh.saas.plugin.yiliangyiyun.service.ITranCarInfoService;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.StorageFeeRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,15 +24,31 @@ public class StorageFeeRecordController {
     @Autowired
     private IStorageFeeRecordService storageFeeRecordService;
 
-
     /**
      * 添加
-     * @param contractNo
+     * @param example
      * @return
      */
     @PostMapping("/api/addStorageFeeRecord")
-    public String addStorageFeeRecord(@RequestParam String contractNo) {
-        return storageFeeRecordService.addStorageFeeRecord(contractNo);
+    public String addStorageFeeRecord(@RequestBody StorageFeeRecord example) {
+        return storageFeeRecordService.addStorageFeeRecord(example.getContractNo());
+    }
+    /**
+     * 信息分页列表查询
+     *
+     * @param storageFeeRecord
+     * @return
+     */
+    @GetMapping("/selectInfo")
+    public Page<StorageFeeRecord> selectInfo(StorageFeeRecord storageFeeRecord) {
+        return storageFeeRecordService.selectInfo(storageFeeRecord);
+    }
+    /**
+     * 编辑
+     */
+    @PostMapping("/editInfo")
+    public String editInfo(@RequestBody StorageFeeRecord storageFeeRecord) {
+        return storageFeeRecordService.editInfo(storageFeeRecord);
     }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/StorageFeeRecord.java

@@ -87,7 +87,7 @@ public class StorageFeeRecord extends BaseModel<StorageFeeRecord> {
      */
     private Double receivable;
     /**
-     * 终止标识（默认0）
+     * 终止标识（默认0终止1）
      */
     private String endFlag;
     /**
@@ -104,6 +104,11 @@ public class StorageFeeRecord extends BaseModel<StorageFeeRecord> {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(exist = false)
     private Date endDate;
+    /**
+     * 修改标识1修改代储费2终止
+     */
+    @TableField(exist = false)
+    private String flag;
 
 
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/StorageFeeRecordMapper.java

@@ -3,6 +3,9 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.StorageFeeRecord;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 记录代储费信息 Mapper 接口
@@ -12,5 +15,20 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @since 2022-01-18
  */
 public interface StorageFeeRecordMapper extends BaseMapper<StorageFeeRecord> {
+    /**
+     * 根据条件查询总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<StorageFeeRecord> getListByCondition(Map<String, Object> pageView);
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IStorageFeeRecordChargeService.java

@@ -3,6 +3,8 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 import com.yh.saas.plugin.yiliangyiyun.entity.StorageFeeRecordCharge;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录代储费收费信息 服务类
@@ -18,4 +20,10 @@ public interface IStorageFeeRecordChargeService extends IService<StorageFeeRecor
      * @param storageFeeRecordCharge
      */
     String addCharge(StorageFeeRecordCharge storageFeeRecordCharge);
+    /**
+     * 收费记录
+     *
+     * @param contractId
+     */
+    List<StorageFeeRecordCharge> feeRecord(String contractId);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IStorageFeeRecordService.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.StorageFeeRecord;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -13,4 +14,17 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface IStorageFeeRecordService extends IService<StorageFeeRecord> {
     String addStorageFeeRecord(String contractNo);
+    /**
+     * 信息分页列表查询
+     *
+     * @param storageFeeRecord
+     * @return
+     */
+    Page<StorageFeeRecord> selectInfo(StorageFeeRecord storageFeeRecord);
+    /**
+     * 编辑
+     *
+     * @param storageFeeRecord
+     */
+    String editInfo(StorageFeeRecord storageFeeRecord);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StorageFeeRecordChargeServiceImpl.java

@@ -1,12 +1,16 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.StorageFeeRecordCharge;
 import com.yh.saas.plugin.yiliangyiyun.mapper.StorageFeeRecordChargeMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IStorageFeeRecordChargeService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录代储费收费信息 服务实现类
@@ -29,4 +33,11 @@ public class StorageFeeRecordChargeServiceImpl extends ServiceImpl<StorageFeeRec
         this.insert(storageFeeRecordCharge);
         return "ok";
     }
+
+    @Override
+    public List<StorageFeeRecordCharge> feeRecord(String contractId) {
+        List<StorageFeeRecordCharge> storageFeeRecordCharges=this.selectList(new EntityWrapper<StorageFeeRecordCharge>()
+            .eq("contract_id",contractId));
+        return storageFeeRecordCharges;
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StorageFeeRecordServiceImpl.java

@@ -3,17 +3,18 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.SalesDeliveryReport;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
+import com.yh.saas.plugin.yiliangyiyun.entity.StockSaleReceiptReport;
 import com.yh.saas.plugin.yiliangyiyun.entity.StorageFeeRecord;
-import com.yh.saas.plugin.yiliangyiyun.entity.StorageFeeRecordCharge;
 import com.yh.saas.plugin.yiliangyiyun.mapper.StorageFeeRecordMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.ISalesDeliveryReportService;
+import com.yh.saas.plugin.yiliangyiyun.service.IStockSaleReceiptReportService;
 import com.yh.saas.plugin.yiliangyiyun.service.IStorageFeeRecordService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -21,6 +22,9 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  * 记录代储费信息 服务实现类
@@ -36,7 +40,7 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
     @Autowired
     private IContractManagementInfoService contractManagementInfoService;
     @Autowired
-    private ISalesDeliveryReportService salesDeliveryReportService;
+    private IStockSaleReceiptReportService stockSaleReceiptReportService;
 
     /**
      * 生成代储费记录
@@ -59,19 +63,19 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                     String dateFlag = comparetoTime(sdf.format(new Date()), sdf.format(contractManagementInfo.getStorageFeeEnddate()));
                     // 结束时间 在当天时间 之前
                     if (!"2".equals(dateFlag)) {
-                        EntityWrapper<SalesDeliveryReport> salesDeliveryReportEntityWrapper = new EntityWrapper<SalesDeliveryReport>();
+                        EntityWrapper<StockSaleReceiptReport> salesDeliveryReportEntityWrapper = new EntityWrapper<StockSaleReceiptReport>();
                         salesDeliveryReportEntityWrapper.eq("contract_no", contractNo);
                         salesDeliveryReportEntityWrapper.and("DATE_FORMAT(retrieval_date,\"%Y%m%d\") &lt;=\n" +
                                 "DATE_FORMAT('" + contractManagementInfo.getStorageFeeEnddate() + "',\"%Y%m%d\")");
                         salesDeliveryReportEntityWrapper.groupBy("retrieval_date");
-                        List<SalesDeliveryReport> salesDeliveryReports = salesDeliveryReportService.selectList(salesDeliveryReportEntityWrapper);
+                        List<StockSaleReceiptReport> salesDeliveryReports = stockSaleReceiptReportService.selectList(salesDeliveryReportEntityWrapper);
                         if (!CollectionUtils.isEmpty(salesDeliveryReports)) {
                             for (int i = 0; i < salesDeliveryReports.size(); i++) {
                                 // 查询是否已经生成记录
                                 EntityWrapper<StorageFeeRecord> storageFeeRecordEntityWrapper = new EntityWrapper<StorageFeeRecord>();
                                 storageFeeRecordEntityWrapper.eq("contract_no", contractNo);
                                 storageFeeRecordEntityWrapper.and("DATE_FORMAT(storage_fee_date,\"%Y%m%d\") =\n" +
-                                        "DATE_FORMAT('" + salesDeliveryReports.get(i).getRetrievalDate() + "',\"%Y%m%d\")");
+                                        "DATE_FORMAT('" + salesDeliveryReports.get(i).getDeliveryDate() + "',\"%Y%m%d\")");
                                 StorageFeeRecord storageFeeRecord1 = this.selectOne(storageFeeRecordEntityWrapper);
                                 if (storageFeeRecord1 == null) {
                                     // 初始化
@@ -79,14 +83,14 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     storageFeeRecord.setId(IdGenerator.generateUUID());
                                     storageFeeRecord.setGoodsNameKey(contractManagementInfo.getGoodsNameKey());
                                     storageFeeRecord.setGoodsName(contractManagementInfo.getGoodsName());
-                                    storageFeeRecord.setStorageFeeDate(salesDeliveryReports.get(i).getRetrievalDate());
+                                    storageFeeRecord.setStorageFeeDate(salesDeliveryReports.get(i).getDeliveryDate());
                                     storageFeeRecord.setStorageVolume(0f);
                                     // 查询当日出库量
-                                    EntityWrapper<SalesDeliveryReport> salesDeliveryReportEntityWrapper1 = new EntityWrapper<SalesDeliveryReport>();
+                                    EntityWrapper<StockSaleReceiptReport> salesDeliveryReportEntityWrapper1 = new EntityWrapper<StockSaleReceiptReport>();
                                     salesDeliveryReportEntityWrapper1.eq("contract_no", contractNo);
                                     salesDeliveryReportEntityWrapper1.and("DATE_FORMAT(retrieval_date,\"%Y%m%d\") =\n" +
                                             "DATE_FORMAT('" + contractManagementInfo.getStorageFeeEnddate() + "',\"%Y%m%d\")");
-                                    List<SalesDeliveryReport> salesDeliveryReports1 = salesDeliveryReportService.selectList(salesDeliveryReportEntityWrapper1);
+                                    List<StockSaleReceiptReport> salesDeliveryReports1 = stockSaleReceiptReportService.selectList(salesDeliveryReportEntityWrapper1);
                                     Float ton = 0f;
                                     if (!CollectionUtils.isEmpty(salesDeliveryReports1)) {
                                         for (int j = 0; j < salesDeliveryReports1.size(); j++) {
@@ -96,7 +100,7 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     }
                                     storageFeeRecord.setDeliveryVolume(ton);
                                     // 计算当日计费储量
-                                    String dateAfter = getSpecifiedDayBefore(sdf.format(salesDeliveryReports.get(i).getRetrievalDate()));
+                                    String dateAfter = getSpecifiedDayBefore(sdf.format(salesDeliveryReports.get(i).getDeliveryDate()));
                                     EntityWrapper<StorageFeeRecord> storageFeeRecordEntityWrapper2 = new EntityWrapper<StorageFeeRecord>();
                                     storageFeeRecordEntityWrapper2.eq("contract_no", contractNo);
                                     storageFeeRecordEntityWrapper2.and("DATE_FORMAT(storage_fee_date,\"%Y%m%d\") =\n" +
@@ -114,11 +118,11 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                 // 已经生成过记录修改当日出库量
                                 else {
                                     // 查询当日出库量
-                                    EntityWrapper<SalesDeliveryReport> salesDeliveryReportEntityWrapper1 = new EntityWrapper<SalesDeliveryReport>();
+                                    EntityWrapper<StockSaleReceiptReport> salesDeliveryReportEntityWrapper1 = new EntityWrapper<StockSaleReceiptReport>();
                                     salesDeliveryReportEntityWrapper1.eq("contract_no", contractNo);
                                     salesDeliveryReportEntityWrapper1.and("DATE_FORMAT(retrieval_date,\"%Y%m%d\") =\n" +
                                             "DATE_FORMAT('" + contractManagementInfo.getStorageFeeEnddate() + "',\"%Y%m%d\")");
-                                    List<SalesDeliveryReport> salesDeliveryReports1 = salesDeliveryReportService.selectList(salesDeliveryReportEntityWrapper1);
+                                    List<StockSaleReceiptReport> salesDeliveryReports1 = stockSaleReceiptReportService.selectList(salesDeliveryReportEntityWrapper1);
                                     Float ton = 0f;
                                     if (!CollectionUtils.isEmpty(salesDeliveryReports1)) {
                                         for (int j = 0; j < salesDeliveryReports1.size(); j++) {
@@ -128,7 +132,7 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     }
                                     storageFeeRecord1.setDeliveryVolume(ton);
                                     // 计算当日计费储量
-                                    String dateAfter = getSpecifiedDayBefore(sdf.format(salesDeliveryReports.get(i).getRetrievalDate()));
+                                    String dateAfter = getSpecifiedDayBefore(sdf.format(salesDeliveryReports.get(i).getDeliveryDate()));
                                     EntityWrapper<StorageFeeRecord> storageFeeRecordEntityWrapper2 = new EntityWrapper<StorageFeeRecord>();
                                     storageFeeRecordEntityWrapper2.eq("contract_no", contractNo);
                                     storageFeeRecordEntityWrapper2.and("DATE_FORMAT(storage_fee_date,\"%Y%m%d\") =\n" +
@@ -153,19 +157,19 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
 
 
 
-                        EntityWrapper<SalesDeliveryReport> salesDeliveryReportEntityWrapper = new EntityWrapper<SalesDeliveryReport>();
+                        EntityWrapper<StockSaleReceiptReport> salesDeliveryReportEntityWrapper = new EntityWrapper<StockSaleReceiptReport>();
                         salesDeliveryReportEntityWrapper.eq("contract_no", contractNo);
                         salesDeliveryReportEntityWrapper.and("DATE_FORMAT(retrieval_date,\"%Y%m%d\") &lt;=\n" +
                                 "DATE_FORMAT('" + new Date() + "',\"%Y%m%d\")");
                         salesDeliveryReportEntityWrapper.groupBy("retrieval_date");
-                        List<SalesDeliveryReport> salesDeliveryReports = salesDeliveryReportService.selectList(salesDeliveryReportEntityWrapper);
+                        List<StockSaleReceiptReport> salesDeliveryReports = stockSaleReceiptReportService.selectList(salesDeliveryReportEntityWrapper);
                         if (!CollectionUtils.isEmpty(salesDeliveryReports)) {
                             for (int i = 0; i < salesDeliveryReports.size(); i++) {
                                 // 查询是否已经生成记录
                                 EntityWrapper<StorageFeeRecord> storageFeeRecordEntityWrapper = new EntityWrapper<StorageFeeRecord>();
                                 storageFeeRecordEntityWrapper.eq("contract_no", contractNo);
                                 storageFeeRecordEntityWrapper.and("DATE_FORMAT(storage_fee_date,\"%Y%m%d\") =\n" +
-                                        "DATE_FORMAT('" + salesDeliveryReports.get(i).getRetrievalDate() + "',\"%Y%m%d\")");
+                                        "DATE_FORMAT('" + salesDeliveryReports.get(i).getDeliveryDate() + "',\"%Y%m%d\")");
                                 StorageFeeRecord storageFeeRecord1 = this.selectOne(storageFeeRecordEntityWrapper);
                                 if (storageFeeRecord1 == null) {
                                     // 初始化
@@ -173,14 +177,14 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     storageFeeRecord.setId(IdGenerator.generateUUID());
                                     storageFeeRecord.setGoodsNameKey(contractManagementInfo.getGoodsNameKey());
                                     storageFeeRecord.setGoodsName(contractManagementInfo.getGoodsName());
-                                    storageFeeRecord.setStorageFeeDate(salesDeliveryReports.get(i).getRetrievalDate());
+                                    storageFeeRecord.setStorageFeeDate(salesDeliveryReports.get(i).getDeliveryDate());
                                     storageFeeRecord.setStorageVolume(0f);
                                     // 查询当日出库量
-                                    EntityWrapper<SalesDeliveryReport> salesDeliveryReportEntityWrapper1 = new EntityWrapper<SalesDeliveryReport>();
+                                    EntityWrapper<StockSaleReceiptReport> salesDeliveryReportEntityWrapper1 = new EntityWrapper<StockSaleReceiptReport>();
                                     salesDeliveryReportEntityWrapper1.eq("contract_no", contractNo);
                                     salesDeliveryReportEntityWrapper1.and("DATE_FORMAT(retrieval_date,\"%Y%m%d\") =\n" +
                                             "DATE_FORMAT('" + contractManagementInfo.getStorageFeeEnddate() + "',\"%Y%m%d\")");
-                                    List<SalesDeliveryReport> salesDeliveryReports1 = salesDeliveryReportService.selectList(salesDeliveryReportEntityWrapper1);
+                                    List<StockSaleReceiptReport> salesDeliveryReports1 = stockSaleReceiptReportService.selectList(salesDeliveryReportEntityWrapper1);
                                     Float ton = 0f;
                                     if (!CollectionUtils.isEmpty(salesDeliveryReports1)) {
                                         for (int j = 0; j < salesDeliveryReports1.size(); j++) {
@@ -190,7 +194,7 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     }
                                     storageFeeRecord.setDeliveryVolume(ton);
                                     // 计算当日计费储量
-                                    String dateAfter = getSpecifiedDayBefore(sdf.format(salesDeliveryReports.get(i).getRetrievalDate()));
+                                    String dateAfter = getSpecifiedDayBefore(sdf.format(salesDeliveryReports.get(i).getDeliveryDate()));
                                     EntityWrapper<StorageFeeRecord> storageFeeRecordEntityWrapper2 = new EntityWrapper<StorageFeeRecord>();
                                     storageFeeRecordEntityWrapper2.eq("contract_no", contractNo);
                                     storageFeeRecordEntityWrapper2.and("DATE_FORMAT(storage_fee_date,\"%Y%m%d\") =\n" +
@@ -208,11 +212,11 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                 // 已经生成过记录修改当日出库量
                                 else {
                                     // 查询当日出库量
-                                    EntityWrapper<SalesDeliveryReport> salesDeliveryReportEntityWrapper1 = new EntityWrapper<SalesDeliveryReport>();
+                                    EntityWrapper<StockSaleReceiptReport> salesDeliveryReportEntityWrapper1 = new EntityWrapper<StockSaleReceiptReport>();
                                     salesDeliveryReportEntityWrapper1.eq("contract_no", contractNo);
                                     salesDeliveryReportEntityWrapper1.and("DATE_FORMAT(retrieval_date,\"%Y%m%d\") =\n" +
                                             "DATE_FORMAT('" + contractManagementInfo.getStorageFeeEnddate() + "',\"%Y%m%d\")");
-                                    List<SalesDeliveryReport> salesDeliveryReports1 = salesDeliveryReportService.selectList(salesDeliveryReportEntityWrapper1);
+                                    List<StockSaleReceiptReport> salesDeliveryReports1 = stockSaleReceiptReportService.selectList(salesDeliveryReportEntityWrapper1);
                                     Float ton = 0f;
                                     if (!CollectionUtils.isEmpty(salesDeliveryReports1)) {
                                         for (int j = 0; j < salesDeliveryReports1.size(); j++) {
@@ -222,7 +226,7 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     }
                                     storageFeeRecord1.setDeliveryVolume(ton);
                                     // 计算当日计费储量
-                                    String dateAfter = getSpecifiedDayBefore(sdf.format(salesDeliveryReports.get(i).getRetrievalDate()));
+                                    String dateAfter = getSpecifiedDayBefore(sdf.format(salesDeliveryReports.get(i).getDeliveryDate()));
                                     EntityWrapper<StorageFeeRecord> storageFeeRecordEntityWrapper2 = new EntityWrapper<StorageFeeRecord>();
                                     storageFeeRecordEntityWrapper2.eq("contract_no", contractNo);
                                     storageFeeRecordEntityWrapper2.and("DATE_FORMAT(storage_fee_date,\"%Y%m%d\") =\n" +
@@ -298,4 +302,75 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
         }
 
     }
+    @Override
+    public Page<StorageFeeRecord> selectInfo(StorageFeeRecord storageFeeRecord) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (storageFeeRecord.getCurrentPage() - 1)
+                * storageFeeRecord.getPageSize());
+        //公司id
+        pageView.put("compId", storageFeeRecord.getCompId());
+        pageView.put("pageSize", storageFeeRecord.getPageSize());
+        pageView.put("currentPage", storageFeeRecord.getCurrentPage());
+        pageView.put("startDate", storageFeeRecord.getStartDate());
+        pageView.put("contractNo", storageFeeRecord.getContractNo());
+        pageView.put("endDate", storageFeeRecord.getEndDate());
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<StorageFeeRecord> dataList = baseMapper.getListByCondition(pageView);
+        Page<StorageFeeRecord> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(storageFeeRecord.getCurrentPage());
+        page.setSize(storageFeeRecord.getPageSize());
+        return page;
+    }
+
+    /**
+     * 修改
+     * @param storageFeeRecord
+     * @return
+     */
+    @Override
+    public String editInfo(StorageFeeRecord storageFeeRecord) {
+        //修改代储费
+        if ("1".equals(storageFeeRecord.getFlag())) {
+            StorageFeeRecord storageFeeRecord1 = this.selectById(storageFeeRecord.getId());
+            List<StorageFeeRecord> storageFeeRecordList = this.selectList(new EntityWrapper<StorageFeeRecord>()
+                    .eq("comp_id", storageFeeRecord1.getCompId())
+                    .eq("contract_no", storageFeeRecord1.getContractNo())
+                    .gt("storage_fee_date", storageFeeRecord1.getStorageFeeDate()));
+            if (CollectionUtils.isNotEmpty(storageFeeRecordList)) {
+                for (StorageFeeRecord storageFeeRecord2 : storageFeeRecordList) {
+                    storageFeeRecord2.setStorageFee(storageFeeRecord.getStorageFee());
+                    this.updateById(storageFeeRecord2);
+                }
+            }
+        }
+        //终止
+        else if ("2".equals(storageFeeRecord.getFlag())) {
+            StorageFeeRecord storageFeeRecord1 = this.selectById(storageFeeRecord.getId());
+            //时间大于当条的删除
+            List<StorageFeeRecord> storageFeeRecordList = this.selectList(new EntityWrapper<StorageFeeRecord>()
+                    .eq("comp_id", storageFeeRecord1.getCompId())
+                    .eq("contract_no", storageFeeRecord1.getContractNo())
+                    .gt("storage_fee_date", storageFeeRecord1.getStorageFeeDate()));
+            if (CollectionUtils.isNotEmpty(storageFeeRecordList)) {
+                for (StorageFeeRecord storageFeeRecord2 : storageFeeRecordList) {
+                    this.deleteById(storageFeeRecord2.getId());
+                }
+            }
+            //时间小于当条的状态打成已终止
+            List<StorageFeeRecord> storageFeeRecordList1 = this.selectList(new EntityWrapper<StorageFeeRecord>()
+                    .eq("comp_id", storageFeeRecord1.getCompId())
+                    .eq("contract_no", storageFeeRecord1.getContractNo())
+                    .le("storage_fee_date", storageFeeRecord1.getStorageFeeDate()));
+            if (CollectionUtils.isNotEmpty(storageFeeRecordList1)) {
+                for (StorageFeeRecord storageFeeRecord2 : storageFeeRecordList1) {
+                    storageFeeRecord2.setEndFlag("1");
+                    this.updateById(storageFeeRecord2);
+                }
+            }
+        }
+        this.updateById(storageFeeRecord);
+        return "ok";
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -64,6 +64,10 @@
         m.packing_method as packingMethod,
         m.grain_delivery as grainDelivery,
         m.buyer,
+        m.storage_fee as storageFee,
+        m.storage_fee_weight as storageFeeWeight,
+        m.storage_fee_startdate as storageFeeStartdate,
+        m.storage_fee_enddate as storageFeeEnddate,
         m.deposit,
         m.remarks,
         m.remark,

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/StorageFeeRecordMapper.xml

@@ -1,5 +1,51 @@
 <?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.yh.saas.plugin.yiliangyiyun.mapper.StorageFeeRecordMapper">
-
+    <!-- 获得销售出库统计总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(id)
+        FROM storage_fee_record
+        WHERE
+        delete_flag = '0'
+        AND comp_id = #{compId}
+        AND contract_no = #{contractNo}
+        <if test="startDate != null">
+            AND (DATE_FORMAT(storage_fee_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(storage_fee_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+    </select>
+    <!-- 获得销售出库统计列表 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.StorageFeeRecord">
+        SELECT
+        id,
+        comp_id as compId,
+        goods_name as goodsName,
+        storage_fee_date as storageFeeDate,
+        storage_volume as storageVolume,
+        delivery_volume as deliveryVolume,
+        daily_billing_reserves as dailyBillingReserves,
+        storage_fee as storageFee,
+        receivable,
+        end_flag as endFlag
+        FROM storage_fee_record
+        WHERE
+        delete_flag = '0'
+        AND comp_id = #{compId}
+        AND contract_no = #{contractNo}
+        <if test="startDate != null">
+            AND (DATE_FORMAT(storage_fee_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(storage_fee_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+        ORDER BY storage_fee_date DESC
+    </select>
 </mapper>