|
@@ -5,15 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
-import com.ydtech.modules.admin.dao.SysUserMapper;
|
|
|
|
|
-import com.ydtech.modules.admin.model.SysDept;
|
|
|
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
|
import com.ydtech.modules.admin.model.po.SysOrganizationQuotation;
|
|
import com.ydtech.modules.admin.model.po.SysOrganizationQuotation;
|
|
|
import com.ydtech.modules.admin.model.po.SysQuotationTheme;
|
|
import com.ydtech.modules.admin.model.po.SysQuotationTheme;
|
|
|
import com.ydtech.modules.admin.model.vo.SysQuotationThemeVo;
|
|
import com.ydtech.modules.admin.model.vo.SysQuotationThemeVo;
|
|
|
import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
|
|
import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
|
|
|
-import com.ydtech.modules.admin.service.SysDeptService;
|
|
|
|
|
import com.ydtech.modules.admin.service.SysOrganizationQuotationService;
|
|
import com.ydtech.modules.admin.service.SysOrganizationQuotationService;
|
|
|
import com.ydtech.modules.admin.service.SysQuotationThemeService;
|
|
import com.ydtech.modules.admin.service.SysQuotationThemeService;
|
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
@@ -149,16 +146,20 @@ public class SysQuotationController extends BaseController {
|
|
|
|
|
|
|
|
@ApiOperation(value = "获取用户对应报价单")
|
|
@ApiOperation(value = "获取用户对应报价单")
|
|
|
@GetMapping(value = "/getThemeByUserId")
|
|
@GetMapping(value = "/getThemeByUserId")
|
|
|
- public HttpResult<SysOrganizationQuotation> getThemeByUserId() {
|
|
|
|
|
|
|
+ public HttpResult< List<String>> getThemeByUserId() {
|
|
|
SysUser user = getUser();
|
|
SysUser user = getUser();
|
|
|
LambdaQueryWrapper<SysOrganizationQuotation> oQueryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SysOrganizationQuotation> oQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
oQueryWrapper.eq(SysOrganizationQuotation::getAuthorizationId, user.getId());
|
|
oQueryWrapper.eq(SysOrganizationQuotation::getAuthorizationId, user.getId());
|
|
|
- SysOrganizationQuotation quotationServiceOne = sysOrganizationQuotationService.getOne(oQueryWrapper);
|
|
|
|
|
- if (quotationServiceOne == null) {
|
|
|
|
|
- quotationServiceOne = new SysOrganizationQuotation();
|
|
|
|
|
- quotationServiceOne.setThemeCode("QD");
|
|
|
|
|
|
|
+ List<SysOrganizationQuotation> list = sysOrganizationQuotationService.list(oQueryWrapper);
|
|
|
|
|
+ List<String> themeCodes = new ArrayList<>();
|
|
|
|
|
+ if (list == null || list.size() == 0) {
|
|
|
|
|
+ themeCodes.add("QD");
|
|
|
|
|
+ } else {
|
|
|
|
|
+ for (SysOrganizationQuotation quotation : list) {
|
|
|
|
|
+ themeCodes.add(quotation.getThemeCode());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- return HttpResult.ok(quotationServiceOne);
|
|
|
|
|
|
|
+ return HttpResult.ok(themeCodes);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|