소스 검색

Accept Merge Request #177 v1.0.31 : (test -> prod)

Merge Request: v1.0.31
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/177
Antiloveg 8 년 전
부모
커밋
b34367998f
100개의 변경된 파일5400개의 추가작업 그리고 5227개의 파일을 삭제
  1. 0 5
      schema/2017-03-07.sql
  2. 0 23
      schema/2017-03-08.sql
  3. 0 49
      schema/2017-03-09.sql
  4. 0 3
      schema/2017-03-10.sql
  5. 0 10
      schema/2017-03-11.sql
  6. 0 3
      schema/2017-03-12.sql
  7. 0 31
      schema/2017-03-13.sql
  8. 0 1
      schema/2017-03-14.sql
  9. 0 37
      schema/2017-03-15.sql
  10. 0 53
      schema/2017-03-16.sql
  11. 0 5
      schema/2017-03-19.sql
  12. 0 7
      schema/2017-03-20.sql
  13. 0 2
      schema/2017-03-22.sql
  14. 0 17
      schema/2017-03-23.sql
  15. 0 8
      schema/2017-03-24.sql
  16. 0 8
      schema/2017-03-27.sql
  17. 0 6
      schema/2017-03-30.sql
  18. 0 1
      schema/2017-04-01.sql
  19. 0 10
      schema/2017-04-02.sql
  20. 0 3
      schema/2017-04-04.sql
  21. 0 15
      schema/2017-04-06.sql
  22. 0 5
      schema/2017-04-08.sql
  23. 0 20
      schema/2017-04-12.sql
  24. 0 49
      schema/2017-04-13.sql
  25. 0 29
      schema/2017-04-14.sql
  26. 0 10
      schema/2017-04-17.sql
  27. 0 30
      schema/2017-04-19.sql
  28. 0 16
      schema/2017-04-20.sql
  29. 0 16
      schema/2017-04-25.sql
  30. 0 42
      schema/2017-04-26.sql
  31. 0 20
      schema/2017-04-27.sql
  32. 0 20
      schema/2017-04-28.sql
  33. 0 22
      schema/2017-05-04.sql
  34. 0 38
      schema/2017-05-08.sql
  35. 0 7
      schema/2017-05-09.sql
  36. 0 14
      schema/2017-05-10.sql
  37. 0 4
      schema/2017-05-12.sql
  38. 0 40
      schema/2017-05-13.sql
  39. 0 13
      schema/2017-05-15.sql
  40. 0 7
      schema/2017-05-16.sql
  41. 0 54
      schema/2017-05-17.sql
  42. 0 4
      schema/2017-05-18.sql
  43. 0 2
      schema/2017-05-19.sql
  44. 0 4
      schema/2017-05-22.sql
  45. 0 4
      schema/2017-05-23.sql
  46. 0 21
      schema/2017-05-24.sql
  47. 0 6
      schema/2017-05-25.sql
  48. 0 16
      schema/2017-05-28.sql
  49. 0 29
      schema/2017-06-01.sql
  50. 0 28
      schema/2017-06-02.sql
  51. 0 24
      schema/2017-06-06.sql
  52. 0 60
      schema/2017-06-07.sql
  53. 0 13
      schema/2017-06-09.sql
  54. 0 11
      schema/2017-06-10.sql
  55. 0 9
      schema/2017-06-12.sql
  56. 0 8
      schema/2017-06-13.sql
  57. 0 2
      schema/2017-06-14.sql
  58. 0 8
      schema/2017-06-17.sql
  59. 0 12
      schema/2017-06-20.sql
  60. 53 0
      schema/20170626-activities-news-billings.sql
  61. 2 0
      schema/data/admin.sql
  62. 3249 0
      schema/data/district.sql
  63. 254 0
      schema/data/field_glossory.sql
  64. 0 0
      schema/data/html_fragment.sql
  65. 0 0
      schema/data/industry_category_init.sql
  66. 4 0
      schema/permission.sql
  67. 9 0
      schema/data/role_init.sql
  68. 0 0
      schema/data/sys_dict.sql
  69. 0 3248
      schema/district.sql
  70. 0 315
      schema/field_glossory.sql
  71. 1088 231
      schema/init.sql
  72. 0 8
      schema/role_init.sql
  73. 38 30
      src/main/java/com/goafanti/achievement/bo/AchievementImportBo.java
  74. 15 20
      src/main/java/com/goafanti/achievement/bo/AchievementListBo.java
  75. 77 11
      src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java
  76. 2 2
      src/main/java/com/goafanti/achievement/bo/InputAchievement.java
  77. 1 1
      src/main/java/com/goafanti/achievement/bo/InputAchievementOrder.java
  78. 2 2
      src/main/java/com/goafanti/achievement/controller/AchievementApiController.java
  79. 1 1
      src/main/java/com/goafanti/achievement/service/AchievementOrderService.java
  80. 1 1
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  81. 1 1
      src/main/java/com/goafanti/achievement/service/impl/AchievementOrderServiceImpl.java
  82. 82 10
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  83. 2 2
      src/main/java/com/goafanti/admin/bo/AdminListBo.java
  84. 3 7
      src/main/java/com/goafanti/admin/bo/AdminLocationBo.java
  85. 3 5
      src/main/java/com/goafanti/admin/bo/InputAdmin.java
  86. 5 9
      src/main/java/com/goafanti/admin/bo/NoticeBo.java
  87. 59 22
      src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java
  88. 131 26
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  89. 42 17
      src/main/java/com/goafanti/admin/controller/AdminContractApiController.java
  90. 39 14
      src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java
  91. 31 21
      src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java
  92. 3 0
      src/main/java/com/goafanti/admin/controller/AdminSuperviseApiController.java
  93. 14 29
      src/main/java/com/goafanti/admin/controller/AdminTriggerController.java
  94. 4 4
      src/main/java/com/goafanti/admin/controller/AdminUserCertifyApiController.java
  95. 8 5
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  96. 4 4
      src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java
  97. 81 75
      src/main/java/com/goafanti/cognizance/bo/CognizanceDetailBo.java
  98. 38 36
      src/main/java/com/goafanti/cognizance/bo/CognizanceOrgInfoBo.java
  99. 54 56
      src/main/java/com/goafanti/cognizance/bo/InputOrgActivity.java
  100. 0 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgActivityCost.java

+ 0 - 5
schema/2017-03-07.sql

@@ -1,5 +0,0 @@
-ALTER TABLE `org_tech_product` add `account_url` varchar(255)  NULL  COMMENT '台帐URL';
-
-ALTER TABLE `org_ratepay` 
-add `gross_profit` INT(6) NULL COMMENT '利润总额(万元)',
-add `research_cost` INT(6) NULL COMMENT '研发费用(万元)';

+ 0 - 23
schema/2017-03-08.sql

