From 36e5b1a2e89077e20c35764356a1f70798142a08 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 06 Jun 2024 14:47:11 +0800
Subject: [PATCH] 完善图斑调查取证模块信息

---
 src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
index 37d9b60..8d82a48 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
@@ -10,6 +10,7 @@
 import com.dji.sample.patches.model.Param.PatchesParam;
 import com.dji.sample.patches.model.entity.LotInfo;
 import com.dji.sample.patches.service.GetPatchesService;
+import com.dji.sample.patches.utils.DistrictCodeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,16 +33,21 @@
      */
     @Override
     public PaginationData<LotInfo> limitGet(PatchesParam param) {
-        if (param.getIsPlan() != null) {
+        if (param.getInvestigate() != null) {
             Page<LotInfo> page = mapper.selectPage(new Page<LotInfo>(param.getPage(), param.getPageSize()),
                     new LambdaQueryWrapper<LotInfo>()
                             .eq(LotInfo::getWorkspaceId, param.getWorkspaceId())
                             .like(LotInfo::getDkbh, param.getDkbh())
                             .like(LotInfo::getXzqdm, param.getXzqdm())
                             .like(LotInfo::getBsm,param.getBsm())
-                            .eq(LotInfo::getIsPlan, param.getIsPlan()));
+                            .like(LotInfo::getXmc,param.getXmc())
+                            .eq(LotInfo::getInvestigate, param.getInvestigate()));
             List<LotInfo> records = page.getRecords()
                     .stream()
+                    .peek(lotInfo -> {
+//                        // 修改 xzqdm 字段的值
+//                        lotInfo.setXzqdm(DistrictCodeUtils.codeToName(lotInfo.getXzqdm()));
+                    })
                     .collect(Collectors.toList());
             return new PaginationData<LotInfo>(records, new Pagination(page));
         } else {
@@ -50,9 +56,14 @@
                             .eq(LotInfo::getWorkspaceId, param.getWorkspaceId())
                             .like(LotInfo::getDkbh, param.getDkbh())
                             .like(LotInfo::getBsm,param.getBsm())
+                            .like(LotInfo::getXmc,param.getXmc())
                             .like(LotInfo::getXzqdm, param.getXzqdm()));
             List<LotInfo> records = page.getRecords()
                     .stream()
+                    .peek(lotInfo -> {
+//                        // 修改 xzqdm 字段的值
+//                        lotInfo.setXzqdm(DistrictCodeUtils.codeToName(lotInfo.getXzqdm()));
+                    })
                     .collect(Collectors.toList());
             return new PaginationData<LotInfo>(records, new Pagination(page));
         }
@@ -111,7 +122,10 @@
     public List<LotInfo> listLotinfo() {
         return mapper.selectList(null);
     }
-
+    @Override
+    public LotInfo getPatchesFromId(String patchesId){
+        return mapper.selectOne(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getId,patchesId));
+    }
     @Override
     public void insertLotinfo(List<LotInfo> list) {
         for (int i = 0; i < list.size(); i++) {

--
Gitblit v1.9.3