联建单位和活动相关接口

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java

@@ -17,8 +17,10 @@
 
 package com.epmet.dto;
 
+import com.epmet.commons.tools.validator.group.AddGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -47,6 +49,7 @@ public class IcPartyActivityDTO implements Serializable {
     /**
      * 组织ID
      */
+    @NotBlank(message = "agencyId不能为空",groups = AddGroup.class)
 	private String agencyId;
 
     /**
@@ -57,26 +60,31 @@ public class IcPartyActivityDTO implements Serializable {
     /**
      * 单位ID
      */
+    @NotBlank(message = "单位不能为空",groups = AddGroup.class)
 	private String unitId;
-
+    private String unitName;
     /**
      * 服务事项
      */
+    @NotBlank(message = "服务事项不能为空",groups = AddGroup.class)
 	private String serviceMatter;
 
     /**
      * 活动标题
      */
+    @NotBlank(message = "活动标题不能为空",groups = AddGroup.class)
 	private String title;
 
     /**
      * 活动目标
      */
+    @NotBlank(message = "活动目标不能为空",groups = AddGroup.class)
 	private String target;
 
     /**
      * 活动内容
      */
+    @NotBlank(message = "活动内容不能为空",groups = AddGroup.class)
 	private String content;
 
     /**
@@ -87,21 +95,25 @@ public class IcPartyActivityDTO implements Serializable {
     /**
      * 活动时间
      */
+    @NotBlank(message = "活动时间不能为空",groups = AddGroup.class)
 	private Date activityTime;
 
     /**
      * 活动地址
      */
+    @NotBlank(message = "活动地址不能为空",groups = AddGroup.class)
 	private String address;
 
     /**
      * 活动地址经度
      */
+    @NotBlank(message = "活动地址不能为空",groups = AddGroup.class)
 	private String longitude;
 
     /**
      * 活动地址纬度
      */
+    @NotBlank(message = "活动地址不能为空",groups = AddGroup.class)
 	private String latitude;
 
     /**

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java

@@ -21,6 +21,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -69,6 +70,8 @@ public class IcPartyUnitDTO implements Serializable {
      */
 	private String serviceMatter;
 
+    private List<String> serviceMatterList;
+
     /**
      * 联系人
      */

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

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/11/22 14:42
+ */
+@NoArgsConstructor
+@Data
+public class PartyActivityFormDTO implements Serializable {
+    private static final long serialVersionUID = -2510068555703677L;
+    private String agencyId;
+    private String unitId;
+    private String title;
+    private Date startTime;
+    private Date endTime;
+    private String serviceMatter;
+    private Integer pageNo;
+    private Integer pageSize;
+}

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

@@ -20,12 +20,11 @@ package com.epmet.controller;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcPartyActivityDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.excel.IcPartyActivityExcel;
 import com.epmet.service.IcPartyActivityService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,19 +48,19 @@ public class IcPartyActivityController {
     @Autowired
     private IcPartyActivityService icPartyActivityService;
 
-    @GetMapping("page")
+    @PostMapping("search")
-    public Result<PageData<IcPartyActivityDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IcPartyActivityDTO>> page(@RequestBody PartyActivityFormDTO formDTO){
-        PageData<IcPartyActivityDTO> page = icPartyActivityService.page(params);
+        PageData<IcPartyActivityDTO> page = icPartyActivityService.search(formDTO);
         return new Result<PageData<IcPartyActivityDTO>>().ok(page);
     }
 
-    @GetMapping("{id}")
+    @PostMapping("detail")
-    public Result<IcPartyActivityDTO> get(@PathVariable("id") String id){
+    public Result<IcPartyActivityDTO> get(@RequestBody IcPartyActivityDTO dto){
-        IcPartyActivityDTO data = icPartyActivityService.get(id);
+        IcPartyActivityDTO data = icPartyActivityService.get(dto.getId());
         return new Result<IcPartyActivityDTO>().ok(data);
     }
 
-    @PostMapping
+    @PostMapping("save")
     public Result save(@RequestBody IcPartyActivityDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -69,19 +68,9 @@ public class IcPartyActivityController {
         return new Result();
     }
 
-    @PutMapping
+    @PostMapping("delete")
-    public Result update(@RequestBody IcPartyActivityDTO dto){
+    public Result delete(@RequestBody IcPartyActivityDTO dto){
-        //效验数据
+        icPartyActivityService.delete(dto.getId());
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icPartyActivityService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icPartyActivityService.delete(ids);
         return new Result();
     }
 

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

@@ -26,7 +26,6 @@ import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
@@ -54,19 +53,20 @@ public class IcPartyUnitController {
     @Autowired
     private IcPartyUnitService icPartyUnitService;
 
-    @GetMapping("list")
+    @PostMapping("list")
     public Result<PageData<IcPartyUnitDTO>> search(@RequestBody PartyUnitFormDTO formDTO){
         PageData<IcPartyUnitDTO> page = icPartyUnitService.search(formDTO);
         return new Result<PageData<IcPartyUnitDTO>>().ok(page);
     }
 
-    @GetMapping("{id}")
+    @PostMapping("detail")
-    public Result<IcPartyUnitDTO> get(@PathVariable("id") String id){
+    public Result<IcPartyUnitDTO> get(@RequestBody IcPartyUnitDTO formDTO){
-        IcPartyUnitDTO data = icPartyUnitService.get(id);
+        AssertUtils.isBlank(formDTO.getId(), "id");
+        IcPartyUnitDTO data = icPartyUnitService.get(formDTO.getId());
         return new Result<IcPartyUnitDTO>().ok(data);
     }
 
-    @PostMapping
+    @PostMapping("save")
     public Result save(@RequestBody IcPartyUnitDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -74,19 +74,11 @@ public class IcPartyUnitController {
         return new Result();
     }
 
-    @PutMapping
+    @PostMapping("delete")
-    public Result update(@RequestBody IcPartyUnitDTO dto){
+    public Result delete(@RequestBody IcPartyUnitDTO dto){
         //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        AssertUtils.isBlank(dto.getId(), "id");
-        icPartyUnitService.update(dto);
+        icPartyUnitService.delete(dto.getId());
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icPartyUnitService.delete(ids);
         return new Result();
     }
 
@@ -111,4 +103,10 @@ public class IcPartyUnitController {
         ValidatorUtils.validateEntity(formDTO,ServiceQueryFormDTO.AddUserInternalGroup.class);
         return new Result<List<OptionDTO>>().ok(icPartyUnitService.queryServiceList(formDTO));
     }
+
+    @PostMapping("option")
+    public Result<List<OptionDTO>> option(@RequestBody IcPartyUnitDTO dto){
+        AssertUtils.isBlank(dto.getAgencyId(), "agencyId");
+        return new Result<List<OptionDTO>>().ok(icPartyUnitService.option(dto));
+    }
 }

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

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcPartyActivityDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 
 import java.util.List;
@@ -36,12 +37,12 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
     /**
      * 默认分页
      *
-     * @param params
+     * @param formDTO
      * @return PageData<IcPartyActivityDTO>
      * @author generator
      * @date 2021-11-19
      */
-    PageData<IcPartyActivityDTO> page(Map<String, Object> params);
+    PageData<IcPartyActivityDTO> search(PartyActivityFormDTO formDTO);
 
     /**
      * 默认查询
@@ -73,16 +74,6 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
      */
     void save(IcPartyActivityDTO dto);
 
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-11-19
-     */
-    void update(IcPartyActivityDTO dto);
-
     /**
      * 批量删除
      *
@@ -91,5 +82,5 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
      * @author generator
      * @date 2021-11-19
      */
-    void delete(String[] ids);
+    void delete(String id);
 }

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

@@ -76,25 +76,16 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
      */
     void save(IcPartyUnitDTO dto);
 
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-11-19
-     */
-    void update(IcPartyUnitDTO dto);
 
     /**
      * 批量删除
      *
-     * @param ids
+     * @param id
      * @return void
      * @author generator
      * @date 2021-11-19
      */
-    void delete(String[] ids);
+    void delete(String id);
 
     /**
      * 需求指派，选择区域化党建单位，调用此接口
@@ -105,4 +96,13 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
      * @return
      */
     List<OptionDTO> queryServiceList(ServiceQueryFormDTO formDTO);
+
+    /**
+     * @Description 获取组织下单位列表
+     * @Param dto
+     * @Return {@link List< OptionDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/22 14:35
+     */
+    List<OptionDTO> option(IcPartyUnitDTO dto);
 }

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

@@ -17,25 +17,33 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcPartyActivityDao;
 import com.epmet.dto.IcPartyActivityDTO;
+import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyActivityEntity;
-import com.epmet.redis.IcPartyActivityRedis;
 import com.epmet.service.IcPartyActivityService;
+import com.epmet.service.IcPartyUnitService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 联建活动
@@ -46,16 +54,32 @@ import java.util.Map;
 @Service
 public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityDao, IcPartyActivityEntity> implements IcPartyActivityService {
 
-    @Autowired
+    @Resource
-    private IcPartyActivityRedis icPartyActivityRedis;
+    private IcPartyUnitService icPartyUnitService;
 
     @Override
-    public PageData<IcPartyActivityDTO> page(Map<String, Object> params) {
+    public PageData<IcPartyActivityDTO> search(PartyActivityFormDTO formDTO) {
-        IPage<IcPartyActivityEntity> page = baseDao.selectPage(
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        LambdaQueryWrapper<IcPartyActivityEntity> wrapper = new LambdaQueryWrapper<>();
-                getWrapper(params)
+        wrapper.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId());
-        );
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcPartyActivityEntity::getUnitId, formDTO.getUnitId());
-        return getPageData(page, IcPartyActivityDTO.class);
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyActivityEntity::getServiceMatter, formDTO.getServiceMatter());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getTitle()), IcPartyActivityEntity::getTitle, formDTO.getTitle());
+        wrapper.between(IcPartyActivityEntity::getActivityTime, formDTO.getStartTime(), formDTO.getEndTime());
+        wrapper.orderByDesc(IcPartyActivityEntity::getUpdatedTime);
+        List<IcPartyActivityEntity> list = baseDao.selectList(wrapper);
+        List<IcPartyActivityDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyActivityDTO.class);
+
+        IcPartyUnitDTO unitDTO = new IcPartyUnitDTO();
+        unitDTO.setAgencyId(formDTO.getAgencyId());
+        if (CollectionUtils.isNotEmpty(dtoList)) {
+            Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+            dtoList.forEach(dto -> {
+                dto.setUnitName(option.get(dto.getUnitId()));
+            });
+        }
+        PageInfo<IcPartyActivityDTO> pageInfo = new PageInfo<>(dtoList);
+        return new PageData<>(dtoList, pageInfo.getTotal());
     }
 
     @Override
@@ -84,21 +108,20 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPartyActivityDTO dto) {
         IcPartyActivityEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActivityEntity.class);
+        AgencyInfoCache agency = CustomerOrgRedis.getAgencyInfo(entity.getAgencyId());
+        entity.setPids(agency.getPids());
+        if(StringUtils.isBlank(entity.getId())) {
             insert(entity);
-    }
+        } else {
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IcPartyActivityDTO dto) {
-        IcPartyActivityEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActivityEntity.class);
             updateById(entity);
         }
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
+    public void delete(String id) {
         // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+        baseDao.deleteById(id);
     }
 
 }

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

