bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重庆需求变更代码提交

This commit is contained in:
liang.chao 2024-09-28 13:02:02 +08:00
parent b1c60a2b9e
commit 53e4094974
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java
View File

@ -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.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;

9
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java
View File

@ -212,6 +212,15 @@ public class SltAgreementInfoController extends BaseController {
util.exportExcel(response, leaseInfoList, "维修明细导出"); util.exportExcel(response, leaseInfoList, "维修明细导出");
} }
/**
* 校验该类型是否有归还记录，有的话该类型都按最后一次提交时间规划，
*/
/* @ApiOperation(value = "费用结算提交")
@PostMapping("/checkSltEndTime")
public AjaxResult checkSltEndTime(@RequestBody SltAgreementApply apply) {
return sltAgreementInfoService.submitFee(apply);
}*/
/** /**
* 费用结算提交 * 费用结算提交
*/ */

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java
View File

@ -77,4 +77,6 @@ public interface SltAgreementInfoMapper {
int insertApplyRelation(ApplyRelation applyRelation1); int insertApplyRelation(ApplyRelation applyRelation1);
List<ApplyRelation> getAddLoseList(AgreementInfo bean); List<ApplyRelation> getAddLoseList(AgreementInfo bean);
List<SltAgreementInfo> checkEndTime(SltAgreementApply apply);
} }

12
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
View File

@ -598,4 +598,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getAddLoseList" resultType="com.bonus.sgzb.base.api.domain.ApplyRelation"> <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 cost_remark,add_cost,agreement_id from slt_agreement_add_cost where agreement_id = #{agreementId}
</select> </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> </mapper>