2.0.0 no.2 up

附件.sql

@@ -1,3 +1,6 @@
+ALTER TABLE  `jl_config` ADD  `smsswitch` TINYINT NOT NULL DEFAULT  '1';
+ALTER TABLE  `jl_user_profiles` ADD  `isnotice` TINYINT NOT NULL DEFAULT  '0';
+
 ALTER TABLE `jl_item_attachment`
   DROP `mpid`,
   DROP `itemid`,

分享项目.sql

@@ -1,3 +1,4 @@
+ALTER TABLE `jl_user_profiles` ADD `remark` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '备注信息';
 
 CREATE TABLE IF NOT EXISTS `jl_share` (
   `sid` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT,

170to184.sql

@@ -0,0 +1,28 @@
+CREATE TABLE IF NOT EXISTS `jl_measure_concern` (
+  `mcid` mediumint(9) NOT NULL,
+  `pid` mediumint(9) NOT NULL COMMENT '项目id',
+  `stid` mediumint(9) NOT NULL COMMENT '标段类型id',
+  `pmid` mediumint(9) NOT NULL COMMENT '标段id',
+  `uid` mediumint(9) NOT NULL COMMENT '关注人id',
+  `intime` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='标段关注人表';
+
+
+ALTER TABLE `jl_measure_concern`
+  ADD PRIMARY KEY (`mcid`);
+
+ALTER TABLE `jl_measure_concern`
+  MODIFY `mcid` mediumint(9) NOT NULL AUTO_INCREMENT;COMMIT;
+
+ALTER TABLE `jl_config` ADD `reportswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '软件生成报表开关';
+
+ALTER TABLE `jl_config` ADD `signswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT 'web在线签署开启开关';
+
+ALTER TABLE `jl_config` ADD `launchsignswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '发起签署开启开关';
+
+ALTER TABLE `jl_sign` ADD `isinter` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '图表类型，0：签署表，1：未完成传输的中间计量表，2表示已完成传输可签署的中间计量表，3 已完成添加草图成为签署表的计量表' AFTER `ishare`;
+ALTER TABLE `jl_sign` ADD `internum` INT UNSIGNED NOT NULL DEFAULT '0' COMMENT '中间计量表总页数';
+ALTER TABLE `jl_config` ADD `imediateswitch` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '中间计量表开关';
+ALTER TABLE `jl_config` ADD `smssignswitch` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '签署短信通知开关';
+ALTER TABLE `jl_sign` CHANGE `status` `status` ENUM('uncheck','checking','checked','stop','back') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'uncheck' COMMENT '签署状态';
+ALTER TABLE `jl_sign_audit` CHANGE `status` `status` ENUM('uncheck','checking','checked','stop','back') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'uncheck' COMMENT '个人签署状态';

184to190.sql

@@ -0,0 +1,34 @@
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `jl_user_token`
+--
+
+CREATE TABLE IF NOT EXISTS `jl_user_token` (
+  `id` int(10) UNSIGNED NOT NULL,
+  `uid` int(10) UNSIGNED NOT NULL,
+  `token` varchar(500) COLLATE utf8_unicode_ci NOT NULL COMMENT '登录token',
+  `addtime` int(15) NOT NULL COMMENT '生成时间',
+  `endtime` int(15) NOT NULL COMMENT '失效时间',
+  `comefrom` tinyint(1) UNSIGNED NOT NULL COMMENT '来自：1:web;2:software;3:app'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='登录信息表';
+
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `jl_user_token`
+--
+ALTER TABLE `jl_user_token`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- 在导出的表使用AUTO_INCREMENT
+--
+
+--
+-- 使用表AUTO_INCREMENT `jl_user_token`
+--
+ALTER TABLE `jl_user_token`
+  MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT;COMMIT;

190to200.sql

@@ -0,0 +1 @@
+ALTER TABLE `jl_sign` CHANGE `status` `status` ENUM('uncheck','checking','checked','stop','back','del') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'uncheck' COMMENT '签署状态';

jlweb1.8.0.sql

@@ -3,7 +3,7 @@
 -- https://www.phpmyadmin.net/
 --
 -- Host: 10.27.6.148
+-- Generation Time: 2017-10-31 10:28:05
 -- 服务器版本： 5.7.17-13
 -- PHP Version: 7.0.15-0ubuntu0.16.04.4
 
@@ -19,7 +19,7 @@ SET time_zone = "+00:00";
 /*!40101 SET NAMES utf8mb4 */;
 
 --
+-- Database: `jlwebdev`
 --
 
 -- --------------------------------------------------------
@@ -62,7 +62,7 @@ CREATE TABLE `jl_auser` (
 --
 
 INSERT INTO `jl_auser` (`auid`, `auname`, `aupass`, `aemail`) VALUES
-(1, 'madmin', '$2a$08$TbScA7uWG/VGm6KWqMfkiOAuCdC4wqRlSWcafwObi5PS71jJVXXve', '');
+(1, 'madmin', '$2a$08$TbScA7uWG/VGm6KWqMfkiOAuCdC4wqRlSWcafwObi5PS71jJVXXve', '2417587264@qq.com');
 
 -- --------------------------------------------------------
 
@@ -78,15 +78,17 @@ CREATE TABLE `jl_config` (
   `smsswitch` tinyint(4) NOT NULL DEFAULT '1',
   `reportswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '软件生成报表开关',
   `signswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT 'web在线签署开启开关',
-  `launchsignswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '发起签署开启开关'
+  `launchsignswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '发起签署开启开关',
+  `imediateswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '中间计量表开关',
+  `smssignswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '签署短信通知开关'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- 转存表中的数据 `jl_config`
 --
 
-INSERT INTO `jl_config` (`conid`, `proname`, `onoff`, `upgradeinfo`, `smsswitch`, `reportswitch`, `signswitch`, `launchsignswitch`) VALUES
-(1, '', 0, '', 0, 1, 1, 1);
+INSERT INTO `jl_config` (`conid`, `proname`, `onoff`, `upgradeinfo`, `smsswitch`, `reportswitch`, `signswitch`, `launchsignswitch`, `imediateswitch`, `smssignswitch`) VALUES
+(1, '', 0, '', 1, 1, 1, 1, 1, 1);
 
 -- --------------------------------------------------------
 
@@ -262,17 +264,19 @@ CREATE TABLE `jl_sign` (
   `sid` int(11) NOT NULL COMMENT '主键',
   `project` int(11) NOT NULL COMMENT '项目主键',
   `tender` int(11) NOT NULL COMMENT '标段主键',
-  `phaseno` int(11) NOT NULL COMMENT '期数',
+  `phaseno` int(11) NOT NULL COMMENT '期数主键',
   `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '报表名',
   `ownuid` smallint(6) NOT NULL COMMENT '生成人id',
   `intime` int(11) NOT NULL COMMENT '生成时间',
   `pagenum` smallint(5) UNSIGNED NOT NULL DEFAULT '0' COMMENT '共有多少张报表，未解压默认为0',
-  `widhei` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '报表纸张大小 以mm为单位',
+  `widhei` varchar(20) NOT NULL COMMENT '报表纸张大小 以mm为单位',
   `audituid` smallint(6) UNSIGNED DEFAULT NULL COMMENT '发起人id',
   `aintime` varchar(15) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '发起时间',
-  `status` enum('uncheck','checking','checked') NOT NULL DEFAULT 'uncheck' COMMENT '签署状态',
+  `status` enum('uncheck','checking','checked','stop','back','del') NOT NULL DEFAULT 'uncheck' COMMENT '签署状态',
   `sintime` varchar(15) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '签署完成时间',
-  `ishare` tinyint(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '是否分享,0不分享（默认），1分享'
+  `ishare` tinyint(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '是否分享,0不分享（默认），1分享',
+  `isinter` tinyint(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '图表类型，0：签署表，1：未完成传输的中间计量表，2表示已完成传输可签署的中间计量表',
+  `internum` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '中间计量表总页数'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='在线签署报表信息表';
 
 -- --------------------------------------------------------
@@ -297,7 +301,7 @@ CREATE TABLE `jl_sign_attachment` (
 CREATE TABLE `jl_sign_audit` (
   `satid` int(11) UNSIGNED NOT NULL COMMENT '主键',
   `sid` int(11) UNSIGNED NOT NULL COMMENT '报表id主键',
-  `status` enum('uncheck','checking','checked') NOT NULL DEFAULT 'uncheck' COMMENT '个人签署状态',
+  `status` enum('uncheck','checking','checked','stop','back') NOT NULL DEFAULT 'uncheck' COMMENT '个人签署状态',
   `audituid` int(11) UNSIGNED NOT NULL COMMENT '签署人id',
   `aname` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '签署人姓名',
   `intime` int(11) NOT NULL COMMENT '签署时间'
@@ -371,13 +375,28 @@ CREATE TABLE `jl_user_profiles` (
   `groups` enum('vip','anonymous') NOT NULL DEFAULT 'anonymous',
   `avatar` char(255) NOT NULL DEFAULT 'global/avatar/avtra.jpg',
   `isnotice` tinyint(4) NOT NULL DEFAULT '0',
-  `remark` varchar(500) NOT NULL COMMENT '备注信息',
-  `signpath` varchar(255) NOT NULL DEFAULT 'global/signpath/signavatar.png' COMMENT '签名图片地址'
+  `signpath` varchar(255) NOT NULL DEFAULT 'global/signpath/signavatar.png' COMMENT '签名图片地址',
+  `remark` varchar(500) NOT NULL COMMENT '备注信息'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
 
 --
+-- 表的结构 `jl_user_token`
+--
+
+CREATE TABLE `jl_user_token` (
+  `id` int(10) UNSIGNED NOT NULL,
+  `uid` int(10) UNSIGNED NOT NULL,
+  `token` varchar(500) COLLATE utf8_unicode_ci NOT NULL COMMENT '登录token',
+  `addtime` int(15) NOT NULL COMMENT '生成时间',
+  `endtime` int(15) NOT NULL COMMENT '失效时间',
+  `comefrom` tinyint(1) UNSIGNED NOT NULL COMMENT '来自：1:web;2:software;3:app'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='登录信息表';
+
+-- --------------------------------------------------------
+
+--
 -- 表的结构 `jl_zero_audit`
 --
 
@@ -514,6 +533,12 @@ ALTER TABLE `jl_user_profiles`
   ADD UNIQUE KEY `userid` (`userid`);
 
 --
+-- Indexes for table `jl_user_token`
+--
+ALTER TABLE `jl_user_token`
+  ADD PRIMARY KEY (`id`);
+
+--
 -- Indexes for table `jl_zero_audit`
 --
 ALTER TABLE `jl_zero_audit`
@@ -527,7 +552,7 @@ ALTER TABLE `jl_zero_audit`
 -- 使用表AUTO_INCREMENT `jl_attachment`
 --
 ALTER TABLE `jl_attachment`
-  MODIFY `aid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5594;
+  MODIFY `aid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5339;
 --
 -- 使用表AUTO_INCREMENT `jl_auser`
 --
@@ -542,78 +567,83 @@ ALTER TABLE `jl_config`
 -- 使用表AUTO_INCREMENT `jl_item_attachment`
 --
 ALTER TABLE `jl_item_attachment`
-  MODIFY `iaid` mediumint(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1162;
+  MODIFY `iaid` mediumint(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1157;
 --
 -- 使用表AUTO_INCREMENT `jl_item_measure_numofper`
 --
 ALTER TABLE `jl_item_measure_numofper`
-  MODIFY `imnid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1030;
+  MODIFY `imnid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1025;
 --
 -- 使用表AUTO_INCREMENT `jl_measure_audit`
 --
 ALTER TABLE `jl_measure_audit`
-  MODIFY `maid` smallint(6) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7672;
+  MODIFY `maid` smallint(6) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7276;
 --
 -- 使用表AUTO_INCREMENT `jl_measure_concern`
 --
 ALTER TABLE `jl_measure_concern`
-  MODIFY `mcid` mediumint(9) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=64;
+  MODIFY `mcid` mediumint(9) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3;
 --
 -- 使用表AUTO_INCREMENT `jl_measure_numofper`
 --
 ALTER TABLE `jl_measure_numofper`
-  MODIFY `mpid` mediumint(9) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2140;
+  MODIFY `mpid` mediumint(9) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1999;
 --
 -- 使用表AUTO_INCREMENT `jl_project`
 --
 ALTER TABLE `jl_project`
-  MODIFY `pid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=321;
+  MODIFY `pid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=316;
 --
 -- 使用表AUTO_INCREMENT `jl_project_measure`
 --
 ALTER TABLE `jl_project_measure`
-  MODIFY `pmid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1733;
+  MODIFY `pmid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1671;
 --
 -- 使用表AUTO_INCREMENT `jl_section_type`
 --
 ALTER TABLE `jl_section_type`
-  MODIFY `stid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=498;
+  MODIFY `stid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=481;
 --
 -- 使用表AUTO_INCREMENT `jl_share`
 --
 ALTER TABLE `jl_share`
-  MODIFY `sid` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=16;
+  MODIFY `sid` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
 --
 -- 使用表AUTO_INCREMENT `jl_sign`
 --
 ALTER TABLE `jl_sign`
-  MODIFY `sid` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=14;
+  MODIFY `sid` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=56;
 --
 -- 使用表AUTO_INCREMENT `jl_sign_attachment`
 --
 ALTER TABLE `jl_sign_attachment`
-  MODIFY `said` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=14;
+  MODIFY `said` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=457;
 --
 -- 使用表AUTO_INCREMENT `jl_sign_audit`
 --
 ALTER TABLE `jl_sign_audit`
-  MODIFY `satid` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=10;
+  MODIFY `satid` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=32;
 --
 -- 使用表AUTO_INCREMENT `jl_sign_audit_attachment`
 --
 ALTER TABLE `jl_sign_audit_attachment`
-  MODIFY `saaid` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=6;
+  MODIFY `saaid` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=44;
 --
 -- 使用表AUTO_INCREMENT `jl_users`
 --
 ALTER TABLE `jl_users`
-  MODIFY `uid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=270;
+  MODIFY `uid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=269;
 --
 -- 使用表AUTO_INCREMENT `jl_users_auth`
 --
 ALTER TABLE `jl_users_auth`
   MODIFY `aid` int(11) NOT NULL AUTO_INCREMENT;
 --
+-- 使用表AUTO_INCREMENT `jl_user_token`
+--
+ALTER TABLE `jl_user_token`
+  MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
+--
 -- 使用表AUTO_INCREMENT `jl_zero_audit`
 --
 ALTER TABLE `jl_zero_audit`

在线签署开关.sql

@@ -1,5 +0,0 @@
-ALTER TABLE `jl_config` ADD `reportswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '软件生成报表开关';
-
-ALTER TABLE `jl_config` ADD `signswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT 'web在线签署开启开关';
-
-ALTER TABLE `jl_config` ADD `launchsignswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '发起签署开启开关';

备注信息.sql

@@ -1 +0,0 @@
-ALTER TABLE `jl_user_profiles` ADD `remark` VARCHAR(500) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '备注信息';

标段关注人.sql

@@ -1,17 +0,0 @@
-
-CREATE TABLE IF NOT EXISTS `jl_measure_concern` (
-  `mcid` mediumint(9) NOT NULL,
-  `pid` mediumint(9) NOT NULL COMMENT '项目id',
-  `stid` mediumint(9) NOT NULL COMMENT '标段类型id',
-  `pmid` mediumint(9) NOT NULL COMMENT '标段id',
-  `uid` mediumint(9) NOT NULL COMMENT '关注人id',
-  `intime` int(11) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='标段关注人表';
-
-
-ALTER TABLE `jl_measure_concern`
-  ADD PRIMARY KEY (`mcid`);
-
-ALTER TABLE `jl_measure_concern`
-  MODIFY `mcid` mediumint(9) NOT NULL AUTO_INCREMENT;COMMIT;
-

版本管理.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `jl_config` ADD `onoff` TINYINT（2) NOT NULL DEFAULT '0';
-ALTER TABLE  `jl_config` ADD  `upgradeinfo` TEXT NOT NULL ;

短信提醒.sql

@@ -1,2 +0,0 @@
-ALTER TABLE  `jl_config` ADD  `smsswitch` TINYINT NOT NULL DEFAULT  '1';
-ALTER TABLE  `jl_user_profiles` ADD  `isnotice` TINYINT NOT NULL DEFAULT  '0';