@@ -24,6 +24,8 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcPartyUnitDao;
@@ -38,16 +40,15 @@ import com.epmet.service.IcPartyUnitService;
 import com.epmet.service.IcUserDemandRecService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
+import java.util.stream.Collectors;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 联建单位
@@ -74,11 +75,16 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         wrapper.eq(StringUtils.isNotBlank(formDTO.getType()), IcPartyUnitEntity::getType, formDTO.getType());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContact()), IcPartyUnitEntity::getContact, formDTO.getContact());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContactMobile()), IcPartyUnitEntity::getContactMobile, formDTO.getContactMobile());
+        wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime);
         List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
         List<IcPartyUnitDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyUnitDTO.class);
         Result<Map<String, String>> unitTypeMap =  epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
         dtoList.forEach(item -> {
             item.setType(unitTypeMap.getData().get(item.getType()));
+            //TODO 服务事项
+            if (StringUtils.isNotBlank(item.getServiceMatter())) {
+                List<String> matters = Arrays.asList(item.getServiceMatter().split(StrConstant.COMMA));
+            }
         });
         PageInfo<IcPartyUnitDTO> pageInfo = new PageInfo<>(dtoList);
         return new PageData<>(dtoList, pageInfo.getTotal());
@@ -103,6 +109,10 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
     @Override
     public IcPartyUnitDTO get(String id) {
         IcPartyUnitEntity entity = baseDao.selectById(id);
+        IcPartyUnitDTO dto = ConvertUtils.sourceToTarget(entity, IcPartyUnitDTO.class);
+        if (StringUtils.isNotBlank(dto.getServiceMatter())) {
+            dto.setServiceMatterList(Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA)));
+        }
         return ConvertUtils.sourceToTarget(entity, IcPartyUnitDTO.class);
     }
 
