no message

src/biz/admin.ts

 import moment from "moment";
 import { TABLENAME } from "../config/dbEnum";
 import { selectDataCountByParam, selectDataListByParam, selectDataListToPageByParam, selectOneDataByParam } from "../data/findData";
-import { CHAPTER, HLDTYPE, QUESTION, TESTTYPE } from "../config/enum";
+import { CHAPTER, HLDTYPE, HUOLANDE, QUESTION, TESTTYPE } from "../config/enum";
 import { changeEnumValue } from "../tools/eccEnum";
 import { BizError } from "../util/bizError";
 import { ERRORENUM } from "../config/errorEnum";
@@ -40,24 +40,27 @@ export async function login(username, password) {
  * @param current 
  * @returns 
  */
-export async function getUserList(card, createStartTime, createEndTime, area, current) {
-    let selectParam = {"name":{"%ne%":"362527199309194932"}, "phone":{"%ne%":"17255558888"}};
-    if (card) selectParam["card"] = card;
-    if (createStartTime && createEndTime) selectParam["create_time"] = {"%between%":[createStartTime, createEndTime]};
-    if (area) selectParam["area"] = area;
-    let findData = await selectDataListToPageByParam(TABLENAME.测试信息表, selectParam, ["infoid", "name", "card", "phone", "email", "area", "create_time", "test_type"], current, 10);
+export async function getUserList(phone, createStartTime, createEndTime, current) {
+    let selectParam = {"name":{"%ne%":"测试"}, "phone":{"%ne%":"17255558888"}};
+    if (phone) selectParam["phone"] = phone;
+    if (createStartTime && createEndTime) selectParam["test_date"] = {"%between%":[createStartTime, createEndTime]};
+    let findData = await selectDataListToPageByParam(TABLENAME.测试信息表, selectParam, ["infoid", "name", "card", "phone", "email", "area", "create_time", "test_date", "test_type", "last_update_time"], current, 10);
     let dataCount = await selectDataCountByParam(TABLENAME.测试信息表, selectParam);
 
     let dataList = [];
-    findData.data.forEach( info => {
-        let {infoid, name, card, phone, email, area, create_time, test_type} = info;
+    for (let i = 0; i < findData.data.length; i++) {
+        let info = findData.data[i];
+        let {infoid, name, card, phone, email, area, create_time, test_type, last_update_time, test_date} = info;
 
+        let inforecordData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid, test_type}, []);
+        if (inforecordData.data.length) {
             dataList.push({
                 infoid, name, card, phone, email, area,
-            createTime: moment(create_time).format("YYYY-MM-DD"),
+                createTime: moment(test_date).format("YYYY-MM-DD HH:mm:ss"),
                 testType: test_type
             })
-    })
+        }
+    }
     
     return {dataList, dataCount:dataCount.data};
 }
@@ -88,8 +91,8 @@ export async function getUserInfoById(infoid, test_type) {
  * @returns 
  */
 async function getChuangYe(infoid) {
-    let findUserData = await selectOneDataByParam(TABLENAME.测试信息表, {infoid}, []);
-    let findData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid}, []);
+    let findUserData = await selectOneDataByParam(TABLENAME.测试信息表, {infoid, test_type:2}, []);
+    let findData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid, test_type:2}, []);
     
     let optionsInfo = [];
     let score = 0;
@@ -115,7 +118,7 @@ async function getChuangYe(infoid) {
         card:findUserData.data.card,
         phone:findUserData.data.phone,
         score,
-        time: moment(new Date()).format("YYYY年MM月DD日HH时mm分"),
+        time: moment(findUserData.data.test_date).format("YYYY年MM月DD日HH时mm分"),
         report:optionsInfo,
     };
 
