(*)培训资料库优化左侧默认选中

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

@@ -8,6 +8,7 @@ async function getResourceClassify(ctx) {
         rlst = [{
             label: "公司培训资料", value: "company", key: "公司培训资料", operation: true, children: []
         }, { label: "部门培训资料", value: 'dept', key: '部门培训资料', operation: false, children: [] }];
+        const findObj = { order: [["departmentName", "asc"]] }
         const filterData = (arrayData, arrIndex, operation) => {
             if (arrayData.length) {
                 for (let level of arrayData) {
@@ -15,17 +16,18 @@ async function getResourceClassify(ctx) {
                     /** departmentName:2级，trainDate：3级 */
                     if (departmentName) {
                         if (trainDate) {
+                            const trainDateLabel = 'object' == typeof trainDate ? moment(trainDate).format('YYYY-MM') : trainDate;
                             const depKey = rlst[arrIndex].label + '/' + departmentName
                             //区分2级是否记录
                             if (rlst[arrIndex].children) {
                                 const depIndex = rlst[arrIndex].children.findIndex(r => r.key == depKey);
                                 if (depIndex > -1) {
-                                    const dateKey = rlst[arrIndex].label + '/' + rlst[arrIndex].children[depIndex].label + '/' + moment(trainDate).format('YYYY-MM');
+                                    const dateKey = rlst[arrIndex].label + '/' + rlst[arrIndex].children[depIndex].label + '/' + trainDateLabel;
                                     if (rlst[arrIndex].children[depIndex].children) {
                                         const dateIndex = rlst[arrIndex].children[depIndex].children.findIndex(r => r.key == dateKey);
                                         if (dateIndex == -1) {
                                             rlst[arrIndex].children[depIndex].children.push({
-                                                label: moment(trainDate).format('YYYY-MM'),
+                                                label: trainDateLabel,
                                                 value: dateKey,
                                                 key: dateKey,
                                                 operation
@@ -33,7 +35,7 @@ async function getResourceClassify(ctx) {
                                         }
                                     } else {
                                         rlst[arrIndex].children[depIndex].children = [{
-                                            label: moment(trainDate).format('YYYY-MM'),
+                                            label: trainDateLabel,
                                             value: dateKey,
                                             key: dateKey,
                                             operation
@@ -46,9 +48,9 @@ async function getResourceClassify(ctx) {
                                         key: depKey,
                                         operation,
                                         children: [{
-                                            label: moment(trainDate).format('YYYY-MM'),
-                                            value: depKey + '/' + moment(trainDate).format('YYYY-MM'),
-                                            key: depKey + '/' + moment(trainDate).format('YYYY-MM'),
+                                            label: trainDateLabel,
+                                            value: depKey + '/' + trainDateLabel,
+                                            key: depKey + '/' + trainDateLabel,
                                             operation
                                         }]
                                     });
@@ -60,9 +62,9 @@ async function getResourceClassify(ctx) {
                                     key: depKey,
                                     operation,
                                     children: [{
-                                        label: moment(trainDate).format('YYYY-MM'),
-                                        value: depKey + '/' + moment(trainDate).format('YYYY-MM'),
-                                        key: depKey + '/' + moment(trainDate).format('YYYY-MM'),
+                                        label: trainDateLabel,
+                                        value: depKey + '/' + trainDateLabel,
+                                        key: depKey + '/' + trainDateLabel,
                                         operation
                                     }]
                                 }]
@@ -94,11 +96,11 @@ async function getResourceClassify(ctx) {
             }
         }
 
-        const deptTraining = await models.DeptTraining.findAll({});
+        const deptTraining = await models.DeptTraining.findAll(findObj);
         if (deptTraining.length) {
             filterData(deptTraining, 1, false);
         }
-        const trainingInformation = await models.TrainingInformation.findAll({});
+        const trainingInformation = await models.TrainingInformation.findAll(findObj);
         if (trainingInformation.length) {
             filterData(trainingInformation, 0, true);
         }
@@ -113,7 +115,13 @@ async function getResourceClassify(ctx) {
         }
     }
 }
-
+/**查询培训资源储备库文件列表
+ * query
+ *  limit、offset
+ *  type : 文件分类，必填，{公司培训资料/部门培训资料}
+ *  departmentName：二级目录 
+ *  trainDate：三级目录
+ */
 async function getResourceFileList(ctx, next) {
     try {
         const { models } = ctx.fs.dc;
@@ -122,6 +130,7 @@ async function getResourceFileList(ctx, next) {
         if (["公司培训资料", "部门培训资料"].includes(type)) {
             const findObj = {
                 attributes: ["id", "fileType", "fileName", "fileSize", "updateDate", "attachPath"],
+                order: [["departmentName", "desc"]]
             };
             if (Number(limit) > 0 && Number(offset) >= 0) {
                 findObj.limit = Number(limit);
@@ -153,8 +162,31 @@ async function getResourceFileList(ctx, next) {
         ctx.body = { message: err.message || '查询培训资源储备库文件列表失败' }
     }
 }
+async function postResourceClassify(ctx) {
+    try {
+        const { models } = ctx.fs.dc;
+        const { departmentName, trainDate } = ctx.request.body;
+        if (departmentName && '' != departmentName) {
+            const where = {
+                departmentName: departmentName
+            };
+            if (trainDate && '' != trainDate) {
+                where.trainDate = trainDate;
+            }
+            const oldData = await models.TrainingInformation.findOne(where);
+
+        }
+
+        ctx.status = 204;
+    } catch (err) {
+        ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+        ctx.status = 400;
+        ctx.body = { message: err.message || '查询培训资源储备库文件列表失败' }
+    }
+}
 
 module.exports = {
     getResourceClassify,
-    getResourceFileList
+    getResourceFileList,
+    postResourceClassify
 }

api/app/lib/models/training_information.js

@@ -25,7 +25,7 @@ module.exports = dc => {
       autoIncrement: false
     },
     trainDate: {
-      type: DataTypes.DATE,
+      type: DataTypes.STRING,
       allowNull: true,
       defaultValue: null,
       comment: null,

web/client/src/sections/humanAffairs/containers/resourceRepository.jsx

@@ -113,6 +113,7 @@ const ResourceRepository = (props) => {
                                     defaultExpandAll={true}
                                     treeData={treeData}
                                     style={style}
+                                    value={currentSelect}
                                     expandedKeys={defaultExpandedKey}
                                     filterTreeNode={true}
                                     searchRender={false}