From 008bbc2f28f9c74b85e64a8d471605dffa65fe28 Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Fri, 26 Jan 2024 18:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LeaseOutDetailsController.java | 20 +++++++++++ .../sgzb/app/domain/LeaseApplyDetails.java | 12 +++++++ .../app/mapper/LeaseOutDetailsMapper.java | 9 +++++ .../app/service/LeaseOutDetailsService.java | 9 +++++ .../impl/LeaseOutDetailsServiceImpl.java | 6 ++++ .../mapper/app/LeaseOutDetailsMapper.xml | 34 +++++++++++++++++++ 6 files changed, 90 insertions(+) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index 2c54b8dd..561977e7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -1,5 +1,8 @@ package com.bonus.sgzb.app.controller; +import com.bonus.sgzb.app.domain.BackApplyInfo; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.service.LeaseOutDetailsService; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.common.core.web.controller.BaseController; @@ -10,6 +13,7 @@ import com.bonus.sgzb.common.log.enums.BusinessType; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * Description: 任务领料出库详情表控制器 @@ -64,4 +68,20 @@ public class LeaseOutDetailsController extends BaseController { return leaseOutDetailsService.submitOut(record); } + + /** + * 综合查询--领用记录查询 + * @param bean + */ + @Log(title = "综合查询--领用记录查询", businessType = BusinessType.UPDATE) + @PostMapping("/leaseOutRecord") + public AjaxResult leaseOutRecord(@RequestBody LeaseApplyDetails bean){ + try { + List list = leaseOutDetailsService.leaseOutRecord(bean); + return success(list); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java index 96e23d4e..173703ed 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java @@ -121,6 +121,11 @@ public class LeaseApplyDetails implements Serializable { @ApiModelProperty(value = "计量单位") private String unitName; + /** + * 工程名称 + */ + private String proName; + /** * 设备所属类型 */ @@ -153,4 +158,11 @@ public class LeaseApplyDetails implements Serializable { */ @ApiModelProperty(value = "当前库管员领料出库的单子") private Integer count; + + @ApiModelProperty(value="开始时间") + private String startTime; + @ApiModelProperty(value="结束时间") + private String endTime; + @ApiModelProperty(value="关键字") + private String keyWord; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index cec88c8d..2df81ada 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -1,5 +1,7 @@ package com.bonus.sgzb.app.mapper; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -51,4 +53,11 @@ public interface LeaseOutDetailsMapper { int updateTaskStatus(@Param("taskId") String taskId,@Param("status")int status); String getMachineStatus(LeaseOutDetails record); + + /** + * 综合查询--领用记录查询 + * @param bean + * @return List + */ + List leaseOutRecord(LeaseApplyDetails bean); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java index fd0899c1..953034a4 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java @@ -1,5 +1,7 @@ package com.bonus.sgzb.app.service; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -22,4 +24,11 @@ public interface LeaseOutDetailsService { List getMaMachineByCode(String maCode); List getMaMachineByQrCode(String qrCode); + + /** + * 综合查询--领用记录查询 + * @param bean + * @return List + */ + List leaseOutRecord(LeaseApplyDetails bean); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 3c151dca..8e068dd1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.app.service.impl; import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; import com.bonus.sgzb.app.mapper.LeaseOutDetailsMapper; import com.bonus.sgzb.app.service.LeaseOutDetailsService; @@ -124,4 +125,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return maMachineMapper.getMaMachineByQrCode(qrCode); } + @Override + public List leaseOutRecord(LeaseApplyDetails bean) { + return leaseOutDetailsMapper.leaseOutRecord(bean); + } + } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 0403b12a..50c11d91 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -25,6 +25,40 @@ where ma_id = #{maId} + + UPDATE lease_apply_details