@@ -110,21 +120,21 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPartyUnitDTO dto) {
         IcPartyUnitEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyUnitEntity.class);
+        AgencyInfoCache agency = CustomerOrgRedis.getAgencyInfo(entity.getAgencyId());
+        entity.setPids(agency.getPids());
+        if(StringUtils.isBlank(entity.getId())) {
             insert(entity);
-    }
+        } else {
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IcPartyUnitDTO dto) {
-        IcPartyUnitEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyUnitEntity.class);
             updateById(entity);
         }
+    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
+    public void delete(String id) {
         // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+        baseDao.deleteById(id);
     }
 
     /**
@@ -151,4 +161,29 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         return resultList;
     }
 
+    /**
+     * @Description 获取组织下单位列表
+     * @param dto
+     * @Return {@link List< OptionDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/22 14:35
+     */
+    @Override
+    public List<OptionDTO> option(IcPartyUnitDTO dto) {
+        LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyUnitEntity::getAgencyId, dto.getAgencyId());
+        wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime);
+        wrapper.eq(StringUtils.isNotBlank(dto.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, dto.getServiceMatter());
+        List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            OptionDTO option = new OptionDTO();
+            option.setValue(item.getId());
+            option.setLabel(item.getUnitName());
+            return option;
+        }).collect(Collectors.toList());
+    }
+
 }