共通字典

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/service/impl/FarmCommonService.java

@@ -2,10 +2,15 @@ package jp.yamoto.farm.common.biz.service.impl;
 
 import jp.yamoto.farm.common.biz.domain.bo.OptionsParamBo;
 import jp.yamoto.farm.common.biz.domain.vo.OptionsKeyValueVo;
+import jp.yamoto.farm.common.biz.mapper.SysDictDataMapper;
 import jp.yamoto.farm.common.biz.service.IFarmCommonService;
+import jp.yamoto.farm.common.core.domain.entity.SysDictData;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 共通ロジックのサービスクラス
@@ -15,6 +20,9 @@ import java.util.List;
 @Service
 public class FarmCommonService implements IFarmCommonService {
 
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
+
     /**
      * コンボボックスデータを取得する
      *
@@ -23,6 +31,22 @@ public class FarmCommonService implements IFarmCommonService {
      */
     @Override
     public List<OptionsKeyValueVo> getCommonOptions(OptionsParamBo optionsParam) {
-        return null;
+        SysDictData dictData = new SysDictData();
+        dictData.setStatus("0");
+        dictData.setDictType(optionsParam.getCmdOptionName());
+
+        List<SysDictData> list = dictDataMapper.selectDictDataList(dictData);
+
+        // 表示順・昇順
+        Comparator<SysDictData> sortDisplayOrder = Comparator.nullsFirst(Comparator.comparing((SysDictData entity) -> 0, Comparator.nullsFirst(Integer::compareTo)));
+        // ・昇順
+        return list.stream()
+                .sorted(sortDisplayOrder
+                        .thenComparing(SysDictData::getDictSort))
+                .map(item -> OptionsKeyValueVo.builder()
+                        .key(item.getDictValue())
+                        .value(item.getDictLabel()
+                        ).build())
+                .collect(Collectors.toList());
     }
 }

farm-common-biz/src/main/resources/mapper/MastItemMapper.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="jp.yamoto.farm.common.biz.mapper.MastItemMapper">
-
-    <resultMap id="baseResultMap" type="jp.yamoto.farm.common.biz.domain.vo.MastItemVo">
-        <id column="id" property="id"/>
-        <result column="item_id" property="itemId"/>
-        <result column="item_code" property="itemCode"/>
-        <result column="item_name" property="itemName"/>
-    </resultMap>
-
-    <select id="getListPage" resultMap="baseResultMap">
-        SELECT
-            id,
-            item_id,
-            item_code,
-            item_name
-        FROM
-            mast_item
-        <where>
-            <if test="query.itemId != null and query.itemId != ''">
-                <bind name="itemIdLike" value="'%'+query.itemId+'%'"/>
-                AND item_id LIKE #{itemIdLike}
-            </if>
-            <if test="query.itemCode != null and query.itemCode != ''">
-                AND item_code = #{query.itemCode}
-            </if>
-            <if test="query.itemName != null and query.itemName != ''">
-                <bind name="itemNameLike" value="'%'+query.itemName+'%'"/>
-                AND item_name LIKE #{itemNameLike}
-            </if>
-        </where>
-
-    </select>
-
-</mapper>