From 833521d1d4ff06c41bac3f185623f5e5cfb51c7d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 20 Jan 2022 10:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E5=BB=BA=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E6=97=B6=EF=BC=8C=E6=9C=8D=E5=8A=A1=E4=BA=8B=E9=A1=B9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E6=8E=A5=E5=8F=A3=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=EF=BC=9A/api/heart/serviceitem/dict-list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IcServiceItemDictController.java          | 14 +++++++++++
 .../service/IcServiceItemDictService.java     | 10 ++++++++
 .../impl/IcServiceItemDictServiceImpl.java    | 25 +++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceItemDictController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceItemDictController.java
index d2f9f6d412..d6234d4a2c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceItemDictController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceItemDictController.java
@@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.demand.ServiceItemAddFormDTO;
 import com.epmet.dto.form.demand.ServiceItemPageFormDTO;
 import com.epmet.dto.form.demand.StatusFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceItemResultDTO;
 import com.epmet.service.IcServiceItemDictService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 服务事项分类字典表
  *
@@ -68,4 +71,15 @@ public class IcServiceItemDictController {
         icServiceItemDictService.updateStatus(formDTO);
         return new Result();
     }
+
+    /**
+     * 新增联建单位，查询服务事项列表
+     *
+     * @param tokenDto
+     * @return
+     */
+    @PostMapping("dict-list")
+    public Result<List<OptionDTO>> queryDictList(@LoginUser TokenDto tokenDto){
+        return new Result<List<OptionDTO>>().ok(icServiceItemDictService.queryDictList(tokenDto.getCustomerId()));
+    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java
index a93e50aaff..fc671c3cdc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java
@@ -22,9 +22,12 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.form.demand.ServiceItemAddFormDTO;
 import com.epmet.dto.form.demand.ServiceItemPageFormDTO;
 import com.epmet.dto.form.demand.StatusFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceItemResultDTO;
 import com.epmet.entity.IcServiceItemDictEntity;
 
+import java.util.List;
+
 /**
  * 服务事项分类字典表
  *
@@ -52,4 +55,11 @@ public interface IcServiceItemDictService extends BaseService<IcServiceItemDictE
      * @return
      */
     void updateStatus(StatusFormDTO formDTO);
+
+    /**
+     * 新增联建单位，查询服务事项列表
+     * @param customerId
+     * @return
+     */
+    List<OptionDTO> queryDictList(String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java
index 4235d282c5..1868076ade 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java
@@ -28,6 +28,7 @@ import com.epmet.dao.IcServiceItemDictDao;
 import com.epmet.dto.form.demand.ServiceItemAddFormDTO;
 import com.epmet.dto.form.demand.ServiceItemPageFormDTO;
 import com.epmet.dto.form.demand.StatusFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceItemResultDTO;
 import com.epmet.entity.IcServiceItemDictEntity;
 import com.epmet.service.IcServiceItemDictService;
@@ -37,6 +38,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -122,5 +124,28 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl<IcServiceItemD
         baseDao.update(null, update);
     }
 
+    /**
+     * 新增联建单位，查询服务事项列表
+     *
+     * @param customerId
+     * @return
+     */
+    @Override
+    public List<OptionDTO> queryDictList(String customerId) {
+        List<OptionDTO> resultList=new ArrayList<>();
+        LambdaQueryWrapper<IcServiceItemDictEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcServiceItemDictEntity::getCustomerId, customerId)
+                .orderByAsc(IcServiceItemDictEntity::getSort);
+        List<IcServiceItemDictEntity> list=baseDao.selectList(query);
+        for(IcServiceItemDictEntity entity:list){
+            OptionDTO optionDTO=new OptionDTO();
+            optionDTO.setLabel(entity.getCategoryName());
+            optionDTO.setValue(entity.getCategoryCode());
+            optionDTO.setAwardPoint(entity.getAwardPoint());
+            resultList.add(optionDTO);
+        }
+        return resultList;
+    }
+
 
 }
\ No newline at end of file