Browse Source

对应者下拉共通

于俊龙 1 month ago
parent
commit
f2a6141732

+ 6 - 0
farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/mapper/SysUserMapper.java

@@ -142,4 +142,10 @@ public interface SysUserMapper {
      * @return 結果
      */
     public SysUser checkEmailUnique(String email);
+
+    /**
+     * 対応者コンボボックスデータを取得する
+     * @return
+     */
+    List<SysUser> selectCrmUserList();
 }

+ 9 - 1
farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/service/ISysUserService.java

@@ -1,9 +1,11 @@
 package jp.yamoto.farm.crm.biz.sys.service;
 
-import java.util.List;
+import jp.yamoto.farm.common.biz.domain.vo.OptionsKeyValueVo;
 import jp.yamoto.farm.common.core.domain.entity.SysUser;
 import jp.yamoto.farm.crm.biz.sys.domain.bo.SysUserQueryBo;
 
+import java.util.List;
+
 /**
  * ユーザー ビジネス層
  *
@@ -203,4 +205,10 @@ public interface ISysUserService {
      * @return 結果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 対応者コンボボックスデータを取得する
+     * @return
+     */
+    List<OptionsKeyValueVo> getCrmUserOptions();
 }

+ 20 - 0
farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,7 @@
 package jp.yamoto.farm.crm.biz.sys.service.impl;
 
 import jakarta.validation.Validator;
+import jp.yamoto.farm.common.biz.domain.vo.OptionsKeyValueVo;
 import jp.yamoto.farm.common.biz.service.ISysConfigService;
 import jp.yamoto.farm.common.constant.UserConstants;
 import jp.yamoto.farm.common.core.domain.entity.SysRole;
@@ -493,4 +494,23 @@ public class SysUserServiceImpl implements ISysUserService {
         }
         return successMsg.toString();
     }
+
+    /**
+     * 対応者コンボボックスデータを取得する
+     * @return
+     */
+    @Override
+    public List<OptionsKeyValueVo> getCrmUserOptions() {
+        List<SysUser> sysUserList = userMapper.selectCrmUserList();
+        if(ValueUtils.isNotEmpty(sysUserList)){
+
+            return sysUserList.stream()
+                    .map(item -> OptionsKeyValueVo.builder()
+                            .key(item.getUserName())
+                            .value(item.getNickName()
+                            ).build())
+                    .collect(Collectors.toList());
+        }
+        return null;
+    }
 }

+ 12 - 0
farm-crm-biz/src/main/resources/mapper/crm/SysUserMapper.xml

@@ -238,4 +238,16 @@
 
 	</update>
 
+	<!--対応者-->
+	<select id="selectCrmUserList" resultType="SysUser">
+		select
+		    u.nick_name as nickName,
+		    u.user_name as userName
+		from sys_user u
+		WHERE
+		    u.user_type = '00'
+		AND del_flag = 0
+		ORDER BY u.nick_name
+	</select>
+
 </mapper> 

+ 13 - 0
farm-crm/src/main/java/jp/yamoto/farm/crm/web/controller/common/CommonController.java

@@ -12,6 +12,7 @@ import jp.yamoto.farm.common.utils.StringUtils;
 import jp.yamoto.farm.common.utils.file.FileUploadUtils;
 import jp.yamoto.farm.common.utils.file.FileUtils;
 import jp.yamoto.farm.crm.biz.master.service.IMastFarmerService;
+import jp.yamoto.farm.crm.biz.sys.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,9 @@ public class CommonController {
     @Autowired
     private IMastFarmerService mastFarmerService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * コンボボックスデータを取得する
      *
@@ -202,4 +206,13 @@ public class CommonController {
     public AjaxResult getFarmerCommonOptions() {
         return AjaxResult.success(mastFarmerService.getFarmerOptions());
     }
+
+    /**
+     * 対応者コンボボックスデータを取得する
+     * @return
+     */
+    @GetMapping(value = "/user/options")
+    public AjaxResult getCrmUserOptions(){
+        return AjaxResult.success(sysUserService.getCrmUserOptions());
+    }
 }