|
|
@ -2,8 +2,15 @@ package com.hxhq.system.controller; |
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
import java.util.ArrayList; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
|
|
|
import java.util.stream.Collectors; |
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
|
|
|
|
import com.hxhq.business.domain.Yq; |
|
|
|
|
|
import com.hxhq.business.enums.NormalEnum; |
|
|
|
|
|
import com.hxhq.business.form.yq.YqSearchForm; |
|
|
|
|
|
import com.hxhq.business.service.IYqService; |
|
|
|
|
|
import com.hxhq.system.api.domain.SysDept; |
|
|
|
|
|
import com.hxhq.system.service.ISysDeptService; |
|
|
import com.hxhq.system.service.ISysDictDataService; |
|
|
import com.hxhq.system.service.ISysDictDataService; |
|
|
import com.hxhq.system.service.ISysDictTypeService; |
|
|
import com.hxhq.system.service.ISysDictTypeService; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
@ -41,7 +48,10 @@ public class SysDictDataController extends BaseController |
|
|
@Autowired |
|
|
@Autowired |
|
|
private ISysDictTypeService dictTypeService; |
|
|
private ISysDictTypeService dictTypeService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private IYqService yqService; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private ISysDeptService sysDeptService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 获取字典数据列表 |
|
|
* 获取字典数据列表 |
|
|
@ -51,9 +61,21 @@ public class SysDictDataController extends BaseController |
|
|
@GetMapping("/list") |
|
|
@GetMapping("/list") |
|
|
public TableDataInfo list(SysDictData dictData) |
|
|
public TableDataInfo list(SysDictData dictData) |
|
|
{ |
|
|
{ |
|
|
startPage(); |
|
|
|
|
|
List<SysDictData> list = dictDataService.selectDictDataList(dictData); |
|
|
|
|
|
return getDataTable(list); |
|
|
|
|
|
|
|
|
if(StringUtils.equals(dictData.getDictType(), "business_ccwz")) { |
|
|
|
|
|
YqSearchForm form = new YqSearchForm(); |
|
|
|
|
|
List<SysDept> superiorAndSubordinate = sysDeptService.getSuperiorAndSubordinate(SecurityUtils.getLoginUser().getSysUser().getDeptId()); |
|
|
|
|
|
List<Long> deptIdList = superiorAndSubordinate.stream().map(SysDept::getDeptId).collect(Collectors.toList()); |
|
|
|
|
|
form.setDeptIdList(deptIdList); |
|
|
|
|
|
form.setCcwz(NormalEnum.yes.getValue()); |
|
|
|
|
|
startPage(); |
|
|
|
|
|
List<Yq> list = yqService.queryList(form); |
|
|
|
|
|
|
|
|
|
|
|
return getDataTable(list); |
|
|
|
|
|
} else { |
|
|
|
|
|
startPage(); |
|
|
|
|
|
List<SysDictData> list = dictDataService.selectDictDataList(dictData); |
|
|
|
|
|
return getDataTable(list); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Log(title = "字典数据", businessType = BusinessType.EXPORT) |
|
|
@Log(title = "字典数据", businessType = BusinessType.EXPORT) |
|
|
|