From d2fe5b72f147cad28cd35f80d4bbeda42e93401f Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Fri, 15 Mar 2024 16:22:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=9C=B0=E7=9B=B4=E8=BD=AC=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/DirectApplyInfo.java | 13 +++++++++++++ .../controller/WorkSiteDirectManageController.java | 4 ++-- .../material/mapper/WorkSiteDirectManageMapper.java | 2 ++ .../service/WorkSiteDirectManageService.java | 3 +++ .../service/impl/WorkSiteDirectManageImpl.java | 5 +++++ 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java index f6626151..76e71ea2 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java @@ -29,6 +29,10 @@ public class DirectApplyInfo extends BaseEntity { * 退料工程id */ private String backProId; + /** + * 关键字 + */ + private String keyWord; /** * 退料工程名称 */ @@ -116,6 +120,15 @@ public class DirectApplyInfo extends BaseEntity { */ private String leaseAgreementCode; + /** + * 退料工程id + */ + private String lotId; + /** + * 退料单位id + */ + private String unitId; + private List directApplyDetails; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index 6e7bcaba..eb3c2ad5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -50,9 +50,9 @@ public class WorkSiteDirectManageController extends BaseController { */ @ApiOperation(value = "列表展示") @GetMapping("/list") - public TableDataInfo list() { + public TableDataInfo list(DirectApplyInfo directApplyInfo) { startPage(); - List directApplyInfos = workSiteDirectManageService.getList(); + List directApplyInfos = workSiteDirectManageService.getList(directApplyInfo); return getDataTable(directApplyInfos); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java index 9f9f1158..497c95c0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java @@ -35,6 +35,8 @@ public interface WorkSiteDirectManageMapper { List getList(); + List getList(@Param("record") DirectApplyInfo directApplyInfo); + DirectApplyInfo getDirectApplyInfoById(String id); int insertSelective(LeaseApplyInfo leaseApplyInfo); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java index 654e4b0d..7f20f8f8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java @@ -21,6 +21,9 @@ public interface WorkSiteDirectManageService { List getList(); + + List getList(DirectApplyInfo directApplyInfo); + String genderLeaseCode(); DirectApplyInfo getDirectApplyInfoById(String id); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java index ae2f2d14..3af90cbe 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java @@ -79,6 +79,11 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { return workSiteDirectManageMapper.getList(); } + @Override + public List getList(DirectApplyInfo directApplyInfo) { + return workSiteDirectManageMapper.getList(directApplyInfo); + } + @Override public String genderLeaseCode() { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");