BUG修改

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java

@@ -81,7 +81,6 @@ public class DepartmentController extends ControllerBase {
         }
         else {
 
-            dept.setDeptCode(null);
             dept.setDataModifyUserNo(AdminUserUtil.getUserNo());
             dept.setDataModifyUserName(AdminUserUtil.getUserName());
             dept.setDataModifyTime(LocalDateTime.now());

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java

@@ -1,16 +1,23 @@
 package com.nflg.mobilebroken.admin.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableList;
 import com.nflg.mobilebroken.admin.annotation.ApiMark;
 import com.nflg.mobilebroken.admin.pojo.dto.DeviceTypeCqmDTO;
 import com.nflg.mobilebroken.admin.pojo.query.DeviceTypeQuery;
 import com.nflg.mobilebroken.admin.pojo.vo.TBaseDeviceTypeVO;
+import com.nflg.mobilebroken.common.constant.STATE;
+import com.nflg.mobilebroken.common.exception.NflgException;
 import com.nflg.mobilebroken.common.pojo.ApiResult;
 import com.nflg.mobilebroken.common.pojo.PageData;
+import com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO;
 import com.nflg.mobilebroken.common.util.AdminUserUtil;
+import com.nflg.mobilebroken.repository.entity.ParamConfig;
 import com.nflg.mobilebroken.repository.entity.TBaseDeviceType;
+import com.nflg.mobilebroken.repository.service.IParamConfigService;
 import com.nflg.mobilebroken.repository.service.ITBaseDeviceTypeService;
 import com.nflg.mobilebroken.starter.annotation.MethodInfoMark;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +29,8 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 设备类型
@@ -33,6 +42,9 @@ public class DeviceTypeController extends ControllerBase {
     @Resource
     ITBaseDeviceTypeService baseDeviceTypeService;
 
+    @Resource
+    IParamConfigService paramConfigService;
+
     /**
      * 获取设备类型列表
      * @param query
@@ -54,10 +66,14 @@ public class DeviceTypeController extends ControllerBase {
     @MethodInfoMark(value = "设置CQM" ,menuName = "设备类型")
     @ApiMark(moduleName = "设备类型管理", apiName = "设置CQM")
     public ApiResult<Boolean> setCqm(@Valid @RequestBody DeviceTypeCqmDTO deviceTypeCqmDTO){
+        if(CollUtil.isEmpty(deviceTypeCqmDTO.getCqmPersonList()) ){
+            throw new NflgException(STATE.ParamErr, "请设置客户质量管理人");
+        }
          TBaseDeviceType deviceType=new TBaseDeviceType();
          deviceType.setId(deviceTypeCqmDTO.getId());
-         deviceType.setCqmPersonName(deviceTypeCqmDTO.getCqmPersonName());
+         deviceType.setCqmPersonName(StrUtil.join(",", deviceTypeCqmDTO.getCqmPersonList().stream().map(u->u.getUserName()).collect(Collectors.toList())));
-        deviceType.setDataModifyUserNo(AdminUserUtil.getUserNo());
+         deviceType.setCqmPersonId(StrUtil.join(",", deviceTypeCqmDTO.getCqmPersonList().stream().map(u->u.getId()).collect(Collectors.toList())));
+         deviceType.setDataModifyUserNo(AdminUserUtil.getUserNo());
         deviceType.setDataModifyUserName(AdminUserUtil.getUserName());
          deviceType.setDataModifyTime(LocalDateTime.now());
          baseDeviceTypeService.updateById(deviceType);
@@ -82,8 +98,11 @@ public class DeviceTypeController extends ControllerBase {
      */
     @PostMapping("getCqmPersonList")
     @ApiMark(moduleName = "设备类型管理", apiName = "获取客户质量管理人")
-    public ApiResult<List<String>> getCqmPersonList(){
+    public ApiResult<List<CqmPersonVO>> getCqmPersonList(){
-        return ApiResult.success(ImmutableList.of("CQM001","CQM002"));
+        ParamConfig  config= paramConfigService.lambdaQuery().eq(ParamConfig::getCode, "CQM").one();
+        List<String> cqms= Objects.isNull(config)? ImmutableList.of("CQM"): StrUtil.split(config.getValue(),",");
+
+        return ApiResult.success(baseDeviceTypeService.getCqmPersonList(cqms));
     }
 
 }

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceTypeCqmDTO.java

@@ -1,9 +1,12 @@
 package com.nflg.mobilebroken.admin.pojo.dto;
 
+import com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 public class DeviceTypeCqmDTO {
@@ -15,8 +18,8 @@ public class DeviceTypeCqmDTO {
     private Long id;
 
     /**
-     * 客户质量管理人-多个以逗号隔开
+     * 客户质量管理人
      */
-    @NotBlank(message = "客户质量管理人不能为空")
+    @NotEmpty(message = "客户质量管理人不能为空")
-    private String cqmPersonName;
+    private List<CqmPersonVO> cqmPersonList;
 }

nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CqmPersonVO.java

@@ -0,0 +1,18 @@
+package com.nflg.mobilebroken.common.pojo.vo;
+
+
+import lombok.Data;
+
+@Data
+public class CqmPersonVO {
+
+    /**
+     * 用户ID
+     */
+    private Integer id;
+
+    /**
+     * 姓名
+     */
+    private String userName;
+}

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDeviceType.java

@@ -41,6 +41,12 @@ public class TBaseDeviceType implements Serializable {
      */
     private String deviceType;
 
+
+    /**
+     * 客户质量管理人(id)多个以逗号隔开
+     */
+    private String cqmPersonId;
+
     /**
      * 客户质量管理人(姓名)多个以逗号隔开
      */

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseDeviceTypeMapper.java

@@ -2,6 +2,7 @@ package com.nflg.mobilebroken.repository.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
+import com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO;
 import com.nflg.mobilebroken.repository.entity.TBaseDeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,6 @@ public interface TBaseDeviceTypeMapper extends BaseMapper<TBaseDeviceType> {
     Page<TBaseDeviceType> getList(@Param("page")Page<PageBaseQuery> page, @Param("query") PageBaseQuery query);
 
     List<String> getDistinctDeviceType();
+
+    List<CqmPersonVO> getCqmPersonList(@Param("cqms") List<String> cqms);
 }

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseDeviceTypeService.java

@@ -2,6 +2,7 @@ package com.nflg.mobilebroken.repository.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
+import com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO;
 import com.nflg.mobilebroken.repository.entity.TBaseDeviceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.ibatis.annotations.Param;
@@ -22,4 +23,6 @@ public interface ITBaseDeviceTypeService extends IService<TBaseDeviceType> {
     Page<TBaseDeviceType> getList(@Param("page")Page<PageBaseQuery> page, @Param("query") PageBaseQuery query);
 
     List<String> getDistinctDeviceType();
+
+    List<CqmPersonVO> getCqmPersonList(@Param("cqms") List<String> cqms);
 }

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDeviceTypeServiceImpl.java

@@ -2,10 +2,12 @@ package com.nflg.mobilebroken.repository.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
+import com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO;
 import com.nflg.mobilebroken.repository.entity.TBaseDeviceType;
 import com.nflg.mobilebroken.repository.mapper.TBaseDeviceTypeMapper;
 import com.nflg.mobilebroken.repository.service.ITBaseDeviceTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -29,4 +31,9 @@ public class TBaseDeviceTypeServiceImpl extends ServiceImpl<TBaseDeviceTypeMappe
     public List<String> getDistinctDeviceType(){
         return this.getBaseMapper().getDistinctDeviceType();
     }
+
+
+    public List<CqmPersonVO> getCqmPersonList(@Param("cqms") List<String> cqms){
+        return this.getBaseMapper().getCqmPersonList(cqms);
+    }
 }

nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml

@@ -20,8 +20,14 @@
         SELECT distinct device_type from t_base_device_type
     </select>
 
+
     <!--获取客户质量管理人-->
-<!--    <select id="getCqmPersonList" resultType="java.lang.String">-->
+    <select id="getCqmPersonList" resultType="com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO">
-<!--        select-->
+        select a.id, a.user_name from admin_user  a
-<!--    </select>-->
+        join t_base_position b  ON a.title_id=b.id
+        where b.position_code in
+        <foreach collection="cqms" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
 </mapper>