From 53e4094974be1007fb73642f97614416925d6ddd Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Sat, 28 Sep 2024 13:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BA=86=E9=9C=80=E6=B1=82=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/base/controller/SysDicController.java |  1 +
 .../controller/SltAgreementInfoController.java       |  9 +++++++++
 .../sgzb/material/mapper/SltAgreementInfoMapper.java |  2 ++
 .../mapper/material/SltAgreementInfoMapper.xml       | 12 ++++++++++++
 4 files changed, 24 insertions(+)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java
index 0bb7459..4d64853 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java
@@ -8,6 +8,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.core.web.page.TableDataInfo;
 import com.bonus.sgzb.common.log.annotation.Log;
 import com.bonus.sgzb.common.log.enums.BusinessType;
+import com.bonus.sgzb.common.security.annotation.RequiresPermissions;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java
index 6790b9f..4799a7f 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java
@@ -212,6 +212,15 @@ public class SltAgreementInfoController extends BaseController {
         util.exportExcel(response, leaseInfoList, "维修明细导出");
     }
 
+
+    /**
+     * 校验该类型是否有归还记录，有的话该类型都按最后一次提交时间规划，
+     */
+ /*   @ApiOperation(value = "费用结算提交")
+    @PostMapping("/checkSltEndTime")
+    public AjaxResult checkSltEndTime(@RequestBody SltAgreementApply apply) {
+        return sltAgreementInfoService.submitFee(apply);
+    }*/
     /**
      * 费用结算提交
      */
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java
index c61b549..db74bd3 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java
@@ -77,4 +77,6 @@ public interface SltAgreementInfoMapper {
     int insertApplyRelation(ApplyRelation applyRelation1);
 
     List<ApplyRelation> getAddLoseList(AgreementInfo bean);
+
+    List<SltAgreementInfo> checkEndTime(SltAgreementApply apply);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
index 26f236a..60ac291 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
@@ -598,4 +598,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getAddLoseList" resultType="com.bonus.sgzb.base.api.domain.ApplyRelation">
         select cost_remark,add_cost,agreement_id from slt_agreement_add_cost where agreement_id = #{agreementId}
     </select>
+    <select id="checkEndTime" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo">
+        select sai.id,
+               sai.agreement_id as agreementId,
+               sai.type_id as typeId,
+               sai.ma_id as maId,
+               sai.is_slt as isSlt,
+               DATE(sai.end_time) as endTime
+        from slt_agreement_info sai
+            left join ma_type mt on sai.type_id = mt.type_id
+            left join ma_type mt1 on mt.parent_id = mt1.type_id
+        where sai.agreement_id = #{agreementId} and sai.lease_type = 0
+    </select>
 </mapper>
\ No newline at end of file