Merge remote-tracking branch 'origin/master' into dev

biz-base/src/main/java/com/dayou/controller/DepartmentController.java

@@ -100,15 +100,15 @@ public class DepartmentController extends BaseController {
 
 
     /**
-     * 机构下拉列表
+     * 机构下拉列表(根据业务类型获取接单部门)
      */
-    @GetMapping("/allot")
-    public RestResponse<List<PullDownModel>> allotDepartment(){
-        LambdaQueryWrapper<Department> lambdaQueryWrapper = new LambdaQueryWrapper<Department>()
-                .select(Department::getId,Department::getName)
-                .eq(Department::getDeleted,false).eq(Department::getIfAllot,true);
-        List<Department> list= departmentService.list(lambdaQueryWrapper);
-        List<PullDownModel> ret=ConvertUtil.copyList(list, PullDownModel.class);
+    @GetMapping("/allot/{businessCode}")
+    public RestResponse<List<PullDownModel>> allotDepartment(@PathVariable String businessCode){
+//        LambdaQueryWrapper<Department> lambdaQueryWrapper = new LambdaQueryWrapper<Department>()
+//                .select(Department::getId,Department::getName)
+//                .eq(Department::getDeleted,false).eq(Department::getIfAllot,true);
+//        List<Department> list= departmentService.list(lambdaQueryWrapper);
+        List<PullDownModel> ret=ConvertUtil.copyList(departmentService.getAllotDepartmentByBusiness(businessCode), PullDownModel.class);
         return RestResponse.data(ret);
     }
 

dao/src/main/java/com/dayou/mapper/DepartmentMapper.java

@@ -6,6 +6,8 @@ import com.dayou.dao.CustomBaseMapper;
 import com.dayou.vo.DepartmentVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 机构 Mapper 接口
@@ -19,4 +21,11 @@ public interface DepartmentMapper extends CustomBaseMapper<Department> {
     Page<DepartmentVO> xPage(@Param("department") Department department, Page page);
 
     Page<DepartmentVO> getPage(Page page, @Param("department") Department department);
+
+    /**
+     * 根据业务code获取接单部门
+     * @param businessCode 业务code
+     * @return List<Department>
+     */
+    List<Department> getAllotDepartmentByBusiness(@Param("businessCode") String businessCode);
 }

dao/src/main/resources/mapper/DepartmentMapper.xml

@@ -43,4 +43,13 @@
         select d.*,u.name as leaderName from department d left join user u on u.id = d.leader_id
         where d.deleted = 0
     </select>
+
+    <!--根据业务code获取接单部门-->
+    <select id="getAllotDepartmentByBusiness" resultType="com.dayou.entity.Department">
+        SELECT department.id, department.name
+        FROM department,sorted_department
+        WHERE department.id = sorted_department.department_id
+        AND department.deleted = 0
+        AND sorted_department.business_type = #{businessCode}
+    </select>
 </mapper>

service/src/main/java/com/dayou/service/IDepartmentService.java

@@ -10,6 +10,9 @@ import com.dayou.vo.DepartmentVO;
 import com.dayou.vo.UserVO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
 /**
  * <p>
  * 机构 服务类
@@ -39,4 +42,11 @@ public interface IDepartmentService extends IService<Department> {
 
         DepartmentStatVO stat();
 
+    /**
+     * 根据业务code获取接单部门
+     * @param businessCode 业务code
+     * @return List<Department>
+     */
+    List<Department> getAllotDepartmentByBusiness(String businessCode);
+
 }

service/src/main/java/com/dayou/service/impl/DepartmentServiceImpl.java

@@ -156,4 +156,14 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 .build();
     }
 
+    /**
+     * 根据业务code获取接单部门
+     * @param businessCode 业务code
+     * @return List<Department>
+     */
+    @Override
+    public List<Department> getAllotDepartmentByBusiness(String businessCode) {
+        return departmentMapper.getAllotDepartmentByBusiness(businessCode);
+    }
+
 }