From 6b1ebf97c5e713d3a4427948ca327661bbc332bf Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Wed, 27 Aug 2025 11:41:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E8=A1=A8=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LeaseAgreementSltController.java | 77 ++++++++++ .../lease/domain/LeaseAgreementSlt.java | 101 +++++++++++++ .../lease/mapper/LeaseAgreementSltMapper.java | 25 ++++ .../service/ILeaseAgreementSltService.java | 21 +++ .../impl/LeaseAgreementSltServiceImpl.java | 62 ++++++++ .../lease/LeaseAgreementSltMapper.xml | 140 ++++++++++++++++++ 6 files changed, 426 insertions(+) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseAgreementSltController.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseAgreementSlt.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseAgreementSltMapper.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseAgreementSltService.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseAgreementSltServiceImpl.java create mode 100644 bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseAgreementSltMapper.xml diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseAgreementSltController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseAgreementSltController.java new file mode 100644 index 00000000..a0483313 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseAgreementSltController.java @@ -0,0 +1,77 @@ +package com.bonus.material.lease.controller; + +import com.bonus.common.biz.domain.lease.LeaseApplyInfo; +import com.bonus.common.core.utils.poi.ExcelUtil; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.RequiresPermissions; +import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.lease.domain.LeaseAgreementRecord; +import com.bonus.material.lease.domain.LeaseAgreementSlt; +import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; +import com.bonus.material.lease.service.ILeaseAgreementRecordService; +import com.bonus.material.lease.service.ILeaseAgreementSltService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 项目领退Controller + * + * @author xsheng + * @date 2024-10-16 + */ +@Api(tags = "结算列表接口") +@RestController +@RequestMapping("/lease_agreement_slt") +public class LeaseAgreementSltController extends BaseController { + @Autowired + private ILeaseAgreementSltService leaseAgreementSltService; + + /** + * 查询列表 + */ + @ApiOperation(value = "查询列表") + @GetMapping("/list") + public TableDataInfo list(LeaseAgreementSlt leaseAgreementSlt) { + startPage(); + List list = leaseAgreementSltService.selectLeaseAgreementSltList(leaseAgreementSlt); + return getDataTable(list); + } + + /** + * 获取单据详细信息 + * @param leaseAgreementSlt + * @return + */ + @ApiOperation(value = "获取单据详细信息") + //@RequiresPermissions("lease:info:query") + @GetMapping(value = "/getInfo") + public AjaxResult getInfo(LeaseAgreementSlt leaseAgreementSlt) { + return success(leaseAgreementSltService.getInfo(leaseAgreementSlt)); + } + + + /** + * 修改数据 + */ + @ApiOperation(value = "修改数据") + @PreventRepeatSubmit + //@RequiresPermissions("lease:info:edit") + @PostMapping(value = "/updateInfo") + public AjaxResult edit(@RequestBody @NotNull LeaseAgreementSlt leaseAgreementSlt) { + try { + return toAjax(leaseAgreementSltService.updateLeaseSltInfo(leaseAgreementSlt)); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseAgreementSlt.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseAgreementSlt.java new file mode 100644 index 00000000..a027c1d4 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseAgreementSlt.java @@ -0,0 +1,101 @@ +package com.bonus.material.lease.domain; + +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 项目领退对象 lease_agreement_record + * + * @author xsheng + * @date 2024-10-16 + */ + + +@Data +@ToString +public class LeaseAgreementSlt extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** ID */ + private Long id; + + /** 协议ID */ + @Excel(name = "协议ID") + @ApiModelProperty(value = "协议ID") + private Long agreementId; + + /** 机具规格ID */ + @Excel(name = "机具规格ID") + @ApiModelProperty(value = "机具规格ID") + private Long typeId; + + /** 机具ID */ + @Excel(name = "机具ID") + @ApiModelProperty(value = "机具ID") + private Long maId; + + /** 数量 */ + @Excel(name = "数量") + @ApiModelProperty(value = "数量") + private BigDecimal num; + + /** 状态 */ + @Excel(name = "状态") + @ApiModelProperty(value = "状态") + private String status; + + /** 领料时间 */ + @ApiModelProperty(value = "领料时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "领料时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date outTime; + + /** 领料任务 */ + @Excel(name = "领料任务") + @ApiModelProperty(value = "领料任务") + private Long pickId; + + /** 退料时间 */ + @ApiModelProperty(value = "退料时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "退料时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date backTime; + + /** 退料任务 */ + @Excel(name = "退料任务") + @ApiModelProperty(value = "退料任务") + private Long backId; + + /** 是否结算 */ + @Excel(name = "是否结算") + @ApiModelProperty(value = "是否结算") + private String isSlt; + + /** 结算时间 */ + @ApiModelProperty(value = "结算时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结算时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date sltTime; + + /** 数据所属组织 */ + @Excel(name = "数据所属组织") + @ApiModelProperty(value = "数据所属组织") + private Long companyId; + + /** 数量 */ + @Excel(name = "租赁单价") + @ApiModelProperty(value = "租赁单价") + private BigDecimal leasePrice; + + /** 操作标识 */ + + @ApiModelProperty(value = "操作标识") + private String optFlag; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseAgreementSltMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseAgreementSltMapper.java new file mode 100644 index 00000000..70a88544 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseAgreementSltMapper.java @@ -0,0 +1,25 @@ +package com.bonus.material.lease.mapper; + +import com.bonus.material.lease.domain.LeaseAgreementRecord; +import com.bonus.material.lease.domain.LeaseAgreementSlt; + +import java.util.List; + +/** + * 项目领退Mapper接口 + * + * @author xsheng + * @date 2024-10-16 + */ +public interface LeaseAgreementSltMapper { + + List selectLeaseAgreementSltList(LeaseAgreementSlt leaseAgreementSlt); + + LeaseAgreementSlt getInfo(LeaseAgreementSlt leaseAgreementSlt); + + int updateLeaseSltInfo(LeaseAgreementSlt leaseAgreementSlt); + + int deleteLeaseSltInfo(LeaseAgreementSlt leaseAgreementSlt); + + int insertLeaseSltInfo(LeaseAgreementSlt leaseAgreementSlt); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseAgreementSltService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseAgreementSltService.java new file mode 100644 index 00000000..81c8e835 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseAgreementSltService.java @@ -0,0 +1,21 @@ +package com.bonus.material.lease.service; + +import com.bonus.material.lease.domain.LeaseAgreementRecord; +import com.bonus.material.lease.domain.LeaseAgreementSlt; + +import java.util.List; + +/** + * 项目领退Service接口 + * + * @author xsheng + * @date 2024-10-16 + */ +public interface ILeaseAgreementSltService { + + List selectLeaseAgreementSltList(LeaseAgreementSlt leaseAgreementSlt); + + LeaseAgreementSlt getInfo(LeaseAgreementSlt leaseAgreementSlt); + + int updateLeaseSltInfo(LeaseAgreementSlt leaseAgreementSlt); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseAgreementSltServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseAgreementSltServiceImpl.java new file mode 100644 index 00000000..1391c78d --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseAgreementSltServiceImpl.java @@ -0,0 +1,62 @@ +package com.bonus.material.lease.service.impl; + +import com.bonus.common.core.exception.ServiceException; +import com.bonus.common.core.utils.DateUtils; +import com.bonus.material.lease.domain.LeaseAgreementRecord; +import com.bonus.material.lease.domain.LeaseAgreementSlt; +import com.bonus.material.lease.mapper.LeaseAgreementRecordMapper; +import com.bonus.material.lease.mapper.LeaseAgreementSltMapper; +import com.bonus.material.lease.service.ILeaseAgreementRecordService; +import com.bonus.material.lease.service.ILeaseAgreementSltService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目领退Service业务层处理 + * + * @author xsheng + * @date 2024-10-16 + */ +@Service +public class LeaseAgreementSltServiceImpl implements ILeaseAgreementSltService { + @Autowired + private LeaseAgreementSltMapper leaseAgreementSltMapper; + + + @Override + public List selectLeaseAgreementSltList(LeaseAgreementSlt leaseAgreementSlt) { + return leaseAgreementSltMapper.selectLeaseAgreementSltList(leaseAgreementSlt); + } + + @Override + public LeaseAgreementSlt getInfo(LeaseAgreementSlt leaseAgreementSlt) { + return leaseAgreementSltMapper.getInfo(leaseAgreementSlt); + } + + @Override + public int updateLeaseSltInfo(LeaseAgreementSlt leaseAgreementSlt) { + try { + String optFlag = leaseAgreementSlt.getOptFlag(); + if ("update".equals(optFlag)) { + leaseAgreementSlt.setUpdateTime(DateUtils.getNowDate()); + return leaseAgreementSltMapper.updateLeaseSltInfo(leaseAgreementSlt); + } + if ("delete".equals(optFlag)) { + leaseAgreementSlt.setUpdateTime(DateUtils.getNowDate()); + return leaseAgreementSltMapper.deleteLeaseSltInfo(leaseAgreementSlt); + } + if ("insert".equals(optFlag)) { + leaseAgreementSlt.setCreateTime(DateUtils.getNowDate()); + return leaseAgreementSltMapper.insertLeaseSltInfo(leaseAgreementSlt); + + + } + + } catch (Exception e) { + throw new ServiceException("系统错误, " + e.getMessage()); + } + return 0; + } +} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseAgreementSltMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseAgreementSltMapper.xml new file mode 100644 index 00000000..878c9693 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseAgreementSltMapper.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update slt_agreement_info + + agreement_id = #{agreementId}, + type_id = #{typeId}, + ma_id = #{maId}, + num = #{num}, + status = #{status}, + start_time = #{outTime}, + lease_id = #{pickId}, + end_time = #{backTime}, + back_id = #{backId}, + is_slt = #{isSlt}, + lease_price = #{leasePrice}, + slt_time = #{sltTime}, + company_id = #{companyId}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from slt_agreement_info where id = #{id} + + + + + insert into slt_agreement_info + + agreement_id, + type_id, + ma_id, + num, + status, + start_time, + lease_id, + end_time, + back_id, + is_slt, + lease_price, + slt_time, + company_id, + create_time, + update_time, + + + #{agreementId}, + #{typeId}, + #{maId}, + #{num}, + #{status}, + #{outTime}, + #{pickId}, + #{backTime}, + #{backId}, + #{isSlt}, + #{leasePrice}, + #{sltTime}, + #{companyId}, + #{createTime}, + #{updateTime}, + + +