diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml index 1623c947..e4093e1a 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml @@ -300,7 +300,7 @@ dxf2GeoJson: file-name: main.exe ys7: app-key: 3acf9f1a43dc4209841e0893003db0a2 - app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36 + app-secret: 09e29c70ae1161fbc3ce2030fc09ba2e # 斯巴达算法 sparta: url: http://119.3.204.120:8040 diff --git a/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java b/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java index 42970f35..1acb1851 100644 --- a/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java +++ b/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java @@ -18,6 +18,7 @@ import org.dromara.contractor.service.ISubConstructionUserService; import org.dromara.contractor.service.ISubUserSalaryDetailService; import org.dromara.design.service.IDesTechnicalStandardService; import org.dromara.facility.domain.FacMatrix; +import org.dromara.facility.domain.FacPhotovoltaicPanel; import org.dromara.facility.service.IFacMatrixService; import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService; import org.dromara.facility.service.IFacPhotovoltaicPanelService; @@ -101,6 +102,52 @@ public class DemoTest { @Resource private IOutConstructionValueService constructionValueService; + @Test + void syncTest() { + List projects = projectService.lambdaQuery() + .eq(BusProject::getPId, 1968506669544656898L) + .list(); + Set projectIds = projects.stream().map(BusProject::getId).collect(Collectors.toSet()); + List zujian = photovoltaicPanelService.lambdaQuery() + .eq(FacPhotovoltaicPanel::getProgressCategoryName, "组件安装") + .in(FacPhotovoltaicPanel::getProjectId, projectIds) + .list(); + Map> zujianMap = zujian.stream() + .collect(Collectors.groupingBy(FacPhotovoltaicPanel::getMatrixId)); + List zhijia = progressCategoryService.lambdaQuery() + .eq(PgsProgressCategory::getName, "支架安装") + .in(PgsProgressCategory::getProjectId, projectIds) + .list(); + Map> zhijiaMap = zhijia.stream() + .collect(Collectors.groupingBy(PgsProgressCategory::getMatrixId)); + List newP = new ArrayList<>(); + for (Map.Entry> entry : zujianMap.entrySet()) { + Long key = entry.getKey(); + List panels = entry.getValue(); + List list = zhijiaMap.getOrDefault(key, new ArrayList<>()); + if (CollUtil.isEmpty(list)) { + continue; + } + PgsProgressCategory zhi = list.getFirst(); + List panelList = panels.stream().map(panel -> { + FacPhotovoltaicPanel p = new FacPhotovoltaicPanel(); + p.setProjectId(panel.getProjectId()); + p.setMatrixId(panel.getMatrixId()); + p.setName(panel.getName()); + p.setPositions(panel.getPositions()); + p.setProgressCategoryId(zhi.getId()); + p.setProgressCategoryName(zhi.getName()); + p.setRemark(panel.getRemark()); + p.setCreateDept(panel.getCreateDept()); + p.setCreateBy(panel.getCreateBy()); + p.setUpdateBy(panel.getUpdateBy()); + return p; + }).toList(); + newP.addAll(panelList); + } + photovoltaicPanelService.saveBatch(newP); + } + @Test void testConstructionValue() { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java index 3cc821d2..ac191171 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java @@ -14,7 +14,6 @@ import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.contractor.domain.SubConstructionUser; import org.dromara.contractor.domain.SubContractor; import org.dromara.contractor.domain.dto.contractor.SubContractorCreateReq; @@ -119,7 +118,10 @@ public class SubContractorServiceImpl extends ServiceImpl 0) { throw new ServiceException("分包单位名称重复", HttpStatus.BAD_REQUEST); } @@ -160,7 +162,11 @@ public class SubContractorServiceImpl extends ServiceImpl 0) { throw new ServiceException("分包单位名称重复", HttpStatus.BAD_REQUEST); } diff --git a/xinnengyuan/script/sql/tbgl.sql b/xinnengyuan/script/sql/tbgl.sql new file mode 100644 index 00000000..9468a6f0 --- /dev/null +++ b/xinnengyuan/script/sql/tbgl.sql @@ -0,0 +1,411 @@ + + + +drop table if exists xzd_project_risk_assessment; +CREATE TABLE `xzd_project_risk_assessment` +( + `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `document_number` VARCHAR(64) NOT NULL COMMENT '单据编号', + `project_name` VARCHAR(255) NOT NULL COMMENT '项目名称', + `project_business_owner` VARCHAR(255) NOT NULL COMMENT '项目业主', + `joint_body_members` VARCHAR(500) NULL COMMENT '联合体成员方', + `estimated_contract_amount` DECIMAL(20, 4) default 0.0000 NOT NULL COMMENT '预计合同额(万元)', + `unit_price_index` VARCHAR(255) NULL COMMENT '单价指标', + `engineering_risk` VARCHAR(16) NULL COMMENT '工期风险', + `technical_risk` VARCHAR(16) NULL COMMENT '技术风险', + `economic_risk` VARCHAR(16) NULL COMMENT '经济风险', + `contract_risk` VARCHAR(16) NULL COMMENT '合同风险', + `personnel_risk` VARCHAR(16) NULL COMMENT '人员风险', + `construction_risk` VARCHAR(16) NULL COMMENT '施工风险', + `management_risk` VARCHAR(16) NULL COMMENT '管理风险', + `subcontract_risk` VARCHAR(16) NULL COMMENT '分包风险', + `other_risks` TEXT null COMMENT '其他风险', + `file_id` varchar(1024) NULL COMMENT '文件ID', + `remark` TEXT null COMMENT '备注', + `audit_status` VARCHAR(32) default 'draft' NULL COMMENT '审核状态', + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' +) COMMENT ='项目风险评估签审意见'; + +drop table if exists xzd_bid_pre_project; + +CREATE TABLE xzd_bid_pre_project +( + `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `project_number` VARCHAR(64) NOT NULL COMMENT '项目编码', + `project_name` VARCHAR(255) NOT NULL COMMENT '项目名称', + `country` VARCHAR(100) NOT NULL COMMENT '国家', + `province` VARCHAR(100) NOT NULL COMMENT '省', + `city` VARCHAR(100) NOT NULL COMMENT '城市', + `district` VARCHAR(100) NOT NULL COMMENT '区县', + `project_location` VARCHAR(255) null COMMENT '工程地点', + `capital_source` VARCHAR(255) null COMMENT '资金来源', + `contracting_method` VARCHAR(16) null COMMENT '承包方式', + `operation_mode` VARCHAR(16) null COMMENT '经营模式', + `project_type_id` BIGINT NOT NULL COMMENT '项目类型', + `bidding_method` VARCHAR(100) null COMMENT '招标方式', + `liaison_method` VARCHAR(100) null COMMENT '联系方法', + `investment_unit` VARCHAR(255) null COMMENT '投资单位', + `project_cost` DECIMAL(20, 2) DEFAULT 0.0000 not null COMMENT '工程造价（万元）', + `information_cost` DECIMAL(20, 2) DEFAULT 0.0000 not null COMMENT '资料费', + -- 公共字段 + `file_id` varchar(1024) NULL COMMENT '文件ID', + `remark` TEXT null COMMENT '备注', + `audit_status` VARCHAR(32) default 'draft' NULL COMMENT '审核状态', + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' +) COMMENT ='标前立项'; + +drop table if exists xzd_bqlx_project_info; + +CREATE TABLE xzd_bqlx_project_info +( + `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `bid_pre_project_id` BIGINT NOT NULL COMMENT '关联标前立项ID', + `expected_start_date` DATE COMMENT '预计开工日期', + `qualification_requirement` VARCHAR(512) COMMENT '资质要求', + `bid_start_date` DATE COMMENT '报名开始时间', + `bid_end_date` DATE NOT NULL COMMENT '报名截止时间', + `submission_deadline` DATE COMMENT '投标截止时间', + `design_description` VARCHAR(512) COMMENT '设计情况', + `project_status` TEXT COMMENT '工程概况', + `bidding_announcement_address` VARCHAR(512) COMMENT '招标公告地址', + `quality_requirement` VARCHAR(255) COMMENT '质量要求', + `duration_days` DECIMAL(10, 1) default 0.0 COMMENT '工期要求（天）', + `lowest_qualification_requirement` VARCHAR(512) COMMENT '最低资质要求', + `project_manager_requirement` VARCHAR(512) COMMENT '项目经理要求', + `performance_requirement` VARCHAR(512) COMMENT '业绩要求', + `start_date` DATE COMMENT '开标时间', + `evaluation_method` VARCHAR(128) COMMENT '评标方式', + `bidding_deposit_form` VARCHAR(255) COMMENT '投标保证金形式', + `bidding_deposit` DECIMAL(20, 4) default 0.0000 COMMENT '投标保证金', + `construction_unit` VARCHAR(255) COMMENT '建设单位', + `construction_person` VARCHAR(100) COMMENT '建设单位联系人', + `construction_method` VARCHAR(100) COMMENT '建设单位联系方式', + `bidding_unit` VARCHAR(255) COMMENT '招标单位', + `bidding_person` VARCHAR(100) COMMENT '招标单位联系人', + `bidding_method` VARCHAR(100) COMMENT '招标单位联系方式', + `cost_price` DECIMAL(20, 4) default 0.0000 COMMENT '成本价', + `bidding_price_control` DECIMAL(20, 4) default 0.0000 COMMENT '招标控制价', + `project_number` VARCHAR(64) NOT NULL COMMENT '项目编码', + `default_finance` varchar(255) NULL COMMENT '默认财务组织', + `involve_finance` varchar(255) NULL COMMENT '涉及财务组织', + -- 公共字段 + `file_id` varchar(1024) NULL COMMENT '文件ID', + `remark` TEXT null COMMENT '备注', + `audit_status` VARCHAR(32) default 'draft' NULL COMMENT '审核状态', + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' +) COMMENT ='标前立项-项目信息'; + +drop table if exists xzd_project_type; + +CREATE TABLE xzd_project_type +( + `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `parent_id` BIGINT DEFAULT 0 NOT NULL COMMENT '父节点ID', + `type_name` VARCHAR(100) NOT NULL COMMENT '项目类型名称', + `sort_order` INT DEFAULT 0 COMMENT '排序', + `remark` VARCHAR(255) COMMENT '备注', + -- 公共字段 + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' +) COMMENT ='项目类型'; + +drop table if exists xzd_bidding_file_estimate; + +CREATE TABLE xzd_bidding_file_estimate +( + `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `document_code` VARCHAR(50) NOT NULL COMMENT '单据编码', + `document_date` DATE NOT NULL COMMENT '单据日期', + `project_name` VARCHAR(255) NOT NULL COMMENT '项目名称', + `title` VARCHAR(255) COMMENT '标题', + `project_location` VARCHAR(255) COMMENT '工程地点', + `bidding_unit` VARCHAR(255) COMMENT '招标单位', + `bidding_method` VARCHAR(16) COMMENT '招标方式', + `contracting_method` VARCHAR(16) COMMENT '承包方式', + `start_date` DATE COMMENT '开标时间', + `project_overview` TEXT COMMENT '工程概况', + `bidding_date` DATE COMMENT '投标时间', + `bidding_address` VARCHAR(255) COMMENT '投标地址', + `bidding_control_price` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '招标控制价', + `evaluation_method` VARCHAR(100) COMMENT '评标方法', + `bidding_scope` VARCHAR(255) COMMENT '招标范围', + + `project_manager_requirement` varchar(1024) COMMENT '项目经理要求', + + -- 公共字段 + `file_id` varchar(1024) NULL COMMENT '文件ID', + `remark` TEXT null COMMENT '备注', + `audit_status` VARCHAR(32) default 'draft' NULL COMMENT '审核状态', + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' + +) COMMENT ='招标文件审估'; + + +drop table if exists xzd_bidding_agency_fee_payment; + +CREATE TABLE xzd_bidding_agency_fee_payment +( + `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `document_code` VARCHAR(50) NOT NULL COMMENT '单据编码', + `document_date` DATE NOT NULL COMMENT '单据日期', + `title` VARCHAR(255) COMMENT '标题', + + `project_name` VARCHAR(255) NOT NULL COMMENT '项目', + `project_location` VARCHAR(512) COMMENT '工程地点', + `contact_person` VARCHAR(100) COMMENT '联系人', + `contact_method` VARCHAR(100) COMMENT '联系方式', + `bidding_date` DATE COMMENT '投标时间', + + `agency_name` VARCHAR(255) NOT NULL COMMENT '代理机构名称', + + + `application_amount` DECIMAL(20, 4) DEFAULT 0.0000 NOT NULL COMMENT '申请金额', + `payment_method` VARCHAR(16) NOT NULL COMMENT '支付方式', + `receiving_bank` VARCHAR(255) COMMENT '收款银行', + `receiving_account` VARCHAR(100) COMMENT '收款', + `reason` varchar(1024) COMMENT '事由', + + `file_id` varchar(1024) NULL COMMENT '文件ID', + `remark` TEXT null COMMENT '备注', + `audit_status` VARCHAR(32) default 'draft' NULL COMMENT '审核状态', + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' + +) COMMENT ='招标代理服务费支付申请'; + +drop table if exists xzd_bid_deposit_payment; + +CREATE TABLE `xzd_bid_deposit_payment` +( + `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `document_code` VARCHAR(50) NOT NULL COMMENT '单据编码', + `document_date` DATE NOT NULL COMMENT '单据日期', + `project_name` VARCHAR(255) NOT NULL COMMENT '项目名称', + `project_cost` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '工程造价(万元)', + `business_mode` VARCHAR(100) DEFAULT NULL COMMENT '经营模式', + `deposit_amount` DECIMAL(20, 4) DEFAULT 0.0000 NOT NULL COMMENT '保证金金额', + `deposit_amount_capital` VARCHAR(512) NOT NULL COMMENT '保证金金额大写', + `remittance_method` VARCHAR(128) DEFAULT NULL COMMENT '汇款方式', + `payment_deadline` DATETIME DEFAULT NULL COMMENT '支付截止时间', + `receiving_unit` VARCHAR(255) DEFAULT NULL COMMENT '收款单位', + `receiving_account_name` VARCHAR(255) DEFAULT NULL COMMENT '收款账户名称', + `receiving_bank` VARCHAR(255) DEFAULT NULL COMMENT '收款账户银行', + `receiving_bank_account` VARCHAR(100) DEFAULT NULL COMMENT '收款银行账号', + `request_recovery_days` INT DEFAULT '0' COMMENT '招标结束后要求工作日收回', + `deposit_type` VARCHAR(16) NOT NULL COMMENT '保证金类型', + `receipt_requirement` VARCHAR(16) DEFAULT NULL COMMENT '回单要求', + `is_mail` TINYINT(1) DEFAULT '0' COMMENT '是否邮寄(0否 1是)', + `deposit_ratio` DECIMAL(5, 2) default 0.00 COMMENT '保证金比例', + `file_id` varchar(1024) NULL COMMENT '文件ID', + `remark` TEXT null COMMENT '备注', + `audit_status` VARCHAR(32) default 'draft' NULL COMMENT '审核状态', + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' +) COMMENT = '投标保证金缴纳'; + +drop table if exists xzd_bid_deposit_recovery; + +CREATE TABLE `xzd_bid_deposit_recovery` +( + `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `document_code` VARCHAR(50) NOT NULL COMMENT '单据编码', + `document_date` DATE NOT NULL COMMENT '单据日期', + `project_name` VARCHAR(255) NOT NULL COMMENT '项目名称', + `project_type` BIGINT DEFAULT NULL COMMENT '项目类型', + `business_mode` VARCHAR(255) DEFAULT NULL COMMENT '经营模式', + `project_cost` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '工程造价', + `recovery_amount` DECIMAL(20, 4) DEFAULT 0.0000 NOT NULL COMMENT '收回金额', + `recovery_amount_capital` VARCHAR(255) NOT NULL COMMENT '收回金额大写', + `data_fee` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '资料费', + `data_fee_capital` VARCHAR(255) DEFAULT NULL COMMENT '资料费大写', + `refund_amount` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '退款金额', + `recovery_date` DATE DEFAULT NULL COMMENT '收回日期', + `deposit_status` VARCHAR(50) DEFAULT NULL COMMENT '保证金状态', + `deposit_amount` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '保证金金额', + `deposit_amount_capital` VARCHAR(100) DEFAULT NULL COMMENT '保证金金额大写', + `deposit_remittance_method` VARCHAR(255) DEFAULT NULL COMMENT '保证金汇款方式', + `payment_deadline` DATETIME DEFAULT NULL COMMENT '支付截止时间', + `receiving_unit` VARCHAR(255) DEFAULT NULL COMMENT '收款单位', + `deposit_receiving_account_name` VARCHAR(255) DEFAULT NULL COMMENT '保证金收款账户名称', + `receiving_bank` VARCHAR(255) DEFAULT NULL COMMENT '收款账户银行', + `receiving_bank_account` VARCHAR(255) DEFAULT NULL COMMENT '收款账户账号', + `applicant` VARCHAR(100) DEFAULT NULL COMMENT '申请人', + `application_unit` VARCHAR(255) DEFAULT NULL COMMENT '申请单位', + `application_date` DATE DEFAULT NULL COMMENT '申请日期', + `file_id` varchar(1024) NULL COMMENT '文件ID', + `remark` TEXT null COMMENT '备注', + `audit_status` VARCHAR(32) default 'draft' NULL COMMENT '审核状态', + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' +) COMMENT = '投标保证金收回'; + +drop table if exists xzd_bidding_document; + +CREATE TABLE `xzd_bidding_document` +( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `document_number` VARCHAR(50) NOT NULL COMMENT '单据编号', + `title` VARCHAR(255) DEFAULT NULL COMMENT '标题', + `bidding_time` DATETIME NOT NULL COMMENT '投标时间', + `project_name` VARCHAR(255) NOT NULL COMMENT '项目名称', + `project_type` BIGINT DEFAULT NULL COMMENT '项目类型ID', + `bid_unit` VARCHAR(255) DEFAULT NULL COMMENT '投标单位', + `document_date` DATE NOT NULL COMMENT '单据日期', + `project_manager` VARCHAR(100) DEFAULT NULL COMMENT '项目经理', + `project_overview` TEXT DEFAULT NULL COMMENT '工程概况', + `organization` VARCHAR(255) DEFAULT NULL COMMENT '组织', + `file_id` varchar(1024) NULL COMMENT '文件ID', + `remark` TEXT null COMMENT '备注', + `audit_status` VARCHAR(32) default 'draft' NULL COMMENT '审核状态', + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) +) COMMENT ='投标文件'; + +drop table if exists xzd_tbwj_business_bid; + +CREATE TABLE `xzd_tbwj_business_bid` +( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `bidding_document_id` BIGINT NOT NULL COMMENT '投标文件ID', + `bid_price` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '标底价', + `discount_rate` DECIMAL(5, 2) DEFAULT 0.00 COMMENT '折扣率', + `ceiling_price` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '最高限价', + `cost_price` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '成本价', + `total_bid_price` DECIMAL(20, 4) DEFAULT 0.0000 NOT NULL COMMENT '投标报价', + `fee_rate` DECIMAL(5, 2) DEFAULT 0.00 COMMENT '毛利率', + `bid_tax_rate` DECIMAL(5, 2) DEFAULT 0.00 COMMENT '投标税率', + `petty_cash` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '备用金', + `compilation_dept` VARCHAR(512) NULL COMMENT '编制部门', + `estimated_profit` VARCHAR(512) NULL COMMENT '报价说明', + PRIMARY KEY (`id`), + INDEX `idx_bidding_document_id` (`bidding_document_id`) +) COMMENT ='投标文件-商务标'; + +drop table if exists xzd_tbwj_technical_bid; + +CREATE TABLE `xzd_tbwj_technical_bid` +( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `bidding_document_id` BIGINT NOT NULL COMMENT '投标文件ID', + `quality_requirements` TEXT DEFAULT NULL COMMENT '质量要求', + `technical_requirements` TEXT DEFAULT NULL COMMENT '技术要求', + `compilation_dept` VARCHAR(255) DEFAULT NULL COMMENT '编制部门', + `compilation_explain` VARCHAR(255) DEFAULT NULL COMMENT '编制说明', + PRIMARY KEY (`id`), + INDEX `idx_bidding_document_id` (`bidding_document_id`) +) COMMENT ='投标文件-技术标'; + +drop table if exists xzd_tbwj_qualification_requirements; +CREATE TABLE `xzd_tbwj_qualification_requirements` +( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `bidding_document_id` BIGINT NOT NULL COMMENT '投标文件ID', + `qualification_requirement` VARCHAR(512) NOT NULL COMMENT '资审要求', + `compilation_points` TEXT DEFAULT NULL COMMENT '编制要点', + `provide_time` DATETIME NOT NULL COMMENT '提供时间', + `remark` TEXT null COMMENT '备注', + PRIMARY KEY (`id`), + INDEX `idx_bidding_document_id` (`bidding_document_id`) +) COMMENT ='投标文件-资审要求'; + +drop table if exists xzd_tbwj_business_bid_requirements; +CREATE TABLE `xzd_tbwj_business_bid_requirements` +( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `bidding_document_id` BIGINT NOT NULL COMMENT '投标文件ID', + `business_bid_requirement` VARCHAR(512) NOT NULL COMMENT '商务标要求', + `compilation_points` TEXT DEFAULT NULL COMMENT '编制要点', + `provide_time` DATETIME NOT NULL COMMENT '提供时间', + `remark` TEXT null COMMENT '备注', + PRIMARY KEY (`id`), + INDEX `idx_bidding_document_id` (`bidding_document_id`) +) COMMENT ='投标文件-商务标要求'; + +drop table if exists xzd_tbwj_technical_bid_requirements; +CREATE TABLE `xzd_tbwj_technical_bid_requirements` +( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `bidding_document_id` BIGINT NOT NULL COMMENT '投标文件ID', + `technical_bid_requirement` VARCHAR(512) NOT NULL COMMENT '技术标要求', + `compilation_points` TEXT DEFAULT NULL COMMENT '编制要点', + `provide_time` DATETIME NOT NULL COMMENT '提供时间', + `remark` TEXT null COMMENT '备注', + PRIMARY KEY (`id`), + INDEX `idx_bidding_document_id` (`bidding_document_id`) +) COMMENT ='投标文件-技术标要求'; + +drop table if exists xzd_post_bid_analysis; +CREATE TABLE `xzd_post_bid_analysis` +( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `project_code` VARCHAR(100) NOT NULL COMMENT '项目编码', + `project_name` VARCHAR(255) NOT NULL COMMENT '项目名称', + `project_cost` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '工程造价(万元)', + `project_type` BIGINT DEFAULT NULL COMMENT '项目类型ID', + `project_address` VARCHAR(255) DEFAULT NULL COMMENT '项目地址', + `project_overview` TEXT DEFAULT NULL COMMENT '工程概况', + `construction_unit` VARCHAR(255) DEFAULT NULL COMMENT '建设单位', + `bid_opening_date` DATE DEFAULT NULL COMMENT '开标日期', + `business_model` VARCHAR(100) DEFAULT NULL COMMENT '经营模式', + `control_price` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '招标控制价(万元)', + `final_quote` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '最终报价(万元)', + `bidding_result` VARCHAR(16) NOT NULL COMMENT '投标结果', + `bid_record_link` VARCHAR(500) DEFAULT NULL COMMENT '开标记录链接', + `analysis_summary` TEXT DEFAULT NULL COMMENT '投标分析与总结', + `final_quote_yuan` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '最终报价(元)', + `final_quote_chinese` VARCHAR(255) DEFAULT NULL COMMENT '最终报价(大写)', + `file_id` varchar(1024) NULL COMMENT '文件ID', + `remark` TEXT null COMMENT '备注', + `audit_status` VARCHAR(32) default 'draft' NULL COMMENT '审核状态', + `create_by` bigint NULL COMMENT '创建者', + `update_by` bigint NULL COMMENT '更新者', + `create_dept` bigint null comment '创建部门', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) +) COMMENT ='标后分析'; + +drop table if exists xzd_bidding_unit_ranking; +CREATE TABLE `xzd_bidding_unit_ranking` +( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `bid_analysis_id` BIGINT NOT NULL COMMENT '标后分析ID', + `bidding_unit_name` VARCHAR(255) DEFAULT NULL COMMENT '参与投标单位', + `bid_price` DECIMAL(20, 4) DEFAULT 0.0000 COMMENT '投标报价(万元)', + `ranking` INT NOT NULL COMMENT '排名', + `remark` TEXT null COMMENT '备注', + PRIMARY KEY (`id`), + INDEX `idx_bid_analysis_id` (`bid_analysis_id`) +) COMMENT ='标后分析-投标单位排名'; diff --git a/xinnengyuan/script/sql/xzd.sql b/xinnengyuan/script/sql/xzd.sql index 377e9fd6..27a9741c 100644 --- a/xinnengyuan/script/sql/xzd.sql +++ b/xinnengyuan/script/sql/xzd.sql @@ -380,42 +380,66 @@ create table ctr_subcontract_seal ) comment ='分包合同-印章信息'; -- 菜单 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692582274809858, '主要信息', '1970690857740615681', '1', 'subcontractMain', 'ctr/subcontractMain/index', 1, 0, 'C', '0', '0', 'ctr:subcontractMain:list', '#', 103, 1, sysdate(), null, null, '主要信息菜单'); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692582274809858, '主要信息', '1970690857740615681', '1', 'subcontractMain', 'ctr/subcontractMain/index', 1, + 0, 'C', '0', '0', 'ctr:subcontractMain:list', '#', 103, 1, sysdate(), null, null, '主要信息菜单'); -- 按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692582274809859, '主要信息查询', 1970692582274809858, '1', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractMain:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692582274809859, '主要信息查询', 1970692582274809858, '1', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractMain:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692582274809860, '主要信息新增', 1970692582274809858, '2', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractMain:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692582274809860, '主要信息新增', 1970692582274809858, '2', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractMain:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692582274809861, '主要信息修改', 1970692582274809858, '3', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractMain:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692582274809861, '主要信息修改', 1970692582274809858, '3', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractMain:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692582274809862, '主要信息删除', 1970692582274809858, '4', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractMain:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692582274809862, '主要信息删除', 1970692582274809858, '4', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractMain:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692582274809863, '主要信息导出', 1970692582274809858, '5', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractMain:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692582274809863, '主要信息导出', 1970692582274809858, '5', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractMain:export', '#', 103, 1, sysdate(), null, null, ''); -- 菜单 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692923594686465, '印章信息', '1970692582274809858', '1', 'subcontractSeal', 'ctr/subcontractSeal/index', 1, 0, 'C', '0', '0', 'ctr:subcontractSeal:list', '#', 103, 1, sysdate(), null, null, '印章信息菜单'); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692923594686465, '印章信息', '1970692582274809858', '1', 'subcontractSeal', 'ctr/subcontractSeal/index', 1, + 0, 'C', '0', '0', 'ctr:subcontractSeal:list', '#', 103, 1, sysdate(), null, null, '印章信息菜单'); -- 按钮 SQL -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692923594686466, '印章信息查询', 1970692923594686465, '1', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractSeal:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692923594686466, '印章信息查询', 1970692923594686465, '1', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractSeal:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692923594686467, '印章信息新增', 1970692923594686465, '2', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractSeal:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692923594686467, '印章信息新增', 1970692923594686465, '2', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractSeal:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692923594686468, '印章信息修改', 1970692923594686465, '3', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractSeal:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692923594686468, '印章信息修改', 1970692923594686465, '3', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractSeal:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692923594686469, '印章信息删除', 1970692923594686465, '4', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractSeal:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692923594686469, '印章信息删除', 1970692923594686465, '4', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractSeal:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) -values(1970692923594686470, '印章信息导出', 1970692923594686465, '5', '#', '', 1, 0, 'F', '0', '0', 'ctr:subcontractSeal:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, + status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values (1970692923594686470, '印章信息导出', 1970692923594686465, '5', '#', '', 1, 0, 'F', '0', '0', + 'ctr:subcontractSeal:export', '#', 103, 1, sysdate(), null, null, '');