Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/ServiceItemSelectFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+@Data
+public class ServiceItemSelectFormDTO implements Serializable {
+    private static final long serialVersionUID = 1689002457565460495L;
+
+    public interface AddUserInternalGroup {
+    }
+    /**
+     * all:查询全部
+     * usable：可用的
+     * 默认查询全部
+     */
+    private String type;
+
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceItemDictController.java

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.utils.Result;
 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.ServiceItemSelectFormDTO;
 import com.epmet.dto.form.demand.StatusFormDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceItemResultDTO;
@@ -79,7 +80,9 @@ public class IcServiceItemDictController {
      * @return
      */
     @PostMapping("dict-list")
-    public Result<List<OptionDTO>> queryDictList(@LoginUser TokenDto tokenDto){
+    public Result<List<OptionDTO>> queryDictList(@LoginUser TokenDto tokenDto,@RequestBody ServiceItemSelectFormDTO formDTO){
-        return new Result<List<OptionDTO>>().ok(icServiceItemDictService.queryDictList(tokenDto.getCustomerId()));
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,ServiceItemSelectFormDTO.AddUserInternalGroup.class);
+        return new Result<List<OptionDTO>>().ok(icServiceItemDictService.queryDictListForSelect(formDTO));
     }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceItemDictService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 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.ServiceItemSelectFormDTO;
 import com.epmet.dto.form.demand.StatusFormDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceItemResultDTO;
@@ -62,4 +63,11 @@ public interface IcServiceItemDictService extends BaseService<IcServiceItemDictE
      * @return
      */
     List<OptionDTO> queryDictList(String customerId);
+
+    /**
+     * 前端调用此接口
+     * @param formDTO
+     * @return
+     */
+    List<OptionDTO> queryDictListForSelect(ServiceItemSelectFormDTO formDTO);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.page.PageData;
 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.ServiceItemSelectFormDTO;
 import com.epmet.dto.form.demand.StatusFormDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceItemResultDTO;
@@ -146,5 +147,29 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl<IcServiceItemD
         return resultList;
     }
 
+    /**
+     * 前端调用此接口
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public List<OptionDTO> queryDictListForSelect(ServiceItemSelectFormDTO formDTO) {
+        List<OptionDTO> resultList = new ArrayList<>();
+        LambdaQueryWrapper<IcServiceItemDictEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcServiceItemDictEntity::getCustomerId, formDTO.getCustomerId())
+                .eq(StringUtils.isNotBlank(formDTO.getType()) && "usable".equals(formDTO.getType()), IcServiceItemDictEntity::getUsableFlag, true)
+                .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;
+    }
+
 
 }