Skip to content

D
dsk-operate-sys-cscec
Commit e582487a authored by liuChang's avatar liuChang
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of 192.168.60.201:root/dsk-operate-sys into V20231129-中建一局二公司

parents fe9f346e 5872b3de
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 49 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CustomerInfoController.java
View file @ e582487a
......@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 供应商相关
......@@ -78,7 +79,12 @@ public class CustomerInfoController extends BaseController {
return iCustomerInfoService.queryCooperationList(bo, query);
}
/**
* 查询供应商基本情况
*/
@GetMapping("/queryBasicInfo")
public R<Map<String,Long>> queryBasicInfo() {
return R.ok(iCustomerInfoService.queryBasicInfo());
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/ICustomerInfoService.java
View file @ e582487a
......@@ -59,4 +59,9 @@ public interface ICustomerInfoService extends IService<DCustomer> {
* @return
*/
Map<String,Object> cooperationStatistic(String companyName);
/**
* 查询供应商基本情况
*/
Map<String, Long> queryBasicInfo();
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java
View file @ e582487a
......@@ -54,23 +54,23 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
@Override
public TableDataInfo<CustomerInfoVo> queryPageList(CustomerInfoBo bo, PageQuery query) {
if("劳务分包".equals(bo.getCustomerClass())){
if ("劳务分包".equals(bo.getCustomerClass())) {
bo.setServiceTeamLogo("N");
}
if("劳务分包队伍".equals(bo.getCustomerClass())){
if ("劳务分包队伍".equals(bo.getCustomerClass())) {
bo.setCustomerClass("劳务分包");
bo.setServiceTeamLogo("Y");
}
Page<CustomerInfoVo> page = baseMapper.queryListByType(query.build(), bo);
if (CollectionUtils.isNotEmpty(page.getRecords())) {
page.getRecords().parallelStream().forEach(item->{
page.getRecords().parallelStream().forEach(item -> {
DCustomerListVo vo = subcontractMapper.selectStatisticByCustomerId(item.getCustomerId());
//企业合作数量
item.setEnterpriseCooperationCount(vo.getEnterpriseCooperationCount());
//项目合作数量
item.setProjectCooperationCount(vo.getProjectCooperationCount());
//关键字标红
if(!ObjectUtils.isEmpty(bo.getCustomerName())){
if (!ObjectUtils.isEmpty(bo.getCustomerName())) {
item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
}
try {
......@@ -80,11 +80,11 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
Integer companyId = MapUtil.getInt(data, "jskEid");
item.setCompanyId(companyId);
}
}catch (Exception e){
} catch (Exception e) {
log.error("CustomerInfoServiceImpl.queryPageList() error:" + e);
}
//关键字标红
if(!ObjectUtils.isEmpty(bo.getLeaderName())){
if (!ObjectUtils.isEmpty(bo.getLeaderName())) {
item.setCustomerName(StringUtils.markInRed(item.getLeaderName(), bo.getLeaderName()));
}
});
......@@ -94,18 +94,18 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
@Override
public CustomerApproveVo queryApproveByBo(CustomerInfoBo bo) {
if(ObjectUtil.isNull(bo.getCustomerKey()) && StringUtil.isBlank(bo.getCustomerName()) && StringUtil.isBlank(bo.getUnifySocialCode())){
Assert.isTrue(false,"参数不能为空");
if (ObjectUtil.isNull(bo.getCustomerKey()) && StringUtil.isBlank(bo.getCustomerName()) && StringUtil.isBlank(bo.getUnifySocialCode())) {
Assert.isTrue(false, "参数不能为空");
}
LambdaQueryWrapper<DCustomer> lqw = Wrappers.lambdaQuery();
lqw.eq(DCustomer::getRecommendOrgId, AdvisoryBodyManageQueryConstants.LEVEL1_COMPANY_ID);
lqw.eq(ObjectUtil.isNotNull(bo.getCustomerKey()),DCustomer::getCustomerKey,bo.getCustomerKey());
lqw.eq(StringUtil.isNotBlank(bo.getUnifySocialCode()),DCustomer::getUnifySocialCode,bo.getUnifySocialCode());
lqw.eq(StringUtil.isNotBlank(bo.getCustomerName()),DCustomer::getCustomerName,bo.getCustomerName());
lqw.eq(ObjectUtil.isNotNull(bo.getCustomerKey()), DCustomer::getCustomerKey, bo.getCustomerKey());
lqw.eq(StringUtil.isNotBlank(bo.getUnifySocialCode()), DCustomer::getUnifySocialCode, bo.getUnifySocialCode());
lqw.eq(StringUtil.isNotBlank(bo.getCustomerName()), DCustomer::getCustomerName, bo.getCustomerName());
lqw.orderByDesc(DCustomer::getApproveDate2);
lqw.last("limit 1");
DCustomer dCustomer = baseMapper.selectOne(lqw);
if(ObjectUtil.isNotEmpty(dCustomer)){
if (ObjectUtil.isNotEmpty(dCustomer)) {
//营业执照url
dCustomer.setBusinessLicenseList(baseMapper.selectBusinessLicense(dCustomer.getCustomerId()));
//组织机构代码证url
......@@ -133,7 +133,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
@Override
public TableDataInfo<AdvisoryBodyVo> queryAdvisoryList(AdvisoryBodyBo bo, PageQuery query) {
bo.setContractOrgId(AdvisoryBodyManageQueryConstants.LEVEL1_COMPANY_ID);
Page<AdvisoryBodyVo> page = advisoryBodyMapper.queryListByBo(query.build(),bo);
Page<AdvisoryBodyVo> page = advisoryBodyMapper.queryListByBo(query.build(), bo);
page.getRecords().parallelStream().forEach(vo -> {
try {
Map<String, Object> map = opportunityRadarService.enterpriseByName(vo.getOwnerName());
......@@ -157,11 +157,11 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
@Override
public TableDataInfo<CustomerCooperationVo> queryCooperationList(CustomerCooperationBo bo, PageQuery query) {
if(StringUtil.isBlank(bo.getCustomerId()) && StringUtil.isBlank(bo.getCustomerName())){
Assert.isTrue(false,"供应商不能为空");
if (StringUtil.isBlank(bo.getCustomerId()) && StringUtil.isBlank(bo.getCustomerName())) {
Assert.isTrue(false, "供应商不能为空");
}
bo.setSignOrgId(AdvisoryBodyManageQueryConstants.LEVEL1_COMPANY_ID);
Page<CustomerCooperationVo> page = dSubcontractMapper.selectCooperationList(query.build(),bo);
Page<CustomerCooperationVo> page = dSubcontractMapper.selectCooperationList(query.build(), bo);
return TableDataInfo.build(page);
}
......@@ -190,4 +190,41 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
// result.put("在施工程情况", 0);
return result;
}
/**
* 查询供应商基本情况
*/
@Override
public Map<String, Long> queryBasicInfo() {
HashMap<String, Long> infoMap = new HashMap<>();
//专业分包数量
Long zyfbCount = baseMapper.selectCount(new LambdaQueryWrapper<DCustomer>()
.eq(DCustomer::getRecommendOrgId, "F17305B4EA4444CBAB12892C7B99E475")
.eq(DCustomer::getCustomerClass, "专业分包"));
//机械施工数量
Long jxsgCount = baseMapper.selectCount(new LambdaQueryWrapper<DCustomer>()
.eq(DCustomer::getRecommendOrgId, "F17305B4EA4444CBAB12892C7B99E475")
.eq(DCustomer::getCustomerClass, "租赁"));
//物资设备数量
Long wzsbCount = baseMapper.selectCount(new LambdaQueryWrapper<DCustomer>()
.eq(DCustomer::getRecommendOrgId, "F17305B4EA4444CBAB12892C7B99E475")
.eq(DCustomer::getCustomerClass, "分供"));
//劳务分包数量
Long lwfbCount = baseMapper.selectCount(new LambdaQueryWrapper<DCustomer>()
.eq(DCustomer::getRecommendOrgId, "F17305B4EA4444CBAB12892C7B99E475")
.eq(DCustomer::getCustomerClass, "劳务分包")
.eq(DCustomer::getServiceTeamLogo,"N"));
//劳务分包队伍数量
Long lwfbdwCount = baseMapper.selectCount(new LambdaQueryWrapper<DCustomer>()
.eq(DCustomer::getRecommendOrgId, "F17305B4EA4444CBAB12892C7B99E475")
.eq(DCustomer::getCustomerClass, "劳务分包")
.eq(DCustomer::getServiceTeamLogo,"Y"));
infoMap.put("customerTotal", zyfbCount + jxsgCount + wzsbCount + lwfbCount + lwfbdwCount);
infoMap.put("zyfbCount", zyfbCount);
infoMap.put("jxsgCount", jxsgCount);
infoMap.put("wzsbCount", wzsbCount);
infoMap.put("lwfbCount", lwfbCount);
infoMap.put("lwfbdwCount", lwfbdwCount);
return infoMap;
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/EnterpriseCreditController.java
View file @ e582487a
......@@ -120,9 +120,9 @@ public class EnterpriseCreditController {
*@Author: Dgm
*@date: 2024/5/13 14:24
*/
@PostMapping(value = "/selectPageChinaXzxkInfo")
public TableDataInfo selectPageChinaXzxkInfo(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectPageChinaXzxkInfo(body);
@PostMapping(value = "/selectChinaXzxkPage")
public TableDataInfo selectChinaXzxkPage(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectChinaXzxkPage(body);
}
/***
......@@ -132,7 +132,7 @@ public class EnterpriseCreditController {
*@Author: Dgm
*@date: 2024/5/13 14:24
*/
@PostMapping(value = "/selectChinaXzcf/detail")
@PostMapping(value = "/selectChinaXzxk/detail")
public R selectChinaXzxkDetail(@RequestBody @Valid EnterpriseCreditChinaDetailBody body) throws Exception {
return enterpriseCreditService.selectChinaXzxkDetail(body);
}
......@@ -144,9 +144,9 @@ public class EnterpriseCreditController {
*@Author: Dgm
*@date: 2024/5/13 14:24
*/
@PostMapping(value = "/selectPageChinaXzcfInfo")
public TableDataInfo selectPageChinaXzcfInfo(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectPageChinaXzcfInfo(body);
@PostMapping(value = "/selectChinaXzcfPage")
public TableDataInfo selectChinaXzcfPage(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectChinaXzcfPage(body);
}
/***
......@@ -156,7 +156,7 @@ public class EnterpriseCreditController {
*@Author: Dgm
*@date: 2024/5/13 14:24
*/
@PostMapping(value = "/selectChinaXzcfDetail")
@PostMapping(value = "/selectChinaXzcf/detail")
public R selectChinaXzcfDetail(@RequestBody @Valid EnterpriseCreditChinaDetailBody body) throws Exception {
return enterpriseCreditService.selectChinaXzcfDetail(body);
}
......@@ -168,11 +168,24 @@ public class EnterpriseCreditController {
*@Author: Dgm
*@date: 2024/5/13 14:24
*/
@PostMapping(value = "/selectPageChinaNsxydjInfo")
public TableDataInfo selectPageChinaNsxydjInfo(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectPageChinaNsxydjInfo(body);
@PostMapping(value = "/selectChinaNsxydjPage")
public TableDataInfo selectChinaNsxydjPage(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectChinaNsxydjPage(body);
}
/***
*@Description: 信用中国-诚实守信-海关高级认证企业
*@Param:
*@return: com.dsk.common.core.page.TableDataInfo
*@Author: Dgm
*@date: 2024/5/13 14:24
*/
@PostMapping(value = "/selectChinaHggjczqyPage")
public TableDataInfo selectChinaHggjczqyPage(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectChinaHggjczqyPage(body);
}
/***
*@Description: 信用中国-诚实守信-严重失信主体名单
*@Param:
......@@ -180,9 +193,9 @@ public class EnterpriseCreditController {
*@Author: Dgm
*@date: 2024/5/13 14:24
*/
@PostMapping(value = "/selectPageChinaYzsxztmdInfo")
public TableDataInfo selectPageChinaYzsxztmdInfo(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectPageChinaYzsxztmdInfo(body);
@PostMapping(value = "/selectChinaYzsxztmdPage")
public TableDataInfo selectChinaYzsxztmdPage(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectChinaYzsxztmdPage(body);
}
/***
......@@ -192,9 +205,9 @@ public class EnterpriseCreditController {
*@Author: Dgm
*@date: 2024/5/13 14:24
*/
@PostMapping(value = "/selectPageChinaJyycInfo")
public TableDataInfo selectPageChinaJyycInfo(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectPageChinaJyycInfo(body);
@PostMapping(value = "/selectChinaJyycPage")
public TableDataInfo selectChinaJyycPage(@RequestBody @Valid EnterpriseCreditChinaPageBody body) throws Exception {
return enterpriseCreditService.selectChinaJyycPage(body);
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditChinaPageBody.java
View file @ e582487a
......@@ -16,9 +16,9 @@ public class EnterpriseCreditChinaPageBody extends BasePage {
* 企业id
*/
@NotNull(message = "企业id不能为空")
private Integer companyId;
private Integer cid;
public boolean isVaildCid() {
return 0 == companyId;
return 0 == cid;
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseCreditService.java
View file @ e582487a
......@@ -145,43 +145,55 @@ public class EnterpriseCreditService {
return dskOpenApiUtil.responsePage(map);
}
public TableDataInfo selectPageChinaXzxkInfo(EnterpriseCreditChinaPageBody body) throws Exception{
public TableDataInfo selectChinaXzxkPage(EnterpriseCreditChinaPageBody body) throws Exception{
body.setPageSize(1000);
if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterpriseCredit/china/selectPageChinaXzxkInfo", BeanUtil.beanToMap(body, false, false));
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/selectChinaXzxkPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map);
}
public R selectChinaXzxkDetail(EnterpriseCreditChinaDetailBody body) throws Exception{
Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterpriseCredit/china/selectChinaXzxkInfo", BeanUtil.beanToMap(body, false, false));
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/selectChinaXzxkDetail", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class);
}
public TableDataInfo selectPageChinaXzcfInfo(EnterpriseCreditChinaPageBody body) throws Exception{
public TableDataInfo selectChinaXzcfPage(EnterpriseCreditChinaPageBody body) throws Exception{
body.setPageSize(1000);
if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterpriseCredit/china/selectPageChinaXzcfInfo", BeanUtil.beanToMap(body, false, false));
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/selectChinaXzcfPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map);
}
public R selectChinaXzcfDetail(EnterpriseCreditChinaDetailBody body) throws Exception{
Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterpriseCredit/china/selectChinaXzcfInfo", BeanUtil.beanToMap(body, false, false));
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/selectChinaXzcfDetail", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class);
}
public TableDataInfo selectPageChinaNsxydjInfo(EnterpriseCreditChinaPageBody body) throws Exception{
public TableDataInfo selectChinaNsxydjPage(EnterpriseCreditChinaPageBody body) throws Exception{
body.setPageSize(1000);
if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterpriseCredit/china/selectPageChinaNsxydjInfo", BeanUtil.beanToMap(body, false, false));
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/selectChinaNsxydjPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map);
}
public TableDataInfo selectPageChinaYzsxztmdInfo(EnterpriseCreditChinaPageBody body) throws Exception{
public TableDataInfo selectChinaHggjczqyPage(EnterpriseCreditChinaPageBody body) throws Exception{
body.setPageSize(1000);
if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterpriseCredit/china/selectPageChinaYzsxztmdInfo", BeanUtil.beanToMap(body, false, false));
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/selectChinaHggjczqyPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map);
}
public TableDataInfo selectPageChinaJyycInfo(EnterpriseCreditChinaPageBody body) throws Exception{
public TableDataInfo selectChinaYzsxztmdPage(EnterpriseCreditChinaPageBody body) throws Exception{
body.setPageSize(1000);
if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterpriseCredit/china/selectPageChinaJyycInfo", BeanUtil.beanToMap(body, false, false));
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/selectChinaYzsxztmdPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map);
}
public TableDataInfo selectChinaJyycPage(EnterpriseCreditChinaPageBody body) throws Exception{
body.setPageSize(1000);
if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/selectChinaJyycPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment