Skip to content

D
dsk-operate-sys-cscec
Commit 4565ee74 authored by chenyuefang's avatar chenyuefang
Browse files
Options

Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司 

# Conflicts:
#	dsk-common/src/main/java/com/dsk/common/core/page/TableDataInfo.java
parents bc529851 2abecd33
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 680 additions and 326 deletions
dsk-common/src/main/java/com/dsk/common/core/page/TableDataInfo.java
View file @ 4565ee74
...@@ -24,6 +24,11 @@ public class TableDataInfo<T> implements Serializable { ...@@ -24,6 +24,11 @@ public class TableDataInfo<T> implements Serializable {
*/ */
private long total; private long total;
/**
* 当前页
*/
private long currentPage;
/** /**
* 列表数据 * 列表数据
*/ */
...@@ -40,9 +45,9 @@ public class TableDataInfo<T> implements Serializable { ...@@ -40,9 +45,9 @@ public class TableDataInfo<T> implements Serializable {
private String msg; private String msg;
/** /**
* 当前页 * object
*/ */
private long currentPage; private Object object;
/** /**
* 分页 * 分页
...@@ -57,6 +62,20 @@ public class TableDataInfo<T> implements Serializable { ...@@ -57,6 +62,20 @@ public class TableDataInfo<T> implements Serializable {
this.msg = "查询成功"; this.msg = "查询成功";
} }
/**
* 分页
*
* @param list 列表数据
* @param total 总记录数
*/
public TableDataInfo(List<T> list, long total, Object object) {
this.rows = list;
this.object = object;
this.total = total;
this.code = HttpStatus.HTTP_OK;
this.msg = "查询成功";
}
public static <T> TableDataInfo<T> build(IPage<T> page) { public static <T> TableDataInfo<T> build(IPage<T> page) {
TableDataInfo<T> rspData = new TableDataInfo<>(); TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK); rspData.setCode(HttpStatus.HTTP_OK);
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java
View file @ 4565ee74
...@@ -5,14 +5,12 @@ import com.dsk.common.core.controller.BaseController; ...@@ -5,14 +5,12 @@ import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.PageQuery; import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.domain.R; import com.dsk.common.core.domain.R;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.AdvisoryBody;
import com.dsk.cscec.domain.bo.AdvisoryBodySearchBo; import com.dsk.cscec.domain.bo.AdvisoryBodySearchBo;
import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo; import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
import com.dsk.cscec.domain.bo.ProjectSearchBo; import com.dsk.cscec.domain.bo.ProjectSearchBo;
import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo; import com.dsk.cscec.domain.vo.*;
import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo; import com.dsk.cscec.service.AdvisoryBodyProjectService;
import com.dsk.cscec.domain.vo.ProjectDetailVo; import com.dsk.cscec.service.AdvisoryBodyService;
import com.dsk.cscec.domain.vo.ProjectSearchVo;
import com.dsk.cscec.service.IDProjectService; import com.dsk.cscec.service.IDProjectService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -33,11 +31,12 @@ import javax.validation.constraints.NotNull; ...@@ -33,11 +31,12 @@ import javax.validation.constraints.NotNull;
@RestController @RestController
@RequestMapping("advisory/body") @RequestMapping("advisory/body")
public class AdvisoryBodyManageController extends BaseController { public class AdvisoryBodyManageController extends BaseController {
/**
* 服务对象
*/
@Resource @Resource
private IDProjectService baseService; private IDProjectService baseService;
@Resource
private AdvisoryBodyService advisoryBodyService;
@Resource
private AdvisoryBodyProjectService advisoryBodyProjectService;
/** /**
* 获取所有项目列表数据 * 获取所有项目列表数据
...@@ -52,7 +51,7 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -52,7 +51,7 @@ public class AdvisoryBodyManageController extends BaseController {
*/ */
@GetMapping("/getAdvisoryBodyList") @GetMapping("/getAdvisoryBodyList")
public TableDataInfo<AdvisoryBodySearchVo> getAdvisoryBodyList(AdvisoryBodySearchBo advisoryBodySearchBo, PageQuery pageQuery) { public TableDataInfo<AdvisoryBodySearchVo> getAdvisoryBodyList(AdvisoryBodySearchBo advisoryBodySearchBo, PageQuery pageQuery) {
return baseService.queryAdvisoryBodyList(advisoryBodySearchBo, pageQuery); return advisoryBodyService.queryAdvisoryBodyList(advisoryBodySearchBo, pageQuery);
} }
/** /**
...@@ -75,8 +74,8 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -75,8 +74,8 @@ public class AdvisoryBodyManageController extends BaseController {
* 根据咨询机构ID查询咨询机构详情 * 根据咨询机构ID查询咨询机构详情
*/ */
@GetMapping("/getAdvisoryBodyDetail/{advisoryBodyId}") @GetMapping("/getAdvisoryBodyDetail/{advisoryBodyId}")
public R<AdvisoryBody> getAdvisoryBodyDetail(@NotNull(message = "咨询机构ID不能为空") @PathVariable Long advisoryBodyId) { public R<AdvisoryBodyDetailVo> getAdvisoryBodyDetail(@NotNull(message = "咨询机构ID不能为空") @PathVariable Long advisoryBodyId) {
return R.ok(baseService.queryAdvisoryBodyDetail(advisoryBodyId)); return R.ok(advisoryBodyService.queryAdvisoryBodyDetail(advisoryBodyId));
} }
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyProjectController.java deleted 100644 → 0
View file @ bc529851
package com.dsk.cscec.controller;
import com.dsk.common.core.controller.BaseController;
import com.dsk.cscec.service.AdvisoryBodyProjectService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 咨询机构和项目关联表(AdvisoryBodyProject)表控制层
*
* @author sxk
* @since 2023-12-15 15:57:54
*/
@RestController
@RequestMapping("advisoryBodyProject")
public class AdvisoryBodyProjectController extends BaseController {
/**
* 服务对象
*/
@Resource
private AdvisoryBodyProjectService advisoryBodyProjectService;
///**
// * 分页查询所有数据
// *
// * @param page 分页对象
// * @param advisoryBodyProject 查询实体
// * @return 所有数据
// */
//@GetMapping
//public R selectAll(Page<AdvisoryBodyProject> page, AdvisoryBodyProject advisoryBodyProject) {
// return success(this.advisoryBodyProjectService.page(page, new QueryWrapper<>(advisoryBodyProject)));
//}
//
///**
// * 通过主键查询单条数据
// *
// * @param id 主键
// * @return 单条数据
// */
//@GetMapping("{id}")
//public R selectOne(@PathVariable Serializable id) {
// return success(this.advisoryBodyProjectService.getById(id));
//}
//
///**
// * 新增数据
// *
// * @param advisoryBodyProject 实体对象
// * @return 新增结果
// */
//@PostMapping
//public R insert(@RequestBody AdvisoryBodyProject advisoryBodyProject) {
// return success(this.advisoryBodyProjectService.save(advisoryBodyProject));
//}
//
///**
// * 修改数据
// *
// * @param advisoryBodyProject 实体对象
// * @return 修改结果
// */
//@PutMapping
//public R update(@RequestBody AdvisoryBodyProject advisoryBodyProject) {
// return success(this.advisoryBodyProjectService.updateById(advisoryBodyProject));
//}
//
///**
// * 删除数据
// *
// * @param idList 主键结合
// * @return 删除结果
// */
//@DeleteMapping
//public R delete(@RequestParam("idList") List<Long> idList) {
// return success(this.advisoryBodyProjectService.removeByIds(idList));
//}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DCustomerController.java
View file @ 4565ee74
...@@ -5,12 +5,19 @@ import com.dsk.common.core.controller.BaseController; ...@@ -5,12 +5,19 @@ import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.PageQuery; import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.domain.R; import com.dsk.common.core.domain.R;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.common.excel.ExcelUtils;
import com.dsk.cscec.domain.DCustomer; import com.dsk.cscec.domain.DCustomer;
import com.dsk.cscec.domain.bo.DCustomerSearchBo; import com.dsk.cscec.domain.bo.DCustomerSearchBo;
import com.dsk.cscec.domain.vo.DCustomerListVo;
import com.dsk.cscec.service.IDCustomerService; import com.dsk.cscec.service.IDCustomerService;
import com.dsk.jsk.domain.JskCombineSearchDto;
import com.dsk.jsk.domain.vo.JskCombineWinBidProjectExportVo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/** /**
* 组织维表(DCustomer)表控制层 * 组织维表(DCustomer)表控制层
* *
...@@ -30,7 +37,7 @@ public class DCustomerController extends BaseController { ...@@ -30,7 +37,7 @@ public class DCustomerController extends BaseController {
* 供应商总台账筛选 * 供应商总台账筛选
*/ */
@PostMapping("/all/searchList") @PostMapping("/all/searchList")
public TableDataInfo<DCustomer> allSearchList(@RequestBody DCustomerSearchBo bo,@RequestBody PageQuery query) { public TableDataInfo<DCustomerListVo> allSearchList(@RequestBody DCustomerSearchBo bo,@RequestBody PageQuery query) {
return baseService.allSearchList(bo,query); return baseService.allSearchList(bo,query);
} }
...@@ -42,6 +49,16 @@ public class DCustomerController extends BaseController { ...@@ -42,6 +49,16 @@ public class DCustomerController extends BaseController {
return R.ok(baseService.getById(customerKey)); return R.ok(baseService.getById(customerKey));
} }
/**
* 供应商信息
*/
@PostMapping("/export")
public void export(@RequestBody DCustomerSearchBo bo, HttpServletResponse response) {
List<DCustomerListVo> list = baseService.exportList(bo);
ExcelUtils<DCustomerListVo> util = new ExcelUtils<>(DCustomerListVo.class);
util.exportExcel(response, list, "集团中标","", true);
}
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodyDetailVo.java 0 → 100644
View file @ 4565ee74
package com.dsk.cscec.domain.vo;
import com.dsk.cscec.domain.AdvisoryBody;
import lombok.Data;
/**
* @author sxk
* @date 2023.12.18
* @time 14:30
*/
@Data
public class AdvisoryBodyDetailVo extends AdvisoryBody {
/**
* 经营状态
*/
private String businessStatus;
/**
* 法定代表人
*/
private String corporatePerson;
/**
* 法定代表人联系电话
*/
private String corporatePersonPhone;
/**
* 注册地址
*/
private String regAddress;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/DCustomerListVo.java 0 → 100644
View file @ 4565ee74
package com.dsk.cscec.domain.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.dsk.common.annotation.Excel;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Author lcl
* @Data 2023/12/18 14:14
*/
@Data
public class DCustomerListVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* jsk企业id
*/
private Integer companyId;
/**
* 客商主键
*/
private Long customerKey;
/**
* ipm供应商id
*/
private String customerId;
/**
* 税号
*/
private String taxNumber;
/**
* 供应商编号
*/
@Excel(name = "供应商编号", width = 5)
private String customerCode;
/**
* 供应商名称
*/
@Excel(name = "供应商名称", width = 10)
private String customerName;
/**
* 推荐公司
*/
@Excel(name = "推荐公司", width = 10)
private String recommendOrg;
/**
* 注册地区域
*/
@Excel(name = "注册地区域", width = 5)
private String registerRegion;
/**
* 省份
*/
@Excel(name = "省份", width = 5)
private String registerProvince;
/**
* 城市
*/
@Excel(name = "城市", width = 5)
private String registerCity;
/**
* 注册资金
*/
@Excel(name = "注册资金", width = 5)
private Double registerCapital;
/**
* 供应商类别
*/
@Excel(name = "供应商类别", width = 5)
private String customerClass;
/**
* 集团专业类别
*/
@Excel(name = "专业类别", width = 5)
private String groupSpecialty;
/**
* 纳税人身份
*/
@Excel(name = "纳税人身份", width = 5)
private String paytaxType;
/**
* 纳税人税率
*/
@Excel(name = "纳税人税率", width = 5)
private String taxRate;
/**
* 供应商状态
*/
@Excel(name = "供应商状态", width = 5)
private String customerState;
/**
* 队长名称
*/
@Excel(name = "劳务队长", width = 5)
private String leaderName;
/**
* 劳务队长身份证号
*/
@Excel(name = "劳务队长身份证号", width = 5)
private String laborCaptainIdcard;
/**
* 劳务队长联系电话
*/
@Excel(name = "劳务队长联系电话", width = 5)
private String laborCaptainPhone;
/**
* 队伍规模人数
*/
@Excel(name = "队伍规模人数", width = 5)
private Double serviceTeamPersonnum;
/**
* 专业特长
*/
@Excel(name = "专业特长", width = 5)
private String serviceTeamSpeciality;
/**
* 施工承包范围
*/
@Excel(name = "施工承包范围", width = 5)
private String constructJobScope;
/**
* 资质等级
*/
@Excel(name = "资质等级", width = 5)
private String credential;
/**
* 联系人
*/
@Excel(name = "联系人", width = 5)
private String contactPerson;
/**
* 电话
*/
@Excel(name = "电话", width = 5)
private String contactPhone;
/**
* 准入时间
*/
@Excel(name = "准入时间", width = 5 , dateFormat = "yyyy-MM-dd")
private Date approveDate2;
/**
* 考评等级
*/
@Excel(name = "考评等级", width = 5)
private String creditLevel;
/**
* 企业合作数量
*/
private Integer enterpriseCooperationCount;
/**
* 项目合作数量
*/
private Integer projectCooperationCount;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/ProjectDetailVo.java
View file @ 4565ee74
package com.dsk.cscec.domain.vo; package com.dsk.cscec.domain.vo;
import com.dsk.cscec.domain.AdvisoryBody;
import com.dsk.cscec.domain.DProject; import com.dsk.cscec.domain.DProject;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
...@@ -17,7 +18,7 @@ import lombok.NoArgsConstructor; ...@@ -17,7 +18,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
public class ProjectDetailVo extends DProject { public class ProjectDetailVo extends DProject {
/** /**
* 咨询机构名称 * 咨询机构
*/ */
private String advisoryBodyName; private AdvisoryBody advisoryBody;
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/AdvisoryBodyMapper.java
View file @ 4565ee74
...@@ -34,11 +34,11 @@ public interface AdvisoryBodyMapper extends BaseMapper<AdvisoryBody> { ...@@ -34,11 +34,11 @@ public interface AdvisoryBodyMapper extends BaseMapper<AdvisoryBody> {
Page<AdvisoryBodyVo> queryListByBo(IPage<AdvisoryBodyBo> build, @Param("bo") AdvisoryBodyBo bo); Page<AdvisoryBodyVo> queryListByBo(IPage<AdvisoryBodyBo> build, @Param("bo") AdvisoryBodyBo bo);
/** /**
* 根据咨询机构名称查询对应的项目IDs * 根据咨询机构名称查询咨询机构Cids
* @param advisoryBodyName 咨询机构名称 * @param advisoryBodyName 咨询机构名称
* @return 项目IDs * @return 项目IDs
*/ */
List<Long> selectProjectIdsByAdvisoryBodyName(@Param("advisoryBodyName") String advisoryBodyName); List<Long> selectAdvisoryBodyCidsByName(@Param("advisoryBodyName") String advisoryBodyName);
/** /**
* 根据项目主键查询咨询机构 * 根据项目主键查询咨询机构
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/AdvisoryBodyProjectMapper.java
View file @ 4565ee74
...@@ -2,6 +2,9 @@ package com.dsk.cscec.mapper; ...@@ -2,6 +2,9 @@ package com.dsk.cscec.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsk.cscec.domain.AdvisoryBodyProject; import com.dsk.cscec.domain.AdvisoryBodyProject;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 咨询机构和项目关联表(AdvisoryBodyProject)表数据库访问层 * 咨询机构和项目关联表(AdvisoryBodyProject)表数据库访问层
...@@ -11,5 +14,12 @@ import com.dsk.cscec.domain.AdvisoryBodyProject; ...@@ -11,5 +14,12 @@ import com.dsk.cscec.domain.AdvisoryBodyProject;
*/ */
public interface AdvisoryBodyProjectMapper extends BaseMapper<AdvisoryBodyProject> { public interface AdvisoryBodyProjectMapper extends BaseMapper<AdvisoryBodyProject> {
/**
* 根据咨询机构Cids查询项目Keys
*
* @param advisoryBodyCids 咨询机构Cids
* @return 项目Keys
*/
List<Long> selectProjectKeysByAdvisoryBodyCids(@Param("advisoryBodyCids") List<Long> advisoryBodyCids);
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DCustomerMapper.java
View file @ 4565ee74
...@@ -8,6 +8,7 @@ import com.dsk.cscec.domain.DCustomer; ...@@ -8,6 +8,7 @@ import com.dsk.cscec.domain.DCustomer;
import com.dsk.cscec.domain.bo.CustomerInfoBo; import com.dsk.cscec.domain.bo.CustomerInfoBo;
import com.dsk.cscec.domain.bo.DCustomerSearchBo; import com.dsk.cscec.domain.bo.DCustomerSearchBo;
import com.dsk.cscec.domain.vo.CustomerInfoVo; import com.dsk.cscec.domain.vo.CustomerInfoVo;
import com.dsk.cscec.domain.vo.DCustomerListVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -20,7 +21,7 @@ import java.util.List; ...@@ -20,7 +21,7 @@ import java.util.List;
*/ */
public interface DCustomerMapper extends BaseMapper<DCustomer> { public interface DCustomerMapper extends BaseMapper<DCustomer> {
Page<DCustomer> allSearchList(IPage<DCustomerSearchBo> build, @Param("bo") DCustomerSearchBo bo); Page<DCustomerListVo> allSearchList(IPage<DCustomerSearchBo> build, @Param("bo") DCustomerSearchBo bo);
/** /**
* 分类查询供应商列表 * 分类查询供应商列表
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/AdvisoryBodyService.java
View file @ 4565ee74
package com.dsk.cscec.service; package com.dsk.cscec.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.AdvisoryBody; import com.dsk.cscec.domain.AdvisoryBody;
import com.dsk.cscec.domain.bo.AdvisoryBodySearchBo;
import com.dsk.cscec.domain.vo.AdvisoryBodyDetailVo;
import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo;
/** /**
* 咨询机构(SysAdvisoryBody)表服务接口 * 咨询机构(SysAdvisoryBody)表服务接口
...@@ -10,6 +15,21 @@ import com.dsk.cscec.domain.AdvisoryBody; ...@@ -10,6 +15,21 @@ import com.dsk.cscec.domain.AdvisoryBody;
* @since 2023-12-12 10:12:09 * @since 2023-12-12 10:12:09
*/ */
public interface AdvisoryBodyService extends IService<AdvisoryBody> { public interface AdvisoryBodyService extends IService<AdvisoryBody> {
/**
* 获取所有企业列表(咨询机构)数据
*
* @param advisoryBodySearchBo 查询实体
* @param pageQuery 分页对象
* @return 所有数据
*/
TableDataInfo<AdvisoryBodySearchVo> queryAdvisoryBodyList(AdvisoryBodySearchBo advisoryBodySearchBo, PageQuery pageQuery);
/**
* 根据咨询机构ID查询咨询机构详情
*
* @param advisoryBodyId 咨询机构ID
* @return 咨询机构详情
*/
AdvisoryBodyDetailVo queryAdvisoryBodyDetail(Long advisoryBodyId);
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDCustomerService.java
View file @ 4565ee74
...@@ -5,6 +5,9 @@ import com.dsk.common.core.domain.PageQuery; ...@@ -5,6 +5,9 @@ import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.DCustomer; import com.dsk.cscec.domain.DCustomer;
import com.dsk.cscec.domain.bo.DCustomerSearchBo; import com.dsk.cscec.domain.bo.DCustomerSearchBo;
import com.dsk.cscec.domain.vo.DCustomerListVo;
import java.util.List;
/** /**
* 组织维表(DCustomer)表服务接口 * 组织维表(DCustomer)表服务接口
...@@ -14,7 +17,9 @@ import com.dsk.cscec.domain.bo.DCustomerSearchBo; ...@@ -14,7 +17,9 @@ import com.dsk.cscec.domain.bo.DCustomerSearchBo;
*/ */
public interface IDCustomerService extends IService<DCustomer> { public interface IDCustomerService extends IService<DCustomer> {
TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query); TableDataInfo<DCustomerListVo> allSearchList(DCustomerSearchBo bo, PageQuery query);
List<DCustomerListVo> exportList(DCustomerSearchBo bo);
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDProjectService.java
View file @ 4565ee74
...@@ -3,12 +3,9 @@ package com.dsk.cscec.service; ...@@ -3,12 +3,9 @@ package com.dsk.cscec.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.dsk.common.core.domain.PageQuery; import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.AdvisoryBody;
import com.dsk.cscec.domain.DProject; import com.dsk.cscec.domain.DProject;
import com.dsk.cscec.domain.bo.AdvisoryBodySearchBo;
import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo; import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
import com.dsk.cscec.domain.bo.ProjectSearchBo; import com.dsk.cscec.domain.bo.ProjectSearchBo;
import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo;
import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo; import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
import com.dsk.cscec.domain.vo.ProjectDetailVo; import com.dsk.cscec.domain.vo.ProjectDetailVo;
import com.dsk.cscec.domain.vo.ProjectSearchVo; import com.dsk.cscec.domain.vo.ProjectSearchVo;
...@@ -29,15 +26,6 @@ public interface IDProjectService extends IService<DProject> { ...@@ -29,15 +26,6 @@ public interface IDProjectService extends IService<DProject> {
*/ */
TableDataInfo<ProjectSearchVo> queryProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery); TableDataInfo<ProjectSearchVo> queryProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery);
/**
* 获取所有企业列表(咨询机构)数据
*
* @param advisoryBodySearchBo 查询实体
* @param pageQuery 分页对象
* @return 所有数据
*/
TableDataInfo<AdvisoryBodySearchVo> queryAdvisoryBodyList(AdvisoryBodySearchBo advisoryBodySearchBo, PageQuery pageQuery);
/** /**
* 获取合作项目明细 * 获取合作项目明细
* *
...@@ -54,13 +42,5 @@ public interface IDProjectService extends IService<DProject> { ...@@ -54,13 +42,5 @@ public interface IDProjectService extends IService<DProject> {
* @return 项目详情 * @return 项目详情
*/ */
ProjectDetailVo queryProjectDetail(Long projectKey); ProjectDetailVo queryProjectDetail(Long projectKey);
/**
* 根据咨询机构ID查询咨询机构详情
*
* @param advisoryBodyId 咨询机构ID
* @return 咨询机构详情
*/
AdvisoryBody queryAdvisoryBodyDetail(Long advisoryBodyId);
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/AdvisoryBodyServiceImpl.java
View file @ 4565ee74
package com.dsk.cscec.service.impl; package com.dsk.cscec.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.cscec.mapper.AdvisoryBodyMapper; import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.page.TableDataInfo;
import com.dsk.common.utils.StringUtils;
import com.dsk.cscec.domain.AdvisoryBody; import com.dsk.cscec.domain.AdvisoryBody;
import com.dsk.cscec.domain.AdvisoryBodyProject;
import com.dsk.cscec.domain.bo.AdvisoryBodySearchBo;
import com.dsk.cscec.domain.vo.AdvisoryBodyDetailVo;
import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo;
import com.dsk.cscec.mapper.AdvisoryBodyMapper;
import com.dsk.cscec.mapper.AdvisoryBodyProjectMapper;
import com.dsk.cscec.service.AdvisoryBodyService; import com.dsk.cscec.service.AdvisoryBodyService;
import com.dsk.jsk.domain.EnterpriseInfoHeaderBody;
import com.dsk.system.utils.DskOpenApiUtil;
import org.apache.commons.collections4.MapUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/** /**
* 咨询机构(SysAdvisoryBody)表服务实现类 * 咨询机构(SysAdvisoryBody)表服务实现类
* *
...@@ -14,6 +35,93 @@ import org.springframework.stereotype.Service; ...@@ -14,6 +35,93 @@ import org.springframework.stereotype.Service;
*/ */
@Service("advisoryBodyService") @Service("advisoryBodyService")
public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, AdvisoryBody> implements AdvisoryBodyService { public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, AdvisoryBody> implements AdvisoryBodyService {
@Resource
private AdvisoryBodyMapper baseMapper;
@Resource
private DskOpenApiUtil dskOpenApiUtil;
@Resource
private AdvisoryBodyProjectMapper advisoryBodyProjectMapper;
/**
* 获取所有企业列表(咨询机构)数据
*
* @param advisoryBodySearchBo 查询实体
* @param pageQuery 分页对象
* @return 所有数据
*/
@Override
public TableDataInfo<AdvisoryBodySearchVo> queryAdvisoryBodyList(AdvisoryBodySearchBo advisoryBodySearchBo, PageQuery pageQuery) {
//先按照分页要求从咨询机构表中查出分页数据
QueryWrapper<AdvisoryBody> wrapper = Wrappers.query();
wrapper.like(StringUtils.isNotBlank(advisoryBodySearchBo.getAdvisoryBodyName()), "advisory_body_name", advisoryBodySearchBo.getAdvisoryBodyName())
.between(ObjectUtil.isNotNull(advisoryBodySearchBo.getMinLastCooperateDate()) && ObjectUtil.isNotNull(advisoryBodySearchBo.getMaxLastCooperateDate()),
"create_time",
advisoryBodySearchBo.getMinLastCooperateDate(),
advisoryBodySearchBo.getMaxLastCooperateDate())
.like(StringUtils.isNotBlank(advisoryBodySearchBo.getBusinessScope()), "business_scope", advisoryBodySearchBo.getBusinessScope());
Page<AdvisoryBodySearchVo> page = baseMapper.selectPageAdvisoryBodyList(pageQuery.build(), wrapper);
//根据咨询机构cid查询对应的企业信息
for (AdvisoryBodySearchVo advisoryBodySearchVo : page.getRecords()) {
EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
//有Cid的才去建设库查数据
if (ObjectUtil.isNotNull(advisoryBodySearchVo.getAdvisoryBodyCid())) {
infoHeaderBody.setCompanyId(Math.toIntExact(advisoryBodySearchVo.getAdvisoryBodyCid()));
} else {
continue;
}
Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
Map companyData = MapUtils.getMap(companyMap, "data", null);
//最近一次合作时间
List<AdvisoryBodyProject> advisoryBodyProjectList = advisoryBodyProjectMapper.selectList(new LambdaQueryWrapper<AdvisoryBodyProject>()
.select(AdvisoryBodyProject::getCreateTime)
.eq(AdvisoryBodyProject::getAdvisoryBodyCid, advisoryBodySearchVo.getAdvisoryBodyCid())
.orderByDesc(AdvisoryBodyProject::getCreateTime));
if (ObjectUtil.isNotNull(advisoryBodyProjectList) && !advisoryBodyProjectList.isEmpty()) {
advisoryBodySearchVo.setLastCooperateTime(advisoryBodyProjectList.get(0).getCreateTime());
}
//经营范围
advisoryBodySearchVo.setBusinessStatus(MapUtils.getString(companyData, "businessStatus", ""));
//法人
advisoryBodySearchVo.setCorporatePerson(MapUtils.getString(companyData, "corporatePerson", ""));
//注册资本
advisoryBodySearchVo.setRegCapital(MapUtils.getString(companyData, "regCapital", ""));
//拼接地区
String provinceName = MapUtils.getString(companyData, "provinceName", "");
String cityName = MapUtils.getString(companyData, "cityName", "");
String districtName = MapUtils.getString(companyData, "districtName", "");
advisoryBodySearchVo.setRegArea(provinceName + "-" + cityName + "-" + districtName);
//成立日期
advisoryBodySearchVo.setRegisteredDate(MapUtils.getString(companyData, "registeredDate", ""));
//经营范围
advisoryBodySearchVo.setBusinessScope(MapUtils.getString(companyData, "businessScope", ""));
//合作项目数量
advisoryBodySearchVo.setCooperateProjectCount(advisoryBodyProjectMapper.selectCount(new LambdaQueryWrapper<AdvisoryBodyProject>()
.eq(AdvisoryBodyProject::getAdvisoryBodyCid, advisoryBodySearchVo.getAdvisoryBodyCid())));
}
return TableDataInfo.build(page);
}
/**
* 根据咨询机构ID查询咨询机构详情
*
* @param advisoryBodyId 咨询机构ID
* @return 咨询机构详情
*/
@Override
public AdvisoryBodyDetailVo queryAdvisoryBodyDetail(Long advisoryBodyId) {
AdvisoryBodyDetailVo advisoryBodyDetailVo = BeanUtil.toBean(baseMapper.selectById(advisoryBodyId), AdvisoryBodyDetailVo.class);
EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
infoHeaderBody.setCompanyId(Math.toIntExact(advisoryBodyDetailVo.getAdvisoryBodyCid()));
Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
Map companyData = MapUtils.getMap(companyMap, "data", null);
//法人
advisoryBodyDetailVo.setCorporatePerson(MapUtils.getString(companyData, "corporatePerson", ""));
//TODO:法人电话
//advisoryBodyDetailVo.setCorporatePersonPhone(MapUtils.getString(companyData, "corporatePersonPhone", ""));
//注册地址
advisoryBodyDetailVo.setRegAddress(MapUtils.getString(companyData, "addressDetail", ""));
return advisoryBodyDetailVo;
}
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java
View file @ 4565ee74
...@@ -9,6 +9,7 @@ import com.dsk.common.core.domain.PageQuery; ...@@ -9,6 +9,7 @@ import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.DCustomer; import com.dsk.cscec.domain.DCustomer;
import com.dsk.cscec.domain.bo.DCustomerSearchBo; import com.dsk.cscec.domain.bo.DCustomerSearchBo;
import com.dsk.cscec.domain.vo.DCustomerListVo;
import com.dsk.cscec.mapper.DCustomerMapper; import com.dsk.cscec.mapper.DCustomerMapper;
import com.dsk.cscec.mapper.DSubcontractMapper; import com.dsk.cscec.mapper.DSubcontractMapper;
import com.dsk.cscec.service.IDCustomerService; import com.dsk.cscec.service.IDCustomerService;
...@@ -39,9 +40,9 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer ...@@ -39,9 +40,9 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
private BusinessOpportunityRadarService opportunityRadarService; private BusinessOpportunityRadarService opportunityRadarService;
@Override @Override
public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) { public TableDataInfo<DCustomerListVo> allSearchList(DCustomerSearchBo bo, PageQuery query) {
dealWithCustomerClass(bo); dealWithCustomerClass(bo);
Page<DCustomer> page = baseMapper.allSearchList(query.build(), bo); Page<DCustomerListVo> page = baseMapper.allSearchList(query.build(), bo);
if (CollectionUtils.isNotEmpty(page.getRecords())) { if (CollectionUtils.isNotEmpty(page.getRecords())) {
page.getRecords().parallelStream().forEach(item->{ page.getRecords().parallelStream().forEach(item->{
//企业合作数量 //企业合作数量
...@@ -63,6 +64,15 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer ...@@ -63,6 +64,15 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
return TableDataInfo.build(page); return TableDataInfo.build(page);
} }
@Override
public List<DCustomerListVo> exportList(DCustomerSearchBo bo) {
dealWithCustomerClass(bo);
PageQuery query = new PageQuery();
query.setPageNum(1);
query.setPageSize(1000);
return baseMapper.allSearchList(query.build(), bo).getRecords();
}
private void dealWithCustomerClass(DCustomerSearchBo bo) { private void dealWithCustomerClass(DCustomerSearchBo bo) {
if (!ObjectUtils.isEmpty(bo.getCustomerClass())) { if (!ObjectUtils.isEmpty(bo.getCustomerClass())) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/controlelr/MonitorController.java
View file @ 4565ee74
...@@ -107,6 +107,18 @@ public class MonitorController { ...@@ -107,6 +107,18 @@ public class MonitorController {
return monitorService.companyPage(pageVo); return monitorService.companyPage(pageVo);
} }
/***
*@Description: 添加企业监控列表 分页
*@Param:
*@return: com.dsk.common.core.domain.R
*@Author: Dgm
*@date: 2023/12/9 9:29
*/
@PostMapping(value = "system/queryMonitorCompany")
public TableDataInfo queryMonitorCompany(@RequestBody MonitorQueryMonitorCompanyPageVo pageVo) throws Exception{
return monitorService.queryMonitorCompany(pageVo);
}
/*** /***
*@Description: 添加监控 *@Description: 添加监控
*@Param: *@Param:
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/dto/PushMonitorRules.java
View file @ 4565ee74
...@@ -42,12 +42,12 @@ public class PushMonitorRules implements Serializable { ...@@ -42,12 +42,12 @@ public class PushMonitorRules implements Serializable {
/** /**
* 推送时段-起 * 推送时段-起
*/ */
private Integer timePeriodStart; private String timePeriodStart;
/** /**
* 推送时段-止 * 推送时段-止
*/ */
private Integer timePeriodEnd; private String timePeriodEnd;
/** /**
* 接收方式 手机：0 PC:1 * 接收方式 手机：0 PC:1
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/ConditionVo.java
View file @ 4565ee74
...@@ -2,6 +2,8 @@ package com.dsk.monitor.domain.vo; ...@@ -2,6 +2,8 @@ package com.dsk.monitor.domain.vo;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* @ClassName ConditionVo * @ClassName ConditionVo
* @Description 共用条件 * @Description 共用条件
...@@ -18,7 +20,7 @@ public class ConditionVo { ...@@ -18,7 +20,7 @@ public class ConditionVo {
/** /**
* 条件查询企业id * 条件查询企业id
*/ */
private Integer companyOrstaffId; private Integer companyId;
/** /**
* 条件查询企业名称(模糊查询) * 条件查询企业名称(模糊查询)
*/ */
...@@ -26,15 +28,15 @@ public class ConditionVo { ...@@ -26,15 +28,15 @@ public class ConditionVo {
/** /**
* 条件查询风险等级：正向，负向，中立，警示 * 条件查询风险等级：正向，负向，中立，警示
*/ */
private String riskLevel; private List<String> riskLevel;
/** /**
* 条件查询监控维度子级名称 * 条件查询监控维度父级名称数组
*/ */
private String dimensionId; private List<String> parentDimension;
/** /**
* 条件查询监控维度父级名称 * 条件查询监控维度子级名称数组
*/ */
private String parentId; private List<String> dimension;
/** /**
* 条件查询开始时间 * 条件查询开始时间
*/ */
...@@ -49,4 +51,9 @@ public class ConditionVo { ...@@ -49,4 +51,9 @@ public class ConditionVo {
*/ */
private Integer reportType; private Integer reportType;
/**
* 系统来源(ZJYJ)
*/
private String sysType = "ZJYJ";
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/MonitorQueryMonitorCompanyPageVo.java 0 → 100644
View file @ 4565ee74
package com.dsk.monitor.domain.vo;
import com.dsk.jsk.domain.BasePage;
import lombok.Data;
/**
* @ClassName PushMonitorRulesVo
* @Description 添加企业监控列表 分页
* @Author Dgm
* @Date 2023/12/9 11:05
* @Version
*/
@Data
public class MonitorQueryMonitorCompanyPageVo extends BasePage {
/**
* 查询条件
*/
private String companyName;
/**
* 用户id
*/
private Long userId = 7324L;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/job/PushScheduling.java
View file @ 4565ee74
package com.dsk.monitor.job; //package com.dsk.monitor.job;
//
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; //import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsk.common.utils.DateUtils; //import com.dsk.common.utils.DateUtils;
import com.dsk.monitor.domain.dto.PushMonitorRules; //import com.dsk.monitor.domain.dto.PushMonitorRules;
import com.dsk.monitor.mapper.PushMonitorInfoMapper; //import com.dsk.monitor.mapper.PushMonitorInfoMapper;
import com.dsk.monitor.mapper.PushMonitorRulesMapper; //import com.dsk.monitor.mapper.PushMonitorRulesMapper;
import com.dsk.monitor.util.SendMessageUtil; //import com.dsk.monitor.util.SendMessageUtil;
import org.springframework.scheduling.annotation.Scheduled; //import org.springframework.scheduling.annotation.Scheduled;
//
import javax.annotation.Resource; //import javax.annotation.Resource;
//
/** ///**
* @ClassName PushScheduling // * @ClassName PushScheduling
* @Description 发送短信 // * @Description 发送短信
* @Author Dgm // * @Author Dgm
* @Date 2023/12/9 13:51 // * @Date 2023/12/9 13:51
* @Version // * @Version
*/ // */
public class PushScheduling { //public class PushScheduling {
//
@Resource // @Resource
private PushMonitorInfoMapper monitorInfoMapper; // private PushMonitorInfoMapper monitorInfoMapper;
//
@Resource // @Resource
private PushMonitorRulesMapper rulesMapper; // private PushMonitorRulesMapper rulesMapper;
//
@Scheduled(cron = "0 0 5 * * * ?") // @Scheduled(cron = "0 0 5 * * * ?")
public void receiveModePhone() { // public void receiveModePhone() {
// 获取当前整点时间 // // 获取当前整点时间
Integer concurrentHour = DateUtils.getHour(); // Integer concurrentHour = DateUtils.getHour();
QueryWrapper queryWrapper = new QueryWrapper(); // QueryWrapper queryWrapper = new QueryWrapper();
PushMonitorRules detail = rulesMapper.selectOne(queryWrapper); // PushMonitorRules detail = rulesMapper.selectOne(queryWrapper);
// 推送时段-起 // // 推送时段-起
Integer timePeriodStart = detail.getTimePeriodStart(); // Integer timePeriodStart = detail.getTimePeriodStart();
// 推送时段-止 // // 推送时段-止
Integer timePeriodEnd = detail.getTimePeriodEnd(); // Integer timePeriodEnd = detail.getTimePeriodEnd();
if (concurrentHour > timePeriodStart && concurrentHour < timePeriodEnd) { // if (concurrentHour > timePeriodStart && concurrentHour < timePeriodEnd) {
QueryWrapper monitorInfoWrapper = new QueryWrapper(); // QueryWrapper monitorInfoWrapper = new QueryWrapper();
// 风险类型 // // 风险类型
monitorInfoWrapper.in("risk_type", detail.getRiskType()); // monitorInfoWrapper.in("risk_type", detail.getRiskType());
// 监控维度 // // 监控维度
monitorInfoWrapper.in("dimension", detail.getDimension()); // monitorInfoWrapper.in("dimension", detail.getDimension());
Long count = monitorInfoMapper.selectCount(monitorInfoWrapper); // Long count = monitorInfoMapper.selectCount(monitorInfoWrapper);
if (count >0 ) { // if (count >0 ) {
SendMessageUtil.sendMessage(detail.getPhones(), count.toString()); // SendMessageUtil.sendMessage(detail.getPhones(), count.toString());
} // }
} // }
} // }
} //}
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/MonitorService.java
View file @ 4565ee74
...@@ -79,6 +79,17 @@ public interface MonitorService { ...@@ -79,6 +79,17 @@ public interface MonitorService {
TableDataInfo companyPage(PushMonitorCompanyPageVo pageVo) throws Exception; TableDataInfo companyPage(PushMonitorCompanyPageVo pageVo) throws Exception;
/***
*@Description: 企业监控列表 分页
*@Param: pageVo 信息
*@return: R
*@Author: Dgm
*@date: 2023/12/9 10:03
*/
TableDataInfo queryMonitorCompany(MonitorQueryMonitorCompanyPageVo pageVo) throws Exception;
/*** /***
*@Description: 添加监控 *@Description: 添加监控
*@Param: addVo 信息 *@Param: addVo 信息
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/impl/MonitorServiceImpl.java
View file @ 4565ee74
...@@ -92,13 +92,15 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -92,13 +92,15 @@ public class MonitorServiceImpl implements MonitorService {
@Override @Override
public TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception { public TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception {
Long userId = LoginHelper.getUserId(); pageVo.setPageSize(3);
Long userId = 1733058034734989314L;
if (ObjectUtil.isNotEmpty(userId)) { if (ObjectUtil.isNotEmpty(userId)) {
pageVo.setUserId(userId); pageVo.setUserId(userId);
pageVo.getCondition().setUserId(userId); pageVo.getCondition().setUserId(userId);
} }
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/companyDynamicList", BeanUtil.beanToMap(pageVo, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/companyDynamicList", BeanUtil.beanToMap(pageVo, false, false));
return dskOpenApiUtil.responsePage(map); log.info("companyDynamicPage=============================>"+map);
return dskOpenApiUtil.responsePageT(map);
} }
@Override @Override
...@@ -123,6 +125,16 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -123,6 +125,16 @@ public class MonitorServiceImpl implements MonitorService {
return dskOpenApiUtil.responsePage(map); return dskOpenApiUtil.responsePage(map);
} }
@Override
public TableDataInfo queryMonitorCompany(MonitorQueryMonitorCompanyPageVo pageVo) throws Exception {
Long userId = LoginHelper.getUserId();
if (ObjectUtil.isNotEmpty(userId)) {
pageVo.setUserId(userId);
}
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/queryCancelMonitorCompany", BeanUtil.beanToMap(pageVo, false, false));
return dskOpenApiUtil.responsePage(map);
}
@Override @Override
public R systemAdd(PushMonitorCompanyAddVo addVo) { public R systemAdd(PushMonitorCompanyAddVo addVo) {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
...@@ -248,6 +260,13 @@ public class MonitorServiceImpl implements MonitorService { ...@@ -248,6 +260,13 @@ public class MonitorServiceImpl implements MonitorService {
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
} }
/***
*@Description: 参数处理
*@Param:
*@return: com.dsk.monitor.domain.vo.PushMonitorSystemDetailVo
*@Author: Dgm
*@date: 2023/12/15 15:43
*/
public PushMonitorSystemDetailVo getDetailVo(PushMonitorSystemDetailVo detailVo) { public PushMonitorSystemDetailVo getDetailVo(PushMonitorSystemDetailVo detailVo) {
String value1 = null; String value1 = null;
String value2 = null; String value2 = null;
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/ExportController.java
View file @ 4565ee74
...@@ -8,6 +8,7 @@ import com.dsk.search.service.BusinessOpportunityRadarService; ...@@ -8,6 +8,7 @@ import com.dsk.search.service.BusinessOpportunityRadarService;
import com.dsk.search.service.ExportService; import com.dsk.search.service.ExportService;
import com.dsk.system.domain.vo.AptitudeVo; import com.dsk.system.domain.vo.AptitudeVo;
import com.dsk.system.domain.vo.SysUserImportVo; import com.dsk.system.domain.vo.SysUserImportVo;
import com.dsk.system.service.ISysUserFileRecordService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -30,6 +31,18 @@ public class ExportController { ...@@ -30,6 +31,18 @@ public class ExportController {
@Resource @Resource
private ExportService exportService; private ExportService exportService;
@Resource
private ISysUserFileRecordService sysUserFileRecordService;
/**
* 导出回调接口
* @param object
* @return
*/
@PostMapping(value = "/backUrl")
public AjaxResult exportBack(@RequestBody JSONObject object) {
return sysUserFileRecordService.exportBack(object);
}
/** /**
* 获取导入模板 * 获取导入模板
...@@ -37,10 +50,8 @@ public class ExportController { ...@@ -37,10 +50,8 @@ public class ExportController {
@PostMapping("/aptitude/importTemplate") @PostMapping("/aptitude/importTemplate")
public void importTemplate(HttpServletResponse response) { public void importTemplate(HttpServletResponse response) {
List<Object> list = new ArrayList<>(); List<Object> list = new ArrayList<>();
AptitudeVo aptitudeVo = new AptitudeVo(); list.add(new AptitudeVo("重庆市轨道交通（集团）有限公司"));
aptitudeVo.setCompanyName("重庆市轨道交通（集团）有限公司"); ExcelUtil.exportTemplate(list, "企业数据", "excel/aptitudeImportTemplate.xlsx", response);
list.add(aptitudeVo);
ExcelUtil.exportTemplate(list, "企业数据", "excel/userImportTemplate.xlsx", response);
} }
/* /*
......
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyMapper.xml
View file @ 4565ee74
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<mapper namespace="com.dsk.cscec.mapper.AdvisoryBodyMapper"> <mapper namespace="com.dsk.cscec.mapper.AdvisoryBodyMapper">
<select id="selectPageAdvisoryBodyList" resultType="com.dsk.cscec.domain.vo.AdvisoryBodySearchVo"> <select id="selectPageAdvisoryBodyList" resultType="com.dsk.cscec.domain.vo.AdvisoryBodySearchVo">
select select
<include refid="allColumnOfAdvisoryBody"></include> <include refid="allColumn"></include>
from advisory_body ${ew.getCustomSqlSegment} from advisory_body ab ${ew.getCustomSqlSegment}
</select> </select>
<select id="queryListByBo" resultType="com.dsk.cscec.domain.vo.AdvisoryBodyVo"> <select id="queryListByBo" resultType="com.dsk.cscec.domain.vo.AdvisoryBodyVo">
select abp.advisory_body_id,abp.advisory_body_cid,abp.project_key,abp.project_leader,abp.project_leader_major, select abp.advisory_body_id,abp.advisory_body_cid,abp.project_key,abp.project_leader,abp.project_leader_major,
abp.project_leader_phone, abp.project_leader_phone,
ab.advisory_body_name, ab.advisory_body_name,
dp.project_name,dp.project_code,dp.province_name,dp.city_name,dp.isinvestproject,dp.project_type1, dp.project_name,dp.project_code,dp.province_name,dp.city_name,dp.isinvestproject,dp.project_type1,
dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.load_time dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.load_time
from advisory_body_project abp from advisory_body_project abp
...@@ -62,33 +62,34 @@ ...@@ -62,33 +62,34 @@
order by dp.load_time desc order by dp.load_time desc
</select> </select>
<select id="selectProjectIdsByAdvisoryBodyName" resultType="java.lang.Long"> <select id="selectAdvisoryBodyCidsByName" resultType="java.lang.Long">
select select
<include refid="allColumnOfAdvisoryBody"></include> ab.advisory_body_cid
from advisory_body from advisory_body ab
where <where>
<if test="advisoryBodyName != null"> <if test="advisoryBodyName != null">
and advisory_body_name like concat('%',#{advisoryBodyName},'%') advisory_body_name like concat('%',#{advisoryBodyName},'%')
</if> </if>
</where>
</select> </select>
<select id="queryAdvisoryBodyByProjectKey" resultType="com.dsk.cscec.domain.AdvisoryBody"> <select id="queryAdvisoryBodyByProjectKey" resultType="com.dsk.cscec.domain.AdvisoryBody">
select select
<include refid="allColumnOfAdvisoryBody"></include> <include refid="allColumn"></include>
from advisory_body ab from advisory_body ab
left join advisory_body_project abp left join advisory_body_project abp
on abp.advisory_body_cid = ab.advisory_body_cid on abp.advisory_body_cid = ab.advisory_body_cid
where abp.project_key = ${projectKey}; where abp.project_key = ${projectKey};
</select> </select>
<sql id="allColumnOfAdvisoryBody"> <sql id="allColumn">
advisory_body_id, ab.advisory_body_id,
advisory_body_cid, ab.advisory_body_cid,
advisory_body_name, ab.advisory_body_name,
business_scope, ab.business_scope,
create_by, ab.create_by,
create_time, ab.create_time,
update_by, ab.update_by,
update_time ab.update_time
</sql> </sql>
</mapper> </mapper>
\ No newline at end of file
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyProjectMapper.xml
View file @ 4565ee74
...@@ -4,4 +4,13 @@ ...@@ -4,4 +4,13 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsk.cscec.mapper.AdvisoryBodyProjectMapper"> <mapper namespace="com.dsk.cscec.mapper.AdvisoryBodyProjectMapper">
<select id="selectProjectKeysByAdvisoryBodyCids" resultType="java.lang.Long">
select abp.project_key
from advisory_body_project abp
<where>
<if test="advisoryBodyCids != null">
abp.advisory_body_cid = #{advisoryBodyCids}
</if>
</where>
</select>
</mapper> </mapper>
\ No newline at end of file
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DCustomerMapper.xml
View file @ 4565ee74
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsk.cscec.mapper.DCustomerMapper"> <mapper namespace="com.dsk.cscec.mapper.DCustomerMapper">
<select id="allSearchList" resultType="com.dsk.cscec.domain.DCustomer"> <select id="allSearchList" resultType="com.dsk.cscec.domain.vo.DCustomerListVo">
select select
customer_key, customer_id, customer_code, customer_name, recommend_org, register_region, register_province, register_city, customer_class, primary_business, customer_key, customer_id, customer_code, customer_name, recommend_org, register_region, register_province, register_city, customer_class, primary_business,
paytax_type, tax_rate, customer_state, leader_name, labor_captain_phone, labor_captain_idcard, service_team_personnum, service_team_speciality, paytax_type, tax_rate, customer_state, leader_name, labor_captain_phone, labor_captain_idcard, service_team_personnum, service_team_speciality,
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</if> </if>
<if test="bo.approveDateBegion != null and bo.approveDateBegion != '' ">and approve_date2 &gt;= #{bo.approveDateBegion}</if> <if test="bo.approveDateBegion != null and bo.approveDateBegion != '' ">and approve_date2 &gt;= #{bo.approveDateBegion}</if>
<if test="bo.approveDateEnd != null and bo.approveDateEnd != '' ">and approve_date2 &lt;= #{bo.approveDateBegion} </if> <if test="bo.approveDateEnd != null and bo.approveDateEnd != '' ">and approve_date2 &lt;= #{bo.approveDateBegion} </if>
<if test="bo.isTeam != null"> and leader_name is <if test="bo.isTeam == 0">not</if> null </if> <if test="bo.isTeam != null"> and leader_name is <if test="bo.isTeam == 1">not</if> null </if>
order by approve_date2 desc order by approve_date2 desc
</select> </select>
......
dsk-operate-ui/public/index.html
View file @ 4565ee74
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<div id="loader"></div> <div id="loader"></div>
<div class="loader-section section-left"></div> <div class="loader-section section-left"></div>
<div class="loader-section section-right"></div> <div class="loader-section section-right"></div>
<div class="load_title">正在加载央企数字化经营管理系统</div> <div class="load_title">正在加载大数据经营管理支撑服务平台</div>
</div> </div>
</div> </div>
</body> </body>
......
dsk-operate-ui/src/api/supplier/supplier.js
View file @ 4565ee74
...@@ -15,6 +15,15 @@ export function customerAll(param) { ...@@ -15,6 +15,15 @@ export function customerAll(param) {
method: 'POSt', method: 'POSt',
}); });
} }
//总台账导出
export function customerExport(param) {
return request({
url: '/customer/export',
method: 'post',
data:param,
responseType: 'blob'
});
}
//专业类别选项列表 //专业类别选项列表
export function bizDictData() { export function bizDictData() {
return request({ return request({
......
dsk-operate-ui/src/assets/styles/supplierlist.scss
View file @ 4565ee74
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
} }
.total-dc{ .total-dc{
float: right; float: right;
cursor: pointer;
img{ img{
width: 18px; width: 18px;
margin-right: 6px; margin-right: 6px;
......
dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue
View file @ 4565ee74
...@@ -70,9 +70,9 @@ ...@@ -70,9 +70,9 @@
<div class="table-supplier"> <div class="table-supplier">
<div class="total-title"> <div class="total-title">
<div class="totals">共{{total}}条</div> <div class="totals">共{{total}}条</div>
<p class="total-dc"> <p class="total-dc" @click="customerExport">
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel">导出EXCEL</span>
</p> </p>
</div> </div>
<div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton"> <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</el-table-column> </el-table-column>
<el-table-column label="队伍规模" min-width="120" :resizable="false"> <el-table-column label="队伍规模" min-width="120" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.legalPerson||"--"}} {{scope.row.serviceTeamPersonnum||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="专业特长" min-width="120" :resizable="false"> <el-table-column label="专业特长" min-width="120" :resizable="false">
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
import "@/assets/styles/public.scss"; import "@/assets/styles/public.scss";
import "@/assets/styles/supplierlist.scss"; import "@/assets/styles/supplierlist.scss";
import skeleton from '@/views/project/projectList/component/skeleton'; import skeleton from '@/views/project/projectList/component/skeleton';
import {customerAll,areaAll} from '@/api/supplier/supplier'; import {customerAll,areaAll,customerExport} from '@/api/supplier/supplier';
import { getDicts } from "@/api/system/dict/data"; import { getDicts } from "@/api/system/dict/data";
export default { export default {
name: 'ledger', name: 'ledger',
...@@ -367,6 +367,38 @@ ...@@ -367,6 +367,38 @@
this.litigationstatus = res.data this.litigationstatus = res.data
}) })
}, },
customerExport(){
let param = this.formdata
if(param.times){
param.approveDateBegion = param.times[0]
param.approveDateEnd = param.times[1]
}else{
param.approveDateBegion = ''
param.approveDateEnd = ''
}
if(param.areas){
let province = []
let city = []
param.areas.forEach(item=>{
if(item.length == 3){//到市
if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
province.push(item[1])
}else{
city.push(item[2])
}
}
})
param.province = province
param.city = city
}else{
param.province = []
param.city = []
}
// this.download('/customer/export', param, `type_${new Date().getTime()}.xlsx`)
customerExport(param).then(blob => {
this.$download.saveAs(blob, `type_${new Date().getTime()}.xlsx`)
})
},
getSearch(){ getSearch(){
this.formdata.pageNum = 1 this.formdata.pageNum = 1
this.customerAll() this.customerAll()
......
dsk-system/src/main/java/com/dsk/system/domain/vo/AptitudeVo.java
View file @ 4565ee74
...@@ -74,4 +74,8 @@ public class AptitudeVo implements Serializable { ...@@ -74,4 +74,8 @@ public class AptitudeVo implements Serializable {
@Excel(name = "经营范围") @Excel(name = "经营范围")
private String businessScope; private String businessScope;
public AptitudeVo(String deptName) {
this.companyName = deptName.replace(" ", "");
}
} }
dsk-system/src/main/java/com/dsk/system/utils/DskOpenApiUtil.java
View file @ 4565ee74
...@@ -125,6 +125,25 @@ public class DskOpenApiUtil { ...@@ -125,6 +125,25 @@ public class DskOpenApiUtil {
return new TableDataInfo((List<?>) list, count); return new TableDataInfo((List<?>) list, count);
} }
/***
*@Description: 特殊返回
*@Param:
*@return: com.dsk.common.core.page.TableDataInfo
*@Author: Dgm
*@date: 2023/12/15 15:04
*/
public TableDataInfo responsePageT(Map<String, Object> resMap) throws Exception {
Integer code = MapUtils.getInteger(resMap, "code", 300);
Map data = MapUtils.getMap(resMap, "data", null);
if (200 != code) {
throw new RuntimeException();
}
Integer count = MapUtils.getInteger(data, "totalCount", 0);
Object list = MapUtils.getObject(data, "list", "");
Object object = MapUtils.getObject(data, "obj", "");
return new TableDataInfo((List<?>) list, count, object);
}
private void initApiConfig() { private void initApiConfig() {
TenantHelper.ignore(() -> { TenantHelper.ignore(() -> {
SysConfig accessKeyId = sysConfigMapper.selectOne(Wrappers.<SysConfig>lambdaQuery().eq(SysConfig::getTenantId, TenantConstants.DEFAULT_TENANT_ID).eq(SysConfig::getConfigKey, "dsk-Appkey")); SysConfig accessKeyId = sysConfigMapper.selectOne(Wrappers.<SysConfig>lambdaQuery().eq(SysConfig::getTenantId, TenantConstants.DEFAULT_TENANT_ID).eq(SysConfig::getConfigKey, "dsk-Appkey"));
......
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