From 13fb09a1719d9a0332d93ab06b4807275b7dcaa7 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 13 Nov 2024 11:08:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86--=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BackApplyDetailsController.java | 2 +- .../controller/LeaseApplyInfoController.java | 3 +- .../lease/domain/LeaseApplyDetails.java | 15 +++++++++ .../lease/domain/vo/LeaseApplyRequestVo.java | 6 ++-- .../lease/mapper/LeaseOutDetailsMapper.java | 8 +++++ .../lease/service/ILeaseApplyInfoService.java | 4 +-- .../impl/LeaseApplyInfoServiceImpl.java | 30 ++++++++++++++---- .../lease/LeaseApplyDetailsMapper.xml | 22 +++++++------ .../material/lease/LeaseOutDetailsMapper.xml | 31 +++++++++++++------ 9 files changed, 88 insertions(+), 33 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyDetailsController.java index 226d4a3a..2d02ccd7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyDetailsController.java @@ -3,6 +3,7 @@ package com.bonus.material.back.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -16,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; -import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.back.domain.BackApplyDetails; import com.bonus.material.back.service.IBackApplyDetailsService; import com.bonus.common.core.web.controller.BaseController; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java index 2121b8dc..67f661c7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java @@ -16,6 +16,7 @@ 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; /** @@ -63,7 +64,7 @@ public class LeaseApplyInfoController extends BaseController { @ApiOperation(value = "获取领料任务详细信息") //@RequiresPermissions("lease:info:query") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { + public AjaxResult getInfo(@PathVariable("id") @NotNull(message = "领料任务ID不能为空") Long id) { return success(leaseApplyInfoService.selectLeaseApplyInfoById(id)); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java index 43f84651..7619c7cd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java @@ -56,5 +56,20 @@ public class LeaseApplyDetails extends BaseEntity { @ApiModelProperty(value = "数据所属组织") private Long companyId; + public LeaseApplyDetails(Long id, Long parentId, Long typeId, Long preNum, Long auditNum, Long alNum, String status, Long companyId) { + this.id = id; + this.parentId = parentId; + this.typeId = typeId; + this.preNum = preNum; + this.auditNum = auditNum; + this.alNum = alNum; + this.status = status; + this.companyId = companyId; + } + public LeaseApplyDetails() {} + + public LeaseApplyDetails(Long parentId) { + this.parentId = parentId; + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseApplyRequestVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseApplyRequestVo.java index 0c26e5d3..1ff206c6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseApplyRequestVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseApplyRequestVo.java @@ -1,15 +1,12 @@ package com.bonus.material.lease.domain.vo; -import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.lease.domain.LeaseApplyInfo; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.Date; import java.util.List; /** @@ -20,6 +17,7 @@ import java.util.List; */ +@EqualsAndHashCode(callSuper = false) @Data @ToString public class LeaseApplyRequestVo extends BaseEntity { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseOutDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseOutDetailsMapper.java index 2accf78e..b0e19d22 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseOutDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseOutDetailsMapper.java @@ -32,6 +32,14 @@ public interface LeaseOutDetailsMapper { */ public List selectLeaseOutDetailsList(LeaseOutDetails leaseOutDetails); + /** + * 查询领料出库详细列表--by任务id + * + * @param parentId 任务id + * @return 领料出库详细集合 + */ + List selectLeaseOutDetailsListByParentId(String parentId); + /** * 新增领料出库详细 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java index fda31d68..9f25b510 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java @@ -16,11 +16,11 @@ import com.bonus.material.task.domain.vo.TmTaskRequestVo; public interface ILeaseApplyInfoService { /** * 查询领料任务 - * + * * @param id 领料任务主键 * @return 领料任务 */ - public LeaseApplyInfo selectLeaseApplyInfoById(Long id); + LeaseApplyRequestVo selectLeaseApplyInfoById(Long id); /** * 查询领料任务列表 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 849980b7..ea4b9e78 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.material.lease.service.impl; import java.util.List; +import java.util.Optional; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.biz.enums.PurchaseTaskStatusEnum; @@ -9,12 +10,9 @@ import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.basic.domain.BmFileInfo; import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; import com.bonus.material.lease.mapper.LeaseApplyDetailsMapper; -import com.bonus.material.purchase.domain.PurchaseCheckDetails; -import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.domain.vo.TmTaskRequestVo; @@ -50,17 +48,37 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { @Resource TmTaskAgreementMapper tmTaskAgreementMapper; + /** * 查询领料任务 - * + * * @param id 领料任务主键 * @return 领料任务 */ @Override - public LeaseApplyInfo selectLeaseApplyInfoById(Long id) { - return leaseApplyInfoMapper.selectLeaseApplyInfoById(id); + public LeaseApplyRequestVo selectLeaseApplyInfoById(Long id) { + try { + Optional optionalInfo = Optional.ofNullable(leaseApplyInfoMapper.selectLeaseApplyInfoById(id)); + LeaseApplyRequestVo leaseApplyRequestVo = new LeaseApplyRequestVo(); + + optionalInfo.ifPresent(info -> { + leaseApplyRequestVo.setLeaseApplyInfo(info); + // 获取领料单详情 + List details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(id)); + if (!CollectionUtils.isEmpty(details)) { + leaseApplyRequestVo.setLeaseApplyDetailsList(details); + } + }); + + return leaseApplyRequestVo; + } catch (Exception e) { + // 记录异常日志 + System.err.println("Error occurred while selecting lease apply info by ID: " + id + e.getMessage()); + throw new RuntimeException("Failed to select lease apply info", e); + } } + /** * 查询领料任务列表 * diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml index 2c69c8d0..c03ca030 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml @@ -25,25 +25,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, parent_id, type_id, pre_num, audit_num, al_num, status, create_by, create_time, update_by, update_time, remark, company_id from lease_apply_details + select + lad.id, lad.parent_id, lad.type_id, lad.pre_num, lad.audit_num, lad.al_num, lad.status, + lad.create_by, lad.create_time, lad.update_by, lad.update_time, lad.remark, lad.company_id + from + lease_apply_details lad diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml index f2f9ca0f..e033aec8 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml @@ -21,26 +21,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, parent_id, type_id, ma_id, out_num, out_type, create_by, create_time, update_by, update_time, remark, company_id, car_code, push_notifications from lease_out_details + select + lod.id, lod.parent_id, lod.type_id, lod.ma_id, lod.out_num, lod.out_type, lod.create_by, lod.create_time, + lod.update_by, lod.update_time, lod.remark, lod.company_id, lod.car_code, lod.push_notifications + from + lease_out_details lod + +