@@ -1,23 +0,0 @@
-ALTER TABLE `organization_identity` 
-add `listed` int(1)  NOT NULL  default 0 COMMENT '是否上市',
-add `listed_date` DATETIME   NULL   COMMENT '上市时间',
-add `listed_type` int(1)   NOT NULL   COMMENT '上市类型',
-add `stock_code` VARCHAR(32)   NULL   COMMENT '股票代码';
-
-ALTER TABLE `org_human_resource` 
-add `new_employment` int(6)   NULL   COMMENT '新增就业人数' AFTER `year`,
-add `graduate_number` int(6)   NULL   COMMENT '高校应届毕业生人数'  AFTER `new_employment`;
-
-CREATE TABLE `org_annual_report` (
-  `id` VARCHAR(36) NOT NULL,
-  `uid` VARCHAR(36) NULL,
-  `create_time` DATETIME NULL COMMENT '创建时间',
-  `last_update_time` DATETIME NULL COMMENT '最近跟新时间',
-  `total_tax` DECIMAL(8,2) NULL COMMENT '纳税总额(万元)',
-  `income_tax_relief` DECIMAL(8,2) NULL COMMENT '所得税减免(万元)',
-  `total_export_volume` DECIMAL(8,2) NULL COMMENT '出口创汇总额(万元)',
-  `year` INT(4) NULL COMMENT '年份',
-  `state` INT(1) NULL DEFAULT 0 COMMENT '年报状态',
-  `deleted_sign` INT(1) NOT NULL DEFAULT 0 COMMENT '删除标记',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB;

+ 0 - 49
schema/2017-03-09.sql

@@ -1,49 +0,0 @@
-ALTER TABLE org_annual_report 
-add `basic_research_cost` DECIMAL(8,2) NULL COMMENT '基础研究投入费用' AFTER `total_export_volume`;
-
-ALTER TABLE org_activity 
-MODIFY COLUMN budget DECIMAL(8,2) COMMENT '预算(万元)',
-MODIFY COLUMN first_year_expenditure DECIMAL(8,2) COMMENT '第一年研发经费支出(万元)',
-MODIFY COLUMN second_year_expenditure DECIMAL(8,2) COMMENT '第二年研发经费支出(万元)',
-MODIFY COLUMN third_year_expenditure DECIMAL(8,2) COMMENT '第三年研发经费支出(万元)';
-
-ALTER TABLE org_activity_cost 
-MODIFY COLUMN internal_labor_cost DECIMAL(8,2) COMMENT '内部人员人工费用(万元)',
-MODIFY COLUMN internal_direct_cost DECIMAL(8,2) COMMENT '内部直接投入费用(万元)',
-MODIFY COLUMN internal_depreciation_cost DECIMAL(8,2) COMMENT '内部折旧费用与长期待摊费用(万元)',
-MODIFY COLUMN internal_amortization_cost DECIMAL(8,2) COMMENT '内部无形资产摊销费用(万元)',
-MODIFY COLUMN internal_design_cost DECIMAL(8,2) COMMENT '内部设计费用(万元)',
-MODIFY COLUMN internal_equipment_cost DECIMAL(8,2) COMMENT '内部装备调试费用与实验费用(万元)',
-MODIFY COLUMN internal_other_cost DECIMAL(8,2) COMMENT '内部其他费用(万元)',
-MODIFY COLUMN external_total_cost DECIMAL(8,2) COMMENT '委托外部研究开发总费用(万元)',
-MODIFY COLUMN external_abroad_cost DECIMAL(8,2) COMMENT '委托外部境内的外部研发费用(万元)';
-
-ALTER TABLE org_cognizance 
-MODIFY COLUMN basic_research_cost DECIMAL(8,2) COMMENT '基础研究投入费用总额(万元)';
-
-ALTER TABLE org_finance
-MODIFY COLUMN main_business_income DECIMAL(8,2) COMMENT '主营业务收入(万元)',
-MODIFY COLUMN management_cost DECIMAL(8,2) COMMENT '管理费用(万元)',
-MODIFY COLUMN operating_profit DECIMAL(8,2) COMMENT '营业利润(万元)',
-MODIFY COLUMN various_tax DECIMAL(8,2) COMMENT '支付的各项税费(万元)',
-MODIFY COLUMN current_asset DECIMAL(8,2) COMMENT '流动资产(万元)',
-MODIFY COLUMN net_fixed_asset DECIMAL(8,2) COMMENT '固定资产净额(万元)',
-MODIFY COLUMN total_asset DECIMAL(8,2) COMMENT '资产总额(万元)',
-MODIFY COLUMN net_asset DECIMAL(8,2) COMMENT '所有者权益合计(万元)',
-MODIFY COLUMN gross_profit DECIMAL(8,2) COMMENT '利润总额(万元)',
-MODIFY COLUMN net_profit DECIMAL(8,2) COMMENT '净利润(万元)',
-MODIFY COLUMN sales_revenue DECIMAL(8,2) COMMENT '销售收入(万元)';
-
-ALTER TABLE org_ratepay
-MODIFY COLUMN operating_income DECIMAL(8,2) COMMENT '营业收入(万元)',
-MODIFY COLUMN management_cost DECIMAL(8,2) COMMENT '管理费用(万元)',
-MODIFY COLUMN operating_profit DECIMAL(8,2) COMMENT '营业利润(万元)',
-MODIFY COLUMN non_operating_income DECIMAL(8,2) COMMENT '营业外收入(万元)',
-MODIFY COLUMN non_taxable_income DECIMAL(8,2) COMMENT '不征税收入(万元)',
-MODIFY COLUMN tax_exempt_income DECIMAL(8,2) COMMENT '免税收入(万元)',
-MODIFY COLUMN subsidy_income DECIMAL(8,2) COMMENT '政府补助收入(万元)',
-MODIFY COLUMN gross_profit DECIMAL(8,2) COMMENT '利润总额(万元)',
-MODIFY COLUMN research_cost DECIMAL(8,2) COMMENT '研发费用(万元)';
-
-ALTER TABLE org_tech_product
-MODIFY COLUMN last_year_revenue DECIMAL(8,2) COMMENT '上年度销售收入(万元)';

+ 0 - 3
schema/2017-03-10.sql

@@ -1,3 +0,0 @@
-ALTER TABLE user
-add aid VARCHAR(36) NULL COMMENT '管理员ID';
-

+ 0 - 10
schema/2017-03-11.sql

@@ -1,10 +0,0 @@
-CREATE TABLE `aft_file` (
-  `id` VARCHAR(36) NOT NULL,
-  `uid` VARCHAR(36) NULL COMMENT '用户id',
-  `file_name` VARCHAR(32) NULL COMMENT '文件名称',
-  `file_path` VARCHAR(255) NOT NULL COMMENT '文件路径',
-  `sign` VARCHAR(45) NULL COMMENT '模版标记',
-  `comment` VARCHAR(45) NULL COMMENT '备注',
-  `deleleted_sign` INT(1) NOT NULL DEFAULT 0 COMMENT '删除标记',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB

+ 0 - 3
schema/2017-03-12.sql

@@ -1,3 +0,0 @@
-alter table org_cognizance_log drop foreign key fk_org_cognizance_log_org_cognizance1;
-
-alter table patent_info add deleted_sign INT(1) NULL COMMENT '删除标记';

+ 0 - 31
schema/2017-03-13.sql

@@ -1,31 +0,0 @@
-
-alter table org_cognizance add 
-`record_time` DATETIME NULL COMMENT '高企申请时间' AFTER `year`;
-
-alter table patent_info add 
-`record_time` DATETIME NULL COMMENT '专利申请时间' AFTER `confirm_state`;
-
-alter table organization_identity 
-MODIFY COLUMN `listed`  INT(1) NULL COMMENT '是否上市' ,
-MODIFY COLUMN `listed_type` INT(1) NULL COMMENT '上市类型';
-
-alter table patent_info 
-MODIFY COLUMN `principal`  VARCHAR(36) NULL COMMENT '负责人';
-
-alter table patent_log
-MODIFY COLUMN `principal`  VARCHAR(36) NULL COMMENT '负责人' ,
-MODIFY COLUMN `operator`  VARCHAR(36) NULL COMMENT '操作人';
-
-alter table org_cognizance
-MODIFY COLUMN `consultant`  VARCHAR(36) NULL COMMENT '咨询师';
-
-alter table org_cognizance_log
-MODIFY COLUMN `principal`  VARCHAR(36) NULL COMMENT '负责人' ,
-MODIFY COLUMN `operator`  VARCHAR(36) NULL COMMENT '操作人';
-
-update org_cognizance set contacts = '1' where contacts <> '1';
-
-alter table org_cognizance
-MODIFY COLUMN `contacts`  INT(1) NULL COMMENT '联系人及联系方式' ;
-
-

+ 0 - 1
schema/2017-03-14.sql

@@ -1 +0,0 @@
-alter table admin MODIFY COLUMN `id` VARCHAR(36) NOT NULL ;

+ 0 - 37
schema/2017-03-15.sql

@@ -1,37 +0,0 @@
-CREATE TABLE `copyright_info` (
-  `id` varchar(36) NOT NULL COMMENT '主键',
-  `uid` varchar(36) NOT NULL COMMENT '用户主键',
-  `serial_number` int(11) NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `accept_time` datetime DEFAULT NULL COMMENT '受理时间',
-  `principal` varchar(36) DEFAULT NULL COMMENT '负责人',
-  `contact` int(1) DEFAULT NULL COMMENT '联系人',
-  `copyright_info` varchar(255) DEFAULT NULL COMMENT '软著简介',
-  `copyright_name` varchar(60) DEFAULT NULL COMMENT '软著名字',
-  `status` int(1) DEFAULT NULL COMMENT '申请状态',
-  `work_issue` varchar(128) DEFAULT NULL COMMENT '派单信息',
-  `comment` varchar(128) DEFAULT NULL COMMENT '备注',
-  `outsource` varchar(60) DEFAULT NULL COMMENT '外包公司',
-  `in_urgent` int(3) DEFAULT NULL COMMENT '加急天数',
-  `authorized_date` datetime DEFAULT NULL COMMENT '下证日',
-  `certificate_url` varchar(255) DEFAULT NULL COMMENT '证书附件地址',
-  `application_url` varchar(255) DEFAULT NULL COMMENT '申请书附件地址',
-  `delete_sign` int(1) NOT NULL DEFAULT '0' COMMENT '删除标记',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `serial_number_UNIQUE` (`serial_number`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE `copyright_log` (
-  `id` varchar(36) NOT NULL COMMENT '主键',
-  `cid` varchar(36) NOT NULL COMMENT '软著申请id',
-  `record_time` datetime DEFAULT NULL COMMENT '状态流转时间',
-  `status` int(1) DEFAULT NULL COMMENT '状态',
-  `principal` varchar(36) DEFAULT NULL COMMENT '负责人',
-  `operator` varchar(36) DEFAULT NULL COMMENT '操作人',
-  `comment` varchar(45) DEFAULT NULL COMMENT '备注',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '日志创建时间',
-  PRIMARY KEY (`id`),
-  KEY `fk_copyright_log_copyright_info1_idx` (`cid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-

+ 0 - 53
schema/2017-03-16.sql

@@ -1,53 +0,0 @@
-
-CREATE TABLE  `tech_project` (
-  `id` VARCHAR(36) NOT NULL,
-  `uid` VARCHAR(36) NOT NULL,
-  `serial_number` INT(8) NULL COMMENT '编号' AUTO_INCREMENT,
-  `contacts` INT(1) NULL COMMENT '联系人',
-  `department` VARCHAR(45) NULL COMMENT '科技项目申报部门',
-  `dispatch_info` VARCHAR(400) NULL COMMENT '派单信息',
-  `project_name` VARCHAR(45) NULL COMMENT '项目名称',
-  `project_catagory` VARCHAR(45) NULL COMMENT '项目类型',
-  `tech_field` VARCHAR(45) NULL COMMENT '技术领域',
-  `project_des` VARCHAR(400) NULL COMMENT '项目简介',
-  `project_mode` INT(1) NULL COMMENT '是否立项',
-  `project_approval` DECIMAL(8,2) NULL COMMENT '立项金额',
-  `subsidy` INT(1) NULL COMMENT '是否补助',
-  `consultant` VARCHAR(36) NULL COMMENT '咨询师',
-  `approval_url` VARCHAR(255) NULL COMMENT '项目材料URL',
-  `state` INT(1) NULL COMMENT '申报状态',
-  `create_time` DATETIME NULL COMMENT '派单日',
-  `accept_date` DATETIME NULL COMMENT '受理日',
-  `approved_date` DATETIME NULL COMMENT '项目批复日期',
-  `record_time` DATETIME NULL COMMENT '记录创建日期',
-  `deleted_sign` INT(1) NULL COMMENT '删除标记',
-  PRIMARY KEY (`id`),
-  INDEX `serialNumber` (`serial_number` ASC))
-ENGINE = InnoDB AUTO_INCREMENT= 600000
-COMMENT = '科技项目申请表';
-
-
-CREATE TABLE `tech_project_log` (
-  `id` VARCHAR(36) NOT NULL,
-  `pid` VARCHAR(36) NOT NULL,
-  `record_time` DATETIME NULL COMMENT '状态变更录入时间',
-  `state` INT(1) NULL COMMENT '状态',
-  `principal` VARCHAR(36) NULL COMMENT '负责人',
-  `operator` VARCHAR(36) NULL COMMENT '操作人',
-  `comment` VARCHAR(45) NULL COMMENT '备注',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '科技项目申报log';
-
-CREATE TABLE `tech_website` (
-  `id` VARCHAR(36) NOT NULL,
-  `uid` VARCHAR(36) NULL,
-  `department` VARCHAR(45) NULL COMMENT '科技部门名称',
-  `website` VARCHAR(255) NULL COMMENT '网址',
-  `account_number` VARCHAR(45) NULL COMMENT '帐号',
-  `password` VARCHAR(32) NULL COMMENT '密码',
-  `create_time` DATETIME NULL COMMENT '创建日期',
-  `deleted_sign` INT(1) NULL COMMENT '删除标记',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '科技项目申报网址';

+ 0 - 5
schema/2017-03-19.sql

@@ -1,5 +0,0 @@
-alter table organization_identity 
-add certificate_number VARCHAR(36) NULL COMMENT '高企认定证书编号' ,
-add issuing_date DATETIME NULL COMMENT '高企认定发证日期',
-add cog_contacts INT(1) NULL COMMENT '高企认定联系人及联系方式',
-add consultant VARCHAR(36) COMMENT '高企认定咨询师';

+ 0 - 7
schema/2017-03-20.sql

@@ -1,7 +0,0 @@
-ALTER TABLE `role_permission` 
-ADD PRIMARY KEY (`rid`, `pid`);
-
-ALTER TABLE `role` 
-CHANGE COLUMN `role_type` `role_type` INT(6) NOT NULL DEFAULT 1 ;
-
-INSERT INTO `role` (`id`, `role_name`, `role_type`) VALUES ('1', '超级管理员', '999999');

+ 0 - 2
schema/2017-03-22.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `copyright_info` 
-ADD COLUMN `copyright_number` VARCHAR(18) NULL COMMENT '软著证书编号';

+ 0 - 17
schema/2017-03-23.sql

@@ -1,17 +0,0 @@
-ALTER TABLE `patent_info` 
-MODIFY COLUMN `patent_state` INT(2) NULL COMMENT '专利状态';
-
-ALTER TABLE `patent_log` 
-MODIFY COLUMN `state` INT(2) NULL COMMENT '专利状态';
-
-ALTER TABLE `org_cognizance` 
-MODIFY COLUMN `state` INT(2) NULL COMMENT '高企认定状态';
-
-ALTER TABLE `org_cognizance_log` 
-MODIFY COLUMN `state` INT(2) NULL COMMENT '高企认定状态';
-
-ALTER TABLE `tech_project` 
-MODIFY COLUMN `state` INT(2) NULL COMMENT '科技项目状态';
-
-ALTER TABLE `tech_project_log` 
-MODIFY COLUMN `state` INT(2) NULL COMMENT '科技项目状态状态';

+ 0 - 8
schema/2017-03-24.sql

@@ -1,8 +0,0 @@
-ALTER TABLE `patent_info` 
-ADD COLUMN `contacts` INT(1) NULL COMMENT '联系人及联系方式';
-
-ALTER TABLE `patent_info` 
-MODIFY COLUMN patent_number VARCHAR(20) COMMENT '申请号/专利号',
-MODIFY COLUMN patent_des VARCHAR(255) COMMENT '专利简介';
-
-

+ 0 - 8
schema/2017-03-27.sql

@@ -1,8 +0,0 @@
-
-ALTER TABLE `org_standard` 
-MODIFY COLUMN `participate_way` INT(1) NULL COMMENT '参与方式';
-
-
-
-
-

+ 0 - 6
schema/2017-03-30.sql

@@ -1,6 +0,0 @@
-ALTER TABLE `admin` 
-add COLUMN `province` int(2) NULL COMMENT '所在省份',
-ADD INDEX index_number(number),
-MODIFY COLUMN `number` int(6) NOT NULL auto_increment;
-
-ALTER TABLE `admin` auto_increment = 1;

+ 0 - 1
schema/2017-04-01.sql

@@ -1 +0,0 @@
-INSERT into  `user_role` (uid, rid) values ('1', '1');

+ 0 - 10
schema/2017-04-02.sql

@@ -1,10 +0,0 @@
-CREATE TABLE `notice` (
-  `id` VARCHAR(36) NOT NULL,
-  `aid` VARCHAR(36) NULL,
-  `notice_type` VARCHAR(16) NULL COMMENT '通知类型',
-  `content` VARCHAR(36) NULL COMMENT '通知内容',
-  `create_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `readed` INT(1) NULL,
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '流转状态通知表';

+ 0 - 3
schema/2017-04-04.sql

@@ -1,3 +0,0 @@
-alter table `org_tech_center_detail` 
-CHANGE COLUMN `term_time`  `term_start_time` DATETIME NULL COMMENT '期限开始时间' ,
-add COLUMN `term_end_time` DATETIME NULL COMMENT '期限结束时间' after `term_start_time`;

+ 0 - 15
schema/2017-04-06.sql

@@ -1,15 +0,0 @@
-alter table `user_info` 
-MODIFY COLUMN `personal_profile` VARCHAR(1000) NULL COMMENT '个人简介' ;
-
-alter table `user_career` 
-MODIFY COLUMN `experiences` VARCHAR(1000) NULL COMMENT '从业经历',
-MODIFY COLUMN `achievement` VARCHAR(1000) NULL COMMENT '主要成就';
-
-alter table `organization_info` drop column `legal_person`;
-
-alter table `organization_info` 
-MODIFY COLUMN `publicity_picture_url` VARCHAR(1000) NULL COMMENT '宣传图片';
-
-alter table `organization_properties` 
-MODIFY COLUMN `education_lab` int(5) NULL COMMENT '教育部重点实验室';
-

+ 0 - 5
schema/2017-04-08.sql

@@ -1,5 +0,0 @@
-alter table `patent_info` 
-MODIFY COLUMN `record_time` DATETIME NULL COMMENT '专利发文日期' ;
-
-
-

+ 0 - 20
schema/2017-04-12.sql

@@ -1,20 +0,0 @@
-alter table `org_standard` 
-add COLUMN `year` INT(4) NULL COMMENT '标准制定年份' after `create_time`,
-add COLUMN `enclosure_url` VARCHAR(255) NULL COMMENT '附件URL' after `year`;
-
-alter table `org_cognizance`
-add COLUMN `large_order` INT(1) NULL COMMENT '是否为大额订单 ' after `record_time`;
-
-alter table `org_finance`
-add COLUMN `research_cost` DECIMAL(8,2) NULL COMMENT '研发费用' after `finance_url`;
-
-alter table `org_honor_datum`
-add COLUMN `year` INT(4)  NULL COMMENT '荣誉及其他证明材料获取年份' after `enclosure_url`;
-
-alter table `org_intellectual_property`
-add COLUMN `type` INT(1)  NULL COMMENT '知识产权类型(0--非系统申请知识产权,1--专利,2--软著)' after `property_right_url`;
-
-
-
-
-

+ 0 - 49
schema/2017-04-13.sql

@@ -1,49 +0,0 @@
-
-alter table `org_activity_cost`
-add COLUMN `year` INT(4) NULL COMMENT '年份' after `uid`;
-
-CREATE TABLE `org_cognizance_proportion` (
-  `id` VARCHAR(36) NOT NULL,
-  `uid` VARCHAR(36) NOT NULL,
-  `institution` INT(1) NULL COMMENT '企业研发机构',
-  `activity` INT(1) NULL COMMENT '研发活动',
-  `activity_cost` INT(1) NULL COMMENT '研发活动费用详情',
-  `tech_project` INT(1) NULL COMMENT '高新技术产品',
-  `intellectual_property` INT(1) NULL COMMENT '知识产权',
-  `achievement` INT(1) NULL COMMENT '科技成果转化',
-  `ratepay` INT(1) NULL COMMENT '企业所得税纳税申报表',
-  `finance` INT(1) NULL COMMENT '财务报表',
-  `human_resource` INT(1) NULL COMMENT '企业人员情况',
-  `honor_datum` INT(1) NULL COMMENT '企业荣誉及其他证明材料',
-  `standard` INT(1) NULL COMMENT '标准制定情况',
-  `ability` INT(1) NULL COMMENT '企业创新能力',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '高企培育进度权重表';
-
-CREATE TABLE `legal_person_ownership` (
-  `id` VARCHAR(36) NOT NULL,
-  `uid` VARCHAR(36) NOT NULL,
-  `type` INT(1) NULL COMMENT '法人类型(0--中国企业法人,1--外国企业法人)',
-  `name` VARCHAR(32) NULL COMMENT '名称',
-  `org_code` VARCHAR(32) NULL COMMENT '组织机构代码或统一社会信用代码',
-  `investment` DECIMAL(8,2) NULL COMMENT '投资(万元)',
-  `deleted_sign` INT(1) NULL COMMENT '删除标记',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '法人股权表';
-
-CREATE TABLE `nature_ownership` (
-  `id` VARCHAR(36) NOT NULL,
-  `uid` VARCHAR(36) NOT NULL,
-  `type` INT(1) NULL COMMENT '类型 (0--中国公民,1--外籍公民)',
-  `name` VARCHAR(32) NULL COMMENT '姓名',
-  `id_number` VARCHAR(18) NULL COMMENT '身份证(护照)号',
-  `investment` DECIMAL(8,2) NULL COMMENT '投资额(万元)',
-  `deleted_sign` INT(1) NULL COMMENT '删除标记',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '自然人股权表';
-
-
-

+ 0 - 29
schema/2017-04-14.sql

@@ -1,29 +0,0 @@
-
-alter table `organization_identity`
-add COLUMN  `contacts_fixed_tel` VARCHAR(16) NULL COMMENT '联系人固定电话',
-add COLUMN  `contacts_fax` VARCHAR(16) NULL COMMENT '联系人传真',
-add COLUMN  `legal_person_tel` VARCHAR(16) NULL COMMENT '法人电话',
-add COLUMN  `legal_person_fax` VARCHAR(16) NULL COMMENT '法人传真',
-add COLUMN  `legal_person_email` VARCHAR(128) NULL COMMENT '法人Email',
-add COLUMN  `registration_time` DATETIME NULL COMMENT '注册时间',
-add COLUMN  `ratepay_code` VARCHAR(36) NULL COMMENT '税务登记号',
-add COLUMN  `industry` INT(2) NULL COMMENT '所属行业',
-add COLUMN  `enterprise_scale` INT(1) NULL COMMENT '企业规模',
-add COLUMN  `register_type` VARCHAR(8) NULL COMMENT '注册类型',
-add COLUMN  `foreign_investment` VARCHAR(32) NULL COMMENT '外资来源地',
-add COLUMN  `field` VARCHAR(8) NULL COMMENT '领域',
-add COLUMN  `tax_authority` INT(1) NULL COMMENT '企业所得税主管税务机关(0--国税,1--地税)',
-add COLUMN  `ratepay_method` INT(1) NULL COMMENT '企业所得税征收方式(0--查账征收,1--核定征收)',
-add COLUMN  `high_tech_zone` INT(1) NULL COMMENT '是否属于国家级高新区内企业(0--否,1--是)',
-add COLUMN  `risk_investment` INT(1) NULL COMMENT '是否引入风险投资(0--否,1--是)',
-add COLUMN  `business_scope` VARCHAR(400) NULL COMMENT '经营范围',
-add COLUMN  `high_tech_name` VARCHAR(32) NULL COMMENT '国家级高新区名称';
-
-alter table `organization_identity` 
-MODIFY COLUMN `registered_capital` DECIMAL(8,2) NULL COMMENT '注册资金' ,
-MODIFY COLUMN `contacts` VARCHAR(16) NULL COMMENT '联系人' ;
-
-
-
-
-

+ 0 - 10
schema/2017-04-17.sql

@@ -1,10 +0,0 @@
-
-alter table `organization_identity`
-MODIFY COLUMN  `field` VARCHAR(16) NULL COMMENT '领域';
-
-
-
-
-
-
-

+ 0 - 30
schema/2017-04-19.sql

@@ -1,30 +0,0 @@
-
-alter table `notice`
-ADD COLUMN  `uid` VARCHAR(36) NULL COMMENT '用户ID',
-ADD COLUMN  `principle` VARCHAR(36) NULL COMMENT '录入信息业务员ID',
-ADD COLUMN  `rid` VARCHAR(36) NULL COMMENT '业务记录ID';
-
-alter table `patent_info`
-ADD COLUMN  `founder` VARCHAR(36) NULL COMMENT '申请创建人ID';
-
-alter table `copyright_info`
-ADD COLUMN  `founder` VARCHAR(36) NULL COMMENT '申请创建人ID';
-
-
-alter table `org_cognizance`
-ADD COLUMN  `founder` VARCHAR(36) NULL COMMENT '申请创建人ID';
-
-
-alter table `tech_project`
-ADD COLUMN  `founder` VARCHAR(36) NULL COMMENT '申请创建人ID';
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 16
schema/2017-04-20.sql

@@ -1,16 +0,0 @@
-
-alter table `notice`
-ADD COLUMN  `year` INT(4) NULL COMMENT '高企记录申报年份';
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 16
schema/2017-04-25.sql

@@ -1,16 +0,0 @@
-
-alter table `org_cognizance`
-ADD COLUMN  `tech_principal` VARCHAR(36) NULL COMMENT '高企技术负责人';
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 42
schema/2017-04-26.sql

@@ -1,42 +0,0 @@
-
-alter table `admin`
-ADD COLUMN  `position` VARCHAR(32) NULL COMMENT '职位';
-
-alter table `organization_identity` 
-change  `consultant`  `tech_principal` VARCHAR(36) NULL COMMENT '高企技术负责人';
-
-alter table `copyright_log` 
-MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '备注';
-
-alter table `patent_log`
-MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '备注';
-
-alter table `patent_info`
-MODIFY COLUMN  `patent_des`  VARCHAR(128) NULL COMMENT '专利简介';
-
-alter table `tech_project_log`
-MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '备注';
-
-alter table `tech_project`
-MODIFY COLUMN  `dispatch_info`  VARCHAR(128) NULL COMMENT '派单信息';
-
-alter table `org_cognizance_log`
-MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '备注';
-
-alter table `org_cognizance`
-MODIFY COLUMN  `comment`  VARCHAR(128) NULL COMMENT '派单信息';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 20
schema/2017-04-27.sql

@@ -1,20 +0,0 @@
-
-alter table `user`
-ADD COLUMN  `mid` VARCHAR(36) NULL COMMENT '客户经理ID';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 20
schema/2017-04-28.sql

@@ -1,20 +0,0 @@
-
-alter table `organization_identity`
-ADD COLUMN  `patent_prory_statement_url` VARCHAR(255) NULL COMMENT '专利代理委托书URL';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 22
schema/2017-05-04.sql

@@ -1,22 +0,0 @@
-
-alter table `patent_info`
-MODIFY COLUMN  `patent_name` VARCHAR(64) NULL COMMENT '专利名称';
-
-alter table `patent_info`
-MODIFY COLUMN  `author` VARCHAR(36) NULL COMMENT '专利资料撰写人';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 38
schema/2017-05-08.sql

@@ -1,38 +0,0 @@
-CREATE TABLE `contract` (
-  `id` VARCHAR(36) NOT NULL,
-  `uid` VARCHAR(36) NOT NULL,
-  `serial_number` INT(8) NULL COMMENT '合同编号' AUTO_INCREMENT,
-  `name` VARCHAR(36) NULL COMMENT '合同名称(预留字段)',
-  `type` INT(1) NULL COMMENT '合同类型(1-专利类型合同,2-软著类型合同,3-高企认定类型合同,4-科技项目类型合同)',
-  `sign_date` DATETIME NULL COMMENT '合同签订时间',
-  `founder` VARCHAR(36) NULL COMMENT '合同记录创建人',
-  `describe` VARCHAR(128) NULL COMMENT '合同描述',
-  `status` INT(1) NULL COMMENT '合同状态(0-草稿,1-签订,2-分发流转,3-完成(已结款))',
-  `patent_num` INT(2) NULL COMMENT '专利数量',
-  `patent_status` INT(1) NULL COMMENT '专利创建状态(0-未创建,1-已创建)',
-  `copyright_num` INT(2) NULL COMMENT '软著数量',
-  `copyright_status` INT(1) NULL COMMENT '软著创建状态(0-未创建,1-已创建)',
-  `cognizance_year` INT(4) NULL COMMENT '高企申请年份',
-  `cognizance_status` INT(1) NULL COMMENT '高企认定创建状态(1-未创建,1-已创建)',
-  `tech_project_num` INT(2) NULL COMMENT '科技项目数量',
-  `tech_project_status` INT(1) NULL COMMENT '科技项目创建状态(0-未创建,1-已创建)',
-  `comment` VARCHAR(45) NULL COMMENT '合同创建备注',
-  `create_time` DATETIME NULL COMMENT '记录创建时间',
-  `complete_date` DATETIME NULL COMMENT '合同完成(结款)日期',
-  `deleted_sign` INT(1) NULL,
-  PRIMARY KEY (`id`),
-  INDEX `serialNumber` (`serial_number` ASC))
-ENGINE = InnoDB AUTO_INCREMENT= 600000
-COMMENT = '合同';
-
-CREATE TABLE `contract_log` (
-  `id` VARCHAR(36) NOT NULL,
-  `cid` VARCHAR(36) NULL COMMENT '合同表主键',
-  `record_time` DATETIME NULL COMMENT '状态变更录入时间',
-  `status` INT(1) NULL COMMENT '状态',
-  `principal` VARCHAR(36) NULL COMMENT '负责人',
-  `operator` VARCHAR(36) NULL COMMENT '操作人',
-  `comment` VARCHAR(128) NULL COMMENT '备注',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '合同日志';

+ 0 - 7
schema/2017-05-09.sql

@@ -1,7 +0,0 @@
-alter table `contract` 
-add column `contacts` int(1) null comment '联系人' after `uid`; 
-
-alter table `tech_project`
-modify column `project_des` varchar(600) null comment '项目简介';
-
-alter table `contract` change `describe` `depict` varchar(128) null comment '合同描述';

+ 0 - 14
schema/2017-05-10.sql

@@ -1,14 +0,0 @@
-alter table `patent_info` 
-add column `contract_id` VARCHAR(36) null comment '合同ID' after `uid`; 
-
-alter table `copyright_info` 
-add column `contract_id` VARCHAR(36) null comment '合同ID' after `uid`; 
-
-alter table `org_cognizance` 
-add column `contract_id` VARCHAR(36) null comment '合同ID' after `uid`; 
-
-alter table `tech_project` 
-add column `contract_id` VARCHAR(36) null comment '合同ID' after `uid`; 
-
-alter table `tech_project` 
-add column `principal` VARCHAR(36) null comment '负责人' after `founder`; 

+ 0 - 4
schema/2017-05-12.sql

@@ -1,4 +0,0 @@
-alter table `contract` 
-add column `previous_fee` VARCHAR(8) null comment '前期费用'; 
-
- 

+ 0 - 40
schema/2017-05-13.sql

@@ -1,40 +0,0 @@
-CREATE TABLE `demand` (
-  `id` VARCHAR(36) NOT NULL,
-  `serial_number` INT(8)  NULL COMMENT '编号'  AUTO_INCREMENT,
-  `data_category` INT(1) NULL COMMENT '数据类别(0-个人需求,1-单位需求)',
-  `name` VARCHAR(32) NOT NULL COMMENT '名称',
-  `keyword` VARCHAR(45) NOT NULL COMMENT '关键词',
-  `info_sources` INT(1) NOT NULL COMMENT '信息来源(0-平台采集,1-客户发布)',
-  `industry_categoryA` INT(2) NOT NULL COMMENT '行业类别下拉A',
-  `industry_categoryB` INT(2) NULL COMMENT '行业类别下拉B',
-  `industry_categoryC` INT(2) NULL COMMENT '行业类别下拉C',
-  `demand_type` INT(1) NOT NULL COMMENT '需求类型',
-  `problem_des` VARCHAR(256) NOT NULL COMMENT '问题说明',
-  `technical_requirements` VARCHAR(256) NULL COMMENT '技术指标要求',
-  `picture_url` VARCHAR(500) NULL COMMENT '需求文件--图片URL',
-  `text_file_url` VARCHAR(255) NULL COMMENT '需求文件--文本文件',
-  `video_url` VARCHAR(255) NULL COMMENT '需求文件--视屏文件URL',
-  `fixed_budget` DECIMAL(8,2) NULL COMMENT '固定预算',
-  `fixed_cycle` VARCHAR(12) NULL COMMENT '固定周期',
-  `people_number` INT(5) NULL COMMENT '固定人数',
-  `fixed_scheme` VARCHAR(200) NULL COMMENT '固定方案',
-  `cost_escrow` DECIMAL(8,2) NULL COMMENT '费用托管',
-  `budget_cost` DECIMAL(8,2) NULL COMMENT '预算费用',
-  `validity_period` DATETIME NULL COMMENT '有效期限',
-  `employer_id` VARCHAR(36) NULL COMMENT '雇主客户ID',
-  `employer_name` VARCHAR(16) NOT NULL COMMENT '雇主名称',
-  `employer_address` VARCHAR(128) NULL COMMENT '雇主地址',
-  `employer_contacts` VARCHAR(16) NOT NULL COMMENT '雇主联系人名称',
-  `employer_contacts_mobile` VARCHAR(11) NOT NULL COMMENT '雇主联系人电话',
-  `employer_contacts_mailbox` VARCHAR(255) NOT NULL COMMENT '雇主联系人邮箱',
-  `contacts` INT(1) NULL COMMENT '联系人&联系方式',
-  `status` INT(1) NULL COMMENT '需求状态(0-进行中,1-未解决,2-已解决)',
-  `release` INT(1) NULL COMMENT '是否发布(0-未发布,1-发布)',
-  `release_date` DATETIME NULL COMMENT '发布时间',
-  `create_time` DATETIME NULL COMMENT '需求记录创建时间',
-  `principal_id` VARCHAR(36) NULL COMMENT '负责人(营销员)',
-  `deleted_sign` INT(1) NULL COMMENT '删除标记',
-  PRIMARY KEY (`id`), 
-  INDEX `serialNumber` (`serial_number` ASC))
-ENGINE = InnoDB AUTO_INCREMENT= 600000
-COMMENT = '技术需求';

+ 0 - 13
schema/2017-05-15.sql

@@ -1,13 +0,0 @@
-alter table `demand` 
-change column `release` `release_status` int(1) comment '是否发布(0-未发布,1-发布)';
-
-CREATE TABLE `demand_log` (
-  `id` VARCHAR(36) NOT NULL,
-  `demand_id` VARCHAR(36) NOT NULL COMMENT '需求表主键',
-  `status` INT(1) NOT NULL COMMENT '状态',
-  `operator` VARCHAR(36) NULL COMMENT '操作人',
-  `principal` VARCHAR(36) NULL,
-  `recored_time` DATETIME NOT NULL COMMENT '记录时间',
-  `comment` VARCHAR(128) NULL COMMENT '备注',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB

+ 0 - 7
schema/2017-05-16.sql

@@ -1,7 +0,0 @@
-alter table `demand` 
-modify 
-column `industry_category_a`  int(3)  comment '行业类别下拉A',
-modify 
-column `industry_category_b`  int(3)  comment '行业类别下拉B',
-modify 
-column `industry_category_c`  int(3)  comment '行业类别下拉C';

+ 0 - 54
schema/2017-05-17.sql

@@ -1,54 +0,0 @@
-CREATE TABLE `achievement` (
-  `id` VARCHAR(36) NOT NULL,
-  `serial_number` INT(36) NOT NULL COMMENT '编号'  AUTO_INCREMENT,
-  `data_category` INT(1) NOT NULL COMMENT '数据类别 (0--成果, 1--技术, 2--项目)',
-  `name` VARCHAR(32) NOT NULL COMMENT '名称',
-  `keyword` VARCHAR(45) NOT NULL COMMENT '关键词',
-  `category` INT(1) NOT NULL COMMENT '类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)',
-  `summary` VARCHAR(300) NULL COMMENT '摘要',
-  `introduction` VARCHAR(300) NULL COMMENT '成果简介',
-  `technical_picture_url` VARCHAR(500) NULL COMMENT '技术图片',
-  `field_a` INT(2) NULL COMMENT '应用领域1',
-  `field_b` INT(2) NULL COMMENT '应用领域2',
-  `field_c` INT(2) NULL COMMENT '应用领域3',
-  `maturity` INT(1) NULL COMMENT '成熟度(1--正在研发, 2-- 已有样品, 3-- 通过小试, 4-- 通过中试, 5-- 可以量产)',
-  `maturity_picture_url` VARCHAR(500) NULL COMMENT '成熟度资料--图片URL',
-  `maturity_text_file_url` VARCHAR(255) NULL COMMENT '成熟度资料--文本文件URL',
-  `maturity_video_url` VARCHAR(255) NULL COMMENT '成熟度资料--视屏URL',
-  `innovation` INT(1) NULL COMMENT '创新度(0--行业先进,1--行业领先,2--国内先进,3--国内领先,4--国际先进,5--国际领先)',
-  `owner_name` VARCHAR(32) NOT NULL COMMENT '成果所有人名称',
-  `owner_type` INT(1) NOT NULL COMMENT '所有人类型(0-个人,1-组织)',
-  `owner_id_number` VARCHAR(36) NOT NULL COMMENT '所有人证件号',
-  `owner_mobile` VARCHAR(12) NOT NULL COMMENT '所有人联系电话',
-  `owner_email` VARCHAR(255) NOT NULL COMMENT '所有人电子邮箱',
-  `owner_postal_address` VARCHAR(255) NOT NULL COMMENT '所有人通讯地址',
-  `cooperation_mode` INT(1) NOT NULL COMMENT '合作方式(0--技术转让,1--授权生产)',
-  `transfer_mode` INT(1) NULL COMMENT '转让方式(0--完全转让,1--许可转让,2--技术入股)',
-  `bargaining_mode` INT(1) NULL COMMENT '议价方式(0--面议,1--定价)',
-  `transfer_price` DECIMAL(8,2) NULL COMMENT '转让价格',
-  `technical_scene` VARCHAR(300) NULL COMMENT '技术场景',
-  `breakthrough` VARCHAR(300) NULL COMMENT '技术突破',
-  `patent_case` VARCHAR(300) NULL COMMENT '专利情况',
-  `awards` VARCHAR(300) NULL COMMENT '获奖情况',
-  `team_des` VARCHAR(300) NULL COMMENT '技术团队情况',
-  `parameter` VARCHAR(255) NULL COMMENT '技术参数',
-  `tech_plan_url` VARCHAR(255) NULL COMMENT '技术方案URL',
-  `business_plan_url` VARCHAR(255) NULL COMMENT '商业计划书URL',
-  `org_id` VARCHAR(36) NULL COMMENT '所属组织ID',
-  `org_name` VARCHAR(45) NULL COMMENT '所属组织名称',
-  `org_address` VARCHAR(255) NULL COMMENT '所属组织地址',
-  `org_email` VARCHAR(255) NULL COMMENT '所属组织邮箱',
-  `org_contacts` VARCHAR(45) NULL COMMENT '所属组织联系人名称',
-  `org_contacts_mobile` VARCHAR(45) NULL COMMENT '所属组织联系人电话',
-  `contacts` VARCHAR(45) NULL COMMENT '联系人及联系电话',
-  `manager_id` VARCHAR(36) NULL COMMENT '客户经理ID',
-  `salesman_id` VARCHAR(36) NULL COMMENT '营销员ID',
-  `status` INT(1) NULL COMMENT '状态',
-  `create_time` DATETIME NULL COMMENT '成果记录创建时间',
-  `release_status` INT(1) NULL COMMENT '是否发布(0--未发布,1--已发布)',
-  `release_date` DATETIME NULL COMMENT '发布时间',
-  `deleted_sign` INT(1) NULL COMMENT '删除标记',
-  PRIMARY KEY (`id`),
-  INDEX `serialNumber` (`serial_number` ASC))
-ENGINE = InnoDB AUTO_INCREMENT= 600000
-COMMENT = '技术成果'

+ 0 - 4
schema/2017-05-18.sql

@@ -1,4 +0,0 @@
-alter TABLE `achievement`
-modify column `field_a` int(3) null comment'应用领域1',
-modify column `field_b` int(3) null comment'应用领域2',
-modify column `field_c` int(3) null comment'应用领域3';

+ 0 - 2
schema/2017-05-19.sql

@@ -1,2 +0,0 @@
-alter TABLE `achievement`
-add column `owner_id` varchar(36) null comment'所有人ID' after `innovation`;

+ 0 - 4
schema/2017-05-22.sql

@@ -1,4 +0,0 @@
-alter TABLE `demand`
-add column `audit_status` int(1) null comment'审核状态(0--未提交审核草稿,1,--提交审核,2--审核中,3--审核通过,4--审核未通过)',
-add column `tech_broker_id` varchar(36) null comment'技术经纪人ID';
-

+ 0 - 4
schema/2017-05-23.sql

@@ -1,4 +0,0 @@
-
-alter TABLE `achievement`
-add column `audit_status` int(1) null comment'审核状态(0--未提交审核草稿,1,--提交审核,2--审核中,3--审核通过,4--审核未通过)',
-add column `tech_broker_id` varchar(36) null comment'技术经纪人ID';

+ 0 - 21
schema/2017-05-24.sql

@@ -1,21 +0,0 @@
-CREATE TABLE `demand_keyword` (
-  `id` VARCHAR(36) NOT NULL,
-  `demand_id` VARCHAR(36) NOT NULL COMMENT '科技需求ID',
-  `keyword` VARCHAR(16) NOT NULL COMMENT '关键词',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '科技需求关键词';
-
-CREATE TABLE `achievement_keyword` (
-  `id` VARCHAR(36) NOT NULL,
-  `achievement_id` VARCHAR(36) NOT NULL COMMENT '科技成果ID',
-  `keyword` VARCHAR(36) NOT NULL COMMENT '科技成果关键词',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '科技成果关键词';
-
-alter table `achievement` 
-modify column `contacts`  int(1) NULL comment '联系人及方式';
-
-alter table `achievement_keyword` 
-modify column `keyword`  VARCHAR(16) NOT NULL COMMENT '科技成果关键词';

+ 0 - 6
schema/2017-05-25.sql

@@ -1,6 +0,0 @@
-CREATE TABLE `achievement_demand` (
-  `achievement_id` VARCHAR(36) NOT NULL COMMENT '科技成果ID',
-  `demand_id` VARCHAR(36) NOT NULL COMMENT '科技需求ID',
-  PRIMARY KEY (`achievement_id`, `demand_id`))
-ENGINE = InnoDB
-COMMENT = '科技成果及科技需求匹配'

+ 0 - 16
schema/2017-05-28.sql

@@ -1,16 +0,0 @@
-CREATE TABLE `achievement_interest` (
-  `id` varchar(36) NOT NULL,
-  `achievement_id` varchar(36) NOT NULL COMMENT '科技成果ID',
-  `uid` varchar(36) NOT NULL COMMENT '感兴趣人ID',
-  `create_time` datetime NOT NULL COMMENT '记录创建时间(关注时间)',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='科技成果"感兴趣(关注)"';
-
-CREATE TABLE `demand_interest` (
-  `id` VARCHAR(36) NOT NULL,
-  `demand_id` VARCHAR(36) NOT NULL COMMENT '需求主键',
-  `uid` VARCHAR(36) NOT NULL COMMENT '关注人ID',
-  `create_time` DATETIME NOT NULL COMMENT '关注时间',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '科技需求\"感兴趣(关注)\"'

+ 0 - 29
schema/2017-06-01.sql

@@ -1,29 +0,0 @@
-CREATE TABLE `demand_order` (
-  `id` VARCHAR(36) NOT NULL,
-  `serial_number` INT(8) NULL COMMENT '编号'  AUTO_INCREMENT,
-  `demand_id` VARCHAR(36) NOT NULL COMMENT '科技需求ID',
-  `uid` VARCHAR(36) NULL COMMENT '接单人ID',
-  `create_time` DATETIME NULL COMMENT '接单时间',
-  `enclosure_url` VARCHAR(255) NULL COMMENT '附件URL',
-  `status` INT(1) NULL COMMENT '流程变动(0--初始意向,1--意向金,2--签订合同,3--合同金,4--佣金,5--服务金,6--关闭)',
-  `intention_money` INT(8) NULL COMMENT '意向金',
-  `contract_money` INT(8) NULL COMMENT '合同金',
-  `commission` INT(8) NULL COMMENT '佣金',
-  `service_money` INT(8) NULL COMMENT '服务金',
-  `refund` INT(1) NULL COMMENT '是否退款(0--未退款,1--已退款)',
-  `deleted_sign` INT(1) NULL COMMENT '删除标记(0--未删除,1--已删除)',
-  PRIMARY KEY (`id`),
-  INDEX `serialNumber` (`serial_number` ASC))
-ENGINE = InnoDB	AUTO_INCREMENT= 600000
-COMMENT = '科技需求意向单/交易单';
-
-CREATE TABLE `demand_order_log` (
-  `id` VARCHAR(36) NOT NULL,
-  `demand_order_id` VARCHAR(36) NOT NULL COMMENT '科技需求意向单/交易单ID',
-  `record_time` DATETIME NULL,
-  `status` INT(1) NULL COMMENT '状态',
-  `operator` VARCHAR(36) NULL COMMENT '记录操作人',
-  `comment` VARCHAR(128) NULL,
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '科技需求意向单/交易单日志';

+ 0 - 28
schema/2017-06-02.sql

@@ -1,28 +0,0 @@
-CREATE TABLE `achievement_order` (
-  `id` VARCHAR(36) NOT NULL,
-  `serial_number` INT(8) NULL COMMENT '编号' AUTO_INCREMENT,
-  `achievement_id` VARCHAR(36) NOT NULL COMMENT '科技成果ID',
-  `uid` VARCHAR(36) NULL COMMENT '购买科技成果人ID',
-  `create_time` DATETIME NULL COMMENT '购买时间',
-  `status` INT(1) NULL COMMENT '流程变动(0--初始意向,1--意向金,2--签订合同,3--合同金,4--佣金,5--服务金,6--关闭(未签合同),7--关闭(已签合同))',
-  `intention_money` INT(8) NULL COMMENT '意向金',
-  `contract_money` INT(8) NULL COMMENT '合同金',
-  `commission` INT(8) NULL COMMENT '佣金',
-  `service_money` INT(8) NULL COMMENT '服务金',
-  `refund` INT(1) NULL COMMENT '是否退款(0--未退款,1--已退款)',
-  `deleted_sign` INT(1) NULL COMMENT '删除标记(0--未删除,1--已删除)',
-  PRIMARY KEY (`id`),
-  INDEX `serialNumber` (`serial_number` ASC))
-ENGINE = InnoDB AUTO_INCREMENT= 600000
-COMMENT = '科技成果意向单/交易单';
-
-CREATE TABLE `achievement_order_log` (
-  `id` VARCHAR(36) NOT NULL,
-  `achievement_order_id` VARCHAR(36) NULL COMMENT '科技成果订单ID',
-  `record_time` DATETIME NULL,
-  `status` INT(1) NULL COMMENT '状态',
-  `operator` VARCHAR(36) NULL COMMENT '记录操作人',
-  `comment` VARCHAR(128) NULL COMMENT '备注',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '科技成果意向单/交易单log';

+ 0 - 24
schema/2017-06-06.sql

@@ -1,24 +0,0 @@
-alter table `admin` 
-add column `superior_id` varchar(36) null comment '上级管理用户ID',
-add column `city` int(3) null comment '所在市';
-
-CREATE TABLE `industry_category` (
-  `id` INT NOT NULL,
-  `name` VARCHAR(45) NULL,
-  `pid` INT NULL,
-  `value` DECIMAL(4,2) NULL,
-  PRIMARY KEY (`id`));
-  
-  CREATE TABLE .`admin_location` (
-  `id` VARCHAR(36) NOT NULL,
-  `admin_id` VARCHAR(36) NOT NULL COMMENT '管理员ID',
-  `province` INT(2) NOT NULL COMMENT '省份',
-  `city` INT(3) NULL COMMENT '市',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '管理员地区';
-
-alter table user_identity
-modify column `province` int(2) null comment '所在地-省份',
-modify column `city` int(3) null comment '所在地--市',
-modify column `area` int(4) null comment '所在地--区';

+ 0 - 60
schema/2017-06-07.sql

@@ -1,60 +0,0 @@
-UPDATE `organization_identity`
-SET licence_area = NULL,
- licence_city = NULL,
- licence_province = NULL,
- location_area = NULL,
- location_city = NULL,
- location_province = NULL;
-
-UPDATE `user_identity`
-SET province = NULL,
- city = NULL,
- area = NULL;
-
-UPDATE `user_info`
-SET	residence_area = null,
-residence_city = null,
-residence_province = null;
-
-alter table user_identity
-modify column `province` int(2) null comment '所在地-省份',
-modify column `city` int(3) null comment '所在地--市',
-modify column `area` int(4) null comment '所在地--区';
-
-alter table organization_identity
-modify column `licence_province` int(2) null comment '营业执照所在地--省',
-modify column `licence_city` int(3) null comment '营业执照所在地-市',
-modify column `licence_area` int(4) null comment '营业执照所在地-区(县)',
-modify column `location_province` int(2) null comment '开户行所在地-省',
-modify column `location_city` int(3) null comment '开户行所在地-市',
-modify column `location_area` int(4) null comment '开户行所在地-区(县)';
-
-alter table user_info
-modify column `residence_province` int(2) null comment '居住地--省',
-modify column `residence_city` int(3) null comment '居住地--市',
-modify column `residence_area` int(4) null comment '居住地--区';
-
-CREATE TABLE `district_glossory` (
-  `id` INT(4) NOT NULL,
-  `name` VARCHAR(16) NULL COMMENT '名称',
-  `pid` INT(4) NULL COMMENT '上级ID',
-  `level` INT(1) NULL COMMENT '层级',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '地区数据字典';
-
-
-delete from `permission` where name = '系统设置--管理员列表';
-
-update `permission` set url = 'api/admin/supervise/insertAdmin'
-where url = 'api/admin/insertAdmin';
-
-update `permission` set url = 'api/admin/supervise/resetPwd'
-where url = 'api/admin/resetPwd';
-
-update `permission` set url = '/api/admin/supervise/updateAdmin'
-where url = 'api/admin/updateAdmin';
-
-insert into `permission`(`id`, `url`, `name`) 
-values 
-(UUID(), 'api/admin/supervise/adminList', '系统设置--管理员列表');

+ 0 - 13
schema/2017-06-09.sql

@@ -1,13 +0,0 @@
-CREATE TABLE `value_evaluation` (
-  `id` BIGINT(18) NOT NULL,
-  `uid` VARCHAR(36) NULL COMMENT '用户id',
-  `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `name` VARCHAR(128) NULL COMMENT '技术名称',
-  `value` BIGINT(18) NULL COMMENT '评估值',
-  `step` INT(2) NULL COMMENT '当前步骤',
-  `log` JSON NULL COMMENT '步骤记录',
-  PRIMARY KEY (`id`)
-);
-
-ALTER TABLE `value_evaluation` 
-ADD INDEX `uid_index` (`uid` ASC);

+ 0 - 11
schema/2017-06-10.sql

@@ -1,11 +0,0 @@
-UPDATE `organization_info`
-SET location_province = NULL,
- 	location_city = NULL,
-	location_area = NULL;
-
-
-alter table `organization_info`
-modify column `location_province` int(2) null comment '所在地-省份',
-modify column `location_city` int(3) null comment '所在地--市',
-modify column `location_area` int(4) null comment '所在地--区';
-

+ 0 - 9
schema/2017-06-12.sql

@@ -1,9 +0,0 @@
-alter table `user_identity`
-add column `expert` int(1) null comment '专家(0--否,1--是)',
-add column `celebrity` int(1) null comment '明星(0--否,1--是)';
-
-CREATE TABLE `html_fragment` (
-  `id` varchar(36) NOT NULL,
-  `content` longtext,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

+ 0 - 8
schema/2017-06-13.sql

@@ -1,8 +0,0 @@
-CREATE TABLE `user_interest` (
-  `id` VARCHAR(36) NOT NULL,
-  `from_uid` VARCHAR(36) NOT NULL COMMENT '关注发起用户ID',
-  `to_uid` VARCHAR(36) NOT NULL COMMENT '被关注用户ID',
-  `create_time` DATETIME NOT NULL COMMENT '关注时间',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '用户关注';

+ 0 - 2
schema/2017-06-14.sql

@@ -1,2 +0,0 @@
-alter table `admin`
-modify column `name` varchar(16) null comment '用户名';

+ 0 - 8
schema/2017-06-17.sql

@@ -1,8 +0,0 @@
-CREATE TABLE `field_glossory` (
-  `id` INT(4) NOT NULL,
-  `name` VARCHAR(32) NULL COMMENT '名称',
-  `pid` INT(4) NULL COMMENT '上级ID',
-  `level` INT(1) NULL COMMENT '层级',
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-COMMENT = '领域类别';

+ 0 - 12
schema/2017-06-20.sql

@@ -1,12 +0,0 @@
-alter TABLE `achievement` 
-  modify column `maturity_picture_url` longtext  NULL
-  COMMENT '成熟度资料--图片URL';
-  
-alter table `demand`
-modify column `picture_url` longtext null comment '需求文件--图片URL';
-
-CREATE TABLE `sys_dict` (
-  `id` varchar(36) NOT NULL,
-  `value` varchar(64) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-);

+ 53 - 0
schema/20170626-activities-news-billings.sql

@@ -0,0 +1,53 @@
+CREATE TABLE `news` (
+  `id` bigint(18) NOT NULL COMMENT '主键',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `edit_time` datetime DEFAULT NULL COMMENT '修改时间',
+  `title` varchar(45) DEFAULT NULL COMMENT '标题',
+  `author` varchar(45) DEFAULT NULL COMMENT '作者',
+  `type` int(2) NOT NULL DEFAULT '0' COMMENT '类型',
+  `content` longtext COMMENT '内容',
+  `hot` int(1) NOT NULL DEFAULT '0' COMMENT '是否放在首页',
+  `source` varchar(45) DEFAULT NULL COMMENT '来源',
+  `sourceUrl` varchar(255) DEFAULT NULL COMMENT '来源url',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='新闻资讯';
+
+CREATE TABLE `activity` (
+  `id` bigint(18) NOT NULL,
+  `start_time` datetime DEFAULT NULL COMMENT '开始时间',
+  `end_time` datetime DEFAULT NULL COMMENT '结束时间',
+  `name` varchar(45) DEFAULT NULL COMMENT '标题',
+  `desc` longtext COMMENT '描述',
+  `status` int(1) DEFAULT NULL COMMENT '状态',
+  `address` varchar(128) DEFAULT NULL COMMENT '活动地址',
+  `host` varchar(45) DEFAULT NULL COMMENT '主办单位',
+  `undertake` varchar(45) DEFAULT NULL COMMENT '承办单位',
+  `asist` varchar(255) DEFAULT NULL COMMENT '协办单位,逗号隔开',
+  `type` int(1) DEFAULT NULL COMMENT '活动类型',
+  `form` int(1) DEFAULT NULL COMMENT '活动形式',
+  `img_urls` varchar(255) DEFAULT NULL COMMENT '活动图片地址',
+  `result` varchar(255) DEFAULT NULL COMMENT '活动结果描述',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='活动主表';
+
+CREATE TABLE `activity_user` (
+  `aid` bigint(18) NOT NULL COMMENT '活动id',
+  `uid` varchar(36) NOT NULL COMMENT '用户ID',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '报名时间',
+  PRIMARY KEY (`aid`,`uid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户活动表';
+
+CREATE TABLE `billings` (
+  `id` bigint(18) NOT NULL COMMENT '流水id',
+  `uid` varchar(36) DEFAULT NULL COMMENT '用户id',
+  `value` bigint(18) NOT NULL DEFAULT '0' COMMENT '支付金额,单位为分',
+  `desc` varchar(45) DEFAULT NULL COMMENT '流水描述',
+  `type` int(2) NOT NULL DEFAULT '0' COMMENT '流水订单类型',
+  `payment_type` int(2) NOT NULL DEFAULT '0' COMMENT '流水支付类型',
+  `number` varchar(45) DEFAULT NULL COMMENT '银行或者其他支付渠道的流水号',
+  `balance` bigint(18) NOT NULL DEFAULT '0' COMMENT '用户账户余额,单位为分',
+  `consumption` bigint(18) NOT NULL DEFAULT '0' COMMENT '用户总消费额,单位为分',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户交易支付流水表';
+
+

+ 2 - 0
schema/data/admin.sql

@@ -0,0 +1,2 @@
+INSERT INTO `admin` (`id`, `mobile`, `name`, `password`, `create_time`, `number`) VALUES ('1', '13272226688', '管理员', '8af978dd914c6c17a9f3bc55bc7970b9', '2017-01-02 15:15:41', '1');
+INSERT INTO `user_role` (`uid`, `rid`) VALUES ('1', '1');

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 3249 - 0
schema/data/district.sql


+ 254 - 0
schema/data/field_glossory.sql

@@ -0,0 +1,254 @@
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (2,"食品饮料",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (4,"建筑建材",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (5,"家居用品",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (7,"轻工纺织",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (15,"化学化工",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (17,"新能源",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (18,"机械",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (19,"环保和资源",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (20,"安全防护",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (25,"交通运输",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (26,"橡胶塑料",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (31,"仪器仪表",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (46,"饮料类",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (48,"食品加工",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (49,"食品添加剂",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (50,"其他食品饮料",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (57,"建筑结构",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (58,"建筑装饰",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (61,"管件、管材",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (62,"建筑施工",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (63,"家居饰品",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (65,"其他建筑建材",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (67,"家居清洁",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (68,"家具",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (72,"家居照明",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (73,"其他家居用品",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (85,"制鞋",7,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (86,"服装服饰",7,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (99,"乳品",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (127,"工艺美术",464,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (140,"其他化学化工",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (159,"通用零部件",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (160,"其他机械",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (161,"水污染治理",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (163,"大气污染防治",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (167,"资源利用与开发",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (168,"监控",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (169,"消防",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (170,"军用安防",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (171,"运动防护",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (172,"救生",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (173,"作业安防",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (174,"其他安全防护",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (176,"装订",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (179,"记录媒介复制",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (180,"其他包装印刷",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (181,"包装材料",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (192,"矿业设备",461,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (194,"汽车",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (195,"航空运输",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (197,"城市公共交通系统",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (198,"公路管理与养护",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (200,"其他交通运输",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (205,"合成材料及其助剂",26,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (206,"橡塑加工与制造",26,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (207,"其他橡胶塑料",26,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (233,"开关、插座、插头",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (234,"变压器、稳压器",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (235,"电动机",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (236,"发电机",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (237,"电线、电缆",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (238,"电力",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (241,"电力绝缘",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (258,"乐器",464,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (286,"电子元器件",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (291,"网络",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (300,"液压机",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (302,"甜品类",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (304,"建筑材料",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (305,"建筑装潢",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (307,"家用电器",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (308,"日常用品",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (339,"内燃机",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (340,"机床",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (341,"发动机",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (344,"机械粉碎",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (345,"电焊",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (346,"机械输送",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (348,"清洁生产与循环经济",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (353,"纸浆",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (354,"纸类包装",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (355,"造纸",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (360,"铁路运输",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (361,"水路运输",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (362,"管道运输",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (363,"装卸搬运",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (370,"控制系统",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (371,"自动化应用",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (372,"自动化元件",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (373,"人工智能",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (375,"新型材料",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (376,"生物医用材料",375,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (377,"高分子材料",375,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (378,"无机非金属材料",375,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (381,"纳米及超细材料",375,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (382,"其他新材料技术",375,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (387,"酒类酿造",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (388,"食用油",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (389,"调味及发酵",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (390,"粗粮",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (391,"肉类",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (392,"水产类",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (393,"果蔬类",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (396,"建筑给排水",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (397,"建筑通风",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (398,"建筑照明",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (399,"采暖空调",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (400,"建筑电气",4,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (401,"厨具",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (402,"餐具",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (413,"专用化学",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (416,"太阳能 ",17,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (417,"阀门",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (418,"泵",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (419,"减速机/变速机",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (420,"机械过滤",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (421,"机械分离",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (422,"机械干燥",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (423,"雕刻切割",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (424,"铸造/热处理",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (425,"机械制冷",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (426,"机械清洗清理",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (427,"机械检测",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (428,"模具",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (430,"防身",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (432,"交通安全",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (435,"器皿、容器",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (436,"标签、标牌",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (440,"自行车",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (441,"摩托车",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (442,"电梯、缆车",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (456,"电子信息",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (457,"医药与医疗",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (458,"农林牧业",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (459,"海洋开发",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (460,"航空航天",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (461,"采矿冶金",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (462,"电气自动化",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (463,"包装印刷",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (464,"教育休闲",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (465,"软件",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (466,"微电子",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (467,"硬件/数码",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (468,"通信",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (469,"广播电视",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (470,"信息安全",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (471,"智能交通",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (472,"其他电子信息",456,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (473,"金属材料",375,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (474,"地热能",17,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (475,"生物质能",17,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (476,"潮汐能",17,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (477,"核能及氢能",17,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (478,"能量转换与储存",17,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (479,"其他新能源",17,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (480,"固体废弃物污染处理",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (481,"环境监测",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (482,"生态保护",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (483,"生物医药",457,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (484,"中药、天然药物",457,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (485,"化学药物",457,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (486,"新剂型及制剂",457,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (487,"医疗器械",457,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (488,"生物化工",457,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (489,"动植物新品培育",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (491,"家畜良种胚胎育种",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (492,"病虫害防治",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (493,"饲料、肥料及添加剂",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (494,"农机用具",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (495,"农副产品贮藏与保鲜",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (496,"其他农业牧业",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (497,"海水淡化",459,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (500,"海水养殖",459,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (501,"海底矿产利用",459,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (502,"海洋能源利用",459,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (503,"海洋渔业资源保护与监测",459,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (504,"渔业捕捞",459,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (505,"海洋船舶",459,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (506,"民用飞机",460,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (507,"空中管理系统",460,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (508,"航空运行保障系统",460,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (509,"卫星通信",460,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (510,"卫星导航",460,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (511,"煤炭开采冶炼",461,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (512,"石油天然气开采提炼",461,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (515,"精炼石油",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (516,"基础化学",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (517,"肥料",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (518,"农药",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (519,"涂料、颜料、油墨",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (520,"合成化学",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (521,"日用化学",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (522,"化工生产",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (523,"光机电一体化",18,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (525,"计时仪器",31,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (526,"光学仪器",31,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (527,"其他仪器仪表",31,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (528,"棉及化纤印染精加工",7,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (529,"编织物",7,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (532,"毛皮",7,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (533,"印刷",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (534,"包装袋、箱",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (535,"焙烤类",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (537,"茶类",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (538,"办公文教",464,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (539,"体育",464,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (540,"玩具",464,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (541,"休闲娱乐",464,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (542,"其他教育休闲",464,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (543,"风能",17,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (544,"节能环保",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (545,"其他航空航天",460,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (546,"其他海洋开发",459,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (547,"其他医药与医疗",457,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (548,"其他环保和资源",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (549,"其他电气自动化",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (550,"电池充电器",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (551,"其他轻工纺织",7,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (552,"其他采矿冶金",461,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (553,"种植",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (554,"养殖",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (555,"电气电工",462,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (556,"防盗预警",20,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (557,"噪声污染治理",19,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (558,"纺织",7,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (559,"皮革",7,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (560,"包装",463,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (561,"海底勘探",459,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (562,"温度仪表",31,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (563,"压力仪表",31,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (564,"检测仪器",31,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (565,"分析仪器",31,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (566,"实验仪器",31,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (567,"飞行器",460,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (568,"方便食品",2,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (569,"有色金属开采冶炼",461,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (570,"黑色金属开采冶炼",461,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (571,"非金属开采冶炼",461,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (572,"金属合金冶炼铸造",461,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (573,"卫浴",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (574,"护理用品",5,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (575,"公路运输",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (576,"物流仓储",25,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (577,"橡胶原料与制品",26,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (578,"塑料原料与制品",26,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (579,"农副产品深加工",458,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (580,"盐湖化工",15,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (589,"钒钛产业",0,1);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (590,"钒钛资源",589,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (591,"钒钛冶金",589,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (592,"钒钛化工",589,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (593,"钒钛钢",589,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (594,"钒钛新材料",589,2);
+insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (595,"其他",589,2);

schema/html_fragment.sql → schema/data/html_fragment.sql


schema/industry_category_init.sql → schema/data/industry_category_init.sql


+ 4 - 0
schema/permission.sql

@@ -501,3 +501,7 @@ values
 (UUID(), 'api/admin/portal/order/demandOrderLog', '科技需求管理--科技需求线索单/意向单log'),
 (UUID(), 'api/admin/portal/order/updateDemandOrder', '科技需求管理--科技需求线索单/意向单修改'),
 (UUID(), 'api/admin/portal/order/downloadDemandOrder', '科技需求管理--下载科技需求线索单/意向单文件');
+
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/deleteHumanResource', '企业人员情况--删除团体人力资源');

+ 9 - 0
schema/data/role_init.sql

@@ -0,0 +1,9 @@
+INSERT INTO `role` (`id`, `role_name`, `role_type`) 
+VALUES 
+('1', '超级管理员', 999999),
+('2', '地区管理员', 99999),
+('3', '审核员', 9999),
+('4', '客户经理', 4),
+('5', '营销经理', 5),
+('6', '营销员', 6),
+('7', '技术经纪人', 7);

schema/sys_dict.sql → schema/data/sys_dict.sql


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 3248
schema/district.sql


+ 0 - 315
schema/field_glossory.sql

@@ -1,315 +0,0 @@
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (1,"电子信息",0,1);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (2,"生物与新医药",0,1);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (3,"航空航天",0,1);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (4,"新材料",0,1);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (5,"高技术服务",0,1);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (6,"新能源与节能",0,1);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (7,"资源与环境",0,1);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (8,"先进制造与自动化",0,1);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (9,"其他领域",0,1);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (10,"软件",1,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (11,"微电子技术",1,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (12,"计算机产品及其网络应用技术",1,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (13,"通信技术",1,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (14,"广播影视技术",1,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (15,"新型电子元器件",1,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (16,"信息安全技术",1,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (17,"智能交通和轨道交通技术",1,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (18,"基础软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (19,"嵌入式软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (20,"计算机辅助设计与辅助工程管理软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (21,"中文及多语种处理软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (22,"图形和图像处理软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (23,"地理信息系统( GIS) 软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (24,"电子商务软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (25,"电子政务软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (26,"企业管理软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (27,"物联网应用软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (28,"云计算与移动互联网软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (29,"Web服务与集成软件",10,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (30,"集成电路设计技术",11,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (31,"集成电路产品设计技术",11,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (32,"集成电路封装技术",11,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (33,"集成电路测试技术",11,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (34,"集成电路芯片制造工艺技术",11,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (35,"集成光电子器件设计、制造与工艺技术",11,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (36,"计算机及终端设计与制造技术",12,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (37,"计算机外围设备设计与制造技术",12,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (38,"网络设备设计与制造技术",12,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (39,"网络应用技术",12,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (40,"通信网络技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (41,"光传输系统技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (42,"有线宽带接入系统技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (43,"移动通信系统技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (44,"宽带无线通信系统技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (45,"卫星通信系统技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (46,"微波通信系统技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (47,"物联网设备、部件及组网技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (48,"电信网络运营支撑管理技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (49,"电信网与互联网增值业务应用技术",13,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (50,"广播电视节目采编播系统技术",14,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (51,"广播电视业务集成与支撑系统技术",14,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (52,"有线传输与覆盖系统技术",14,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (53,"无线传输与覆盖系统技术",14,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (54,"广播电视监测监管、安全运行与维护系统技术",14,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (55,"数字电影系统技术",14,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (56,"数字电视终端技术",14,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (57,"专业视频应用服务平台技术",14,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (58,"音响、光盘技术",14,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (59,"半导体发光技术",15,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (60,"片式和集成无源元件",15,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (61,"大功率半导体器件",15,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (62,"专用特种器件",15,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (63,"敏感元器件与传感器",15,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (64,"中高档机电组件",15,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (65,"平板显示器件",15,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (66,"密码技术",16,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (67,"认证授权技术",16,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (68,"系统与软件安全技术",16,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (69,"网络与通信安全技术",16,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (70,"安全保密技术",16,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (71,"安全测评技术",16,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (72,"安全管理技术",16,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (73,"应用安全技术",16,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (74,"交通控制与管理技术",17,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (75,"交通基础信息采集、处理技术",17,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (76,"交通运输运营管理技术",17,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (77,"车、船载电子设备技术",17,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (78,"轨道交通车辆及运行保障技术",17,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (79,"轨道交通运营管理与服务技术",17,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (80,"医药生物技术",2,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (81,"中药、天然药物",2,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (82,"化学药研发技术",2,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (83,"药物新剂型与制剂创制技术",2,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (84,"医疗仪器、设备与医学专用软件",2,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (85,"轻工和化工生物技术",2,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (86,"农业生物技术",2,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (87,"新型疫苗",80,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (88,"生物治疗技术和基因工程药物",80,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (89,"快速生物检测技术",80,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (90,"生物大分子类药物研发技术",80,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (91,"天然药物生物合成制备技术",80,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (92,"生物分离介质、试剂、装置及相关检测技术",80,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (93,"中药资源可持续利用与生态保护技术",81,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (94,"创新药物研发技术",81,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (95,"中成药二次开发技术",81,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (96,"中药质控及有害物质检测技术",81,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (97,"创新药物技术",82,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (98,"手性药物创制技术",82,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (99,"晶型药物创制技术",82,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (100,"国家基本药物生产技术",82,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (101,"国家基本药物原料药和重要中间体的技术",82,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (102,"创新制剂技术",83,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (103,"新型给药制剂技术",83,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (104,"制剂新辅料开发及生产技术",83,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (105,"制药装备技术",83,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (106,"医学影像诊断技术",84,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (107,"新型治疗、急救与康复技术",84,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (108,"新型电生理检测和监护技术",84,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (109,"医学检验技术及新设备",84,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (110,"医学专用网络新型软件",84,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (111,"医用探测及射线计量检测技术",84,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (112,"高效工业酶制备与生物催化技术",85,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (113,"微生物发酵技术",85,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (114,"生物反应及分离技术",85,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (115,"天然产物有效成份的分离提取技术",85,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (116,"食品安全生产与评价技术",85,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (117,"食品安全检测技术",85,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (118,"农林植物优良新品种与优质高效安全生产技术",86,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (119,"畜禽水产优良新品种与健康养殖技术",86,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (120,"重大农林生物灾害与动物疫病防控技术",86,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (121,"现代农业装备与信息化技术",86,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (122,"农业面源和重金属污染农田综合防治与修复技术",86,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (123,"航空技术",3,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (124,"航天技术",3,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (125,"飞行器",123,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (126,"飞行器动力技术",123,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (127,"飞行器系统技术",123,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (128,"飞行器制造与材料技术",123,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (129,"空中管制技术",123,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (130,"民航及通用航空运行保障技术",123,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (131,"卫星总体技术",124,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (132,"运载火箭技术",124,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (133,"卫星平台技术",124,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (134,"卫星有效载荷技术",124,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (135,"航天测控技术",124,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (136,"航天电子与航天材料制造技术",124,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (137,"先进航天动力设计技术",124,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (138,"卫星应用技术",124,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (139,"金属材料",4,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (140,"无机非金属材料",4,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (141,"高分子材料",4,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (142,"生物医用材料",4,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (143,"精细和专用化学品",4,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (144,"与文化艺术产业相关的新材料",4,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (145,"精品钢材制备技术",139,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (146,"铝、铜、镁、钛合金清洁生产与深加工技术",139,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (147,"稀有、稀土金属精深产品制备技术",139,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (148,"纳米及粉末冶金新材料制备与应用技术",139,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (149,"金属及金属基复合新材料制备技术",139,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (150,"半导体新材料制备与应用技术",139,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (151,"电工、微电子和光电子新材料制备与应用技术",139,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (152,"超导、高效能电池等其它新材料制备与应用技术",139,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (153,"结构陶瓷及陶瓷基复合材料强化增韧技术",140,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (154,"功能陶瓷制备技术",140,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (155,"功能玻璃制备技术",140,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (156,"节能与新能源用材料制备技术",140,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (157,"环保及环境友好型材料技术",140,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (158,"新型功能高分子材料的制备及应用技术",141,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (159,"工程和特种工程塑料制备技术",141,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (160,"新型橡胶的合成技术及橡胶新材料制备技术",141,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (161,"新型纤维及复合材料制备技术",141,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (162,"高分子材料制备及循环再利用技术",141,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (163,"高分子材料的新型加工和应用技术",141,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (164,"介入治疗器具材料制备技术",142,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (165,"心脑血管外科用新型生物材料制备技术",142,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (166,"骨科内置物制备技术",142,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (167,"口腔材料制备技术",142,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (168,"组织工程用材料制备技术",142,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (169,"新型敷料和止血材料制备技术",142,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (170,"专用手术器械和材料制备技术",142,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (171,"其他新型医用材料及制备技术",142,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (172,"新型催化剂制备及应用技术",143,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (173,"电子化学品制备及应用技术",143,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (174,"超细功能材料制备及应用技术",143,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (175,"精细化学品制备及应用技术",143,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (176,"文化载体和介质新材料制备技术",144,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (177,"艺术专用新材料制备技术",144,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (178,"影视场景和舞台专用新材料的加工生产技术",144,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (179,"文化产品印刷新材料制备技术",144,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (180,"文物保护新材料制备技术",144,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (181,"研发与设计服务",5,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (182,"检验检测认证与标准服务",5,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (183,"信息技术服务",5,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (184,"高技术专业化服务",5,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (185,"知识产权与成果转化服务",5,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (186,"电子商务与现代物流技术",5,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (187,"城市管理与社会服务",5,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (188,"文化创意产业支撑技术",5,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (189,"研发服务",181,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (190,"设计服务",181,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (191,"检验检测认证技术",182,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (192,"标准化服务技术",182,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (193,"云计算服务技术",183,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (194,"数据服务技术",183,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (195,"其他信息服务技术",183,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (196,"电子商务技术",186,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (197,"物流与供应链管理技术",186,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (198,"智慧城市服务支撑技术",187,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (199,"互联网教育",187,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (200,"健康管理",187,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (201,"现代体育服务支撑技术",187,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (202,"创作、设计与制作技术",188,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (203,"传播与展示技术",188,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (204,"文化遗产发现与再利用技术",188,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (205,"运营与管理技术",188,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (206,"可再生清洁能源",6,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (207,"核能及氢能",6,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (208,"新型高效能量转换与储存技术",6,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (209,"高效节能技术",6,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (210,"太阳能",206,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (211,"风能",206,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (212,"生物质能",206,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (213,"地热能、海洋能及运动能",206,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (214,"核能",207,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (215,"氢能",207,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (216,"高性能绿色电池(组)技术",208,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (217,"新型动力电池(组)与储能电池技术",208,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (218,"燃料电池技术",208,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (219,"超级电容器与热电转换技术",208,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (220,"工业节能技术",209,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (221,"能量回收利用技术",209,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (222,"蓄热式燃烧技术",209,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (223,"输配电系统优化技术",209,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (224,"高温热泵技术",209,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (225,"建筑节能技术",209,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (226,"能源系统管理、优化与控制技术",209,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (227,"节能监测技术",209,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (228,"水污染控制与水资源利用技术",7,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (229,"大气污染控制技术",7,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (230,"固体废弃物处置与综合利用技术",7,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (231,"物理性污染防治技术",7,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (232,"环境监测及环境事故应急处理技术",7,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (233,"生态环境建设与保护技术",7,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (234,"清洁生产技术",7,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (235,"资源勘查、高效开采与综合利用技术",7,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (236,"城镇污水处理与资源化技术",228,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (237,"工业废水处理与资源化技术",228,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (238,"农业水污染控制技术",228,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (239,"流域水污染治理与富营养化综合控制技术",228,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (240,"节水与非常规水资源综合利用技术",228,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (241,"饮用水安全保障技术",228,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (242,"煤燃烧污染防治技术",229,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (243,"机动车排放控制技术",229,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (244,"工业炉窑污染防治技术",229,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (245,"工业有害废气控制技术",229,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (246,"有限空间空气污染防治技术",229,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (247,"危险固体废弃物处置技术",230,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (248,"工业固体废弃物综合利用技术",230,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (249,"生活垃圾处置与资源化技术",230,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (250,"建筑垃圾处置与资源化技术",230,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (251,"有机固体废物处理与资源化技术",230,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (252,"社会源固体废物处置与资源化技术",230,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (253,"噪声、振动污染防治技术",231,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (254,"核与辐射安全防治技术",231,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (255,"环境监测预警技术",232,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (256,"应急环境监测技术",232,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (257,"生态环境监测技术",232,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (258,"非常规污染物监测技术",232,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (259,"重污染行业生产过程中节水、减排及资源化关键技术",234,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (260,"清洁生产关键技术",234,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (261,"环保制造关键技术",234,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (262,"资源勘查开采技术",235,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (263,"提高矿产资源回收利用率的采矿、选矿技术",235,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (264,"伴生有价元素的分选提取技术",235,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (265,"低品位资源和尾矿资源综合利用技术",235,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (266,"放射性资源勘查开发技术",235,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (267,"放射性废物处理处置技术",235,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (268,"绿色矿山建设技术",235,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (269,"工业生产过程控制系统",8,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (270,"安全生产技术",8,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (271,"高性能、智能化仪器仪表",8,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (272,"先进制造工艺与装备",8,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (273,"新型机械",8,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (274,"电力系统与设备",8,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (275,"汽车及轨道车辆相关技术",8,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (276,"高技术船舶与海洋工程装备设计制造技术",8,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (277,"传统文化产业改造技术",8,2);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (278,"现场总线与工业以太网技术",269,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (279,"嵌入式系统技术",269,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (280,"新一代工业控制计算机技术",269,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (281,"制造执行系统(MES)技术",269,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (282,"工业生产过程综合自动化控制系统技术",269,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (283,"矿山安全生产技术",270,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (284,"危险化学品安全生产技术",270,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (285,"其它事故防治及处置技术",270,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (286,"新型传感器",271,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (287,"新型自动化仪器仪表",271,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (288,"科学分析仪器/检测仪器",271,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (289,"精确制造中的测控仪器仪表",271,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (290,"微机电系统技术",271,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (291,"高档数控装备与数控加工技术",272,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (292,"机器人",272,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (293,"智能装备驱动控制技术",272,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (294,"特种加工技术",272,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (295,"大规模集成电路制造相关技术",272,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (296,"增材制造技术",272,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (297,"高端装备再制造技术",272,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (298,"机械基础件及制造技术",273,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (299,"通用机械装备制造技术",273,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (300,"极端制造与专用机械装备制造技术",273,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (301,"纺织及其他行业专用设备制造技术",273,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (302,"发电与储能技术",274,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (303,"输电技术",274,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (304,"配电与用电技术",274,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (305,"变电技术",274,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (306,"系统仿真与自动化技术",274,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (307,"车用发动机及其相关技术",275,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (308,"汽车关键零部件技术",275,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (309,"节能与新能源汽车技术",275,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (310,"机动车及发动机先进设计、制造和测试平台技术",275,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (311,"轨道车辆及关键零部件技术",275,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (312,"高技术船舶设计制造技术",276,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (313,"海洋工程装备设计制造技术",276,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (314,"乐器制造技术",277,3);
-insert into `field_glossory` (`id`,`name`,`pid`,`level`) values (315,"印刷技术",277,3);

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1088 - 231
schema/init.sql


+ 0 - 8
schema/role_init.sql

@@ -1,8 +0,0 @@
-INSERT INTO `role` (`id`, `role_name`, `role_type`) 
-VALUES ('1', '超级管理员', 999999),
-VALUES ('2', '地区管理员', 99999),
-VALUES ('3', '审核员', 9999),
-VALUES ('4', '客户经理', 4),
-VALUES ('5', '营销经理', 5),
-VALUES ('6', '营销员', 6),
-VALUES ('7', '技术经纪人', 7);

+ 38 - 30
src/main/java/com/goafanti/achievement/bo/AchievementImportBo.java

@@ -6,66 +6,77 @@ import java.util.List;
  * 批量导入科技成果
  */
 public class AchievementImportBo {
-	
+
 	/**
 	 * 数据类别
 	 */
-	private Integer	dataCategory;
-	
+	private Integer			dataCategory;
+
 	/**
 	 * 名称
 	 */
-	private String	name;
-	
-	
+	private String			name;
+
 	/**
 	 * 关键词
 	 */
-	private String	keyword;
-		
+	private String			keyword;
+
 	/**
 	 * 类型
 	 */
-	private Integer	category;
-	
+	private Integer			category;
+
 	/**
 	 * 所有人名称
 	 */
-	private String ownerName;
-	
-	
+	private String			ownerName;
+
 	/**
 	 * 所有人类型
 	 * 
 	 */
-	private Integer ownerType;
-	
+	private Integer			ownerType;
+
 	/**
 	 * 所有人证件号
 	 */
-	private String ownerIdNumber;
-	
+	private String			ownerIdNumber;
+
 	/**
 	 * 所有人联系电话
 	 */
-	private String ownerMobile;
-	
+	private String			ownerMobile;
+
 	/**
 	 * 所有人电子邮箱
 	 */
-	private String ownerEmail;
-	
+	private String			ownerEmail;
+
 	/**
 	 * 所有人通讯地址
 	 */
-	private String ownerPostalAddress;
-	
+	private String			ownerPostalAddress;
+
 	/**
 	 * 合作方式
 	 */
-	private Integer cooperationMode;
+	private Integer			cooperationMode;
 	
-	private List<String> keywords;
+	/**
+	 * 成果简介
+	 */
+	private String			introduction;
+
+	private List<String>	keywords;
+
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
 
 	public Integer getDataCategory() {
 		return dataCategory;
@@ -161,9 +172,6 @@ public class AchievementImportBo {
 
 	public void setKeywords(List<String> keywords) {
 		this.keywords = keywords;
-	} 
-	
-	
-	
-	
+	}
+
 }

+ 15 - 20
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -36,11 +36,11 @@ public class AchievementListBo {
 	 * 类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
 	 */
 	private Integer	category;
-	
+
 	/**
 	 * 成果所有人ID
 	 */
-	private String ownerId;
+	private String	ownerId;
 
 	/**
 	 * 成果所有人名称
@@ -52,38 +52,36 @@ public class AchievementListBo {
 	 */
 	private Integer	ownerType;
 
-
-
 	/**
 	 * 发布时间
 	 */
 	private Date	releaseDate;
-	
+
 	/**
 	 * 审核状态
 	 */
-	private Integer auditStatus;
-	
+	private Integer	auditStatus;
+
 	/**
 	 * 技术经纪人
 	 */
-	private String techBrokerId;
-	
+	private String	techBrokerId;
+
 	/**
 	 * 认证所有人名称
 	 */
-	private String username;
-	
+	private String	username;
+
 	/**
 	 * 所属组织ID
 	 */
-	private String orgId;
-	
+	private String	orgId;
+
 	/**
 	 * 所属组织联系方式
 	 */
-	private Integer contacts;
-	
+	private Integer	contacts;
+
 	public String getOrgId() {
 		return orgId;
 	}
@@ -91,7 +89,7 @@ public class AchievementListBo {
 	public void setOrgId(String orgId) {
 		this.orgId = orgId;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getContacts() {
 		return contacts;
@@ -176,7 +174,6 @@ public class AchievementListBo {
 		this.ownerType = ownerType;
 	}
 
-
 	public Date getReleaseDate() {
 		return releaseDate;
 	}
@@ -184,7 +181,7 @@ public class AchievementListBo {
 	public void setReleaseDate(Date releaseDate) {
 		this.releaseDate = releaseDate;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -201,8 +198,6 @@ public class AchievementListBo {
 	public void setTechBrokerId(String techBrokerId) {
 		this.techBrokerId = techBrokerId;
 	}
-	
-	
 
 	public String getOwnerId() {
 		return ownerId;

+ 77 - 11
src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java

@@ -1,5 +1,6 @@
 package com.goafanti.achievement.bo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -9,42 +10,107 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class AchievementPartnerListBo {
-	private String	id;
+	private String		id;
 
 	/**
 	 * 编号
 	 */
-	private Integer	serialNumber;
+	private Integer		serialNumber;
 
 	/**
 	 * 数据类别 (0--成果, 1--技术, 2--项目)
 	 */
-	private Integer	dataCategory;
+	private Integer		dataCategory;
 
 	/**
 	 * 名称
 	 */
-	private String	name;
+	private String		name;
 
 	/**
 	 * 关键词
 	 */
-	private String	keyword;
+	private String		keyword;
 
 	/**
 	 * 类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
 	 */
-	private Integer	category;
+	private Integer		category;
 
 	/**
 	 * 所有人类型(0-个人,1-组织)
 	 */
-	private Integer	ownerType;
+	private Integer		ownerType;
 
 	/**
 	 * 发布时间
 	 */
-	private Date	releaseDate;
+	private Date		releaseDate;
+
+	/**
+	 * 应用领域1
+	 */
+	private Integer		fieldA;
+
+	/**
+	 * 应用领域2
+	 */
+	private Integer		fieldB;
+
+	/**
+	 * 成熟度
+	 */
+	private Integer		maturity;
+
+	/**
+	 * 议价方式
+	 */
+	private Integer		bargainingMode;
+
+	/**
+	 * 标价
+	 */
+	private BigDecimal	transferPrice;
+
+	public Integer getFieldA() {
+		return fieldA;
+	}
+
+	public void setFieldA(Integer fieldA) {
+		this.fieldA = fieldA;
+	}
+
+	public Integer getFieldB() {
+		return fieldB;
+	}
+
+	public void setFieldB(Integer fieldB) {
+		this.fieldB = fieldB;
+	}
+
+	public Integer getMaturity() {
+		return maturity;
+	}
+
+	public void setMaturity(Integer maturity) {
+		this.maturity = maturity;
+	}
+
+	public Integer getBargainingMode() {
+		return bargainingMode;
+	}
+
+	public void setBargainingMode(Integer bargainingMode) {
+		this.bargainingMode = bargainingMode;
+	}
+
+	public BigDecimal getTransferPrice() {
+		return transferPrice;
+	}
+
+	public void setTransferPrice(BigDecimal transferPrice) {
+		this.transferPrice = transferPrice;
+	}
 
 	public String getId() {
 		return id;
@@ -61,7 +127,7 @@ public class AchievementPartnerListBo {
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDataCategory() {
 		return dataCategory;
@@ -86,7 +152,7 @@ public class AchievementPartnerListBo {
 	public void setKeyword(String keyword) {
 		this.keyword = keyword;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getCategory() {
 		return category;
@@ -95,7 +161,7 @@ public class AchievementPartnerListBo {
 	public void setCategory(Integer category) {
 		this.category = category;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getOwnerType() {
 		return ownerType;

+ 2 - 2
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -77,7 +77,7 @@ public class InputAchievement {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		ownerIdNumber;
 
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		ownerMobile;
 
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -90,7 +90,7 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		cooperationMode;
 
-	@Max(value = 2, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		transferMode;
 

+ 1 - 1
src/main/java/com/goafanti/achievement/bo/InputAchievementOrder.java

@@ -29,7 +29,7 @@ public class InputAchievementOrder {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	serviceMoney;
 	
-	@Max(value = 7, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 6, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	status;
 	

+ 2 - 2
src/main/java/com/goafanti/achievement/controller/AchievementApiController.java

@@ -207,7 +207,7 @@ public class AchievementApiController extends CertifyApiController {
 
 		Achievement a = new Achievement();
 		BeanUtils.copyProperties(ia, a);
-		achievementService.updateAchievement(a, keywords);
+		achievementService.updateAchievement(a, keywords, null);
 		return res;
 	}
 
@@ -292,7 +292,7 @@ public class AchievementApiController extends CertifyApiController {
 	@RequestMapping(value = "/delete", method = RequestMethod.POST)
 	private Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (ids == null || ids.length < 1) {
+		if (ids == null || ids.length != 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
 			List<AchievementOrder> list = achievementOrderService.selectAchievementOrderByAchievementId(ids[0]);

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementOrderService.java

@@ -11,7 +11,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 
 public interface AchievementOrderService {
 
-	AchievementOrder selectAchievementOrderByUidAndAchievementId(String userId, String achievementId);
+	List<AchievementOrder> selectAchievementOrderByUidAndAchievementId(String userId, String achievementId);
 
 	void saveAchievementOrder(AchievementOrder order, AchievementOrderLog aol);
 

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -24,7 +24,7 @@ public interface AchievementService {
 
 	void saveAchievement(Achievement a, String[] keywords);
 
-	int updateAchievement(Achievement a, String[] keywords);
+	int updateAchievement(Achievement a, String[] keywords, Integer switchSign);
 
 	Achievement selectByPrimaryKey(String id);
 

+ 1 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementOrderServiceImpl.java

@@ -37,7 +37,7 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 	private AchievementOrderLogMapper	achievementOrderLogMapper;
 
 	@Override
-	public AchievementOrder selectAchievementOrderByUidAndAchievementId(String uid, String achievementId) {
+	public List<AchievementOrder> selectAchievementOrderByUidAndAchievementId(String uid, String achievementId) {
 		return achievementOrderMapper.selectAchievementOrderByUidAndAchievementId(uid, achievementId);
 	}
 

+ 82 - 10
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -22,14 +22,18 @@ import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.AchievementDemandCountMapper;
 import com.goafanti.common.dao.AchievementDemandMapper;
 import com.goafanti.common.dao.AchievementKeywordMapper;
 import com.goafanti.common.dao.AchievementMapper;
 import com.goafanti.common.dao.DemandKeywordMapper;
 import com.goafanti.common.dao.NoticeMapper;
+import com.goafanti.common.dao.OrganizationIdentityMapper;
+import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.enums.AchievementAuditStatus;
 import com.goafanti.common.enums.AchievementReleaseStatus;
+import com.goafanti.common.enums.AchievementSwitchSign;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.DemandAuditStatus;
 import com.goafanti.common.enums.DemandReleaseStatus;
@@ -38,9 +42,12 @@ import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.AchievementDemand;
+import com.goafanti.common.model.AchievementDemandCount;
 import com.goafanti.common.model.AchievementKeyword;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Notice;
+import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -55,17 +62,23 @@ import com.goafanti.portal.bo.AchievementSearchListBo;
 public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> implements AchievementService {
 
 	@Autowired
-	private AchievementMapper			achievementMapper;
+	private AchievementMapper				achievementMapper;
 	@Autowired
-	private UserRoleMapper				userRoleMapper;
+	private UserRoleMapper					userRoleMapper;
 	@Autowired
-	private NoticeMapper				noticeMapper;
+	private NoticeMapper					noticeMapper;
 	@Autowired
-	private AchievementKeywordMapper	achievementKeywordMapper;
+	private AchievementKeywordMapper		achievementKeywordMapper;
 	@Autowired
-	private AchievementDemandMapper		achievementDemandMapper;
+	private AchievementDemandMapper			achievementDemandMapper;
 	@Autowired
-	private DemandKeywordMapper			demandKeywordMapper;
+	private DemandKeywordMapper				demandKeywordMapper;
+	@Autowired
+	private AchievementDemandCountMapper	achievementDemandCountMapper;
+	@Autowired
+	private UserIdentityMapper				userIdentityMapper;
+	@Autowired
+	private OrganizationIdentityMapper		organizationIdentityMapper;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -111,7 +124,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		now.set(Calendar.MILLISECOND, 0);
 
 		if (TokenManager.getToken() instanceof Admin) {
-			a.setSalesmanId(TokenManager.getAdminId());
+			a.setTechBrokerId(TokenManager.getAdminId());
 		}
 		a.setReleaseStatus(AchievementReleaseStatus.UNRELEASE.getCode());
 
@@ -128,13 +141,17 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	}
 
 	@Override
-	public int updateAchievement(Achievement a, String[] keywords) {
+	public int updateAchievement(Achievement a, String[] keywords, Integer switchSign) {
 		if (AchievementAuditStatus.SUBMIT.getCode().equals(a.getAuditStatus())) {
 			a.setAuditStatus(DemandAuditStatus.INAUDIT.getCode());
 			createAuditorNotice(a);
 		}
 		disposeAchievementKeyword(keywords, a, true);
-		return achievementMapper.updateByPrimaryKeySelective(a);
+		achievementMapper.updateByPrimaryKeySelective(a);
+		if (null != switchSign && AchievementSwitchSign.CLOSE.getCode().equals(switchSign)) {
+			achievementMapper.updateOwnerId(a.getId());
+		}
+		return 1;
 	}
 
 	@Override
@@ -146,6 +163,20 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public int deleteByPrimaryKey(List<String> id) {
 		achievementKeywordMapper.batchDeleteByAchievementIds(id);
 		achievementDemandMapper.batchDeleteByAchievementIds(id);
+		for (String s : id) {
+			Achievement a = achievementMapper.selectByPrimaryKey(s);
+			if (null != a && AchievementAuditStatus.AUDITED.getCode().equals(a.getAuditStatus())
+					&& StringUtils.isNotBlank(a.getOwnerId())) {
+				AchievementDemandCount adc = achievementDemandCountMapper.selectByUid(a.getOwnerId());
+				if (null != adc) {
+					adc.setAchievementCount(adc.getAchievementCount() - 1);
+					if (adc.getAchievementCount() < 0) {
+						adc.setAchievementCount(0);
+					}
+					achievementDemandCountMapper.updateByPrimaryKeySelective(adc);
+				}
+			}
+		}
 		return achievementMapper.batchDeleteByPrimaryKey(id);
 	}
 
@@ -184,7 +215,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 		if (!StringUtils.isBlank(releaseDateEndDate)) {
 			try {
-				rEnd = DateUtils.addDays(DateUtils.parseDate(releaseDateEndDate, AFTConstants.YYYYMMDD),1);
+				rEnd = DateUtils.addDays(DateUtils.parseDate(releaseDateEndDate, AFTConstants.YYYYMMDD), 1);
 			} catch (ParseException e) {
 			}
 		}
@@ -229,6 +260,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			params.put("releaseStatus", releaseStatus);
 		}
 
+		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
+			params.put("techBrokerId", TokenManager.getAdminId());
+		}
+
 		return params;
 	}
 
@@ -241,6 +276,32 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			a.setReleaseDate(now.getTime());
 			a.setReleaseStatus(DemandReleaseStatus.RELEASED.getCode());
 			a.setTechBrokerId(techBroderId);
+			String ownerId = a.getOwnerId();
+			if (StringUtils.isNotBlank(ownerId)) {
+				if (UserType.PERSONAL.getCode().equals(a.getOwnerType())) {
+					UserIdentity ui = userIdentityMapper.selectUserIdentityByUserId(ownerId);
+					if (null != ui) {
+						a.setOwnerName(ui.getUsername());
+					}
+				} else if (UserType.ORGANIZATION.getCode().equals(a.getOwnerType())) {
+					OrganizationIdentity oi = organizationIdentityMapper.selectOrgIdentityByUserId(ownerId);
+					if (null != oi) {
+						a.setOwnerName(oi.getUnitName());
+					}
+				}
+				AchievementDemandCount adc = achievementDemandCountMapper.selectByUid(ownerId);
+				if (null == adc) {
+					AchievementDemandCount achievementDemandCount = new AchievementDemandCount();
+					achievementDemandCount.setId(UUID.randomUUID().toString());
+					achievementDemandCount.setUid(ownerId);
+					achievementDemandCount.setAchievementCount(AFTConstants.ACHIEVEMENT_DEMAND_FIRST_COUNT);
+					achievementDemandCount.setDemandCount(AFTConstants.ACHIEVEMENT_DEMAND_INIT_COUNT);
+					achievementDemandCountMapper.insert(achievementDemandCount);
+				} else {
+					adc.setAchievementCount(adc.getAchievementCount() + 1);
+					achievementDemandCountMapper.updateByPrimaryKeySelective(adc);
+				}
+			}
 		} else {
 			a.setReleaseStatus(DemandReleaseStatus.UNRELEASE.getCode());
 		}
@@ -253,7 +314,18 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		a.setAuditStatus(AchievementAuditStatus.CREATE.getCode());
 		a.setReleaseStatus(AchievementReleaseStatus.UNRELEASE.getCode());
 		achievementDemandMapper.deleteByAchievementId(a.getId());
+		achievementKeywordMapper.batchDeleteByAchievementId(a.getId());
 		achievementMapper.updateByPrimaryKeySelective(a);
+		if (StringUtils.isNotBlank(a.getOwnerId())) {
+			AchievementDemandCount adc = achievementDemandCountMapper.selectByUid(a.getOwnerId());
+			if (null != adc) {
+				adc.setAchievementCount(adc.getAchievementCount() - 1);
+				if (adc.getAchievementCount() < 0) {
+					adc.setAchievementCount(0);
+				}
+				achievementDemandCountMapper.updateByPrimaryKeySelective(adc);
+			}
+		}
 		return achievementMapper.updateReleaseDate(a.getId());
 	}
 

+ 2 - 2
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -48,12 +48,12 @@ public class AdminListBo {
 	 * 上级管理用户名称
 	 */
 	private String	superior;
-	
+
 	/**
 	 * 上级管理用户ID
 	 */
 	private String	superiorId;
-	
+
 	public String getSuperiorId() {
 		return superiorId;
 	}

+ 3 - 7
src/main/java/com/goafanti/admin/bo/AdminLocationBo.java

@@ -1,9 +1,9 @@
 package com.goafanti.admin.bo;
 
 public class AdminLocationBo {
-	private Integer province;
-	
-	private String city;
+	private Integer	province;
+
+	private String	city;
 
 	public Integer getProvince() {
 		return province;
@@ -21,8 +21,4 @@ public class AdminLocationBo {
 		this.city = city;
 	}
 
-
-	
-	
-
 }

+ 3 - 5
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -22,10 +22,10 @@ public class InputAdmin {
 
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	position;
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String superiorId;
-	
+	private String	superiorId;
+
 	public String getId() {
 		return id;
 	}
@@ -66,7 +66,6 @@ public class InputAdmin {
 		this.email = email;
 	}
 
-
 	public String getPosition() {
 		return position;
 	}
@@ -83,5 +82,4 @@ public class InputAdmin {
 		this.superiorId = superiorId;
 	}
 
-	
 }

+ 5 - 9
src/main/java/com/goafanti/admin/bo/NoticeBo.java

@@ -2,12 +2,11 @@ package com.goafanti.admin.bo;
 
 import com.goafanti.common.model.Notice;
 
-public class NoticeBo extends Notice{
-	
-	private String unitName;
-	
-	private String principle;
-	
+public class NoticeBo extends Notice {
+
+	private String	unitName;
+
+	private String	principle;
 
 	public String getUnitName() {
 		return unitName;
@@ -24,8 +23,5 @@ public class NoticeBo extends Notice{
 	public void setPrinciple(String principle) {
 		this.principle = principle;
 	}
-	
-	
-	
 
 }

+ 59 - 22
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -23,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
 import com.alibaba.fastjson.JSON;
 import com.goafanti.achievement.bo.AchievementImportBo;
 import com.goafanti.achievement.bo.InputAchievement;
+import com.goafanti.achievement.service.AchievementOrderService;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.admin.service.AftFileService;
 import com.goafanti.common.bo.Result;
@@ -32,10 +33,13 @@ import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AchievementAuditStatus;
 import com.goafanti.common.enums.AchievementFields;
 import com.goafanti.common.enums.AchievementImportFields;
+import com.goafanti.common.enums.AchievementOrderStatus;
 import com.goafanti.common.enums.AchievementReleaseStatus;
+import com.goafanti.common.enums.AchievementSwitchSign;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.model.Achievement;
+import com.goafanti.common.model.AchievementOrder;
 import com.goafanti.common.model.AftFile;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
@@ -46,12 +50,14 @@ import com.goafanti.user.service.UserService;
 @RequestMapping(value = "/api/admin/achievement")
 public class AdminAchievementApiController extends CertifyApiController {
 	@Resource
-	private AchievementService	achievementService;
+	private AchievementService		achievementService;
 	@Resource
-	private UserService			userService;
+	private UserService				userService;
 	@Resource
-	private AftFileService		aftFileService;
-	
+	private AftFileService			aftFileService;
+	@Resource
+	private AchievementOrderService	achievementOrderService;
+
 	/**
 	 * 个人成果列表
 	 */
@@ -94,7 +100,7 @@ public class AdminAchievementApiController extends CertifyApiController {
 				category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 个人成果所有人列表
 	 */
@@ -120,7 +126,7 @@ public class AdminAchievementApiController extends CertifyApiController {
 		res.setData(userService.selectAchievementOrgOwner(name));
 		return res;
 	}
-	
+
 	/**
 	 * 个人成果详情详情
 	 */
@@ -149,7 +155,6 @@ public class AdminAchievementApiController extends CertifyApiController {
 		return res;
 	}
 
-	
 	/**
 	 * 新增成果
 	 */
@@ -164,6 +169,11 @@ public class AdminAchievementApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (StringUtils.isBlank(ia.getOwnerId()) && StringUtils.isBlank(ia.getOwnerName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果所有人", "成果所有人"));
+			return res;
+		}
+
 		res = disposeInputAchievement(res, ia, keywords);
 		if (!res.getError().isEmpty()) {
 			return res;
@@ -179,7 +189,7 @@ public class AdminAchievementApiController extends CertifyApiController {
 	 * 修改成果
 	 */
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
-	public Result update(@Valid InputAchievement ia, BindingResult bindingResult,
+	public Result update(@Valid InputAchievement ia, BindingResult bindingResult, Integer switchSign,
 			@RequestParam(name = "keywords[]", required = false) String[] keywords) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
@@ -188,11 +198,27 @@ public class AdminAchievementApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (null == switchSign) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到开关标记", "开关标记"));
+			return res;
+		}
+
+		if (!AchievementSwitchSign.CLOSE.getCode().equals(switchSign)
+				&& !AchievementSwitchSign.OPEN.getCode().equals(switchSign)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "开关标记"));
+			return res;
+		}
+
 		if (StringUtils.isBlank(ia.getId())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
 			return res;
 		}
 
+		if (StringUtils.isBlank(ia.getOwnerId()) && StringUtils.isBlank(ia.getOwnerName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果所有人", "成果所有人"));
+			return res;
+		}
+
 		if (!AchievementAuditStatus.CREATE.getCode().equals(ia.getAuditStatus())
 				&& !AchievementAuditStatus.SUBMIT.getCode().equals(ia.getAuditStatus())
 				&& !AchievementAuditStatus.UNAUDITED.getCode().equals(ia.getAuditStatus())) {
@@ -207,25 +233,25 @@ public class AdminAchievementApiController extends CertifyApiController {
 
 		Achievement a = new Achievement();
 		BeanUtils.copyProperties(ia, a);
-		achievementService.updateAchievement(a, keywords);
+		achievementService.updateAchievement(a, keywords, switchSign);
 		return res;
 	}
-	
+
 	/**
 	 * 科技成果匹配科技需求
 	 */
 	@RequestMapping(value = "/matchDemand", method = RequestMethod.POST)
-	public Result matchDemand(String id){
+	public Result matchDemand(String id) {
 		Result res = new Result();
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
 			return res;
 		}
-		
+
 		Achievement a = achievementService.selectByPrimaryKey(id);
 		if (null == a || !AchievementAuditStatus.AUDITED.getCode().equals(a.getAuditStatus())
 				|| !DeleteStatus.UNDELETE.getCode().equals(a.getDeletedSign())
-				|| !AchievementReleaseStatus.RELEASED.getCode().equals(a.getReleaseStatus())){
+				|| !AchievementReleaseStatus.RELEASED.getCode().equals(a.getReleaseStatus())) {
 			res.getError().add(buildError("", "当前状态无法匹配!"));
 			return res;
 		}
@@ -238,14 +264,14 @@ public class AdminAchievementApiController extends CertifyApiController {
 	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/importAchievement", method = RequestMethod.POST)
-	public Result importAchievement(@RequestParam(name = "data", required = false)String d) {
+	public Result importAchievement(@RequestParam(name = "data", required = false) String d) {
 		Result res = new Result();
 		List<AchievementImportBo> data = JSON.parseArray(d, AchievementImportBo.class);
 		if (data == null || data.isEmpty()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "导入数据"));
 			return res;
 		}
-		
+
 		if (data.size() > AFTConstants.IMPORTMAXLENTH) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "导入数据量"));
 			return res;
@@ -337,8 +363,6 @@ public class AdminAchievementApiController extends CertifyApiController {
 		return res;
 	}
 
-	
-
 	/**
 	 * 成果撤消发布(下架)
 	 */
@@ -436,15 +460,21 @@ public class AdminAchievementApiController extends CertifyApiController {
 	@RequestMapping(value = "/delete", method = RequestMethod.POST)
 	private Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (ids == null || ids.length < 1) {
+		if (ids == null || ids.length != 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
+			List<AchievementOrder> list = achievementOrderService.selectAchievementOrderByAchievementId(ids[0]);
+			for (AchievementOrder order : list) {
+				if (!AchievementOrderStatus.CREATE.getCode().equals(order.getStatus())) {
+					res.getError().add(buildError("", "当前科技成果有订单,无法删除!"));
+					return res;
+				}
+			}
 			res.setData(achievementService.deleteByPrimaryKey(Arrays.asList(ids)));
 		}
 		return res;
 	}
 
-	
 	private Result disposeInputAchievement(Result res, InputAchievement ia, String[] keywords) {
 		if (StringUtils.isBlank(ia.getName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果名称", "成果名称"));
@@ -505,13 +535,13 @@ public class AdminAchievementApiController extends CertifyApiController {
 
 	private Result disposeImportAchievement(Result res, List<AchievementImportBo> data) {
 		Field[] field = AchievementImportBo.class.getDeclaredFields();
-		for (AchievementImportBo bo: data) {
+		for (AchievementImportBo bo : data) {
 			for (Field f : field) {
 				f.setAccessible(true);
 				try {
 					if (!f.getName().equals("keywords") && (f.get(bo) == null || "".equals(f.get(bo)))) {
-						res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", AchievementImportFields
-								.getFieldDesc(f.getName())));
+						res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "",
+								AchievementImportFields.getFieldDesc(f.getName())));
 						return res;
 					}
 				} catch (IllegalArgumentException | IllegalAccessException e) {
@@ -578,6 +608,12 @@ public class AdminAchievementApiController extends CertifyApiController {
 				return res;
 			}
 
+			if (bo.getIntroduction().length() > 298) {
+				res.getError().add(buildError(ErrorConstants.PARAM_SIZE_ERROR, "",
+						AchievementImportFields.INTRODUCTION.getDesc()));
+				return res;
+			}
+
 			if (bo.getKeyword().length() > 44) {
 				res.getError().add(
 						buildError(ErrorConstants.PARAM_SIZE_ERROR, "", AchievementImportFields.KEYWORD.getDesc()));
@@ -602,5 +638,6 @@ public class AdminAchievementApiController extends CertifyApiController {
 		res.setData(data);
 		return res;
 	}
+	
 
 }

+ 131 - 26
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -93,6 +93,7 @@ import com.goafanti.common.enums.UserAbilityFields;
 import com.goafanti.common.enums.UserFields;
 import com.goafanti.common.enums.UserIdentityFields;
 import com.goafanti.common.enums.UserLevel;
+import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrgActivity;
 import com.goafanti.common.model.OrgActivityCost;
@@ -399,6 +400,17 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (UserType.ORGANIZATION.getCode().equals(inputUser.getType())
+				&& StringUtils.isBlank(inputUser.getUnitName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "公司名称", "公司名称"));
+			return res;
+		}
+
+		if (UserType.PERSONAL.getCode().equals(inputUser.getType()) && StringUtils.isBlank(inputUser.getUsername())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名称", "用户名称"));
+			return res;
+		}
+
 		User u = new User();
 		u.setId(UUID.randomUUID().toString());
 		u.setMobile(inputUser.getMobile().trim());
@@ -410,7 +422,7 @@ public class AdminApiController extends CertifyApiController {
 		u.setPassword(passwordUtil.getEncryptPwd(u));
 		u.setLvl(UserLevel.GENERAL.getCode());
 		u.setAid(TokenManager.getAdminId());
-		userService.insertRegister(u, "", inputUser.getUnitName());
+		userService.insertRegister(u, "", inputUser.getUnitName(), inputUser.getUsername());
 		return res;
 	}
 
@@ -445,7 +457,7 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
-		res.setData(userIdentityService.selectUserIdentityByUserId(uid));
+		res.setData(userIdentityService.selectUserIdentityByUserIdAdmin(uid));
 		return res;
 	}
 
@@ -464,7 +476,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 
 		if (StringUtils.isBlank(userIdentity.getId())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户认证ID", "找不到用户认证ID"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到认证ID", "认证ID"));
 			return res;
 		}
 
@@ -477,11 +489,17 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到保存提交方式", "保存提交方式"));
 			return res;
 		}
-		
+
+		UserIdentity idd = userIdentityService.selectUserIdentityByUserId(userIdentity.getUid());
+		if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())) {
+			res.getError().add(buildError("", "审核中,无法保存或提交!"));
+			return res;
+		}
+
 		Integer level = userIdentity.getLevel();
 		if (!UserLevel.GENERAL.getCode().equals(level)) {
 			User u = userService.selectByPrimaryKey(userIdentity.getUid());
-			if (UserLevel.GENERAL.getCode().equals(u.getLvl())){
+			if (UserLevel.GENERAL.getCode().equals(u.getLvl())) {
 				res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
 				return res;
 			}
@@ -504,6 +522,11 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(userIdentity, ui);
 
 		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
+			User u = userService.selectByPrimaryKey(userIdentity.getUid());
+			if (!UserLevel.GENERAL.getCode().equals(u.getLvl())) {
+				res.getError().add(buildError("", "已通过实名认证,无法操作!"));
+				return res;
+			}
 			ui.setProcess(IdentityProcess.COMMITTED.getCode());
 			ui.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
 		}
@@ -541,7 +564,7 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
-		res.setData(organizationIdentityService.selectOrgIdentityDetailByUserId(uid));
+		res.setData(organizationIdentityService.selectOrgIdentityDetailByUserIdAdmin(uid));
 		return res;
 	}
 
@@ -575,10 +598,15 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
+		OrganizationIdentity idd = organizationIdentityService.selectOrgIdentityByUserId(orgIdentity.getUid());
+		if (IdentityAuditStatus.COMMITTED.getCode().equals(idd.getAuditStatus())) {
+			res.getError().add(buildError("", "审核中,无法保存或提交!"));
+			return res;
+		}
 		Integer level = orgIdentity.getLevel();
 		if (!UserLevel.GENERAL.getCode().equals(level)) {
 			User u = userService.selectByPrimaryKey(orgIdentity.getUid());
-			if (UserLevel.GENERAL.getCode().equals(u.getLvl())){
+			if (UserLevel.GENERAL.getCode().equals(u.getLvl())) {
 				res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
 				return res;
 			}
@@ -593,7 +621,15 @@ public class AdminApiController extends CertifyApiController {
 
 		OrganizationIdentity oi = new OrganizationIdentity();
 		BeanUtils.copyProperties(orgIdentity, oi);
-
+		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
+			User u = userService.selectByPrimaryKey(oi.getUid());
+			if (!UserLevel.GENERAL.getCode().equals(u.getLvl())) {
+				res.getError().add(buildError("", "已通过实名认证,无法操作!"));
+				return res;
+			}
+			oi.setProcess(IdentityProcess.COMMITTED.getCode());
+			oi.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
+		}
 		res.setData(organizationIdentityService.updateOrgDetail(oi, saveSign, level));
 		return res;
 	}
@@ -752,6 +788,22 @@ public class AdminApiController extends CertifyApiController {
 	}
 
 	/**
+	 * 删除团体人力资源
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteHumanResource", method = RequestMethod.POST)
+	public Result deleteHumanResource(@RequestParam(name = "ids[]", required = false) String[] ids) {
+		Result res = new Result();
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+		} else {
+			orgHumanResourceService.batchDeleteByPrimaryKey(Arrays.asList(ids));
+		}
+		return res;
+	}
+
+	/**
 	 * 企业参与国家标准或行业标准制定情况明细列表
 	 */
 	@RequestMapping(value = "/standard", method = RequestMethod.POST)
@@ -930,11 +982,11 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权ID"));
 			return res;
 		}
-		if (IntellectualPropertyType.PATENT.getCode() == type) {
+		if (IntellectualPropertyType.PATENT.getCode().equals(type)) {
 			res.setData(orgIntellectualPropertyService.selectPatentTypeDetail(id));
-		} else if (IntellectualPropertyType.COPYRIGHT.getCode() == type) {
+		} else if (IntellectualPropertyType.COPYRIGHT.getCode().equals(type)) {
 			res.setData(orgIntellectualPropertyService.selectCopyrightTypeDetail(id));
-		} else if (IntellectualPropertyType.COMMON.getCode() == type) {
+		} else if (IntellectualPropertyType.COMMON.getCode().equals(type)) {
 			OrgIntellectualPropertyDetailBo oipdb = new OrgIntellectualPropertyDetailBo();
 			BeanUtils.copyProperties(oip, oipdb);
 			res.setData(oipdb);
@@ -965,6 +1017,10 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, orgIntellectualProperty.getUid()).getError().isEmpty()) {
 			return res;
 		}
+
+		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(
+				orgIntellectualProperty.getUid(), orgIntellectualProperty.getIntellectualPropertyNumber());
+
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
 				orgIntellectualProperty.setAuthorizationDate(
@@ -976,12 +1032,20 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgIntellectualProperty, oip);
 
 		if (StringUtils.isBlank(oip.getId())) {
+			if (null != p) {
+				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
+				return res;
+			}
 			oip.setId(UUID.randomUUID().toString());
 			oip.setEvaluationCategory((oip.getCatagory() >= 2 && oip.getCatagory() <= 4) ? 1 : 0);
 			oip.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			oip.setType(IntellectualPropertyType.COMMON.getCode());
 			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
+			if (null != p && !p.getId().equals(oip.getId())) {
+				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
+				return res;
+			}
 			oip.setEvaluationCategory(orgIntellectualProperty.getCatagory() <= 2 ? 1 : 0);
 			res.setData(orgIntellectualPropertyService.updateByPrimaryKeySelective(oip));
 		}
@@ -1154,6 +1218,12 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgTechProduct, otp);
 
 		if (StringUtils.isBlank(otp.getId())) {
+			OrgTechProduct product = orgTechProductService.findBySerialNumberAndUid(otp.getSerialNumber(),
+					otp.getUid());
+			if (null != product) {
+				res.getError().add(buildError("", "产品编号重复,无法保存!"));
+				return res;
+			}
 			otp.setId(UUID.randomUUID().toString());
 			otp.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			Calendar now = Calendar.getInstance();
@@ -1294,6 +1364,16 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (StringUtils.isBlank(startDateFormattedDate)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "开始时间"));
+			return res;
+		}
+
+		if (StringUtils.isBlank(endDateFormattedDate)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "结束时间"));
+			return res;
+		}
+
 		if (!StringUtils.isBlank(startDateFormattedDate)) {
 			try {
 				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));
@@ -1457,21 +1537,17 @@ public class AdminApiController extends CertifyApiController {
 		OrgActivityCost oac = new OrgActivityCost();
 		BeanUtils.copyProperties(orgActivityCost, oac);
 
-		if (null != orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear())) {
-			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
-			return res;
-		}
-
+		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear());
+		OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
 		if (StringUtils.isBlank(oac.getId())) {
-			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
+			if (null != ccc) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
+				return res;
+			}
+
 			if (null != ac) {
-				Calendar c = Calendar.getInstance();
-				c.setTime(ac.getStartDate());
-				Integer s = c.get(Calendar.YEAR);
-				c.setTime(ac.getEndDate());
-				Integer e = c.get(Calendar.YEAR);
-				if (oac.getYear() < s || oac.getYear() > e) {
-					res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
+				res = disposeActivityYear(res, ac, oac);
+				if (!res.getError().isEmpty()) {
 					return res;
 				}
 
@@ -1485,6 +1561,14 @@ public class AdminApiController extends CertifyApiController {
 				return res;
 			}
 		} else {
+			if (null != ccc && !ccc.getId().equals(oac.getId())) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
+				return res;
+			}
+			res = disposeActivityYear(res, ac, oac);
+			if (!res.getError().isEmpty()) {
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;
@@ -2197,6 +2281,7 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+
 		if (!checkCertify(res, orgTechCenter.getUid()).getError().isEmpty()) {
 			return res;
 		}
@@ -2649,6 +2734,12 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, cog.getUid()).getError().isEmpty()) {
 			return res;
 		}
+
+		if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.ISSUING
+				&& StringUtils.isBlank(cog.getCertificateNumber())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "证书编号"));
+			return res;
+		}
 		Date recordTime = null;
 		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
 			try {
@@ -2836,7 +2927,8 @@ public class AdminApiController extends CertifyApiController {
 	 * 高企培育列表
 	 */
 	@RequestMapping(value = "/cultivate", method = RequestMethod.POST)
-	public Result cultivationList(String uid, Integer province, String unitName, String pageNo, String pageSize) {
+	public Result cultivationList(String uid, Integer locationProvince, String unitName, String pageNo,
+			String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -2846,7 +2938,7 @@ public class AdminApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgCognizanceService.listCultivation(uid, province, unitName, pNo, pSize));
+		res.setData(orgCognizanceService.listCultivation(uid, locationProvince, unitName, pNo, pSize));
 		return res;
 	}
 
@@ -3013,4 +3105,17 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return ocp;
 	}
+
+	private Result disposeActivityYear(Result res, OrgActivity ac, OrgActivityCost oac) {
+		Calendar c = Calendar.getInstance();
+		c.setTime(ac.getStartDate());
+		Integer s = c.get(Calendar.YEAR);
+		c.setTime(ac.getEndDate());
+		Integer e = c.get(Calendar.YEAR);
+		if (oac.getYear() < s || oac.getYear() > e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
+			return res;
+		}
+		return res;
+	}
 }

+ 42 - 17
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

@@ -57,12 +57,12 @@ public class AdminContractApiController extends CertifyApiController {
 	private CopyrightInfoService	copyrightInfoService;
 	@Resource
 	private TechProjectService		techProjectService;
-	
+
 	/**
 	 * 批量删除合同
 	 */
 	@RequestMapping(value = "/delete", method = RequestMethod.POST)
-	public Result delete(@RequestParam(name = "ids[]", required = false) String[] ids){
+	public Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
@@ -71,12 +71,12 @@ public class AdminContractApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 合同编号下拉
 	 */
-	@RequestMapping(value= "/serialNumber", method = RequestMethod.GET)
-	public Result contractSerialNumber(){
+	@RequestMapping(value = "/serialNumber", method = RequestMethod.GET)
+	public Result contractSerialNumber() {
 		Result res = new Result();
 		res.setData(contractService.selectContractSerialNumber());
 		return res;
@@ -271,8 +271,9 @@ public class AdminContractApiController extends CertifyApiController {
 	 * 合同列表
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Result listContract(String contractId, Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
-			String endDateFormattedDate, Integer province, String unitName, String uid, String pageNo, String pageSize) {
+	public Result listContract(String contractId, Integer serialNumber, Integer type, Integer status,
+			String startDateFormattedDate, String endDateFormattedDate, Integer province, String unitName, String uid,
+			String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -319,7 +320,12 @@ public class AdminContractApiController extends CertifyApiController {
 		if (StringUtils.isBlank(contract.getId())) {
 			res.setData(contractService.saveManageContract(c));
 		} else {
-			res.setData(contractService.updateByPrimaryKeySelective(c));
+			Contract ct = contractService.selectByPrimaryKey(c.getId());
+			if (null != ct && !ContractStatus.COMPLETE.getCode().equals(ct.getStatus())) {
+				res.setData(contractService.updateByPrimaryKeySelective(c));
+			} else {
+				res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
+			}
 		}
 		return res;
 	}
@@ -331,7 +337,7 @@ public class AdminContractApiController extends CertifyApiController {
 	public Result submitContract(@Valid InputContract ic, BindingResult bindingResult, String signDateFormattedDate,
 			@RequestParam(name = "principals[]", required = false) String[] principals) {
 		Result res = new Result();
-		if (principals.length < 1 || null == principals) {
+		if (null == principals || principals.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转分发用户", "流转分发用户"));
 			return res;
 		}
@@ -362,7 +368,12 @@ public class AdminContractApiController extends CertifyApiController {
 		if (StringUtils.isBlank(ic.getId())) {
 			contractService.insertManageSubmit(c, principals, signDateFormattedDate);
 		} else {
-			contractService.updateSubmit(c, principals, signDateFormattedDate);
+			Contract ct = contractService.selectByPrimaryKey(c.getId());
+			if (null != ct && !ContractStatus.COMPLETE.getCode().equals(ct.getStatus())) {
+				contractService.updateSubmit(c, principals, signDateFormattedDate);
+			} else {
+				res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
+			}
 		}
 		return res;
 	}
@@ -438,7 +449,12 @@ public class AdminContractApiController extends CertifyApiController {
 			return res;
 		}
 
-		contractLogService.insertCirculation(icl, principals, recordTimeFormattedDate);
+		Contract ct = contractService.selectByPrimaryKey(icl.getCid());
+		if (null != ct && !ContractStatus.COMPLETE.getCode().equals(ct.getStatus())) {
+			contractLogService.insertCirculation(icl, principals, recordTimeFormattedDate);
+		} else {
+			res.getError().add(buildError("", "当前合同已完成(结款),无法操作!"));
+		}
 		return res;
 	}
 
@@ -449,6 +465,10 @@ public class AdminContractApiController extends CertifyApiController {
 					.add(buildError(ErrorConstants.STATUS_ERROR, "高企认定申请中或认定未到期!无法提交新申请!", "高企认定申请中或认定未到期!无法提交新申请!"));
 			return res;
 		}
+		Contract c = contractService.findByUidAndYear(uid, year);
+		if (null != c) {
+			res.getError().add(buildError("", "当前年份已有合同申请,无法提交新申请!"));
+		}
 		return res;
 	}
 
@@ -457,15 +477,20 @@ public class AdminContractApiController extends CertifyApiController {
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			for (ContractStatus p : ContractStatus.values()) {
 				status.put(p.getCode().toString(), p.getDesc());
+				status.remove(ContractStatus.CREATE.getCode().toString());
 				status.remove(ContractStatus.OTHER.getCode().toString());
 			}
 		} else {
-			if (TokenManager.hasPermission("ContractStatus" + ContractStatus.CREATE.getCode())) {
-				status.put(ContractStatus.CREATE.getCode().toString(), ContractStatus.CREATE.getDesc());
-			}
-			if (TokenManager.hasPermission("ContractStatus" + ContractStatus.SIGN.getCode())) {
-				status.put(ContractStatus.SIGN.getCode().toString(), ContractStatus.SIGN.getDesc());
-			}
+			/*
+			 * if (TokenManager.hasPermission("ContractStatus" +
+			 * ContractStatus.CREATE.getCode())) {
+			 * status.put(ContractStatus.CREATE.getCode().toString(),
+			 * ContractStatus.CREATE.getDesc()); } if
+			 * (TokenManager.hasPermission("ContractStatus" +
+			 * ContractStatus.SIGN.getCode())) {
+			 * status.put(ContractStatus.SIGN.getCode().toString(),
+			 * ContractStatus.SIGN.getDesc()); }
+			 */
 			if (TokenManager.hasPermission("ContractStatus" + ContractStatus.CIRCULATION.getCode())) {
 				status.put(ContractStatus.CIRCULATION.getCode().toString(), ContractStatus.CIRCULATION.getDesc());
 			}

+ 39 - 14
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -33,14 +33,18 @@ import com.goafanti.common.enums.DemandAuditStatus;
 import com.goafanti.common.enums.DemandDataCategory;
 import com.goafanti.common.enums.DemandFields;
 import com.goafanti.common.enums.DemandImportFields;
+import com.goafanti.common.enums.DemandOrderStatus;
 import com.goafanti.common.enums.DemandReleaseStatus;
+import com.goafanti.common.enums.DemandSwitchSign;
 import com.goafanti.common.model.AftFile;
 import com.goafanti.common.model.Demand;
+import com.goafanti.common.model.DemandOrder;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.DemandImportBo;
 import com.goafanti.demand.bo.InputDemand;
+import com.goafanti.demand.service.DemandOrderService;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.user.service.UserService;
 
@@ -48,17 +52,19 @@ import com.goafanti.user.service.UserService;
 @RequestMapping(value = "/api/admin/demand")
 public class AdminDemandApiController extends CertifyApiController {
 	@Resource
-	private DemandService	demandService;
+	private DemandService		demandService;
 	@Resource
-	private UserService		userService;
+	private UserService			userService;
 	@Resource
-	private AftFileService	aftFileService;
+	private AftFileService		aftFileService;
+	@Resource
+	private DemandOrderService	demandOrderService;
 
 	/**
 	 * 科技需求匹配科技成果
 	 */
-	@RequestMapping(value="/matchAchievement", method = RequestMethod.POST)
-	public Result matchAchievement(String id){
+	@RequestMapping(value = "/matchAchievement", method = RequestMethod.POST)
+	public Result matchAchievement(String id) {
 		Result res = new Result();
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "成果ID"));
@@ -66,8 +72,8 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		Demand d = demandService.selectByPrimaryKey(id);
 		if (null == d || !DemandReleaseStatus.RELEASED.getCode().equals(d.getReleaseStatus())
-				|| !DeleteStatus.UNDELETE.getCode().equals(d.getDeletedSign()) 
-				|| !DemandAuditStatus.AUDITED.getCode().equals(d.getAuditStatus())){
+				|| !DeleteStatus.UNDELETE.getCode().equals(d.getDeletedSign())
+				|| !DemandAuditStatus.AUDITED.getCode().equals(d.getAuditStatus())) {
 			res.getError().add(buildError("", "当前状态无法匹配!"));
 			return res;
 		}
@@ -240,6 +246,11 @@ public class AdminDemandApiController extends CertifyApiController {
 					DemandFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(demand.getEmployerId()) && StringUtils.isBlank(demand.getEmployerName())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求雇主", "需求雇主"));
+			return res;
+		}
 
 		res = disposeDemand(res, demand, keywords);
 		if (!res.getError().isEmpty()) {
@@ -352,7 +363,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	 * 修改需求
 	 */
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
-	public Result updateUser(@Valid InputDemand demand, BindingResult bindingResult,
+	public Result updateUser(@Valid InputDemand demand, BindingResult bindingResult, Integer switchSign,
 			@RequestParam(name = "keywords[]", required = false) String[] keywords,
 			String validityPeriodFormattedDate) {
 		Result res = new Result();
@@ -366,6 +377,17 @@ public class AdminDemandApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(demand.getEmployerId()) && StringUtils.isBlank(demand.getEmployerName())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求雇主", "需求雇主"));
+			return res;
+		}
+		
+		if (!DemandSwitchSign.CLOSE.getCode().equals(switchSign)
+				&& !DemandSwitchSign.OPEN.getCode().equals(switchSign)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "开关标记"));
+			return res;
+		}
 
 		if (!DemandAuditStatus.CREATE.getCode().equals(demand.getAuditStatus())
 				&& !DemandAuditStatus.SUBMIT.getCode().equals(demand.getAuditStatus())
@@ -381,7 +403,7 @@ public class AdminDemandApiController extends CertifyApiController {
 
 		Demand d = new Demand();
 		BeanUtils.copyProperties(demand, d);
-		res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate, keywords));
+		res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate, keywords, switchSign));
 		return res;
 	}
 
@@ -435,9 +457,16 @@ public class AdminDemandApiController extends CertifyApiController {
 	@RequestMapping(value = "/delete", method = RequestMethod.POST)
 	public Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (ids == null || ids.length < 1) {
+		if (ids == null || ids.length != 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
+			List<DemandOrder> list = demandOrderService.selectDemandOrderByDemandId(ids[0]);
+			for (DemandOrder order : list) {
+				if (!DemandOrderStatus.CREATE.getCode().equals(order.getStatus())) {
+					res.getError().add(buildError("", "当前科技需求有订单,无法删除!"));
+					return res;
+				}
+			}
 			res.setData(demandService.deleteByPrimaryKey(Arrays.asList(ids)));
 		}
 		return res;
@@ -455,10 +484,6 @@ public class AdminDemandApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (StringUtils.isBlank(demand.getEmployerId())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到雇主ID", "雇主ID"));
-			return res;
-		}
 
 		if (StringUtils.isBlank(demand.getKeyword())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));

+ 31 - 21
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -829,20 +829,26 @@ public class AdminPatentApiController extends CertifyApiController {
 	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/exportComposite", method = RequestMethod.GET)
-	public Result exportComposite(String contractId,
-			@RequestParam(name = "serialNumber", required = false) String serialNumber, String patentNumber,
-			String office, Integer locationProvince, String unitName, String uid,
-			@RequestParam(name = "patentCatagory", required = false) String patentCatagory, String patentName,
+	public Result exportComposite(@RequestParam(name = "contractId", required = false) String contractId,
+			@RequestParam(name = "serialNumber", required = false) String serialNumber,
+			@RequestParam(name = "patentNumber", required = false) String patentNumber,
+			@RequestParam(name = "office", required = false) String office,
+			@RequestParam(name = "locationProvince", required = false) String locationProvince,
+			@RequestParam(name = "unitName", required = false) String unitName,
+			@RequestParam(name = "uid", required = false) String uid,
+			@RequestParam(name = "patentCatagory", required = false) String patentCatagory,
+			@RequestParam(name = "patentName", required = false) String patentName,
 			@RequestParam(name = "patentState", required = false) String patentState,
 			@RequestParam(name = "createTime[]", required = false) String[] createTime,
 			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
-			String author, HttpServletResponse response) throws ParseException {
+			@RequestParam(name = "author", required = false) String author, HttpServletResponse response)
+			throws ParseException {
 		Result res = new Result();
 
 		Integer sn = (!StringUtils.isNumeric(serialNumber) ? null : Integer.parseInt(serialNumber));
 		Integer pc = (!StringUtils.isNumeric(patentCatagory) ? null : Integer.parseInt(patentCatagory));
 		Integer ps = (!StringUtils.isNumeric(patentState) ? null : Integer.parseInt(patentState));
-		Integer lp = (null == locationProvince) ? null : locationProvince;
+		Integer lp = (!StringUtils.isNumeric(locationProvince) ? null : Integer.parseInt(locationProvince));
 		List<PatentManageListBo> composites = (List<PatentManageListBo>) getManagePatentList(contractId, sn,
 				patentNumber, office, lp, unitName, pc, patentName, ps, createTime, patentApplicationDate, author, uid,
 				1, 1000).getList();
@@ -858,11 +864,12 @@ public class AdminPatentApiController extends CertifyApiController {
 	 * 待缴年登印费专利管理报表导出
 	 */
 	@RequestMapping(value = "/exportPending", method = RequestMethod.GET)
-	public Result exportPending(Integer locationProvince, HttpServletResponse response) {
+	public Result exportPending(@RequestParam(name = "locationProvince", required = false) String locationProvince,
+			HttpServletResponse response) {
 		Result res = new Result();
+		Integer lp = (!StringUtils.isNumeric(locationProvince) ? null : Integer.parseInt(locationProvince));
 		@SuppressWarnings("unchecked")
-		List<PatentPendingBo> pendings = (List<PatentPendingBo>) getManagePendingPaymentList(locationProvince, 1, 1000)
-				.getList();
+		List<PatentPendingBo> pendings = (List<PatentPendingBo>) getManagePendingPaymentList(lp, 1, 1000).getList();
 		if (res.getError().isEmpty()) {
 			exportPendings(response, pendings);
 		} else {
@@ -878,10 +885,12 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/exportApplicationFee", method = RequestMethod.GET)
 	public Result exportApplicationFee(
 			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
-			Integer locationProvince, HttpServletResponse response) throws ParseException {
+			@RequestParam(name = "locationProvince", required = false) String locationProvince,
+			HttpServletResponse response) throws ParseException {
 		Result res = new Result();
+		Integer lp = (!StringUtils.isNumeric(locationProvince) ? null : Integer.parseInt(locationProvince));
 		List<PatentApplicationFeeBo> fees = (List<PatentApplicationFeeBo>) getApplicationFeeList(patentApplicationDate,
-				locationProvince, 1, 1000).getList();
+				lp, 1, 1000).getList();
 		if (res.getError().isEmpty()) {
 			exportFees(response, fees);
 		} else {
@@ -1017,8 +1026,8 @@ public class AdminPatentApiController extends CertifyApiController {
 
 	private void exportComosites(HttpServletResponse response, List<PatentManageListBo> composites) {
 		String sheetName = "专利综合管理报表";
-		HSSFWorkbook workbook = createWorkbook(sheetName,
-				new String[] { "编号", "申请号/专利号", "事务所", "省份", "公司名称", "专利名称", "专利状态", "派单日", "申请日", "授权日", "资料撰写人" });
+		HSSFWorkbook workbook = createWorkbook(sheetName, new String[] { "编号", "申请号/专利号", "合同编号", "事务所", "省份", "公司名称",
+				"专利名称", "专利状态", "派单日", "申请日", "授权日", "资料撰写人" });
 		HSSFSheet sheet = workbook.getSheet(sheetName);
 
 		// 将查询出的数据设置到sheet对应的单元格中
@@ -1028,16 +1037,17 @@ public class AdminPatentApiController extends CertifyApiController {
 			HSSFRow row = sheet.createRow(i + 2);// 创建所需的行数
 			row.createCell(0).setCellValue(null == obj.getSerialNumber() ? "" : obj.getSerialNumber().toString());
 			row.createCell(1).setCellValue(obj.getPatentNumber());
-			row.createCell(2).setCellValue(obj.getOffice());
+			row.createCell(2).setCellValue(null == obj.getContractNumber() ? "" : obj.getContractNumber().toString());
+			row.createCell(3).setCellValue(obj.getOffice());
 			Integer locationProvince = obj.getLocationProvince();
-			row.createCell(3).setCellValue(null == locationProvince ? "" : getProvince(districtMap, locationProvince));
-			row.createCell(4).setCellValue(obj.getUnitName());
-			row.createCell(5).setCellValue(obj.getPatentName());
-			row.createCell(6).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
-			row.createCell(7).setCellValue(obj.getCreateTimeFormattedDate());
-			row.createCell(8).setCellValue(obj.getPatentApplicationFormattedDate());
+			row.createCell(4).setCellValue(null == locationProvince ? "" : getProvince(districtMap, locationProvince));
+			row.createCell(5).setCellValue(obj.getUnitName());
+			row.createCell(6).setCellValue(obj.getPatentName());
+			row.createCell(7).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
+			row.createCell(8).setCellValue(obj.getCreateTimeFormattedDate());
 			row.createCell(9).setCellValue(obj.getPatentApplicationFormattedDate());
-			row.createCell(10).setCellValue(obj.getAuthor());
+			row.createCell(10).setCellValue(obj.getPatentApplicationFormattedDate());
+			row.createCell(11).setCellValue(obj.getAuthor());
 		}
 		FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
 

+ 3 - 0
src/main/java/com/goafanti/admin/controller/AdminSuperviseApiController.java

@@ -261,6 +261,9 @@ public class AdminSuperviseApiController extends CertifyApiController {
 
 	private Result disposeAdminLocationList(Result res, JSONObject jo, Admin ad) {
 		JSONArray locations = jo.getJSONArray("locations");
+		if (null == locations || locations.size()<1){
+			return res;
+		}
 		List<AdminLocation> adminLocationList = new ArrayList<>();
 		AdminLocation al = null;
 		Boolean areaAdminFlag = false;

+ 14 - 29
src/main/java/com/goafanti/admin/controller/AdminTriggerController.java

@@ -1,11 +1,9 @@
 package com.goafanti.admin.controller;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -13,21 +11,27 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.utils.FileUtils;
-import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.crawler.RequestUtils;
 import com.goafanti.crawler.callback.TransitFutureCallback;
+import com.goafanti.fragment.service.FragmentService;
 
 @RestController
 @RequestMapping(value = "/api/admin/trigger")
 public class AdminTriggerController extends BaseApiController {
 
 	@Value(value = "${upload.path}")
-	private String uploadPath = null;
+	private String			uploadPath	= null;
+
+	@Autowired
+	private FragmentService	fragmentService;
 
 	@RequestMapping(value = "/vacationcrawler", method = RequestMethod.GET)
-	public Result vacationCrawlerStart(String id) {
+	public Result vacationCrawlerStart(String year) {
 		Result res = new Result();
+		if (StringUtils.isBlank(year)) {
+			return res.error(buildError("", "需要年份信息。"));
+		}
 		try {
 			TransitFutureCallback cb = new TransitFutureCallback("<a.*?href=\"(.*?)\".*?节假日安排.*?</a>");
 			Map<String, String> json = new HashMap<>();
@@ -35,32 +39,13 @@ public class AdminTriggerController extends BaseApiController {
 			RequestUtils.startRequest(
 					"http://sousuo.gov.cn/list.htm?n=40&p=0&t=paper&sort=pubtime&subchildtype=gc189&location=%E7%BB%BC%E5%90%88%E6%94%BF%E5%8A%A1%E5%85%B6%E4%BB%96&timetype=timeqb",
 					cb);
-			for (String j : json.keySet()) {
-				saveToFile("/json/vacations/" + j + ".json", json.get(j));
+			if (json.containsKey(year)) {
+				fragmentService.save("vacations" + year, json.get(year));
 			}
+			res.setData(json);
 		} catch (Exception e) {
 			res.getError().add(buildError("", e.getMessage()));
 		}
 		return res;
 	}
-
-	private void saveToFile(String filePath, String s) {
-		File file = new File(uploadPath + filePath);
-		file.getParentFile().mkdirs();
-		FileWriter fw = null;
-		try {
-			fw = new FileWriter(file);
-			fw.write(s);
-		} catch (IOException e) {
-			LoggerUtils.error(FileUtils.class, e.getMessage(), e);
-		} finally {
-			try {
-				if (fw != null) {
-					fw.close();
-				}
-			} catch (IOException e) {
-				fw = null;
-			}
-		}
-	}
 }

+ 4 - 4
src/main/java/com/goafanti/admin/controller/AdminUserCertifyApiController.java

@@ -125,10 +125,10 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (null == userIdentity.getLevel()) {
+		/*if (null == userIdentity.getLevel()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户等级", "用户等级"));
 			return res;
-		}
+		}*/
 
 		if (!UserLevel.GENERAL.getCode().equals(userIdentity.getLevel())
 				|| IdentityAuditStatus.PASSED.getCode().equals(userIdentity.getAuditStatus())) {
@@ -204,10 +204,10 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 			return res;
 		}
 		
-		if (null == orgIdentity.getLevel()) {
+		/*if (null == orgIdentity.getLevel()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户等级", "用户等级"));
 			return res;
-		}
+		}*/
 
 		if (!UserLevel.GENERAL.getCode().equals(orgIdentity.getLevel())
 				|| IdentityAuditStatus.PASSED.getCode().equals(orgIdentity.getAuditStatus())) {

+ 8 - 5
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -80,10 +80,10 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 					.selectProvinceWhereCityIsNullByAdminId(TokenManager.getAdminId());
 			List<Integer> cityList = adminLocationMapper.selectCityByAdminId(TokenManager.getAdminId());
 			provinceList.addAll(cityList);
-			if (null != provinceList && provinceList.size() > 0){
+			if (null != provinceList && provinceList.size() > 0) {
 				params.put("provinceList", provinceList);
 			}
-			if (null != cityList && cityList.size() > 0){
+			if (null != cityList && cityList.size() > 0) {
 				params.put("cityList", cityList);
 			}
 			return (Pagination<AdminListBo>) findPage("findAreaAdminListByPage", "findAreaAdminCount", params, pageNo,
@@ -111,7 +111,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 			TokenManager.clearUserAuthByUserId(ad.getId());
 		}
 		adminLocationMapper.deleteByAdminId(ad.getId());
-		adminLocationMapper.insertBatch(adminLocationList);
+		if (null != adminLocationList && adminLocationList.size() > 0) {
+			adminLocationMapper.insertBatch(adminLocationList);
+		}
 		return adminMapper.updateByPrimaryKeySelective(ad);
 	}
 
@@ -210,7 +212,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 
 	@Override
 	public int insertNewAdmin(Admin ad, List<AdminLocation> adminLocationList) {
-		adminLocationMapper.insertBatch(adminLocationList);
+		if (null != adminLocationList && adminLocationList.size() > 0) {
+			adminLocationMapper.insertBatch(adminLocationList);
+		}
 		return adminMapper.insert(ad);
 	}
 
@@ -236,5 +240,4 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		return map;
 	}
 
-
 }

+ 4 - 4
src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java

@@ -46,9 +46,9 @@ public class CognizanceBo {
 	private String	founder;
 
 	private String	contractId;
-	
-	private Integer contractNumber;
-	
+
+	private Integer	contractNumber;
+
 	public Integer getContractNumber() {
 		return contractNumber;
 	}
@@ -227,7 +227,7 @@ public class CognizanceBo {
 		if (this.issuingDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getIssuingDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

+ 81 - 75
src/main/java/com/goafanti/cognizance/bo/CognizanceDetailBo.java

@@ -9,149 +9,162 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
  * 高企认定明细
  */
 public class CognizanceDetailBo {
-	private String uid;
-	
-	private String cid;
-	
+	private String		uid;
+
+	private String		cid;
+
 	/**
 	 * 公司名称
 	 */
-	private String unitName;
-	
+	private String		unitName;
+
 	/**
 	 * 公司组织机构代码
 	 */
-	private String orgCode;
-	
+	private String		orgCode;
+
 	/**
 	 * 公司地址
 	 */
-	private String postalAddress;
-	
+	private String		postalAddress;
+
 	/**
 	 * 联系人
 	 */
-	private String contacts;
-	
+	private String		contacts;
+
 	/**
 	 * 技术领域1st
 	 */
-    private Integer technicalField1;
-	
-    /**
-     * 技术领域2nd
-     */
-    private Integer technicalField2;
-    
-    /**
-     * 技术领域3rd
-     */
-	private Integer technicalField3;
-	
+	private Integer		technicalField1;
+
+	/**
+	 * 技术领域2nd
+	 */
+	private Integer		technicalField2;
+
+	/**
+	 * 技术领域3rd
+	 */
+	private Integer		technicalField3;
+
 	/**
 	 * 一类知识产权数量
 	 */
-	private Integer firstCatagory;
-	
+	private Integer		firstCatagory;
+
 	/**
 	 * 二类知识产权数量
 	 */
-	private Integer secondCatagory;
-	
+	private Integer		secondCatagory;
+
 	/**
 	 * 职工总数
 	 */
-	private Integer firmTotal;
-	
+	private Integer		firmTotal;
+
 	/**
 	 * 科技人员总数
 	 */
-	private Integer techTotal;
-	
+	private Integer		techTotal;
+
 	/**
 	 * 第一年所有者权益(净资产)
 	 */
-	private BigDecimal netAsset1;
-	
+	private BigDecimal	netAsset1;
+
 	/**
 	 * 第一年销售收入
 	 */
-	private BigDecimal salesRevenue1;
-	
+	private BigDecimal	salesRevenue1;
+
 	/**
 	 * 第一年利润总额
 	 */
-	private BigDecimal grossProfit1;
-	
+	private BigDecimal	grossProfit1;
+
 	/**
 	 * 第二年所有者权益(净资产)
 	 */
-	private BigDecimal netAsset2;
-	
+	private BigDecimal	netAsset2;
+
 	/**
 	 * 第二年销售收入
 	 */
-	private BigDecimal salesRevenue2;
-	
+	private BigDecimal	salesRevenue2;
+
 	/**
 	 * 第二年利润总额
 	 */
-	private BigDecimal grossProfit2;
-	
+	private BigDecimal	grossProfit2;
+
 	/**
 	 * 第三年所有者权益(净资产)
 	 */
-	private BigDecimal netAsset3;
-	
+	private BigDecimal	netAsset3;
+
 	/**
 	 * 第三年销售收入
 	 */
-	private BigDecimal salesRevenue3;
-	
+	private BigDecimal	salesRevenue3;
+
 	/**
 	 * 第三年利润总额
 	 */
-	private BigDecimal grossProfit3;
-	
+	private BigDecimal	grossProfit3;
+
 	/**
 	 * 近三年研发费用总额
 	 */
-	private BigDecimal researchCost;
-	
+	private BigDecimal	researchCost;
+
 	/**
 	 * 在中国境内研发费用
 	 */
-	private BigDecimal territory;
-	
+	private BigDecimal	territory;
+
 	/**
 	 * 基础研究投入费用
 	 */
-	private BigDecimal basicResearchCost;
-	
+	private BigDecimal	basicResearchCost;
+
 	/**
 	 * 近一年企业总收入
 	 */
-	private BigDecimal totalRevenue;
-	
+	private BigDecimal	totalRevenue;
+
 	/**
 	 * 近一年高新技术产品(服务)收入
 	 */
-	private BigDecimal lastYearRevenue;
-	
+	private BigDecimal	lastYearRevenue;
+
 	/**
 	 * 申请认定前一年内是否发生过重大安全、重大质量或严重环境违法行为
 	 */
-	private Integer accident;
-	
+	private Integer		accident;
+
 	/**
 	 * 是否为大额订单
 	 */
-	private Integer largeOrder;
-	
+	private Integer		largeOrder;
+
 	/**
 	 * 年份
 	 */
-	private Integer year;
+	private Integer		year;
+	
+	/**
+	 * 证书编号
+	 */
+	private String		certificateNumber;
+	
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
 
 	public String getUid() {
 		return uid;
@@ -193,8 +206,6 @@ public class CognizanceDetailBo {
 		this.postalAddress = postalAddress;
 	}
 
-	
-
 	public String getContacts() {
 		return contacts;
 	}
@@ -211,7 +222,7 @@ public class CognizanceDetailBo {
 	public void setTechnicalField1(Integer technicalField1) {
 		this.technicalField1 = technicalField1;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField2() {
 		return technicalField2;
@@ -262,7 +273,6 @@ public class CognizanceDetailBo {
 		this.techTotal = techTotal;
 	}
 
-	
 	public BigDecimal getNetAsset1() {
 		return netAsset1;
 	}
@@ -382,7 +392,7 @@ public class CognizanceDetailBo {
 	public void setAccident(Integer accident) {
 		this.accident = accident;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getLargeOrder() {
 		return largeOrder;
@@ -399,9 +409,5 @@ public class CognizanceDetailBo {
 	public void setYear(Integer year) {
 		this.year = year;
 	}
-	
-	
-	
-	
-	
+
 }

+ 38 - 36
src/main/java/com/goafanti/cognizance/bo/CognizanceOrgInfoBo.java

@@ -6,32 +6,33 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 public class CognizanceOrgInfoBo {
-	private String uid;
-	
-	private String cid;
-	
-	private String unitName;
-	
-	private String orgCode;
-	
-	private String postalAddress;
-	
-	private Integer contacts;
-	
-	private Integer technicalField1;
-	
-	private Integer technicalField2;
-	
-	private Integer technicalField3;
-	
-	private BigDecimal basicResearchCost;
-	
-	private Integer largeOrder;
-
-	private Integer accient;
-	
-	private Integer year;
-	
+	private String		uid;
+
+	private String		cid;
+
+	private String		unitName;
+
+	private String		orgCode;
+
+	private String		postalAddress;
+
+	private Integer		contacts;
+
+	private Integer		technicalField1;
+
+	private Integer		technicalField2;
+
+	private Integer		technicalField3;
+
+	private BigDecimal	basicResearchCost;
+
+	private Integer		largeOrder;
+
+	private Integer		accient;
+
+	private Integer		year;
+
+	private String		certificateNumber;
 
 	public String getUid() {
 		return uid;
@@ -82,7 +83,6 @@ public class CognizanceOrgInfoBo {
 		this.contacts = contacts;
 	}
 
-
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField1() {
 		return technicalField1;
@@ -91,7 +91,7 @@ public class CognizanceOrgInfoBo {
 	public void setTechnicalField1(Integer technicalField1) {
 		this.technicalField1 = technicalField1;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField2() {
 		return technicalField2;
@@ -100,7 +100,7 @@ public class CognizanceOrgInfoBo {
 	public void setTechnicalField2(Integer technicalField2) {
 		this.technicalField2 = technicalField2;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField3() {
 		return technicalField3;
@@ -110,7 +110,6 @@ public class CognizanceOrgInfoBo {
 		this.technicalField3 = technicalField3;
 	}
 
-
 	public BigDecimal getBasicResearchCost() {
 		return basicResearchCost;
 	}
@@ -142,10 +141,13 @@ public class CognizanceOrgInfoBo {
 	public void setYear(Integer year) {
 		this.year = year;
 	}
-	
-	
-	
-	
-	
-	
+
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
+
 }

+ 54 - 56
src/main/java/com/goafanti/cognizance/bo/InputOrgActivity.java

@@ -10,79 +10,79 @@ import javax.validation.constraints.Size;
 import com.goafanti.common.constant.ErrorConstants;
 
 public class InputOrgActivity {
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String id;
-	
+	private String		id;
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String uid;
+	private String		uid;
 
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String activityNumber;
+	private String		activityNumber;
 
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String activityName;
-
-    /**
-    * 开始日期
-    */
-    private Date startDate;
-
-    /**
-    * 结束日期
-    */
-    private Date endDate;
-    
-    @Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String participant;
-    
-    @Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private String		activityName;
+
+	/**
+	 * 开始日期
+	 */
+	private Date		startDate;
+
+	/**
+	 * 结束日期
+	 */
+	private Date		endDate;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		participant;
+
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-    private Integer projectMode;
+	private Integer		projectMode;
 
-    @Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String technicalField1;
+	@Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		technicalField1;
 
-    @Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String technicalField2;
+	@Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		technicalField2;
 
-    @Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String technicalField3;
+	@Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		technicalField3;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		technicalSource;
 
-    @Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-   	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-    private Integer technicalSource;
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		intellectualPropertyNumber;
 
-    @Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String intellectualPropertyNumber;
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long) 0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	budget;
 
-    @Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-   	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-    private BigDecimal budget;
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long) 0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	firstYearExpenditure;
 
-    @Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-   	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-    private BigDecimal firstYearExpenditure;
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long) 0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	secondYearExpenditure;
 
-    @Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-   	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-    private BigDecimal secondYearExpenditure;
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long) 0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	thirdYearExpenditure;
 
-    @Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-   	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-    private BigDecimal thirdYearExpenditure;
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		implement;
 
-    @Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String implement;
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		technologyInnovation;
 
-    @Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String technologyInnovation;
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		achievement;
 
-    @Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String achievement;
-    
-    @Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String proofUrl;
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		proofUrl;
 
 	public String getId() {
 		return id;
@@ -251,7 +251,5 @@ public class InputOrgActivity {
 	public void setProofUrl(String proofUrl) {
 		this.proofUrl = proofUrl;
 	}
-    
-    
 
 }

+ 0 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgActivityCost.java


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.