1

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

@@ -1,10 +1,17 @@
 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 javax.validation.Valid;
+
 /**
  * <p>
  * 记录代储费收费信息 前端控制器
@@ -16,6 +23,15 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/storageFeeRecordCharge")
 public class StorageFeeRecordChargeController {
+    @Autowired
+    private IStorageFeeRecordChargeService storageFeeRecordChargeService;
 
+    /**
+     * 收费
+     */
+    @PostMapping("/api/addCharge")
+    public String addCharge(@RequestBody @Valid StorageFeeRecordCharge storageFeeRecordCharge) {
+        return storageFeeRecordChargeService.addCharge(storageFeeRecordCharge);
+    }
 }
 

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

@@ -63,6 +63,10 @@ public class CollectionWarehousingRecord extends BaseModel<CollectionWarehousing
      * 客户
      */
     private String customerName;
+    /**
+     * identityId
+     */
+    private String identityId;
     /**
      * 身份证号
      */
@@ -237,6 +241,11 @@ public class CollectionWarehousingRecord extends BaseModel<CollectionWarehousing
      */
     @TableField(exist = false)
     private Double money;
+    /**
+     *累计送粮量
+     */
+    @TableField(exist = false)
+    private Double num;
 
     @Override
     protected Serializable pkVal() {

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

@@ -490,6 +490,26 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     @TableField(exist = false)
     private Double amountEdPayableNew;
+    /**
+     * 应收粮款
+     */
+    @TableField(exist = false)
+    private Double grainMoney;
+    /**
+     * 已收粮款
+     */
+    @TableField(exist = false)
+    private Double grainMoneyEd;
+    /**
+     * 列表代储费
+     */
+    @TableField(exist = false)
+    private Double storageFeeNew;
+    /**
+     * 代储合同已收
+     */
+    @TableField(exist = false)
+    private Double depositReceived;
 
 
     @Override

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

@@ -12,5 +12,10 @@ import com.baomidou.mybatisplus.service.IService;
  * @since 2022-01-18
  */
 public interface IStorageFeeRecordChargeService extends IService<StorageFeeRecordCharge> {
-
+    /**
+     * 收费
+     *
+     * @param storageFeeRecordCharge
+     */
+    String addCharge(StorageFeeRecordCharge storageFeeRecordCharge);
 }

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

@@ -90,8 +90,22 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
             List<String> statusList = Lists.newArrayList(StatusEnum.PUR_RETURN.getFlag());
             statusSet.addAll(statusList);
         }
+        Calendar cal = Calendar.getInstance();
+        int yearNum = cal.get(Calendar.YEAR);
+        int month = cal.get(Calendar.MONTH) + 1;
+        if(month < 9){
+            yearNum --;
+        }
+
+        SimpleDateFormat now = new SimpleDateFormat(yearNum +"-09-01 00:00:00");
+        Calendar c = Calendar.getInstance();
+        c.setTime(new java.util.Date());
+        c.add(Calendar.YEAR, 0);
+        Date y = c.getTime();
+        String year = now.format(y);
         //公司id
         pageView.put("compId", collectionWarehousingRecord.getCompId());
+        pageView.put("year", year);
         pageView.put("searchKeyWord", collectionWarehousingRecord.getSearchKeyWord());
         pageView.put("searchType", collectionWarehousingRecord.getSearchType());
         pageView.put("pageSize", collectionWarehousingRecord.getPageSize());
