Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionOperation

modules/all_models/bill_class.js

@@ -4,12 +4,15 @@ const Schema = mongoose.Schema;
 
 
 const billClass = new Schema({
-    compilationID: String,
+    compilationID: { type: String, index: true},
     name: String,
     code: String,
     itemCharacter: String,
     class: { type: Number, index: true }, // 分类
     classCode: { type: String, index: true }, // 类别别名
+    requiredRationIDs: { type: [Number], default: [] }, // 必套定额ID
+    optionalRationIDs: { type: [Number], default: [] }, // 选套定额ID
+    errorRationIDs: { type: [Number], default: [] }, // 错套定额ID
 }, {versionKey: false});
 
 

modules/all_models/stdRation_ration.js

@@ -55,6 +55,7 @@ const rationItemSchema = new Schema({
         type: Array,
         default: []
     },
+    jobContentText:String,//默认的工作内容
     isDeleted: {type: Boolean, default: false}
 });
 

modules/reports/controllers/adhoc_task_controller.js

@@ -1,321 +0,0 @@
-'use strict';
-
-/**
- * Created by Tony on 2021/11/3.
- */
-// const odbc = require('odbc');
-// const odbcdb = new odbc.Database();
-
-const ADODB = require('node-adodb');
-const connection = ADODB.open('Provider=Microsoft.Jet.OLEDB.4.0;Data Source=D:/GitHome/公路养护支持文件/空白.mdb;');
-const rationItemDAO = require("../../ration_repository/models/ration_item");
-
-module.exports = {
-    createDesktopMdb: async function(req, res) {
-        // console.log('request createDesktopMdb!');
-        // console.log(req);
-        let params = JSON.parse(req.body.params);
-        let compilationId = params.compilationId,
-            rationLibId = params.rationLibId,
-            hasRationTree = params.hasRationTree,
-            hasRation = params.hasRation,
-            hasAssistRation = params.hasAssistRation,
-            hasGLJ = params.hasGLJ,
-            hasCOE = params.hasCOE
-        ;
-        // console.log(params);
-        // let rst = {};
-        if (hasRationTree || hasRation || hasGLJ || hasCOE) {
-            //const rst = await rationItem.prepareInitData(data.rationRepId);
-            let mixData = await rationItemDAO.prepareInitData(rationLibId);
-            let gljCache = {};
-            const prefix = '_'
-
-            if (hasRationTree) {
-                //mixData.sectionTree //定额树
-                // await _addTreeData(mixData.sectionTree);
-            }
-            if (hasRation || hasGLJ) {
-                for (let gljItem of mixData.gljList) {
-                    gljCache[prefix + gljItem.ID] = gljItem;
-                }
-                //mixData.gljList //总工料机
-                // await _addGLJData(mixData.gljList);
-            }
-            if (hasRation || hasCOE) {
-                let rationItems = await rationItemDAO.getRationItemsByLib(rationLibId); //定额
-                await _addRationData(rationItems);
-                // await _addRationGljData(rationItems, gljCache, prefix);
-            }
-        }
-        if (hasAssistRation) {
-            //
-        }
-        res.json({error: 0, message: 'success', data: ''});
-    }
-};
-
-const NODE_ID = "ID", P_ID = "ParentID", NEXT_ID = "NextSiblingID", ADHOC_PRE_ID="Previous_ID", CHILDREN_NODE = "items", SUB_ID = "sub_ids",
-    EMPTY_ID_VAL = -1, TREE_LEVEL = 'treeLevel', TOP_BILL_ID = "topBillID";
-
-let tree_Data_Helper = {
-    buildTreeNodeDirectly: function(data, addLevel) {
-        let topArr = [], rst = [], tmpNodes = {}, prefix = "id_";
-        let private_getStartNode = function (idArr) {
-            let tmpNodeRst = null;
-            for (let i = 0; i < idArr.length; i++) {
-                if (parseInt(tmpNodes[prefix + idArr[i]][ADHOC_PRE_ID]) === EMPTY_ID_VAL) {
-                    tmpNodeRst = tmpNodes[prefix + idArr[i]];
-                    break;
-                }
-            }
-            return tmpNodeRst;
-        };
-        let private_buildNodeData = function(parentItem, idArr, treeLevel, tbID) {
-            let iter = [], nextNode = private_getStartNode(idArr), pushedIds = [];
-            while (nextNode !== null && nextNode !== undefined ) {
-                if (parentItem) {
-                    parentItem[CHILDREN_NODE].push(nextNode);
-                } else {
-                    rst.push(nextNode);
-                }
-                iter.push(nextNode);
-                pushedIds.push(nextNode[NODE_ID]);
-                nextNode[TOP_BILL_ID] = tbID;
-                if (parentItem === null) {
-                    nextNode[TOP_BILL_ID] = nextNode[NODE_ID];
-                    if (nextNode.flags && nextNode.flags.length > 0) {
-                        for (let flag of nextNode.flags) {
-                            if (flag.fieldName === "fixed") {
-                                nextNode[TOP_BILL_ID] = flag.flag;
-                                break;
-                            }
-                        }
-                    }
-                }
-                if (addLevel) nextNode[TREE_LEVEL] = treeLevel;
-                nextNode = tmpNodes[prefix + nextNode[NEXT_ID]];
-                if (nextNode === null || nextNode === undefined) {
-                    //备注： 考虑到实际数据的健壮性，有些节点会掉链子，需要用 parentItem[SUB_ID] 比对已经加上的节点，如发现加上的节点数量不够，那就得在这里补充上去
-                    if (parentItem) {
-                        if (parentItem[SUB_ID].length > iter.length) {
-                            for (let subId of parentItem[SUB_ID]) {
-                                if (pushedIds.indexOf(subId) < 0) {
-                                    let restNode = tmpNodes[prefix + subId];
-                                    if (addLevel) restNode[TREE_LEVEL] = treeLevel;
-                                    restNode[TOP_BILL_ID] = tbID;
-                                    parentItem[CHILDREN_NODE].push(restNode);
-                                    iter.push(restNode);
-                                }
-                            }
-                        }
-                    } else {
-                        if (idArr.length > iter.length) {
-                            for (let topId of idArr) {
-                                if (pushedIds.indexOf(topId) < 0) {
-                                    let restNode = tmpNodes[prefix + topId];
-                                    if (addLevel) restNode[TREE_LEVEL] = treeLevel;
-                                    restNode[TOP_BILL_ID] = restNode[NODE_ID];
-                                    if (restNode.flags && restNode.flags.length > 0) {
-                                        for (let flag of restNode.flags) {
-                                            if (flag.fieldName === "fixed") {
-                                                restNode[TOP_BILL_ID] = flag.flag;
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    rst.push(restNode);
-                                    iter.push(restNode);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            pushedIds = [];
-            for (let i = 0; i < iter.length; i++) {
-                let rtbID = tbID;
-                if (parentItem === null) {
-                    rtbID = iter[i][TOP_BILL_ID];
-                }
-                private_buildNodeData(iter[i], iter[i][SUB_ID], (treeLevel + 1), rtbID);
-            }
-        };
-        //1. 给每个节点设置key, 顺便找Top Node
-        for (let i = 0; i < data.length; i++) {
-            tmpNodes[prefix + data[i][NODE_ID]] = data[i];
-            data[i][ADHOC_PRE_ID] = EMPTY_ID_VAL;
-            data[i][SUB_ID] = [];
-            data[i][CHILDREN_NODE] = [];
-            if (parseInt(data[i][P_ID]) === EMPTY_ID_VAL) {
-                topArr.push(data[i][NODE_ID]);
-            }
-        }
-        //2. 通过key，设置好兄弟/父子关系
-        for (let i = 0; i < data.length; i++) {
-            if (parseInt(data[i][NEXT_ID]) !== EMPTY_ID_VAL) {
-                if (tmpNodes[prefix + data[i][NEXT_ID]] !== undefined){
-                    if (tmpNodes[prefix + data[i][NEXT_ID]][P_ID] === data[i][P_ID]) {
-                        tmpNodes[prefix + data[i][NEXT_ID]][ADHOC_PRE_ID] = data[i][NODE_ID];
-                    } else {
-                        tmpNodes[prefix + data[i][NEXT_ID]][ADHOC_PRE_ID] = EMPTY_ID_VAL;
-                        data[i][NEXT_ID] = EMPTY_ID_VAL;
-                    }
-                }
-            }
-            if (parseInt(data[i][P_ID]) !== EMPTY_ID_VAL) {
-                tmpNodes[prefix + data[i][P_ID]][SUB_ID].push(data[i][NODE_ID]);
-            }
-        }
-        //3. 开build
-        private_buildNodeData(null, topArr, 0, -1);
-        //try to release and return
-        tmpNodes = null;
-        topArr.length = 0;
-        return rst;
-    },
-
-    getFlatArray: function (srcArr, destArr) {
-        let private_put = function (parentItem) {
-            destArr.push(parentItem);
-            if (parentItem.items) {
-                for (let subItem of parentItem.items) {
-                    private_put(subItem);
-                }
-            }
-        }
-        for (let node of srcArr) {
-            private_put(node);
-        }
-        for (let item of destArr) {
-            delete item[CHILDREN_NODE];
-            delete item[SUB_ID];
-            delete item[ADHOC_PRE_ID];
-        }
-    }
-};
-
-async function _addRationGljData(rationItemArr, gljCache, prefix) {
-    console.log('start Ration GLJ!');
-    // console.log(`Ration GLJ total amount: ${rationGljArr.length}`);
-    for (let idx = 0; idx < rationItemArr.length; idx++) {
-        let rationItem = rationItemArr[idx];
-        for (let rgljItem of rationItem.rationGljList) {
-            if (parseFloat(rgljItem.consumeAmt) > 0) {
-                let fieldStr = 'RationID, GLJID, Amount, Proportion, Type';
-                let valueStr = `${rationItem.ID}, ${rgljItem.gljId}, ${rgljItem.consumeAmt}, ${(rgljItem.proportion !== undefined)?rgljItem.proportion:0}, ${gljCache[prefix + rgljItem.gljId].gljType}`;
-                let sqlStr = `INSERT INTO Ration_GLJ(${fieldStr}) VALUES (${valueStr})`;
-                try {
-                    // console.log(`executing SQL: ${sqlStr}`);
-                    await connection.execute(sqlStr);
-                } catch(ex) {
-                    console.log(`execute SQL with error: ${sqlStr}`);
-                }
-            }
-        }
-    }
-    console.log('end Ration GLJ!');
-}
-
-async function _addRationData(rationItemArr) {
-    console.log('start Ration!');
-    console.log(`Ration total amount: ${rationItemArr.length}`);
-    for (let idx = 0; idx < rationItemArr.length; idx++) {
-        let item = rationItemArr[idx];
-        let fieldStr = 'ID, IDCode, Code, Name, Unit, BasePrice, SectionID, Caption, FeeType, Name2, Unit2, UUID';
-        let valueStr = `${item.ID}, ${_getIDCode(item.code)}, '${item.code}', '${item.name}', '${item.unit}', ${item.basePrice}, ${item.sectionId}, '${item.caption}', ${item.feeType}, '', '', '' `;
-        let sqlStr = `INSERT INTO RationItems(${fieldStr}) VALUES (${valueStr})`;
-        try {
-            // console.log(`executing SQL: ${sqlStr}`);
-            await connection.execute(sqlStr);
-        } catch(ex) {
-            console.log(`execute SQL with error: ${sqlStr}`);
-        }
-    }
-    console.log('end Ration!');
-}
-
-async function _addGLJData(gljItemArr) {
-    console.log('start GLJ!');
-    console.log(`GLJ total amount: ${gljItemArr.length}`);
-    for (let idx = 0; idx < gljItemArr.length; idx++) {
-        let item = gljItemArr[idx];
-        let fieldStr = 'ID, Code, Name, Specs, Unit, BasePrice, Main, New, Type, DetailType, ShortName, Name2, Unit2, SortParam, CalculateType, UUID, 字段1, 字段2';
-        let valueStr = `${item.ID}, '${item.code}', '${item.name}', '${item.specs}', '${item.unit}', ${(item.basePrice !== undefined)?item.basePrice:0}, 0, 0, ${item.gljType}, ${item.gljClass}, '${item.shortName}', '', '', '', '', '', '', ''`;
-        let sqlStr = `INSERT INTO GLJList(${fieldStr}) VALUES (${valueStr})`;
-        try {
-            // console.log(`executing SQL: ${sqlStr}`);
-            await connection.execute(sqlStr);
-        } catch(ex) {
-            console.log(`execute SQL with error: ${sqlStr}`);
-        }
-    }
-    console.log('end GLJ!');
-}
-
-async function _addTreeData(treeDataArr) {
-    console.log('start tree!');
-    console.log(`GLJ total amount: ${treeDataArr.length}`);
-    let tmpTreeArr = tree_Data_Helper.buildTreeNodeDirectly(treeDataArr, true);
-    for (let idx = 0; idx < tmpTreeArr[0].items.length; idx++) {
-        _setChapterLevel(tmpTreeArr[0].items[idx], idx + 1);
-    }
-    let sectionTreeArr = [];
-    tree_Data_Helper.getFlatArray(tmpTreeArr, sectionTreeArr);
-    for (let sectionNode of sectionTreeArr) {
-        let fieldStr = 'ID, ParentID, NextSiblingID, Name, Code, FullCode, Name2';
-        let valueStr = `${sectionNode.ID},${sectionNode.ParentID},${sectionNode.NextSiblingID},'${sectionNode.name}',${sectionNode.chapterLv === undefined?-1:sectionNode.chapterLv},'',''`;
-        let sqlStr = `INSERT INTO RationTree(${fieldStr}) VALUES (${valueStr})`;
-        try {
-            // console.log(`executing SQL: ${sqlStr}`);
-            await connection.execute(sqlStr);
-        } catch(ex) {
-            console.log(`execute SQL with error: ${sqlStr}`);
-        }
-    }
-    console.log('end tree!');
-}
-
-function _setChapterLevel(chapterNode, cLv) {
-    chapterNode.chapterLv = cLv;
-    if (chapterNode.items && chapterNode.items.length > 0) {
-        for (let subNode of chapterNode.items) {
-            _setChapterLevel(subNode, cLv);
-        }
-    }
-}
-
-function _getIDCode(code) {
-    let rst = '';
-    if (code !== null && code !== undefined) {
-        let codes = code.split('-');
-        if (codes.length === 3) {
-            let suppls = ['', '', ''];
-
-            let regExp = new RegExp('D', "gm");
-            codes[0] = codes[0].replace(regExp, '');
-
-            if (codes[0].length < 2) {
-                for (let idx = codes[0].length; idx < 2; idx++) {
-                    suppls[0] = suppls[0] + '0';
-                }
-            }
-            if (codes[1].length < 2) {
-                for (let idx = codes[1].length; idx < 2; idx++) {
-                    suppls[1] = suppls[1] + '0';
-                }
-            }
-            if (codes[2].length < 3) {
-                for (let idx = codes[2].length; idx < 3; idx++) {
-                    suppls[2] = suppls[2] + '0';
-                }
-            }
-            for (let si = 0; si < codes.length; si++) {
-                rst += (suppls[si] + codes[si]);
-            }
-        } else {
-            //
-        }
-    }
-    return rst;
-}

modules/reports/routes/report_router_operation.js

@@ -5,7 +5,7 @@
 import express from "express";
 let rptRouter = express.Router();
 // import reportController from "../controllers/rpt_controller_operation";
-let adHocController = require("../controllers/adhoc_task_controller");
+
 
 // 完成历史任务，屏蔽
 //*
@@ -49,7 +49,6 @@ module.exports = function (app) {
         }
     });
 
-    rptRouter.post('/createDesktopMdb', adHocController.createDesktopMdb);
-
+   
     app.use("/adHoc_report_api", rptRouter);
 };

modules/std_billsGuidance_lib/controllers/libController.js

@@ -131,6 +131,7 @@ class BillsGuideLibController extends BaseController{
     
     async generateClassData(req, res) {
         try{
+            res.setTimeout(1000 * 60 * 10); // 不设置的话，处理时间过长，会触发默认的响应超时，报错(前端报错，后台还继续在处理)
             const data = JSON.parse(req.body.data);
             await billsGuidanceFacade.generateClassData(data.libID);
             callback(req, res, 0, '', []);
@@ -144,7 +145,9 @@ class BillsGuideLibController extends BaseController{
     async exportClassExcel(req, res) {
         try{
             const excelData = await billsGuidanceFacade.getClassExcelData(req.query.libID);
-            const buffer = excel.build([{name: "清单分类库", data: excelData}], {'!cols': [{wch:6}, {wch:12},{wch:14},{wch:24}, {wch:45}]});
+            console.log('start-build');
+            const buffer = excel.build([{name: "清单分类库", data: excelData}], {'!cols': [{wch:6}, {wch:12}, {wch:14}, {wch:24}, {wch:45}, {wch:20}, {wch:30}, {wch:30}]});
+            console.log('end-build');
             const filePath = './public/export.xlsx';
             fs.writeFileSync(filePath, buffer, 'binary');
             const stats = fs.statSync(filePath);

modules/std_billsGuidance_lib/facade/facades.js

@@ -415,7 +415,7 @@ async function updateItems(updateDatas) {
 
 // 获取清单材料数据
 async function getBillMaterials(libID, billID) {
-    // 指引下已有定额人材机
+    // 指引下已有定额人材机（材料大类）
     let allGljList = [];
     const rationItems = await billsGuideItemsModel.find({ libID, billsID: billID, rationID: { $ne: null } }, '-_id rationID').lean();
     if (rationItems.length) {
@@ -428,7 +428,8 @@ async function getBillMaterials(libID, billID) {
             }
         });
         if (gljIDs.length) {
-            allGljList = await gljModel.find({ ID: { $in: [...new Set(gljIDs)] } }, '-_id ID code name specs').lean();
+            allGljList = await gljModel.find({ ID: { $in: [...new Set(gljIDs)] } }, '-_id ID code name specs gljType').lean();
+            allGljList = allGljList.filter(glj => /^2/.test(glj.gljType) || [4, 5].includes(glj.gljType));
         }
     }
     // 清单材料
@@ -482,22 +483,24 @@ function isOptionNode(node) {
     return node && node.depth() % 2 === 1 && node.data.type === 0
 }
 
-// 从指引节点，获取分类特征数据
-function getItemCharacterData(nodes, prefix) {
+// 从指引节点，获取分类特征、必套定额数据
+function getItemClassData(nodes, prefix) {
     const processNodes = nodes.filter(node => isProcessNode(node));
     const classGroups = []; // 同层必填选项的数组（二维数组）
     processNodes.forEach(processNode => {
         const classItems = [];
         const optionNodes = processNode.children.filter(node => isOptionNode(node));
         optionNodes.forEach(optionNode => {
-            // const name = prefix ? `${prefix}@${optionNode.data.name}` : optionNode.data.name;
             if (optionNode.parent && optionNode.parent.data.required && (!optionNode.children 
                 || !optionNode.children.length 
                 || (optionNode.children[0].data && optionNode.children[0].data.rationID) 
                 || !optionNode.children.some(node => isProcessNode(node)))) {
-                classItems.push(optionNode.data.name);
+                // 必套定额
+                const requiredRationIDs = optionNode.children && optionNode.children.length ?
+                    optionNode.children.filter(node => !!node.data.rationID).map(node => node.data.rationID) : [];
+                classItems.push({ name: optionNode.data.name, requiredRationIDs });
             } else {
-                classItems.push(...getItemCharacterData(optionNode.children, optionNode.parent && optionNode.parent.data.required ? optionNode.data.name : ''));
+                classItems.push(...getItemClassData(optionNode.children, optionNode.parent && optionNode.parent.data.required ? optionNode.data.name : ''));
             }
         });
         if (classItems.length) {
@@ -506,7 +509,10 @@ function getItemCharacterData(nodes, prefix) {
     });
     // 拼接上一文本
     if (classGroups[0] && classGroups[0].length) {
-        classGroups[0] = classGroups[0].map(name => prefix ? `${prefix}@${name}` : name);
+        classGroups[0] = classGroups[0].map(item => {
+            item.name = prefix ? `${prefix}@${item.name}` : item.name
+            return item;
+        });
     }
     // 二维数组内容排列组合
     while (classGroups.length > 1) {
@@ -515,12 +521,57 @@ function getItemCharacterData(nodes, prefix) {
         const mergedClassItems = [];
         for (let i = 0; i < prevClassItems.length; i++) {
             for (let j = 0; j < nextClassItems.length; j++) {
-                mergedClassItems.push(`${prevClassItems[i]}@${nextClassItems[j]}`);
+                // 拼接文本
+                const mergedName = `${prevClassItems[i].name}@${nextClassItems[j].name}`;
+                // 拼接必套定额
+                const mergedRationIDs = [...prevClassItems[i].requiredRationIDs, ...nextClassItems[j].requiredRationIDs];
+                mergedClassItems.push({name: mergedName, requiredRationIDs: mergedRationIDs});
             }
         }
         classGroups.splice(0, 2, mergedClassItems);
     }
-    return classGroups[0] ? [...new Set(classGroups[0])] : []; // 去重
+    // 去重（类别别名要唯一）
+    const items = classGroups[0] || [];
+    const nameMap = {};
+    const rst = [];
+    items.forEach(item => {
+        if (!nameMap[item.name]) {
+            rst.push(item);
+        }
+        nameMap[item.name] = true;
+    });
+    return rst;
+}
+
+// 获取选套定额：把所有分类数据的必套定额确定好了先。选套定额就是清单下所有定额除了必套的
+function getOptionalRationIDs(itemClassData, allRationIDs) {
+    // 所有必套定额
+    let requiredRationIDs = [];
+    itemClassData.forEach(item => {
+        if (item.requiredRationIDs) {
+            requiredRationIDs.push(...item.requiredRationIDs);
+        }
+    });
+    requiredRationIDs = [...new Set(requiredRationIDs)];
+    // 选套定额就是清单下所有定额除了必套的
+    const optionalRationIDs = [];
+    allRationIDs.forEach(rationID => {
+        if (!requiredRationIDs.includes(rationID)) {
+            optionalRationIDs.push(rationID);
+        }
+    });
+    return [...new Set(optionalRationIDs)];
+}
+
+// 获取错套定额：清单下所有定额，除了分类对应的必套、选套定额
+function getErrorRationIDs(requiredRationIDs, optionalRationIDs, allRationIDs) {
+    const errorRationIDs = [];
+    allRationIDs.forEach(rationID => {
+        if (!requiredRationIDs.includes(rationID) && !optionalRationIDs.includes(rationID)) {
+            errorRationIDs.push(rationID);
+        }
+    });
+    return [...new Set(errorRationIDs)];
 }
 
 // 生成清单分类
@@ -550,28 +601,23 @@ async function generateClassData(libID) {
         }
         const guidanceTree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: true});
         guidanceTree.loadDatas(guidanceItems);
-        /* if (!guidanceTree.check(guidanceTree.roots)) {
-            console.log('==================================清单下精灵树结构问题=========================================');
-            console.log('==================================清单下精灵树结构问题=========================================');
-            console.log('==================================清单下精灵树结构问题=========================================');
-            console.log('==================================清单下精灵树结构问题=========================================');
-            console.log('==================================清单下精灵树结构问题=========================================');
-            console.log(billNode.data);
-            console.log('==================================清单下精灵树结构问题=========================================');
-            console.log('==================================清单下精灵树结构问题=========================================');
-            console.log('==================================清单下精灵树结构问题=========================================');
-            console.log('==================================清单下精灵树结构问题=========================================');
-            console.log('==================================清单下精灵树结构问题=========================================');
-        } */
-        const itemCharacterData = getItemCharacterData(guidanceTree.roots);
-        itemCharacterData.forEach(itemCharacter => {
+        const itemClassData = getItemClassData(guidanceTree.roots); // 必套定额在这个方法内就获取了，避免重复执行递归方法
+        const allRationIDs = guidanceTree.items.filter(node => !!node.data.rationID).map(node => node.data.rationID);
+        // 选套定额ID
+        const optionalRationIDs = getOptionalRationIDs(itemClassData, allRationIDs);
+        itemClassData.forEach(item => {
+            // 错套定额
+            const errorRationIDs = getErrorRationIDs(item.requiredRationIDs, optionalRationIDs, allRationIDs);
             billClassData.push({
-                itemCharacter,
+                itemCharacter: item.name,
                 class: classNum++,
-                classCode: `${billNode.data.code}@${itemCharacter}`,
+                classCode: `${billNode.data.code}@${item.name}`,
                 compilationID: lib.compilationId,
                 name: billNode.data.name,
                 code: billNode.data.code,
+                requiredRationIDs: item.requiredRationIDs || [],
+                optionalRationIDs,
+                errorRationIDs,
             });
         });
     });
@@ -594,15 +640,22 @@ async function getClassExcelData(libID) {
     if (!lib) {
         throw new Error('无有效精灵库');
     }
+    console.log('start');
+    const date = Date.now();
     const classData = await billClassModel.find({ compilationID: lib.compilationId }).lean();
-    const excelData = [['类别', '编码', '清单名称', '必填特征排列组合', '类别别名']];
+    console.log('end');
+    console.log(Date.now() -date);
+    const excelData = [['类别', '编码', '清单名称', '必填特征排列组合', '类别别名', '必套定额', '选套定额', '错套定额']];
     classData.forEach(item => {
         const excelItem = [
             item.class,
             item.code,
             item.name,
             item.itemCharacter,
-            item.classCode
+            item.classCode,
+            (item.requiredRationIDs || []).join('@'),
+            (item.optionalRationIDs || []).join('@'),
+            (item.errorRationIDs || []).join('@'),
         ];
         excelData.push(excelItem);
     });

web/maintain/billsGuidance_lib/js/billsGuidance.js

@@ -2589,7 +2589,7 @@ const billsGuidance = (function () {
     }
 
 
-    /* 生成特征分类: 测试使用 */
+    /* 生成特征分类: 前端测试使用，想要前端测试，需要在zhiyin.html中，将id=generate-classa的按钮放开 */
     function getItemCharacterData(nodes, prefix) {
         const processNodes = nodes.filter(node => isProcessNode(node));
         const classGroups = []; // 同层必填选项的数组（二维数组）
@@ -2602,7 +2602,10 @@ const billsGuidance = (function () {
                     || !optionNode.children.length 
                     || (optionNode.children[0].data && optionNode.children[0].data.rationID) 
                     || !optionNode.children.some(node => isProcessNode(node)))) {
-                    classItems.push(optionNode.data.name);
+                    // 必套定额
+                    const requiredRationIDs = optionNode.children && optionNode.children.length ?
+                        optionNode.children.filter(node => !!node.data.rationID).map(node => node.data.rationID) : [];
+                    classItems.push({ name: optionNode.data.name, requiredRationIDs });
                 } else {
                     classItems.push(...getItemCharacterData(optionNode.children, optionNode.parent && optionNode.parent.data.required ? optionNode.data.name : ''));
                 }
@@ -2613,7 +2616,11 @@ const billsGuidance = (function () {
         });
         // 拼接上一文本
         if (classGroups[0] && classGroups[0].length) {
-            classGroups[0] = classGroups[0].map(name => prefix ? `${prefix}@${name}` : name);
+            // classGroups[0] = classGroups[0].map(name => prefix ? `${prefix}@${name}` : name);
+            classGroups[0] = classGroups[0].map(item => {
+                item.name = prefix ? `${prefix}@${item.name}` : item.name
+                return item;
+            });
         }
         // 二维数组内容排列组合
         while (classGroups.length > 1) {
@@ -2622,55 +2629,68 @@ const billsGuidance = (function () {
             const mergedClassItems = [];
             for (let i = 0; i < prevClassItems.length; i++) {
                 for (let j = 0; j < nextClassItems.length; j++) {
-                    mergedClassItems.push(`${prevClassItems[i]}@${nextClassItems[j]}`);
+                    // 拼接文本
+                    const mergedName = `${prevClassItems[i].name}@${nextClassItems[j].name}`;
+                    // 拼接必套定额
+                    const mergedRationIDs = [...prevClassItems[i].requiredRationIDs, ...nextClassItems[j].requiredRationIDs];
+                    mergedClassItems.push({name: mergedName, requiredRationIDs: mergedRationIDs});
                 }
             }
             classGroups.splice(0, 2, mergedClassItems);
         }
-        return classGroups[0] ? [...new Set(classGroups[0])] : [];
+        // 去重（类别别名要唯一）
+        const items = classGroups[0] || [];
+        const nameMap = {};
+        const rst = [];
+        items.forEach(item => {
+            if (!nameMap[item.name]) {
+                rst.push(item);
+            }
+            nameMap[item.name] = true;
+        });
+        return rst;
+        
     }
-    /* function getItemCharacterData(nodes, prefix) {
-        debugger;
-        const processNodes = nodes.filter(node => isProcessNode(node) && node.data.required);
-        const classGroups = []; // 同层必填选项的数组（二维数组）
-        processNodes.forEach(processNode => {
-            const classItems = [];
-            const optionNodes = processNode.children.filter(node => isOptionNode(node));
-            optionNodes.forEach(optionNode => {
-                // const name = prefix ? `${prefix}@${optionNode.data.name}` : optionNode.data.name;
-                if (!optionNode.children 
-                    || !optionNode.children.length 
-                    || (optionNode.children[0].data && optionNode.children[0].data.rationID) 
-                    || !optionNode.children.some(node => isProcessNode(node) && node.data.required)) {
-                    classItems.push(optionNode.data.name);
-                } else {
-                    classItems.push(...getItemCharacterData(optionNode.children, optionNode.data.name));
-                }
-            });
-            classGroups.push(classItems);
+
+    // 获取选套定额：把所有分类数据的必套定额确定好了先。选套定额就是清单下所有定额除了必套的
+    function getOptionalRationIDs(itemClassData, guideNodes) {
+        // 所有必套定额
+        let requiredRationIDs = [];
+        itemClassData.forEach(item => {
+            if (item.requiredRationIDs) {
+                requiredRationIDs.push(...item.requiredRationIDs);
+            }
         });
-        // 拼接上一文本
-        if (classGroups[0] && classGroups[0].length) {
-            classGroups[0] = classGroups[0].map(name => prefix ? `${prefix}@${name}` : name);
-        }
-        // 二维数组内容排列组合
-        while (classGroups.length > 1) {
-            const prevClassItems = classGroups[0];
-            const nextClassItems = classGroups[1];
-            const mergedClassItems = [];
-            for (let i = 0; i < prevClassItems.length; i++) {
-                for (let j = 0; j < nextClassItems.length; j++) {
-                    mergedClassItems.push(`${prevClassItems[i]}@${nextClassItems[j]}`);
-                }
+        requiredRationIDs = [...new Set(requiredRationIDs)];
+        // 选套定额就是清单下所有定额除了必套的
+        const optionalRationIDs = [];
+        guideNodes.forEach(node => {
+            if (node.data.rationID && !requiredRationIDs.includes(node.data.rationID)) {
+                optionalRationIDs.push(node.data.rationID);
             }
-            classGroups.splice(0, 2, mergedClassItems);
-        }
-        return classGroups[0] || [];
-    } */
+        });
+        return [...new Set(optionalRationIDs)];
+    }
+
+    // 获取错套定额：清单下所有定额，除了分类对应的必套、选套定额
+    function getErrorRationIDs(requiredRationIDs, optionalRationIDs, guideNodes) {
+        const errorRationIDs = [];
+        guideNodes.forEach(node => {
+            if (node.data.rationID && !requiredRationIDs.includes(node.data.rationID) && !optionalRationIDs.includes(node.data.rationID)) {
+                errorRationIDs.push(node.data.rationID);
+            }
+        });
+        return [...new Set(errorRationIDs)];
+    }
 
     $('#generate-class').click(() => {
         if (bills.tree.selected && bills.tree.selected.guidance.tree) {
             const classData = getItemCharacterData(bills.tree.selected.guidance.tree.roots);
+            const optionalRationIDs = getOptionalRationIDs(classData, bills.tree.selected.guidance.tree.items);
+            classData.forEach(item => {
+                item.errorRationIDs = getErrorRationIDs(item.requiredRationIDs, optionalRationIDs, bills.tree.selected.guidance.tree.items);
+            })
+            console.log(optionalRationIDs);
             console.log(classData);
         }
     });

web/maintain/ration_repository/dinge.html

@@ -603,6 +603,31 @@
                 </div>
             </div>
         </div>
+    <!-- 设置默认工作内容 -->
+    <div class="modal fade" id="set-job-content-dialog" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">设置默认工作内容</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <form>
+                        <div class="form-group">
+                            <input type="text" class="form-control" placeholder="输入工作内容" id="default-job-content" autofocus="autofocus">
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <a href="javascript:void(0);" class="btn btn-primary" data-dismiss="modal" id="set-job-content-confirm">确定</a>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
         <%include ../../common/html/uploadImg.html %>
         <!--弹出html填写帮助-->
         <!--弹出html填写帮助-->

web/maintain/ration_repository/js/ration.js

@@ -78,6 +78,7 @@ let rationOprObj = {
             {headerName:"显示名称（以%s表示参数）",headerWidth:240,dataCode:"caption", dataType: "String"},
             {headerName:"取费专业",headerWidth:70,dataCode:"feeType", dataType: "Number", hAlign: "center"},
             {headerName:"管理费费率(%)",headerWidth:100,dataCode:"manageFeeRate", dataType: "String", hAlign: "center"},
+            {headerName:"工作内容",headerWidth:130,dataCode:"jobContentText", dataType: "String"},
         ],
         view:{
             comboBox:[

web/maintain/ration_repository/js/section_tree.js

@@ -256,6 +256,17 @@ let sectionTreeObj = {
                                 callback: function (key, opt) {
                                     $('#set-rate-dialog').modal('show');
                                 }
+                            },
+                            "setJobContent": {
+                                name: "设置工作内容",
+                                disabled: function () {
+                                    const section = me.cache[target.row];
+                                    return locked || !section;
+                                },
+                                icon: "fa-pencil-square-o",
+                                callback: function (key, opt) {
+                                    $('#set-job-content-dialog').modal('show');
+                                }
                             }
                         }
                     };
@@ -401,6 +412,26 @@ let sectionTreeObj = {
                 $.bootstrapLoading.end();
             });
         });
+
+           // 设置默认工作内容，设置给其下所有定额
+           $('#set-job-content-confirm').click(function () {
+            $.bootstrapLoading.start();
+            const jobContentText = $('#default-job-content').val();
+            const section = me.tree.selected;
+            const sectionList = me.getSectionLeafList(section);
+            const postData = {
+                rationRepId: pageOprObj.rationLibId,
+                sectionList,
+                updateData: { jobContentText: jobContentText }
+            };
+            $('#default-job-content').val('');
+            CommonAjax.post('/rationRepository/api/updateRationBySection', postData, function () {
+                me.initSelection(section);
+                $.bootstrapLoading.end();
+            }, function () {
+                $.bootstrapLoading.end();
+            });
+        });
     },
 
     insert: function () {