@@ -129,8 +132,8 @@ async function getChuangYe(infoid) {
  * @returns 
  */
 async function getHuoLanDe(infoid) {
-    let findUserData = await selectOneDataByParam(TABLENAME.测试信息表, {infoid}, []);
-    let findData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid}, []);
+    let findUserData = await selectOneDataByParam(TABLENAME.测试信息表, {infoid, test_type:1}, []);
+    let findData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid, test_type:1}, []);
 
     let optionsInfo = {};
     for (let data = 0; data < findData.data.length; data++) {
@@ -182,17 +185,34 @@ async function getHuoLanDe(infoid) {
     let topThreeKeys = sortedEntries.slice(0, 3).map(entry => entry[0]);
     let topThreeStr = topThreeKeys.join("");
 
-    let findCareer = await selectOneDataByParam(TABLENAME.职业对照表, {statistics:topThreeStr}, []);
+    // let findCareer = await selectOneDataByParam(TABLENAME.职业对照表, {statistics:topThreeStr}, []);
+    
+    let selectParam = {"%literal%":``};
+    topThreeKeys.forEach( info => {
+        if (!selectParam["%literal%"]) selectParam["%literal%"] = `statistics REGEXP '[${info}]' `;
+        selectParam["%literal%"] += `and statistics REGEXP '[${info}]' `;
+    })
+    let findCareer = await selectDataListByParam(TABLENAME.职业对照表, selectParam, []);
 
     let testReport = {
         name:findUserData.data.name,
         card:findUserData.data.card,
         phone:findUserData.data.phone,
-        time: moment(new Date()).format("YYYY年MM月DD日HH时mm分"),
+        time: moment(findUserData.data.test_date).format("YYYY年MM月DD日HH时mm分"),
         report1:optionData,
         report2:countData,
         statistics:topThreeStr,
-        recommend:findCareer.data.recommend
+        recommend:""
+    }
+
+    findCareer.data.forEach( info => {
+        testReport.recommend += info.recommend;
+    })
+
+    if (!testReport.recommend) {
+        for (let i = 0; i < topThreeStr.length; i++) {
+            testReport.recommend += HUOLANDE[topThreeStr[i]];
+        }
     }
 
     return testReport;
@@ -212,15 +232,15 @@ export async function outPutData(card, createStartTime, createEndTime, area) {
     let selectParam = {"name":{"%ne%":"362527199309194932"}, "phone":{"%ne%":"17255558888"}};
     // let selectParam = {};
     if (card) selectParam["card"] = card;
-    if (createStartTime && createEndTime) selectParam["create_time"] = {"%between%":[createStartTime, createEndTime]};
+    if (createStartTime && createEndTime) selectParam["test_date"] = {"%between%":[createStartTime, createEndTime]};
     if (area) selectParam["area"] = area;
-    let findData = await selectDataListByParam(TABLENAME.测试信息表, selectParam, ["infoid", "name", "card", "phone", "email", "area", "create_time", "test_type"]);
+    let findData = await selectDataListByParam(TABLENAME.测试信息表, selectParam, ["infoid", "name", "card", "phone", "email", "area", "create_time", "test_type", "last_update_time", "test_date"]);
 
     let dataTitle = ["姓名", "身份证号", "联系方式", "电子邮箱", "所属区域", "测试日期", "测评类型"];
     let dataList = [dataTitle];
     findData.data.forEach( info => {
-        let {name, card, phone, email, area, create_time, test_type} = info;
-        let createTime = moment(create_time).format("YYYY-MM-DD");
+        let {name, card, phone, email, area, create_time, test_type, last_update_time, test_date} = info;
+        let createTime = moment(test_date).format("YYYY-MM-DD HH:mm:ss");
         let testType = changeEnumValue(TESTTYPE, test_type);
         let subList = [
             name || "", 

src/biz/huolande.ts

@@ -4,10 +4,10 @@
 
 import moment from "moment";
 import { TABLENAME } from "../config/dbEnum";
-import { CHAPTER, HLDTYPE, QUESTION, QUESTIONTITLE, TESTTYPE } from "../config/enum";
+import { CHAPTER, HLDTYPE, HUOLANDE, QUESTION, QUESTIONTITLE, TESTTYPE } from "../config/enum";
 import { ERRORENUM } from "../config/errorEnum";
 import { addData } from "../data/addData";
-import { selectDataListByParam, selectDataToTableAssociation, selectOneDataByParam } from "../data/findData";
+import { selectDataListByParam, selectDataToTableAssociation, selectDataToTableAssociationToPage, selectOneDataByParam } from "../data/findData";
 import { changeEnumValue, eccEnumValue } from "../tools/eccEnum";
 import { BizError } from "../util/bizError";
 import { updateManyData } from "../data/updateData";
@@ -15,7 +15,7 @@ import { updateManyData } from "../data/updateData";
 
 /**
  * 个人信息填写
- * @param test_type 题目类型：1. 霍兰德
+ * @param test_type 题目类型：1. 霍兰德 2. 创业
  * @param card 
  * @param name 
  * @param phone 
@@ -23,27 +23,39 @@ import { updateManyData } from "../data/updateData";
  * @param email 非必填，没有传null
  * @returns 
  */
-export async function addUsers(testType, name, card, phone, area, email?) {
-    let findCardData = await selectOneDataByParam(TABLENAME.测试信息表, {test_type:testType, card}, []);
+export async function addUsers(testType, name, phone, card?) {
+    let findCardData = await selectOneDataByParam(TABLENAME.测试信息表, {test_type:testType, name, phone}, []);
     // if (findCardData.data.core) throw new BizError(ERRORENUM.该身份证号码重复);
 
-    let addParam = {
+    let addcyParam:any = {
         test_type:testType,
         name,
-        card,
         phone,
-        area,
-        test_date:moment(new Date()).format("YYYY-MM-DD 00:00:00")
+        test_date:moment(new Date()).format("YYYY-MM-DD HH:mm:ss")
     };
-    if (email) addParam[email] = email;
+    if (card) addcyParam.card = card;
 
-    if (!findCardData.data.card) {
-        await addData(TABLENAME.测试信息表, addParam);
+    if (!findCardData.data.phone) {
+        await addData(TABLENAME.测试信息表, addcyParam);
     } else {
-        await updateManyData(TABLENAME.测试信息表, {test_type:testType, card}, addParam);
+        await updateManyData(TABLENAME.测试信息表, {test_type:testType, name, phone}, addcyParam);
     }
 
-    let userInfo = await selectOneDataByParam(TABLENAME.测试信息表, {test_type:testType, card}, ["infoid", "name"]);
+    // let addhldParam = {
+    //     test_type:TESTTYPE.霍兰德,
+    //     name,
+    //     phone,
+    //     test_date:moment(new Date()).format("YYYY-MM-DD 00:00:00")
+    // };
+    // if (card) addhldParam[card] = card;
+
+    // if (!findCardData.data.phone) {
+    //     await addData(TABLENAME.测试信息表, addhldParam);
+    // } else {
+    //     await updateManyData(TABLENAME.测试信息表, {test_type:testType, phone}, addhldParam);
+    // }
+
+    let userInfo = await selectOneDataByParam(TABLENAME.测试信息表, {test_type:testType, phone}, ["infoid", "name", "test_date"]);
     
     return userInfo.data;
 }
@@ -68,7 +80,7 @@ export async function getArea() {
  * @param isTest 是否演示版 0：否 1：是
  * @returns 
  */
-export async function getQuestion(testType, chapter, isTest) {
+export async function getQuestion(testType, chapter, isTest, isPrevious?) {
     if(!testType) testType = 1;
     eccEnumValue("获取题目", "test_type", TESTTYPE, testType);
     eccEnumValue("获取题目", "chapter", CHAPTER, chapter);
@@ -97,8 +109,27 @@ export async function getQuestion(testType, chapter, isTest) {
         questionData.push({sort:info.sort, qid, chapter, title, option:optionList})
     })
 
+    if (!isPrevious) {
         if (testType == TESTTYPE.创业) questionData = getRandomQuestions(questionData, chapter);
         if (isTest == 1) questionData = getRandomQuestions(questionData, chapter, isTest);
+    } else {
+        questionData = [];
+        for (let i = 0; i < isPrevious.length; i++) {
+            let questionInfo = await selectDataToTableAssociation(TABLENAME.题目表, includeConf, {qid:isPrevious[i]}, ["qid", "sort", "chapter", "title"]);
+            questionInfo.data.forEach( info => {
+                let {qid, title, options} = info;
+                let optionList = [];
+                options.forEach( option => {
+                    let {sort, oid, option_name, points} = option;
+                    optionList.push({oid, optionName:option_name, points, sort});
+                })
+                let chapter = changeEnumValue(CHAPTER, info.chapter);
+                questionData.push({sort:info.sort, qid, chapter, title, option:optionList})
+            })
+
+        }
+    }
+    
     return questionData;
 }
 
@@ -114,7 +145,7 @@ export async function getQuestion(testType, chapter, isTest) {
 export async function addUsersInfo(infoid, chapter, option, testType, isTest) {
     // if(findData.data && findData.data.length) throw new BizError("不可重复提交"); //判断一个用户一个章节答题不可重复提交
 
-    let addParam = {infoid, chapter, title_str:"", option_str:""}
+    let addParam = {infoid, chapter, test_type:testType, title_str:"", option_str:""}
     let optionData = JSON.parse(option);
     let title_str = [];
     let option_str = [];
@@ -133,7 +164,14 @@ export async function addUsersInfo(infoid, chapter, option, testType, isTest) {
     addParam.title_str = JSON.stringify(title_str);
     addParam.option_str = JSON.stringify(option_str);
     
-    if (isTest == 1) await addData(TABLENAME.演示版测试信息记录表, addParam);
+    if (isTest == 1) {
+        let findData = await selectDataListByParam(TABLENAME.演示版测试信息记录表, {infoid, chapter}, []);
+        if (findData.data && findData.data.length) {
+            await updateManyData(TABLENAME.演示版测试信息记录表, {infoid, chapter}, addParam);
+        } else {
+            await addData(TABLENAME.演示版测试信息记录表, addParam);
+        }
+    }
     else if (isTest == 0) {
         let findData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid, chapter}, []);
         if (findData.data && findData.data.length) {
@@ -150,12 +188,13 @@ export async function addUsersInfo(infoid, chapter, option, testType, isTest) {
 /**
  * 霍兰德 获取分数
  * @param infoid 测试用户id
+ * @param isTest 是否演示版 0：否 1：是
  */
 export async function getFinalScore(infoid, isTest) {
     let findUserData = await selectOneDataByParam(TABLENAME.测试信息表, {infoid}, []);
     let findData:any = {};
-    if (isTest == 1) findData = await selectDataListByParam(TABLENAME.演示版测试信息记录表, {infoid}, []);
-    else if (isTest == 0) findData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid}, []);
+    if (isTest == 1) findData = await selectDataListByParam(TABLENAME.演示版测试信息记录表, {infoid, test_type:1}, []);
+    else if (isTest == 0) findData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid, test_type:1}, []);
 
     let optionsInfo = {};
     for (let data = 0; data < findData.data.length; data++) {
@@ -196,10 +235,15 @@ export async function getFinalScore(infoid, isTest) {
     }
     
     let countData = [];
-    for (let key in countInfo) {
-        let keyNum = HLDTYPE[key];
-        let keyName = changeEnumValue(QUESTION, keyNum);
-        countData.push({key:keyName, value:countInfo[key]});
+    
+    for (let enumkey in HLDTYPE) {
+        let anyKey: any = enumkey;
+        let keyNum = 0;
+        let keyName = changeEnumValue(QUESTION, HLDTYPE[enumkey]);
+        if (isNaN(anyKey)) {
+            if (countInfo[enumkey]) keyNum = countInfo[enumkey];
+            countData.push({key:keyName, value:keyNum});
+        }
     }
     
     let sortedEntries:any = Object.entries(countInfo);
@@ -217,10 +261,10 @@ export async function getFinalScore(infoid, isTest) {
         selectParam["%literal%"] += `and statistics REGEXP '[${info}]' `;
     })
     let findCareer = await selectDataListByParam(TABLENAME.职业对照表, selectParam, []);
-
+    let time = moment(new Date()).format("YYYY年MM月DD日HH时mm分");
     let testReport = {
         name:findUserData.data.name,
-        time: moment(new Date()).format("YYYY年MM月DD日HH时mm分"),
+        time,
         report1:optionData,
         report2:countData,
         statistics:topThreeStr,
@@ -231,6 +275,12 @@ export async function getFinalScore(infoid, isTest) {
         testReport.recommend += info.recommend;
     })
 
+    if (!testReport.recommend) {
+        for (let i = 0; i < topThreeStr.length; i++) {
+            testReport.recommend += HUOLANDE[topThreeStr[i]];
+        }
+    }
+
     return testReport;
 }
 
@@ -244,8 +294,8 @@ export async function getFinalScore(infoid, isTest) {
 export async function getChuangYeScore(infoid, isTest) {
     let findUserData = await selectOneDataByParam(TABLENAME.测试信息表, {infoid}, []);
     let findData:any = {};
-    if (isTest == 1) findData = await selectDataListByParam(TABLENAME.演示版测试信息记录表, {infoid}, []);
-    else if (isTest == 0) findData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid}, []);
+    if (isTest == 1) findData = await selectDataListByParam(TABLENAME.演示版测试信息记录表, {infoid, test_type:2}, []);
+    else if (isTest == 0) findData = await selectDataListByParam(TABLENAME.测试信息记录表, {infoid, test_type:2}, []);
 
     let optionsInfo = [];
     let score = 0;

src/config/enum.ts

@@ -92,11 +92,6 @@ export enum QUESTIONTITLE {
 
 
 
-
-
-
-
-
 /**
  * 题型简称
  */
@@ -122,3 +117,18 @@ export enum HLDTYPE {
     "C型常规型" = 6,
 }
 
+
+
+export enum HUOLANDE {
+    R = "木匠、农民、操作X光的技师、工程师、飞机机械师、鱼类和野生动物专家、自动化技师、机械工(车工、钳工等)、电工、无线电报务员、火车司机、长途公共汽车司机、机械制图员、修理机器、电器师",
+    I = "气象学者、生物学者、天文学家、药剂师、动物学者、化学家、科学报刊编辑、地质学者、植物学者、物理学者、数学家、实验员、科研人员、科技作者",
+    A = "室内装饰专家、图书管理专家、摄影师、音乐教师、作家、演员、记者、诗人、作曲家、编剧、雕刻家、漫画家",
+    S = "社会学者、导游、福利机构工作者、咨询人员、社会工作者、社会科学教师、学校领导、精神病工作者、公共保健护士",
+    E = "推销员、进货员、商品批发员、旅馆经理、饭店经理、广告宣传员、调度员、律师、政治家、零售商",
+    C = "记账员、会计、银行出纳、法庭速记员、成本估算员、税务员、核算员、打字员、办公室职员、统计员、计算机操作员、秘书"
+}
+
+
+
+
+

src/config/mysqlTableConfig.ts

@@ -114,6 +114,7 @@ export const TablesConfig = [
             },
             infoid: {type:DataTypes.INTEGER(11),allowNull:false}, //测试信息ID
             chapter: {type:DataTypes.TINYINT(2),allowNull:false}, //章节 1.霍兰德（一、我感兴趣的活动）2.霍兰德（二、我能完成的活动）3.霍兰德（三、我喜欢的职业）4.霍兰德（四、我的能力类型简评A）5.霍兰德（四、我的能力类型简评B）
+            test_type: {type:DataTypes.TINYINT(1)}, //题目类型：1. 霍兰德
             title_str: {type:DataTypes.STRING(255),allowNull:false}, //记录标题用逗号隔开
             option_str: {type:DataTypes.STRING(255),allowNull:false}, //记录结果用逗号隔开
             last_update_time: {type:DataTypes.DATE(0),allowNull:false}, //最后修改时间
@@ -137,6 +138,7 @@ export const TablesConfig = [
             },
             infoid: {type:DataTypes.INTEGER(11),allowNull:false}, //测试信息ID
             chapter: {type:DataTypes.TINYINT(2),allowNull:false}, //章节 1.霍兰德（一、我感兴趣的活动）2.霍兰德（二、我能完成的活动）3.霍兰德（三、我喜欢的职业）4.霍兰德（四、我的能力类型简评A）5.霍兰德（四、我的能力类型简评B）
+            test_type: {type:DataTypes.TINYINT(1)}, //题目类型：1. 霍兰德
             title_str: {type:DataTypes.STRING(255),allowNull:false}, //记录标题用逗号隔开
             option_str: {type:DataTypes.STRING(255),allowNull:false}, //记录结果用逗号隔开
             last_update_time: {type:DataTypes.DATE(0),allowNull:false}, //最后修改时间

src/routers/admin.ts

@@ -21,8 +21,8 @@ async function login(req, res) {
 
 
 async function getUserList(req, res) {
-    let {card, createStartTime, createEndTime, area, current} = req.body;
-    let result = await adminBiz.getUserList(card, createStartTime, createEndTime, area, current);
+    let {phone, createStartTime, createEndTime, current} = req.body;
+    let result = await adminBiz.getUserList(phone, createStartTime, createEndTime, current);
     res.success(result);
 }
 

src/routers/huolande.ts

@@ -16,8 +16,8 @@ export function setRouter(httpServer){
 
 
 async function addUsers(req, res) {
-    let {testType, name, card, phone, email, area} = req.body;
-    let result = await huolandeBiz.addUsers(testType, name, card, phone, area, email);
+    let {testType, name, card, phone} = req.body;
+    let result = await huolandeBiz.addUsers(testType, name, phone, card);
     res.success(result);
 }
 
@@ -29,8 +29,8 @@ async function getArea(req, res) {
 
 
 async function getQuestion(req, res) {
-    let { testType, chapter, isTest } = req.body;
-    let result = await huolandeBiz.getQuestion(testType, chapter, isTest);
+    let { testType, chapter, isTest, isPrevious } = req.body;
+    let result = await huolandeBiz.getQuestion(testType, chapter, isTest, isPrevious);
     res.success(result);
 }