工地直转查询接口修改

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> directApplyDetails;
 
 }

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<DirectApplyInfo> directApplyInfos = workSiteDirectManageService.getList();
+        List<DirectApplyInfo> directApplyInfos = workSiteDirectManageService.getList(directApplyInfo);
         return getDataTable(directApplyInfos);
     }
 

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java

@@ -35,6 +35,8 @@ public interface WorkSiteDirectManageMapper {
 
     List<DirectApplyInfo> getList();
 
+    List<DirectApplyInfo> getList(@Param("record") DirectApplyInfo directApplyInfo);
+
     DirectApplyInfo getDirectApplyInfoById(String id);
 
     int insertSelective(LeaseApplyInfo leaseApplyInfo);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java

@@ -21,6 +21,9 @@ public interface WorkSiteDirectManageService {
 
     List<DirectApplyInfo> getList();
 
+
+    List<DirectApplyInfo> getList(DirectApplyInfo directApplyInfo);
+
     String genderLeaseCode();
 
     DirectApplyInfo getDirectApplyInfoById(String id);

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<DirectApplyInfo> getList(DirectApplyInfo directApplyInfo) {
+        return workSiteDirectManageMapper.getList(directApplyInfo);
+    }
+
     @Override
     public String genderLeaseCode() {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");