Skip to content

D
dsk-operate-sys-cscec
Commit fa41b188 authored by danfuman's avatar danfuman
Browse files
Options

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

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents cb73f6f5 524bb500
Hide whitespace changes
Inline Side-by-side
Showing with 1048 additions and 265 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DCustomerController.java
View file @ fa41b188
package com.dsk.cscec.controller; package com.dsk.cscec.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import com.dsk.common.core.controller.BaseController; import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.domain.R;
import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.DCustomer;
import com.dsk.cscec.domain.bo.DCustomerSearchBo;
import com.dsk.cscec.service.IDCustomerService; import com.dsk.cscec.service.IDCustomerService;
import com.dsk.system.domain.SysDept;
import com.dsk.system.domain.vo.SysDeptVo;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* 组织维表(DCustomer)表控制层 * 组织维表(DCustomer)表控制层
...@@ -14,14 +26,22 @@ import javax.annotation.Resource; ...@@ -14,14 +26,22 @@ import javax.annotation.Resource;
* @author lcl * @author lcl
* @since 2023-12-08 14:57:22 * @since 2023-12-08 14:57:22
*/ */
@RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/customer") @RequestMapping("/customer")
public class DCustomerController extends BaseController { public class DCustomerController extends BaseController {
/** /**
* 服务对象 * 服务对象
*/ */
@Resource private final IDCustomerService baseService;
private IDCustomerService baseService;
/**
* 供应商总台账筛选
*/
@GetMapping("/all/searchList")
public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) {
return baseService.allSearchList(bo,query);
}
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DProjectController.java 0 → 100644
View file @ fa41b188
package com.dsk.cscec.controller;
import com.dsk.common.core.controller.BaseController;
import com.dsk.cscec.service.IDProjectService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 项目维表(DProject)表控制层
*
* @author makejava
* @since 2023-12-10 15:34:46
*/
@RestController
@RequestMapping("dProject")
public class DProjectController extends BaseController {
/**
* 服务对象
*/
@Resource
private IDProjectService IDProjectService;
///**
// * 分页查询所有数据
// *
// * @param page 分页对象
// * @param dProject 查询实体
// * @return 所有数据
// */
//@GetMapping
//public R selectAll(Page<DProject> page, DProject dProject) {
// return success(this.dProjectService.page(page, new QueryWrapper<>(dProject)));
//}
//
///**
// * 通过主键查询单条数据
// *
// * @param id 主键
// * @return 单条数据
// */
//@GetMapping("{id}")
//public R selectOne(@PathVariable Serializable id) {
// return success(this.dProjectService.getById(id));
//}
//
///**
// * 新增数据
// *
// * @param dProject 实体对象
// * @return 新增结果
// */
//@PostMapping
//public R insert(@RequestBody DProject dProject) {
// return success(this.dProjectService.save(dProject));
//}
//
///**
// * 修改数据
// *
// * @param dProject 实体对象
// * @return 修改结果
// */
//@PutMapping
//public R update(@RequestBody DProject dProject) {
// return success(this.dProjectService.updateById(dProject));
//}
//
///**
// * 删除数据
// *
// * @param idList 主键结合
// * @return 删除结果
// */
//@DeleteMapping
//public R delete(@RequestParam("idList") List<Long> idList) {
// return success(this.dProjectService.removeByIds(idList));
//}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/DCustomer.java
View file @ fa41b188
...@@ -2,6 +2,7 @@ package com.dsk.cscec.domain; ...@@ -2,6 +2,7 @@ package com.dsk.cscec.domain;
import java.util.Date; import java.util.Date;
import java.io.Serializable; import java.io.Serializable;
import lombok.Data; import lombok.Data;
/** /**
...@@ -14,518 +15,518 @@ import lombok.Data; ...@@ -14,518 +15,518 @@ import lombok.Data;
public class DCustomer implements Serializable { public class DCustomer implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 客商主键 * 客商主键
*/ */
private Long customerKey; private Long customerKey;
/** /**
* ipm供应商id * ipm供应商id
*/ */
private String customerId; private String customerId;
/** /**
* ipm供应商名称 * ipm供应商名称
*/ */
private String cusomerName; private String cusomerName;
/** /**
* 财务客商编码 * 财务客商编码
*/ */
private String finCustomerCode; private String finCustomerCode;
/** /**
* 财务客商名称 * 财务客商名称
*/ */
private String finCustomerName; private String finCustomerName;
/** /**
* 税号 * 税号
*/ */
private String taxNumber; private String taxNumber;
/** /**
* 是否有效 Y 有效 N 无效 * 是否有效 Y 有效 N 无效
*/ */
private String isvalid; private String isvalid;
/** /**
* 供应商编号 * 供应商编号
*/ */
private String customerCode; private String customerCode;
/** /**
* 供应商名称 * 供应商名称
*/ */
private String customerName; private String customerName;
/** /**
* 供应商状态 * 供应商状态
*/ */
private String customerState; private String customerState;
/** /**
* 推荐公司ID * 推荐公司ID
*/ */
private String recommendOrgId; private String recommendOrgId;
/** /**
* 推荐公司 * 推荐公司
*/ */
private String recommendOrg; private String recommendOrg;
/** /**
* 准入时间 * 准入时间
*/ */
private Date approveDate2; private Date approveDate2;
/** /**
* 版本 * 版本
*/ */
private Long version; private Long version;
/** /**
* 供应商id * 供应商id
*/ */
private String supplierId; private String supplierId;
/** /**
* 供应商类别编码 * 供应商类别编码
*/ */
private String customerCategoryCode; private String customerCategoryCode;
/** /**
* 法人代表 * 法人代表
*/ */
private String representative; private String representative;
/** /**
* 工商注册号 * 工商注册号
*/ */
private String registerNo; private String registerNo;
/** /**
* 统一社会信用代码 * 统一社会信用代码
*/ */
private String unifySocialCode; private String unifySocialCode;
/** /**
* 税务登记号 * 税务登记号
*/ */
private String businessLicense; private String businessLicense;
/** /**
* 组织机构代码号 * 组织机构代码号
*/ */
private String orgnizationCode; private String orgnizationCode;
/** /**
* 注册资金 * 注册资金
*/ */
private Double registerCapital; private Double registerCapital;
/** /**
* 主营业务 * 主营业务
*/ */
private String primaryBusiness; private String primaryBusiness;
/** /**
* 资质等级 * 资质等级
*/ */
private String credential; private String credential;
/** /**
* 品牌 * 品牌
*/ */
private String brand; private String brand;
/** /**
* 地址 * 地址
*/ */
private String address; private String address;
/** /**
* 城市id * 城市id
*/ */
private String registerCityId; private String registerCityId;
/** /**
* 注册地区域 * 注册地区域
*/ */
private String registerRegion; private String registerRegion;
/** /**
* 省份 * 省份
*/ */
private String registerProvince; private String registerProvince;
/** /**
* 城市 * 城市
*/ */
private String registerCity; private String registerCity;
/** /**
* 开户行 * 开户行
*/ */
private String openBank; private String openBank;
/** /**
* 银行账号 * 银行账号
*/ */
private String bankAccount; private String bankAccount;
/** /**
* 联系人 * 联系人
*/ */
private String contactPerson; private String contactPerson;
/** /**
* 电话 * 电话
*/ */
private String contactPhone; private String contactPhone;
/** /**
* 手机 * 手机
*/ */
private String mobile; private String mobile;
/** /**
* 邮编 * 邮编
*/ */
private String zipcode; private String zipcode;
/** /**
* email * email
*/ */
private String email; private String email;
/** /**
* 网址 * 网址
*/ */
private String website; private String website;
/** /**
* 备注说明 * 备注说明
*/ */
private String remark; private String remark;
/** /**
* 地区编号 * 地区编号
*/ */
private String areaCode; private String areaCode;
/** /**
* 货币种类 * 货币种类
*/ */
private String currency; private String currency;
/** /**
* 所属组织机构id * 所属组织机构id
*/ */
private String orgnizationId; private String orgnizationId;
/** /**
* 类型 * 类型
*/ */
private String customerType; private String customerType;
/** /**
* 企业信用情况 * 企业信用情况
*/ */
private String creditSituation; private String creditSituation;
/** /**
* 创建者id * 创建者id
*/ */
private String employeeId; private String employeeId;
/** /**
* 成立日期 * 成立日期
*/ */
private String establishDate; private String establishDate;
/** /**
* 区号 * 区号
*/ */
private String phoneCode; private String phoneCode;
/** /**
* 企业性质 * 企业性质
*/ */
private String customerProperty; private String customerProperty;
/** /**
* 职务 * 职务
*/ */
private String sectorPosition; private String sectorPosition;
/** /**
* 鉴别字段 * 鉴别字段
*/ */
private String scope; private String scope;
/** /**
* 传真 * 传真
*/ */
private String fax; private String fax;
/** /**
* 供应商类别 * 供应商类别
*/ */
private String customerClass; private String customerClass;
/** /**
* 身份证号 * 身份证号
*/ */
private String idCard; private String idCard;
/** /**
* 附属子公司名称 * 附属子公司名称
*/ */
private String subCompany; private String subCompany;
/** /**
* 联营公司名称 * 联营公司名称
*/ */
private String alliedCompany; private String alliedCompany;
/** /**
* 营业额 * 营业额
*/ */
private Double turnOver; private Double turnOver;
/** /**
* 主要客户 * 主要客户
*/ */
private String mainCustomer; private String mainCustomer;
/** /**
* 主要货源 * 主要货源
*/ */
private String mainResource; private String mainResource;
/** /**
* 主要经营区域 * 主要经营区域
*/ */
private String mainRegion; private String mainRegion;
/** /**
* 原材料供应情况 * 原材料供应情况
*/ */
private String rawMaterial; private String rawMaterial;
/** /**
* 生产线及产能情况 * 生产线及产能情况
*/ */
private String productline; private String productline;
/** /**
* 客商类型 * 客商类型
*/ */
private String customerCategoryType; private String customerCategoryType;
/** /**
* 所属母公司名称 * 所属母公司名称
*/ */
private String customerFirm; private String customerFirm;
/** /**
* 客商类型id * 客商类型id
*/ */
private String customertypeId; private String customertypeId;
/** /**
* 供应商类别id * 供应商类别id
*/ */
private String customerCategoryTypeId; private String customerCategoryTypeId;
/** /**
* 企业注册地 * 企业注册地
*/ */
private String registerAddress; private String registerAddress;
/** /**
* 工厂仓库所在地 * 工厂仓库所在地
*/ */
private String warehouseAddress; private String warehouseAddress;
/** /**
* 合作产品 * 合作产品
*/ */
private String teamworkProduct; private String teamworkProduct;
/** /**
* 供方类型 * 供方类型
*/ */
private String isfactoryorfranchise; private String isfactoryorfranchise;
/** /**
* 营业执照到期时间1 * 营业执照到期时间1
*/ */
private Date expireDate1; private Date expireDate1;
/** /**
* 组织机构代码证到期时间2 * 组织机构代码证到期时间2
*/ */
private Date expireDate2; private Date expireDate2;
/** /**
* 税务登记证到期时间3 * 税务登记证到期时间3
*/ */
private Date expireDate3; private Date expireDate3;
/** /**
* 资质证书到期时间4 * 资质证书到期时间4
*/ */
private Date expireDate4; private Date expireDate4;
/** /**
* 安全生产许可证到期时间5 * 安全生产许可证到期时间5
*/ */
private Date expireDate5; private Date expireDate5;
/** /**
* 队长名称 * 队长名称
*/ */
private String leaderName; private String leaderName;
/** /**
* 专业类别id * 专业类别id
*/ */
private String groupSpecialtyId; private String groupSpecialtyId;
/** /**
* 集团专业类别 * 集团专业类别
*/ */
private String groupSpecialty; private String groupSpecialty;
/** /**
* 经营管理能力 * 经营管理能力
*/ */
private String manageAbility; private String manageAbility;
/** /**
* 产品质量保证能力 * 产品质量保证能力
*/ */
private String productQualityAbility; private String productQualityAbility;
/** /**
* 施工承包范围 * 施工承包范围
*/ */
private String constructJobScope; private String constructJobScope;
/** /**
* 经办人 * 经办人
*/ */
private String responsiblePerson; private String responsiblePerson;
/** /**
* 签字时间 * 签字时间
*/ */
private Date approveDate1; private Date approveDate1;
/** /**
* 是否同意准入 * 是否同意准入
*/ */
private String isagree; private String isagree;
/** /**
* 商务经理 * 商务经理
*/ */
private String businessManager; private String businessManager;
/** /**
* 项目经理 * 项目经理
*/ */
private String projectManager; private String projectManager;
/** /**
* 采购部门负责人 * 采购部门负责人
*/ */
private String purchasePrincipal; private String purchasePrincipal;
/** /**
* 上级公司代码 * 上级公司代码
*/ */
private String upperCompanyCode; private String upperCompanyCode;
/** /**
* 劳务队伍标志 * 劳务队伍标志
*/ */
private String serviceTeamLogo; private String serviceTeamLogo;
/** /**
* 劳务队长身份证号 * 劳务队长身份证号
*/ */
private String laborCaptainIdcard; private String laborCaptainIdcard;
/** /**
* 劳务队长联系电话 * 劳务队长联系电话
*/ */
private String laborCaptainPhone; private String laborCaptainPhone;
/** /**
* 队伍规模人数 * 队伍规模人数
*/ */
private Double serviceTeamPersonnum; private Double serviceTeamPersonnum;
/** /**
* 专业特长 * 专业特长
*/ */
private String serviceTeamSpeciality; private String serviceTeamSpeciality;
/** /**
* 二级市场企业编码 * 二级市场企业编码
*/ */
private String secondaryCode; private String secondaryCode;
/** /**
* 商务经理签字时间 * 商务经理签字时间
*/ */
private Date approveDate3; private Date approveDate3;
/** /**
* 项目经理签字时间 * 项目经理签字时间
*/ */
private Date approveDate4; private Date approveDate4;
/** /**
* 业务流程状态 * 业务流程状态
*/ */
private String flowState; private String flowState;
/** /**
* 是否为进京劳务企业 * 是否为进京劳务企业
*/ */
private String isenterbjlaborcomany; private String isenterbjlaborcomany;
/** /**
* 施工队长资格证到期时间6 * 施工队长资格证到期时间6
*/ */
private String expireDate6; private String expireDate6;
/** /**
* 授权委托书到期时间7 * 授权委托书到期时间7
*/ */
private String expireDate7; private String expireDate7;
/** /**
* 考评等级 * 考评等级
*/ */
private String creditLevel; private String creditLevel;
/** /**
* 数据标志 * 数据标志
*/ */
private String baseLogo; private String baseLogo;
/** /**
* 推荐项目 * 推荐项目
*/ */
private String recommendProject; private String recommendProject;
/** /**
* 推荐项目ID * 推荐项目ID
*/ */
private String recommendProjectId; private String recommendProjectId;
/** /**
* 客商推荐时间 * 客商推荐时间
*/ */
private Date recommendDate; private Date recommendDate;
/** /**
* 资质证书号 * 资质证书号
*/ */
private String aptitudeCard; private String aptitudeCard;
/** /**
* 安全生产许可证号 * 安全生产许可证号
*/ */
private String workSafetyLicense; private String workSafetyLicense;
/** /**
* 主表 * 主表
*/ */
private String masterId; private String masterId;
/** /**
* 纳税人身份 * 纳税人身份
*/ */
private String paytaxType; private String paytaxType;
/** /**
* 纳税人税率 * 纳税人税率
*/ */
private String taxRate; private String taxRate;
/** /**
* 身份信息选择 * 身份信息选择
*/ */
private String cardType; private String cardType;
/** /**
* 客商分数 * 客商分数
*/ */
private Double customerScore; private Double customerScore;
/** /**
* 客商名称2 * 客商名称2
*/ */
private String customerName2; private String customerName2;
/** /**
* 客商名称3 * 客商名称3
*/ */
private String customerName3; private String customerName3;
/** /**
* 客商名称4 * 客商名称4
*/ */
private String customerName4; private String customerName4;
/** /**
* 国家 * 国家
*/ */
private String country; private String country;
/** /**
* 一体化客商类型 * 一体化客商类型
*/ */
private String finCustomerType; private String finCustomerType;
/** /**
* 公司编码 * 公司编码
*/ */
private String companyCode; private String companyCode;
/** /**
* 业主性质 * 业主性质
*/ */
private String ownerKind; private String ownerKind;
/** /**
* 客商性质 * 客商性质
*/ */
private String customerKind; private String customerKind;
/** /**
* 数据来源 * 数据来源
*/ */
private String dataSource; private String dataSource;
/** /**
* 是否业主 * 是否业主
*/ */
private String isowner; private String isowner;
/** /**
* 是否供应商 * 是否供应商
*/ */
private String iscustomer; private String iscustomer;
/** /**
* 地址1 * 地址1
*/ */
private String abbrName1; private String abbrName1;
/** /**
* 地址2 * 地址2
*/ */
private String abbrName2; private String abbrName2;
/** /**
* 税率类型 * 税率类型
*/ */
private String taxType; private String taxType;
/** /**
* 是否冻结 * 是否冻结
*/ */
private String isfreeze; private String isfreeze;
/** /**
* 数据变化时间 * 数据变化时间
*/ */
private String updateDate; private String updateDate;
/** /**
* 数据更新时间 * 数据更新时间
*/ */
private Date loadTime; private Date loadTime;
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/DProject.java 0 → 100644
View file @ fa41b188
package com.dsk.cscec.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.extension.activerecord.Model;
/**
* 项目维表(DProject)表实体类
*
* @author sxk
* @since 2023-12-10 15:34:49
*/
@SuppressWarnings("serial")
public class DProject extends Model<DProject> {
//项目主键
private Long projectKey;
//项目ID
private String projectId;
//项目编码
private String projectCode;
//IPM项目名称
private String projectName;
//财务项目编码
private String finProjectCode;
//财务项目名称
private String finProjectName;
//项目简称
private String projectShortName;
//项目标准名称
private String projectStandardName;
//云筑网项目编码（预留）
private String projectCodePurchase;
//云筑网项目名称（预留）
private String projectNamePurchase;
//项目部ID
private String projectdeptId;
//项目部主键
private Long projectdeptKey;
//项目部名称
private String projectdeptName;
//大项目部ID
private String bigprojectdeptId;
//大项目部名称
private String bigprojectdeptName;
//评比用的大项目部ID
private String bigprojdeptAnaId;
//评比用的大项目部编码
private String bigprojdeptAnaCode;
//评比用的大项目部名称
private String bigprojdeptAnaName;
//评比用的大项目部经理
private String bigprojdeptAnaManager;
//评比用的大项目部手机号
private String bigprojdeptAnaMobile;
//分公司ID
private String orgLevelId3;
//分公司名称
private String orgLevelName3;
//子企业ID
private String orgLevelId2;
//子企业名称
private String orgLevelName2;
//子企业排序
private Long dispIndexLevel2;
//分公司排序
private Long dispIndexLevel3;
//大项目排序
private Long dispIndexLevel4;
//组织机构主键
private Long orgKey;
//合同主键
private Long contractKey;
//施工单位属性
private String jobunitAttribute;
//承包单位ID
private String contractOrgId;
//承包单位主键
private String contractOrgName;
//签约单位属性
private String contractunitAttribute;
//监理单位
private String supervisorOrgName;
//设计单位
private String designOrgName;
//流程状态
private String flowStateName;
//流程状态
private String projectState;
//业主结算状态
private String ownerbalanceState;
//分包结算状态
private String subbalanceState;
//财务清算状态
private String financeState;
//商务状态
private String businessState;
//中标信息主键
private String bidKey;
//业主主键
private Long ownerKey;
//业主名称
private String ownerName;
//业主性质
private String ownerNature;
//客户线-业主层级
private String ownerOrgLevel;
//客户线-业主类型
private String ownerTypeLevel;
//竞标方式主键
private Long competbidTypeKey;
//竞标方式名称
private String competbidType;
//所属集团
private String keyaccountName;
//是否关键客户
private Long isgroupkeyaccount;
//关键客户类别
private String groupkeyaccountClass;
//关键客户等级
private String groupkeyaccountGrade;
//是否军方
private Long ismilitary;
//是否市场
private Long ismarket;
//工程类型主键
private Long projectTypeKey;
//工程类型上级名称
private String projectType1;
//工程类型名称
private String projectType2;
//产品线主键
private Long productlineKey;
//产品线名称
private String productlineName2;
//产品线上级名称
private String productlineName1;
//市场模式主键
private Long marketjobTypeKey;
//市场模式名称
private String markJobType;
//市场模型上级名称
private String marketjobTypeName1;
//承包模式主键
private Long jobTypeKey;
//承包模式名称
private String jobType;
//承包模式上级名称
private String jobTypeName1;
//资金来源主键
private Long moneySourceKey;
//资金来源名称
private String moneySource;
//资金来源上级名称
private String moneySourceName1;
//重点项目级别
private String projectLevel;
//工程用途（中标交底）
private String projectPurpose;
//是否重点项目
private Long projectGrade;
//f_tax_sale_invoice_detail
private Long ishomesupport;
//是否内部项目
private String isinternalproject;
//是否房地产项目
private String isestateproject;
//是否投资项目
private String isinvestproject;
//进度款支付方式
private String steppayType;
//进度款支付比例
private Double steppayScale;
//项目所处阶段
private String projectPhase;
//项目类型
private String projectType;
//结构形式
private String structureType;
//基础形式
private String projectBaseFormat;
//市场所属区域主键
private Long marketAreaKey;
//市场所属区域名称
private String marketAreaName;
//省份名称
private String provinceName;
//省份缩写
private String provinceAbbrName;
//物理区域主键
private Long areaKey;
//物理区域名称
private String areaName;
//城市名称
private String cityName;
//县市
private String districtName;
//项目地址
private String projectAddress;
//合同生效(盖章)日期
private Date contractSignDate;
//合同开工日期
private Date contractStartDate;
//合同竣工日期
private Date contractEndDate;
//实际开工日期
private Date actualStartDate;
//实际完工时间
private Date actualEndDate;
//计划开工日期
private Date planStartDate;
//计划竣工日期
private Date planEndDate;
//中标日期
private Date bidwinDate;
//预计签约日期
private Date planSignDate;
//签约日期
private Date signDate;
//合同签订月份
private String contractSignMonth;
//项目经理主键
private String projectManagerKey;
//项目经理名称
private String projectManagerName;
//项目经理电话
private String projectManagerPhone;
//执行经理主键
private String executeManagerKey;
//执行经理名称
private String executeManagerName;
//执行经理电话
private String executeManagerPhone;
//商务经理主键
private String busiManagerKey;
//商务经理名称
private String busiManagerName;
//商务经理电话
private String busiManagerPhone;
//总工程师主键
private String chiefEngineerKey;
//总工程师名称
private String chiefEngineerName;
//总工程师电话
private String chiefEngineerPhone;
//生产经理主键
private String produceManagerKey;
//生产经理名称
private String produceManagerName;
//生产经理电话
private String produceManagerPhone;
//党支部书记主键
private String cpcManagerKey;
//党支部书记名称
private String cpcManagerName;
//党支部书记电话
private String cpcManagerPhone;
//党支部副书记主键
private String cpcViceManagerKey;
//党支部副书记名称
private String cpcViceManagerName;
//党支部副书记电话
private String cpcViceManagerPhone;
//机电经理主键
private String machineManagerKey;
//机电经理名称
private String machineManagerName;
//机电经理电话
private String machineManagerPhone;
//安全总监主键
private String safeManagerKey;
//安全总监名称
private String safeManagerName;
//安全总监电话
private String safeManagerPhone;
//财务总监主键
private String financeManagerKey;
//财务总监名称
private String financeManagerName;
//财务总监电话
private String financeManagerPhone;
//质量总监主键
private String qualifyManagerKey;
//质量总监名称
private String qualifyManagerName;
//质量总监电话
private String qualifyManagerPhone;
//项目相关指标
private Double projectScaleKpi;
//项目相关指标单位
private String projectScaleKpiUnit;
//合同总金额（项目表）
private Double contractValue;
//合同税额（合同分解表）
private Double contractTaxValue;
//不含税合同额（合同分解表）
private Double contractValueExcl;
//合同自施金额（项目表）
private Double ttlContractSelfValue;
//合同自施税额（合同分解表）
private Double contractSelfTaxValue;
//不含税合同自施额（合同分解表）
private Double contractSelfValueExcl;
//承包主合同金额（合同表）
private Double contractOrigValue;
//承包主合同自施金额（合同表）
private Double contractOrigSelfvalue;
//补充协议金额（合同表）
private Double contractModifyValue;
//补充协议自施金额（合同表）
private Double contractModifySelfvalue;
//商务自施额
private Double businessSelfValue;
//合同变更索赔额
private Long contractClaimValue;
//预计收入
private Double estiTtlIncome;
//预计成本
private Double estiTtlCost;
//预计收益
private Double estiTtlProfit;
//预收益率
private Double estiProfitRate;
//目标收益率
private Double targetProfitRate;
//合同总工期
private String contractWorkDays;
//计划工期（天）
private String planWorkDays;
//建筑面积
private Double buildingArea;
//地上层数
private String noOfOverfloor;
//地下层数
private String noOfUnderfloor;
//建筑高度(m)
private String constructHeight;
//长(跨)度
private String constructLongspan;
//单体工程数量(座)
private String constructQty;
//目标工期
private String targetWorkDays;
//项目管理人员数
private BigDecimal noOfProjectMaster;
//工程概况
private String projectOverview;
//工程概况
private String projectQualitygoals;
//产值批复模式
private String outputStatMode;
//项目规模
private String projectScale;
//计税方式
private String vatType;
//税率
private Double taxRate;
//保修完成日期
private Date guaranteeOverDate;
//停工日期
private Date suspensionDate;
//退场日期
private Date exitDate;
//清理日期
private Date checkupDate;
//清算日期
private Date liquidationDate;
//是否完成成本锁定
private String iscostlock;
//员工主键
private Long staffKey;
//项目人数
private Long personnumProject;
//是否计算收入线
private String iscalincome;
//是否计算成本线
private String iscalcost;
//项目封账类型
private String costinventoryType;
//实际完工时间
private Date actualFinishDate;
//分包结算完毕日期
private Date subSettleDate;
//业主结算完毕日期
private Date ownerSettleDate;
//是否需目标责任书
private String isresponse;
//财务手工导入的财务清算状态
private String ffipstate;
//担保比例
private Double guaranteeRatio;
//目标责任书上报日期
private Date reportDate;
//应上报目标责任书日期
private Date mustReportDate;
//是否公示二维码
private String isqrcodeSupervision;
//是否启用环保监督
private String isenableSupervision;
//经度
private Double longitude;
//纬度
private Double latitude;
//人员规模
private String projectHrScale;
//数据更新时间
private Date loadTime;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/DCustomerSearchBo.java 0 → 100644
View file @ fa41b188
package com.dsk.cscec.domain.bo;
import lombok.Data;
/**
* @Author lcl
* @Data 2023/12/8 16:07
*/
@Data
public class DCustomerSearchBo {
/**
* 供应商名称
*/
private String customerName;
/**
* 区域
*/
private String[] region;
/**
* 省
*/
private String[] province;
/**
* 市
*/
private String[] city;
/**
* 供应商类别
*/
private String[] customerClass;
/**
* 供应商状态
*/
private String[] customerState;
/**
* 评价等级
*/
private String[] creditLevel;
/**
* 资质等级
*/
private String[] credential;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DCustomerMapper.java
View file @ fa41b188
...@@ -2,7 +2,13 @@ package com.dsk.cscec.mapper; ...@@ -2,7 +2,13 @@ package com.dsk.cscec.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsk.cscec.domain.DCustomer; import com.dsk.cscec.domain.DCustomer;
import com.dsk.cscec.domain.bo.DCustomerSearchBo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 组织维表(DCustomer)表数据库访问层 * 组织维表(DCustomer)表数据库访问层
...@@ -12,5 +18,7 @@ import com.dsk.cscec.domain.DCustomer; ...@@ -12,5 +18,7 @@ import com.dsk.cscec.domain.DCustomer;
*/ */
public interface DCustomerMapper extends BaseMapper<DCustomer> { public interface DCustomerMapper extends BaseMapper<DCustomer> {
Page<DCustomer> allSearchList(IPage<DCustomerSearchBo> build, @Param("bo") DCustomerSearchBo bo);
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DProjectMapper.java 0 → 100644
View file @ fa41b188
package com.dsk.cscec.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsk.cscec.domain.DProject;
/**
* 项目维表(DProject)表数据库访问层
*
* @author makejava
* @since 2023-12-10 15:34:46
*/
public interface DProjectMapper extends BaseMapper<DProject> {
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDCustomerService.java
View file @ fa41b188
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.DCustomer; import com.dsk.cscec.domain.DCustomer;
import com.dsk.cscec.domain.bo.DCustomerSearchBo;
/** /**
* 组织维表(DCustomer)表服务接口 * 组织维表(DCustomer)表服务接口
...@@ -11,5 +14,7 @@ import com.dsk.cscec.domain.DCustomer; ...@@ -11,5 +14,7 @@ import com.dsk.cscec.domain.DCustomer;
*/ */
public interface IDCustomerService extends IService<DCustomer> { public interface IDCustomerService extends IService<DCustomer> {
TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query);
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDProjectService.java 0 → 100644
View file @ fa41b188
package com.dsk.cscec.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsk.cscec.domain.DProject;
/**
* 项目维表(DProject)表服务接口
*
* @author makejava
* @since 2023-12-10 15:34:51
*/
public interface IDProjectService extends IService<DProject> {
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java
View file @ fa41b188
package com.dsk.cscec.service.impl; package com.dsk.cscec.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.bo.DCustomerSearchBo;
import com.dsk.cscec.mapper.DCustomerMapper; import com.dsk.cscec.mapper.DCustomerMapper;
import com.dsk.cscec.domain.DCustomer; import com.dsk.cscec.domain.DCustomer;
import com.dsk.cscec.service.IDCustomerService; import com.dsk.cscec.service.IDCustomerService;
...@@ -15,5 +18,9 @@ import org.springframework.stereotype.Service; ...@@ -15,5 +18,9 @@ import org.springframework.stereotype.Service;
@Service @Service
public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer> implements IDCustomerService { public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer> implements IDCustomerService {
@Override
public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) {
return TableDataInfo.build(baseMapper.allSearchList(query.build(),bo));
}
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java 0 → 100644
View file @ fa41b188
package com.dsk.cscec.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.cscec.mapper.DProjectMapper;
import com.dsk.cscec.domain.DProject;
import com.dsk.cscec.service.IDProjectService;
import org.springframework.stereotype.Service;
/**
* 项目维表(DProject)表服务实现类
*
* @author makejava
* @since 2023-12-10 15:34:51
*/
@Service("dProjectService")
public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject> implements IDProjectService {
}
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DCustomerMapper.xml
View file @ fa41b188
...@@ -4,5 +4,15 @@ ...@@ -4,5 +4,15 @@
"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
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, construct_job_scope, credential,
register_capital, contact_person, contact_phone, approve_date2, credit_level
from d_customer
where recommend_org_id = 'F17305B4EA4444CBAB12892C7B99E475'
<if test="bo.customerName != null and bo.customerName != '' "> and customer_name like concat('%',#{bo.customerName},'%')</if>
order by approve_date2 desc
</select>
</mapper> </mapper>
\ No newline at end of file
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectMapper.xml 0 → 100644
View file @ fa41b188
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsk.cscec.mapper.DProjectMapper">
</mapper>
\ No newline at end of file
dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue
View file @ fa41b188
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
<el-form-item label="注册城市"> <el-form-item label="注册城市">
<el-cascader <el-cascader
v-model="formdata.user" v-model="formdata.user"
:options="options"></el-cascader> :options="addressList" :collapse-tags="true"
:props="provienceprops"></el-cascader>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
...@@ -270,6 +271,7 @@ ...@@ -270,6 +271,7 @@
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 api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import dataRegion from '@/assets/json/provinceTree'
export default { export default {
name: 'laborSubcontracting', name: 'laborSubcontracting',
components:{skeleton}, components:{skeleton},
...@@ -277,6 +279,12 @@ ...@@ -277,6 +279,12 @@
return{ return{
encodeStr, encodeStr,
formdata:{}, formdata:{},
addressList:[],
provienceprops:{
checkStrictly:true,
multiple:true,
value:'id',
},
options: [ options: [
{ {
value: 'zhinan', value: 'zhinan',
...@@ -488,10 +496,25 @@ ...@@ -488,10 +496,25 @@
} }
}, },
created() { created() {
this.dataRegion()
}, },
methods:{ methods:{
handleCurrentChange(){ handleCurrentChange(){
},
//地区
async dataRegion() {
let addrs = JSON.parse(JSON.stringify(dataRegion))
addrs.forEach(item=>{
if (item.children) {
(item.children).forEach(i => {
if (i.children) {
delete i.children
}
})
}
})
this.addressList = addrs;
}, },
setHeaderRow() { setHeaderRow() {
return "owner-table-list-header"; return "owner-table-list-header";
......
dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue
View file @ fa41b188
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
<el-form-item label="注册城市"> <el-form-item label="注册城市">
<el-cascader <el-cascader
v-model="formdata.user" v-model="formdata.user"
:options="options"></el-cascader> :options="addressList" :collapse-tags="true"
:props="provienceprops"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="供应商状态"> <el-form-item label="供应商状态">
<el-select v-model="formdata.user" placeholder="请选择"> <el-select v-model="formdata.user" placeholder="请选择">
...@@ -303,12 +304,19 @@ ...@@ -303,12 +304,19 @@
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 api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import dataRegion from '@/assets/json/provinceTree'
export default { export default {
name: 'laborSubcontractingTeam', name: 'laborSubcontractingTeam',
components:{skeleton}, components:{skeleton},
data(){ data(){
return{ return{
encodeStr, encodeStr,
addressList:[],
provienceprops:{
checkStrictly:true,
multiple:true,
value:'id',
},
formdata:{}, formdata:{},
options: [ options: [
{ {
...@@ -521,8 +529,23 @@ ...@@ -521,8 +529,23 @@
} }
}, },
created() { created() {
this.dataRegion()
}, },
methods:{ methods:{
//地区
async dataRegion() {
let addrs = JSON.parse(JSON.stringify(dataRegion))
addrs.forEach(item=>{
if (item.children) {
(item.children).forEach(i => {
if (i.children) {
delete i.children
}
})
}
})
this.addressList = addrs;
},
handleCurrentChange(){ handleCurrentChange(){
}, },
......
dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue
View file @ fa41b188
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
<el-form-item label="注册城市"> <el-form-item label="注册城市">
<el-cascader <el-cascader
v-model="formdata.user" v-model="formdata.user"
:options="options"></el-cascader> :options="addressList" :collapse-tags="true"
:props="provienceprops"></el-cascader>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
...@@ -302,12 +303,19 @@ ...@@ -302,12 +303,19 @@
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 api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import dataRegion from '@/assets/json/provinceTree'
export default { export default {
name: 'ledger', name: 'ledger',
components:{skeleton}, components:{skeleton},
data(){ data(){
return{ return{
encodeStr, encodeStr,
addressList:[],
provienceprops:{
checkStrictly:true,
multiple:true,
value:'id',
},
formdata:{}, formdata:{},
options: [ options: [
{ {
...@@ -541,8 +549,23 @@ ...@@ -541,8 +549,23 @@
} }
}, },
created() { created() {
this.dataRegion()
}, },
methods:{ methods:{
//地区
async dataRegion() {
let addrs = JSON.parse(JSON.stringify(dataRegion))
addrs.forEach(item=>{
if (item.children) {
(item.children).forEach(i => {
if (i.children) {
delete i.children
}
})
}
})
this.addressList = addrs;
},
handleCurrentChange(){ handleCurrentChange(){
}, },
......
dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue
View file @ fa41b188
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
<el-form-item label="注册城市"> <el-form-item label="注册城市">
<el-cascader <el-cascader
v-model="formdata.user" v-model="formdata.user"
:options="options"></el-cascader> :options="addressList" :collapse-tags="true"
:props="provienceprops"></el-cascader>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
...@@ -270,12 +271,19 @@ ...@@ -270,12 +271,19 @@
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 api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import dataRegion from '@/assets/json/provinceTree'
export default { export default {
name: 'professionalSubcontracting', name: 'professionalSubcontracting',
components:{skeleton}, components:{skeleton},
data(){ data(){
return{ return{
encodeStr, encodeStr,
addressList:[],
provienceprops:{
checkStrictly:true,
multiple:true,
value:'id',
},
formdata:{}, formdata:{},
options: [ options: [
{ {
...@@ -488,8 +496,23 @@ ...@@ -488,8 +496,23 @@
} }
}, },
created() { created() {
this.dataRegion()
}, },
methods:{ methods:{
//地区
async dataRegion() {
let addrs = JSON.parse(JSON.stringify(dataRegion))
addrs.forEach(item=>{
if (item.children) {
(item.children).forEach(i => {
if (i.children) {
delete i.children
}
})
}
})
this.addressList = addrs;
},
handleCurrentChange(){ handleCurrentChange(){
}, },
......
dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue
View file @ fa41b188
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
<el-form-item label="注册城市"> <el-form-item label="注册城市">
<el-cascader <el-cascader
v-model="formdata.user" v-model="formdata.user"
:options="options"></el-cascader> :options="addressList" :collapse-tags="true"
:props="provienceprops"></el-cascader>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
...@@ -266,12 +267,19 @@ ...@@ -266,12 +267,19 @@
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 api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import dataRegion from '@/assets/json/provinceTree'
export default { export default {
name: 'rentalServices', name: 'rentalServices',
components:{skeleton}, components:{skeleton},
data(){ data(){
return{ return{
encodeStr, encodeStr,
addressList:[],
provienceprops:{
checkStrictly:true,
multiple:true,
value:'id',
},
formdata:{}, formdata:{},
options: [ options: [
{ {
...@@ -484,8 +492,23 @@ ...@@ -484,8 +492,23 @@
} }
}, },
created() { created() {
this.dataRegion()
}, },
methods:{ methods:{
//地区
async dataRegion() {
let addrs = JSON.parse(JSON.stringify(dataRegion))
addrs.forEach(item=>{
if (item.children) {
(item.children).forEach(i => {
if (i.children) {
delete i.children
}
})
}
})
this.addressList = addrs;
},
handleCurrentChange(){ handleCurrentChange(){
}, },
......
dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue
View file @ fa41b188
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
<el-form-item label="注册城市"> <el-form-item label="注册城市">
<el-cascader <el-cascader
v-model="formdata.user" v-model="formdata.user"
:options="options"></el-cascader> :options="addressList" :collapse-tags="true"
:props="provienceprops"></el-cascader>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
...@@ -265,12 +266,19 @@ ...@@ -265,12 +266,19 @@
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 api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import dataRegion from '@/assets/json/provinceTree'
export default { export default {
name: 'supplySubcontracting', name: 'supplySubcontracting',
components:{skeleton}, components:{skeleton},
data(){ data(){
return{ return{
encodeStr, encodeStr,
addressList:[],
provienceprops:{
checkStrictly:true,
multiple:true,
value:'id',
},
formdata:{}, formdata:{},
options: [ options: [
{ {
...@@ -483,8 +491,23 @@ ...@@ -483,8 +491,23 @@
} }
}, },
created() { created() {
this.dataRegion()
}, },
methods:{ methods:{
//地区
async dataRegion() {
let addrs = JSON.parse(JSON.stringify(dataRegion))
addrs.forEach(item=>{
if (item.children) {
(item.children).forEach(i => {
if (i.children) {
delete i.children
}
})
}
})
this.addressList = addrs;
},
handleCurrentChange(){ handleCurrentChange(){
}, },
......
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