@@ -166,6 +180,7 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
                         .eq("customer_number_card",warehousingRecord.getCustomerNumberCard())
                         .eq("authentication_status_key","7"));
                 if (identityAuthenticationInfo!=null){
+                    warehousingRecord.setIdentityId(identityAuthenticationInfo.getId());
                     if (!warehousingRecord.getCustomerName().equals(identityAuthenticationInfo.getCustomerName())){
                         warehousingRecord.setCustomerName("");
                     }

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

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+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;
@@ -17,4 +18,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class StorageFeeRecordChargeServiceImpl extends ServiceImpl<StorageFeeRecordChargeMapper, StorageFeeRecordCharge> implements IStorageFeeRecordChargeService {
 
+    /**
+     * 收费
+     * @param storageFeeRecordCharge
+     * @return
+     */
+    @Override
+    public String addCharge(StorageFeeRecordCharge storageFeeRecordCharge) {
+        storageFeeRecordCharge.setId(IdGenerator.generateUUID());
+        this.insert(storageFeeRecordCharge);
+        return "ok";
+    }
 }

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

@@ -67,99 +67,106 @@
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.CollectionWarehousingRecord">
         SELECT
-        id,
-        comp_id as compId,
-        payment_no as paymentNo,
-        goods_name as goodsName,
-        car_no as carNo,
-        relation_id as relationId,
-        customer_number_card as customerNumberCard,
-        type,
-        in_date as inDate,
-        contract_no as contractNo,
-        net_weight as netWeight,
-        invoicing_sale as invoicingSale,
-        unit_deduction as unitDeduction,
-        unit_have as unithave,
-        amount_ing_payable as amountIngPayable,
-        amount_ed_payable as amountEdPayable,
-        amount_not_payable as amountNotPayable,
-        payment_screenshot as paymentScreenshot,
-        collection_screenshot as collectionScreenshot,
-        amount_ed_collectionable as amountEdCollectionable,
-        amount_not_collectable as amountNotCollectable,
-        customer_name as customerName,
-        customer_phone as customerPhone,
-        collection_date as collectionDate,
-        status,
-        picture_address as pictureAddress,
-        approve_status as approveStatus,
-        status_flag as statusFlag,
-        update_date as updateDate,
-        workflow_id as workflowId,
-        create_date as createDate,
-        unit_deduction as unitDeduction,
-        picture_address as pictureAddress,
-        invoicing,
-        grade
-        FROM collection_warehousing_record
+        c.id,
+        c.comp_id as compId,
+        c.identity_id as identityId,
+        c.payment_no as paymentNo,
+        c.goods_name as goodsName,
+        c.car_no as carNo,
+        c.relation_id as relationId,
+        c.customer_number_card as customerNumberCard,
+        c.type,
+        c.in_date as inDate,
+        c.contract_no as contractNo,
+        c.net_weight as netWeight,
+        c.invoicing_sale as invoicingSale,
+        c.unit_deduction as unitDeduction,
+        c.unit_have as unithave,
+        c.amount_ing_payable as amountIngPayable,
+        c.amount_ed_payable as amountEdPayable,
+        c.amount_not_payable as amountNotPayable,
+        c.payment_screenshot as paymentScreenshot,
+        c.collection_screenshot as collectionScreenshot,
+        c.amount_ed_collectionable as amountEdCollectionable,
+        c.amount_not_collectable as amountNotCollectable,
+        c.customer_name as customerName,
+        c.customer_phone as customerPhone,
+        c.collection_date as collectionDate,
+        c.status,
+        c.picture_address as pictureAddress,
+        c.approve_status as approveStatus,
+        c.status_flag as statusFlag,
+        c.update_date as updateDate,
+        c.workflow_id as workflowId,
+        c.create_date as createDate,
+        c.invoicing,
+        c.grade,
+        (SELECT IFNULL(sum(case when p.type ='潮粮' then p.pure_weight else p.net_weight end),0)
+        FROM payment_management p
+        WHERE p.delete_flag = '0'
+        AND p.customer_number_card = c.customer_number_card
+        AND p.goods_name =c.goods_name
+        AND (DATE_FORMAT(p.create_date,"%Y%m%d") >=
+        DATE_FORMAT(#{year},"%Y%m%d"))
+        AND p.comp_id = c.comp_id) as num
+        FROM collection_warehousing_record c
         WHERE
-        delete_flag = '0'
-        AND comp_id = #{compId}
+        c.delete_flag = '0'
+        AND c.comp_id = #{compId}
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND amount_ed_payable = 0
+                AND c.amount_ed_payable = 0
             </if>
             <if test="searchType == 3">
-                AND amount_ed_payable >0
+                AND c.amount_ed_payable >0
             </if>
             <if test="searchType == 4">
-                AND amount_ed_collectionable=0
+                AND c.amount_ed_collectionable=0
             </if>
             <if test="searchType == 5">
-                AND amount_ed_collectionable>0
+                AND c.amount_ed_collectionable>0
             </if>
             <if test="searchType == 6">
-                AND invoicing='0'
+                AND c.invoicing='0'
             </if>
             <if test="searchType == 7">
-                AND invoicing_sale='0'
+                AND c.invoicing_sale='0'
             </if>
         </if>
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
-            AND contract_no = #{contractNo}
+            AND c.contract_no = #{contractNo}
         </if>
         <if test="startDate != null">
-            AND (DATE_FORMAT(create_date,"%Y%m%d") &gt;=
+            AND (DATE_FORMAT(c.create_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
         </if>
         <if test="endDate != null">
-            AND (DATE_FORMAT(create_date,"%Y%m%d") &lt;=
+            AND (DATE_FORMAT(c.create_date,"%Y%m%d") &lt;=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(car_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            AND (lower(c.customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.car_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             )
         </if>
         <if test="businessKeys != null and businessKeys.size > 0">
             and(
             <foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
-                id = #{businessValue}
+                c.id = #{businessValue}
             </foreach>
             )
         </if>
         <if test="statusSet != null and statusSet.size > 0">
             or (
             <foreach collection="statusSet" item="statusId" separator="or" open="(" close=")">
-                status_flag =
+                c.status_flag =
                 <if test="statusId != null">
                     #{statusId}
                 </if>
             </foreach>
             )
         </if>
-        ORDER BY update_date DESC
+        ORDER BY c.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>

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

@@ -26,6 +26,12 @@
         <if test="contractType != null and contractType != ''">
             AND m.contract_type = #{contractType}
         </if>
+        <if test="agreementType != null and agreementType != ''">
+            AND m.agreement_type = #{agreementType}
+        </if>
+        <if test="agreementType == null and agreementType == ''">
+            AND m.agreement_type !='代储合同'
+        </if>
         <if test="startDate != null">
             AND (DATE_FORMAT(m.signing_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
@@ -78,6 +84,25 @@
         p.mildew_grain as contractExpenditure,
         p.water_content as expenses,
         p.goods_name as invoiced,
+        (SELECT IFNULL(sum(sfr.amount_money),0)
+        FROM storage_fee_record_charge sfr
+        WHERE sfr.delete_flag = '0'
+        AND sfr.contract_id=m.id) as depositReceived,
+        (SELECT IFNULL(sum(s.amount_ed_receivable),0)
+        FROM stock_sale_receipt_report s
+        WHERE s.delete_flag = '0'
+        AND s.contract_no=m.contract_no
+        AND s.comp_id = m.comp_id) as grainMoneyEd,
+        (SELECT IFNULL(sum(s.amount_ing_receivable),0)
+        FROM stock_sale_receipt_report s
+        WHERE s.delete_flag = '0'
+        AND s.contract_no=m.contract_no
+        AND s.comp_id = m.comp_id) as grainMoney,
+        (SELECT IFNULL(sum(sf.storage_fee_receivable),0)
+        FROM storage_fee_record sf
+        WHERE sf.delete_flag = '0'
+        AND sf.contract_no=m.contract_no
+        AND sf.comp_id = m.comp_id) as storageFeeNew,
         (SELECT IFNULL(sum(col.net_weight),0)
         FROM collection_warehousing_record col
         WHERE col.delete_flag = '0'
@@ -130,6 +155,12 @@
         <if test="contractType != null and contractType != ''">
             AND m.contract_type = #{contractType}
         </if>
+        <if test="agreementType != null and agreementType != ''">
+            AND m.agreement_type = #{agreementType}
+        </if>
+        <if test="agreementType == null and agreementType == ''">
+            AND m.agreement_type !='代储合同'
+        </if>
         <if test="startDate != null">
             AND (DATE_FORMAT(m.signing_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))