Jelajahi Sumber

报表,甲供材料,奖罚金,其他,问题

MaiXinRong 5 tahun lalu
induk
melakukan
8395a93438
3 mengubah file dengan 8 tambahan dan 9 penghapusan
  1. 3 3
      app/service/report.js
  2. 1 1
      app/service/report_memory.js
  3. 4 5
      sql/update20200323.sql

+ 3 - 3
app/service/report.js

@@ -109,15 +109,15 @@ module.exports = app => {
                             runnableKey.push(filter);
                             break;
                         case 'stage_jgcl':
-                            runnableRst.push(service.reportMemory.getStageJgcl(params.tender_id, param.stage_id, memFieldKeys[filter]));
+                            runnableRst.push(service.reportMemory.getStageJgcl(params.tender_id, params.stage_id, memFieldKeys[filter]));
                             runnableKey.push(filter);
                             break;
                         case 'stage_bonus':
-                            runnableRst.push(service.reportMemory.getStageBonus(params.tender_id, param.stage_id, memFieldKeys[filter]));
+                            runnableRst.push(service.reportMemory.getStageBonus(params.tender_id, params.stage_id, memFieldKeys[filter]));
                             runnableKey.push(filter);
                             break;
                         case 'stage_other':
-                            runnableRst.push(service.reportMemory.getStageOther(params.tender_id, param.stage_id, memFieldKeys[filter]));
+                            runnableRst.push(service.reportMemory.getStageOther(params.tender_id, params.stage_id, memFieldKeys[filter]));
                             runnableKey.push(filter);
                             break;
                         default:

+ 1 - 1
app/service/report_memory.js

@@ -773,7 +773,7 @@ module.exports = app => {
             await this.ctx.service.tender.checkTender(tid);
             await this.ctx.service.stage.checkStage(sid);
 
-            const data = await ctx.service.stageBonus.getEndStageData(this.ctx.stage.order);
+            const data = await this.ctx.service.stageBonus.getEndStageData(this.ctx.stage.order);
             return data;
         }
 

+ 4 - 5
sql/update20200323.sql

@@ -1,3 +1,6 @@
+-- ----------------------------
+-- 权限 新增合同支付修改权限
+-- ----------------------------
 INSERT INTO `calculation`.`zh_permission` (`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES ('66', '合同支付', 'project', 'dealpay', '38', '', NULL, '1');
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -5,7 +8,6 @@ SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
 -- Table structure for zh_stage_jgcl
 -- ----------------------------
-DROP TABLE IF EXISTS `zh_stage_jgcl`;
 CREATE TABLE `zh_stage_jgcl` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `uuid` varchar(50) CHARACTER SET ascii NOT NULL COMMENT '材料id(uuid)',
@@ -27,12 +29,11 @@ CREATE TABLE `zh_stage_jgcl` (
   `order` int(11) NOT NULL COMMENT '排序字段',
   `pre_used` tinyint(1) DEFAULT NULL COMMENT '是否计量过',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=132 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Table structure for zh_stage_bonus
 -- ----------------------------
-DROP TABLE IF EXISTS `zh_stage_bonus`;
 CREATE TABLE `zh_stage_bonus` (
   `id` varchar(50) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '主键id(uuid)',
   `tid` int(11) NOT NULL COMMENT '标段id',
@@ -54,7 +55,6 @@ CREATE TABLE `zh_stage_bonus` (
 -- ----------------------------
 -- Table structure for zh_stage_other
 -- ----------------------------
-DROP TABLE IF EXISTS `zh_stage_other`;
 CREATE TABLE `zh_stage_other` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
   `uuid` varchar(50) CHARACTER SET ascii NOT NULL COMMENT 'uuid',
@@ -78,7 +78,6 @@ CREATE TABLE `zh_stage_other` (
 -- ----------------------------
 -- Table structure for zh_rpt_custom_define
 -- ----------------------------
-DROP TABLE IF EXISTS `zh_rpt_custom_define`;
 CREATE TABLE `zh_rpt_custom_define` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `tid` int(11) NOT NULL COMMENT '标段id',