抽查导出90%

api/app/lib/controllers/report/index.js

@@ -541,6 +541,7 @@ async function roadSpotPrepare(ctx) {
       let lastTownRoadIds = [] // 上次查得的乡镇道id
       let lastVillageRoadRoadIds = [] // 上次查得的村道id
       let lastVillageIds = []
+      let gather = []  //汇总
 
       if (lastSpotRes) {
          lastCountyPercentage = lastSpotRes.countyPercentage
@@ -591,16 +592,16 @@ async function roadSpotPrepare(ctx) {
          '乡': `route_code LIKE 'Y%'`,
          '村': `route_code LIKE 'C%'`
       }
-        async function getRoadTotalMileage(key, otherWhere = []) {
+      async function getRoadTotalMileage (key, otherWhere = [], spot) {
          let res = await sequelize.query(`
                 SELECT 
                     SUM(COALESCE(CAST(chainage_mileage AS DOUBLE PRECISION), 0)) AS total_mileage  
                 FROM road
                 WHERE del = false 
-                    AND spot = true 
+                    AND spot = ${spot} 
                     AND ${keyMap[key]} ${otherWhere.length ? `AND ${otherWhere.join(' AND ')}` : ''}
             `)
-            return res[0][0].total_mileage
+         return res[0][0].total_mileage || 0
       }
 
       async function getRoadSpot (key, lastRoadIds = [], inOrNot, otherWhere = []) {
@@ -687,13 +688,25 @@ async function roadSpotPrepare(ctx) {
       let villageMil = 0, townMil = 0, countryMil = 0;
 
       // 抽县
-        const countryRoadTotalMileage = await getRoadTotalMileage('县')
+      const countryRoadTotalMileage = await getRoadTotalMileage('县', '', true)
+      const countryRoadHide = await getRoadTotalMileage('县', '', false)
       const countryRoadNeedMileage = countryRoadTotalMileage * countyPercentage / 100
       let spotCountyRoadIdsArr = await spotRoadId('县', lastCountyRoadIds, countryRoadNeedMileage, [])
       let spotCountyRoadIds = spotCountyRoadIdsArr[0]
-        let countryMil_ = spotCountyRoadIdsArr[1]
+      let countryMil_ = spotCountyRoadIdsArr[1] || 0
       if (countryMil_) countryMil += countryMil_;
 
+      gather.push({
+         name: '南昌县交通运输局',
+         county: countryRoadTotalMileage + countryRoadHide,
+         countyParticipate: countryRoadTotalMileage,
+         countyPresent: countryMil_,
+         countyDifferenceValue: countryMil_ - countryRoadNeedMileage
+      })
+
+      let town = await models.Town.findAll() || []
+
+
       // 抽乡
       const allTownCodeRes = await sequelize.query(`
             SELECT 
@@ -708,10 +721,12 @@ async function roadSpotPrepare(ctx) {
       let spotVillageRoadIds = []
       let spotVillageIds = []
 
+      let allTownCodeResTown = []
       for await (let t of allTownCodeRes) {
          // 遍历每个乡镇并抽取
          let otherWhere = [`township_code='${t.township_code}'`]
-            const townRoadTotalMileage = await getRoadTotalMileage('乡', otherWhere)
+         const townRoadTotalMileage = await getRoadTotalMileage('乡', otherWhere, true)
+         const townRoadHide = await getRoadTotalMileage('乡', otherWhere, false)
          const townRoadNeedMileage = townRoadTotalMileage * 25 / 100
 
          let spotTownRoadIdsArr = await spotRoadId('乡', lastTownRoadIds, townRoadNeedMileage, otherWhere)
@@ -719,8 +734,11 @@ async function roadSpotPrepare(ctx) {
          let townMil_ = spotTownRoadIdsArr[1]
          spotTownRoadIds = spotTownRoadIds.concat(spotTownRoadIds_)
          if (townMil_) townMil += townMil_
+
+
          // 抽村
-            const villageRoadTotalMileage = await getRoadTotalMileage('村', otherWhere)
+         const villageRoadTotalMileage = await getRoadTotalMileage('村', otherWhere, true)
+         const villageRoadTotalHide = await getRoadTotalMileage('村', otherWhere, false)
          const villageRoadNeedMileage = villageRoadTotalMileage * 10 / 100
 
          let spotFirstVillageId = -1
@@ -747,6 +765,17 @@ async function roadSpotPrepare(ctx) {
             spotVillageIds.push(villageRes[0].id)
             spotFirstVillageId = villageRes[0].id
          } else {
+            allTownCodeResTown.push({
+               code: t.township_code,
+               township: townRoadTotalMileage + townRoadHide,
+               townshipParticipate: townRoadTotalMileage,
+               townshipPresent: townMil_,
+               townshipDifferenceValue: townMil_ - townRoadNeedMileage,
+               village: villageRoadTotalMileage + villageRoadTotalHide,
+               villageParticipate: villageRoadTotalMileage,
+               villagePresent: 0,
+               villageDifferenceValue: 0
+            })
             continue;
          }
 
@@ -765,8 +794,35 @@ async function roadSpotPrepare(ctx) {
          let villageMil_ = spotVillageRoadIdsArr[1]
          spotVillageRoadIds = spotVillageRoadIds.concat(spotVillageRoadIds_)
          if (villageMil_) villageMil += villageMil_
+
+         allTownCodeResTown.push({
+            code: t.township_code,
+            township: townRoadTotalMileage + townRoadHide,
+            townshipParticipate: townRoadTotalMileage,
+            townshipPresent: townMil_,
+            townshipDifferenceValue: townMil_ - townRoadNeedMileage,
+            village: villageRoadTotalMileage + villageRoadTotalHide,
+            villageParticipate: villageRoadTotalMileage,
+            villagePresent: villageMil_,
+            villageDifferenceValue: villageMil_ - villageRoadNeedMileage
+         })
+
       }
 
+      town.forEach(async d => {
+         if (allTownCodeResTown.find(c => c.code == d.code)) {
+            gather.push({ ...(allTownCodeResTown.find(c => c.code == d.code) || {}), name: d.name })
+         } else {
+            gather.push({
+               name: d.name,
+               township: await getRoadTotalMileage('乡', [`township_code='${d.code}'`], false),
+               village: await getRoadTotalMileage('村', [`township_code='${d.code}'`], false),
+            })
+         }
+      })
+
+
+
       const previewRes = await models.RoadSpotCheckPreview.create({
          countyPercentage: countyPercentage,
          date: moment().format(),
@@ -777,9 +833,12 @@ async function roadSpotPrepare(ctx) {
          checked: false,
          villageMil,
          townMil,
-            countryMil
+         countryMil,
+         gather
       })
 
+
+
       ctx.status = 200;
       ctx.body = {
          previewId: previewRes.id,
@@ -1194,7 +1253,8 @@ async function exportSpotRode (ctx) {
 
       const fileName = `${moment(previewRes.date).format('YYYY年MM月DD日HH时mm分')}道路抽查记录` + '.csv'
       const filePath = await xlsxDownload.simpleExcelDown({
-         data: exportData, header, fileName: fileName, gather:{data: exportData, header}
+         // data: exportData, header, fileName: fileName, gather: { data: previewRes.gather || [] }
+         data: exportData, header, fileName: fileName, 
       })
       const fileData = fs.readFileSync(filePath);
 

api/app/lib/models/road_spot_check_preview.js

@@ -104,7 +104,16 @@ module.exports = dc => {
       primaryKey: false,
       field: "country_mil",
       autoIncrement: false
-    }
+    },
+    gather: {
+      type: DataTypes.JSONB,
+      allowNull: true,
+      defaultValue: null,
+      comment: null,
+      primaryKey: false,
+      field: "gather",
+      autoIncrement: false
+    },
   }, {
     tableName: "road_spot_check_preview",
     comment: "",

api/app/lib/models/town.js

@@ -0,0 +1,42 @@
+/* eslint-disable*/
+'use strict';
+
+module.exports = dc => {
+   const DataTypes = dc.ORM;
+   const sequelize = dc.orm;
+   const Town = sequelize.define("town", {
+      id: {
+         type: DataTypes.INTEGER,
+         allowNull: false,
+         defaultValue: null,
+         comment: null,
+         primaryKey: true,
+         field: "id",
+         autoIncrement: true
+      },
+      name: {
+         type: DataTypes.STRING,
+         allowNull: true,
+         defaultValue: null,
+         comment: null,
+         primaryKey: false,
+         field: "name",
+         autoIncrement: false
+      },
+      code: {
+         type: DataTypes.STRING,
+         allowNull: true,
+         defaultValue: null,
+         comment: null,
+         primaryKey: false,
+         field: "code",
+         autoIncrement: false
+      },
+   }, {
+      tableName: "town",
+      comment: "",
+      indexes: []
+   });
+   dc.models.Town = Town;
+   return Town;
+};

api/utils/xlsxDownload.js

@@ -52,7 +52,7 @@ async function gatherSheet ({ sheet_2, data = [] }) {
    }
 
    const header = [{
-      key: '',
+      key: 'name',
       title: '',
    },{
       key: 'county',
@@ -64,7 +64,7 @@ async function gatherSheet ({ sheet_2, data = [] }) {
       key: 'countyPresent',
       title: '本次考核里程',
    }, {
-      key: 'county',
+      key: 'countyDifferenceValue',
       title: '实际抽取比原计划多',
    }, {
       key: 'township',
@@ -76,7 +76,7 @@ async function gatherSheet ({ sheet_2, data = [] }) {
       key: 'townshipPresent',
       title: '本次考核里程',
    }, {
-      key: 'township',
+      key: 'townshipDifferenceValue',
       title: '实际抽取比原计划多',
    }, {
       key: 'village',
@@ -88,7 +88,7 @@ async function gatherSheet ({ sheet_2, data = [] }) {
       key: 'villagePresent',
       title: '本次考核里程',
    }, {
-      key: 'village',
+      key: 'villageDifferenceValue',
       title: '实际抽取比原计划多',
    },]
 
@@ -100,24 +100,22 @@ async function gatherSheet ({ sheet_2, data = [] }) {
    }
 
    // data
-   // const style = new xlsx.Style();
+   const style = new xlsx.Style();
-   // style.align.h = 'left';
+   style.align.h = 'left';
-   // style.align.v = 'center';
+   style.align.v = 'center';
-   // style.border.right = 'thin';
+   style.border.right = 'thin';
-   // style.border.rightColor = '#000000';
+   style.border.rightColor = '#000000';
-   // style.border.bottom = 'thin';
+   style.border.bottom = 'thin';
-   // style.border.bottomColor = '#000000';
+   style.border.bottomColor = '#000000';
-   // for (let i = 0; i < data.length; i++) {
+
-   //    const row = sheet_2.addRow();
+   for (let i = 0; i < data.length; i++) {
-   //    const indexCell = row.addCell();
+      const row = sheet_2.addRow();
-   //    indexCell.value = i + 1
+      for (let h of header) {
-   //    indexCell.style = headerStyle
+         const cell = row.addCell();
-   //    for (let h of header) {
+         cell.value = data[i][h.key];
-   //       const cell = row.addCell();
+         cell.style = style
-   //       cell.value = data[i][h.key];
+      }
-   //       cell.style = style
+   }
-   //    }
-   // }
 }
 
 async function simpleExcelDown ({ data = [], header = [], fileName = moment().format('YYYY-MM-DD HH:mm:ss'), exp, gather } = {}) {

scripts/1.4.1/schema/3.alter_road_spot_check_preview.sql

@@ -0,0 +1,5 @@
+alter table road_spot_check_preview
+	add gather jsonb;
+
+comment on column road_spot_check_preview.gather is '抽查汇总';
+