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 1/4] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E8=AF=A6=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 + + From f5ec21f675c41e9899fa3d10febddf5f89fa5ed3 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 13 Nov 2024 11:11:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/lease/service/impl/LeaseApplyInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ea4b9e78..e0bd3477 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 @@ -64,7 +64,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { optionalInfo.ifPresent(info -> { leaseApplyRequestVo.setLeaseApplyInfo(info); // 获取领料单详情 - List details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(id)); + List details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getTaskId())); if (!CollectionUtils.isEmpty(details)) { leaseApplyRequestVo.setLeaseApplyDetailsList(details); } From 9f2ed65b7d29c770c6e213ac5d63436dfbe852e1 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 13 Nov 2024 11:16:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BC=98=E5=8C=96=E3=80=81=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LeaseOutDetailsController.java | 10 ++-------- .../material/lease/domain/LeaseApplyInfo.java | 6 ++++++ .../lease/mapper/LeaseApplyDetailsMapper.java | 16 ++++++++-------- .../lease/service/ILeaseApplyInfoService.java | 10 +++++----- .../material/lease/LeaseApplyInfoMapper.xml | 4 +++- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java index ffdabc7d..ae641dd2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java @@ -16,7 +16,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.lease.domain.LeaseOutDetails; import com.bonus.material.lease.service.ILeaseOutDetailsService; import com.bonus.common.core.web.controller.BaseController; @@ -34,6 +33,7 @@ import com.bonus.common.core.web.page.TableDataInfo; @RestController @RequestMapping("/lease_out_details") public class LeaseOutDetailsController extends BaseController { + @Autowired private ILeaseOutDetailsService leaseOutDetailsService; @@ -41,7 +41,6 @@ public class LeaseOutDetailsController extends BaseController { * 查询领料出库详细列表 */ @ApiOperation(value = "查询领料出库详细列表") - @RequiresPermissions("lease:details:list") @GetMapping("/list") public TableDataInfo list(LeaseOutDetails leaseOutDetails) { startPage(); @@ -54,12 +53,11 @@ public class LeaseOutDetailsController extends BaseController { */ @ApiOperation(value = "导出领料出库详细列表") @PreventRepeatSubmit - @RequiresPermissions("lease:details:export") @SysLog(title = "领料出库详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出领料出库详细") @PostMapping("/export") public void export(HttpServletResponse response, LeaseOutDetails leaseOutDetails) { List list = leaseOutDetailsService.selectLeaseOutDetailsList(leaseOutDetails); - ExcelUtil util = new ExcelUtil(LeaseOutDetails.class); + ExcelUtil util = new ExcelUtil<>(LeaseOutDetails.class); util.exportExcel(response, list, "领料出库详细数据"); } @@ -67,7 +65,6 @@ public class LeaseOutDetailsController extends BaseController { * 获取领料出库详细详细信息 */ @ApiOperation(value = "获取领料出库详细详细信息") - @RequiresPermissions("lease:details:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return success(leaseOutDetailsService.selectLeaseOutDetailsById(id)); @@ -78,7 +75,6 @@ public class LeaseOutDetailsController extends BaseController { */ @ApiOperation(value = "新增领料出库详细") @PreventRepeatSubmit - @RequiresPermissions("lease:details:add") @SysLog(title = "领料出库详细", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增领料出库详细") @PostMapping public AjaxResult add(@RequestBody List leaseOutDetailsList) { @@ -94,7 +90,6 @@ public class LeaseOutDetailsController extends BaseController { */ @ApiOperation(value = "修改领料出库详细") @PreventRepeatSubmit - @RequiresPermissions("lease:details:edit") @SysLog(title = "领料出库详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改领料出库详细") @PutMapping public AjaxResult edit(@RequestBody LeaseOutDetails leaseOutDetails) { @@ -110,7 +105,6 @@ public class LeaseOutDetailsController extends BaseController { */ @ApiOperation(value = "删除领料出库详细") @PreventRepeatSubmit - @RequiresPermissions("lease:details:remove") @SysLog(title = "领料出库详细", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除领料出库详细") @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java index 2eb96d2f..e9337f8e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java @@ -139,9 +139,15 @@ public class LeaseApplyInfo extends BaseEntity { @ApiModelProperty(value = "租赁工程") private String leaseProject; + @ApiModelProperty(value = "租赁工程id") + private String leaseProjectId; + @ApiModelProperty(value = "租赁单位") private String leaseUnit; + @ApiModelProperty(value = "租赁单位id") + private String leaseUnitId; + @ApiModelProperty(value = "协议号") private String agreementCode; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java index 2e33122c..ef0dd3ff 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java @@ -16,7 +16,7 @@ public interface LeaseApplyDetailsMapper { * @param id 领料任务详细主键 * @return 领料任务详细 */ - public LeaseApplyDetails selectLeaseApplyDetailsById(Long id); + LeaseApplyDetails selectLeaseApplyDetailsById(Long id); /** * 查询领料任务详细列表 @@ -24,7 +24,7 @@ public interface LeaseApplyDetailsMapper { * @param leaseApplyDetails 领料任务详细 * @return 领料任务详细集合 */ - public List selectLeaseApplyDetailsList(LeaseApplyDetails leaseApplyDetails); + List selectLeaseApplyDetailsList(LeaseApplyDetails leaseApplyDetails); /** * 新增领料任务详细 @@ -32,9 +32,9 @@ public interface LeaseApplyDetailsMapper { * @param leaseApplyDetails 领料任务详细 * @return 结果 */ - public int insertLeaseApplyDetails(LeaseApplyDetails leaseApplyDetails); + int insertLeaseApplyDetails(LeaseApplyDetails leaseApplyDetails); - public int insertLeaseApplyDetailsList(List leaseApplyDetails); + int insertLeaseApplyDetailsList(List leaseApplyDetails); /** * 修改领料任务详细 @@ -42,7 +42,7 @@ public interface LeaseApplyDetailsMapper { * @param leaseApplyDetails 领料任务详细 * @return 结果 */ - public int updateLeaseApplyDetails(LeaseApplyDetails leaseApplyDetails); + int updateLeaseApplyDetails(LeaseApplyDetails leaseApplyDetails); /** * 删除领料任务详细 @@ -50,7 +50,7 @@ public interface LeaseApplyDetailsMapper { * @param id 领料任务详细主键 * @return 结果 */ - public int deleteLeaseApplyDetailsById(Long id); + int deleteLeaseApplyDetailsById(Long id); /** * 批量删除领料任务详细 @@ -58,9 +58,9 @@ public interface LeaseApplyDetailsMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteLeaseApplyDetailsByIds(Long[] ids); + int deleteLeaseApplyDetailsByIds(Long[] ids); - public int deleteLeaseApplyDetailsByParentIds(Long[] ids); + int deleteLeaseApplyDetailsByParentIds(Long[] ids); List getByParentId(Long 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 9f25b510..02ce5716 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 @@ -28,7 +28,7 @@ public interface ILeaseApplyInfoService { * @param leaseApplyInfo 领料任务 * @return 领料任务集合 */ - public List selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo); + List selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo); /** * 新增领料任务 @@ -36,7 +36,7 @@ public interface ILeaseApplyInfoService { * @param leaseApplyRequestVo 领料任务 * @return 结果 */ - public AjaxResult insertLeaseApplyInfo(TmTaskRequestVo leaseApplyRequestVo); + AjaxResult insertLeaseApplyInfo(TmTaskRequestVo leaseApplyRequestVo); /** * 修改领料任务 @@ -44,7 +44,7 @@ public interface ILeaseApplyInfoService { * @param tmTaskRequestVo 领料任务 * @return 结果 */ - public boolean updateLeaseApplyInfo(TmTaskRequestVo tmTaskRequestVo); + boolean updateLeaseApplyInfo(TmTaskRequestVo tmTaskRequestVo); /** * 批量删除领料任务 @@ -52,7 +52,7 @@ public interface ILeaseApplyInfoService { * @param ids 需要删除的领料任务主键集合 * @return 结果 */ - public int deleteLeaseApplyInfoByIds(Long[] ids); + int deleteLeaseApplyInfoByIds(Long[] ids); /** * 删除领料任务信息 @@ -60,5 +60,5 @@ public interface ILeaseApplyInfoService { * @param id 领料任务主键 * @return 结果 */ - public int deleteLeaseApplyInfoById(Long id); + int deleteLeaseApplyInfoById(Long id); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index fb99462b..f3d1327a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -31,7 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -42,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark, lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id, lai.status, lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party, - bu.unit_name, bp.pro_name, bai.agreement_code + bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code from lease_apply_info lai left join From 4584aed981c7097b7534ba8a35f7cbd772f2670d Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 13 Nov 2024 11:23:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/lease/domain/LeaseApplyInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java index e9337f8e..255659ed 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java @@ -140,13 +140,13 @@ public class LeaseApplyInfo extends BaseEntity { private String leaseProject; @ApiModelProperty(value = "租赁工程id") - private String leaseProjectId; + private Integer leaseProjectId; @ApiModelProperty(value = "租赁单位") private String leaseUnit; @ApiModelProperty(value = "租赁单位id") - private String leaseUnitId; + private Integer leaseUnitId; @ApiModelProperty(value = "协议号") private String agreementCode;