no message

serverConfig.xml

 <config>
     <port>9099</port>
     <sign>xxx90909082fsdahfjosadjfpoiwausjorip2hjklrhn1ioud0u124rx0qwejfokasjfolksaujfoas</sign>
-    <dbServer>http://192.168.0.105:9096</dbServer>
+    <dbServer>http://192.168.0.71:9096</dbServer>
 </config>
\ No newline at end of file

src/biz/base.ts

-/**
- * 企业基础信息
- */
\ No newline at end of file

src/config/eccParam/enterprise.ts

@@ -62,19 +62,22 @@ export const EnterpriseQualificationUpdateConfig = {
     zjtxState:{key:"Number", notMustHave:true},//专精特新认定状态
     zjtxImg:{key:"[String]", notMustHave:true},//新增专精特新图片
     zjtxTime:{key:"Number", notMustHave:true},//专精特新认定时间
-    xjrImg:{key:"[String]", notMustHave:true},//新增小巨人证书
-    xjrState:{key:"Number", notMustHave:true},//小巨人认定状态
-    xjrTime:{key:"Number", notMustHave:true},//小巨人认定时间
+    // xjrImg:{key:"[String]", notMustHave:true},//新增小巨人证书
+    // xjrState:{key:"Number", notMustHave:true},//小巨人认定状态
+    // xjrTime:{key:"Number", notMustHave:true},//小巨人认定时间
     xjrPyTime:{key:"Number", notMustHave:true},//小巨人培育认定时间
     xjrPyState:{key:"Number", notMustHave:true},//小巨人培育认定状态
     xjrPyImg:{key:"[String]", notMustHave:true},//新增小巨人培育证书
     gaoXinJiShuTime:{key:"Number", notMustHave:true},// 新增高新技术认定时间
     gaoXinJiShuImg:{key:"[String]", notMustHave:true},//新增高新技术图片
     gxjsState:{key:"Number", notMustHave:true},//高新技术状态
-    listedState:{key:"Number", notMustHave:true},//上市状态
-    goPublicTime:{key:"Number", notMustHave:true},//上市时间
-    goPublicSector:{key:"[Number]", notMustHave:true},//上市板块
-    other:{key:"Number", notMustHave:true},//新增其他
+    cxState:{key:"Number", notMustHave:true},//创新认定状态
+    cxTime:{key:"Number", notMustHave:true},//创新认定时间
+    cxImg:{key:"[String]", notMustHave:true},//新增创新图片
+    // listedState:{key:"Number", notMustHave:true},//上市状态
+    // goPublicTime:{key:"Number", notMustHave:true},//上市时间
+    // goPublicSector:{key:"[Number]", notMustHave:true},//上市板块
+    // other:{key:"Number", notMustHave:true},//新增其他
 }
 
 
@@ -154,3 +157,18 @@ export const EnterpriseManageInfoAddConfig = {
     TXP:{type:"Number"},//纳税
     RD:{type:"Number"},//研发投入
 }
+
+
+export const enterpriseLeaseUpdateConfig = {
+    area:{key:"String"},//租赁面积
+    building:{key:"Number"},//楼号
+    roomNumber:{key:"String"},//室号
+    rent:{key:"String"},//每月租金
+    leaseStartTime:{key:"Number"},//租赁开始时间
+    leaseEndTime:{key:"Number"},//租赁结束时间
+    startTime:{key:"Number"},//孵化开始时间
+    endTime:{key:"Number"},//孵化结束时间
+}
+
+
+

src/config/enum/dbEnum.ts

@@ -41,6 +41,13 @@ export enum TABLENAME {
     作品著作权 = "copy_right",
     软件著作权 = "software_copyright",
     专利 = "patent",
+    高新企业创新能力评价答题="gaoxin_answer",
+    高新企业创新能力评价选项="gaoxin_option",
+    答题记录="gaoxin_answerrecord",
+    答题记录明细="gaoxin_answerdetail",
+    租房补贴企业自评="zufang_answer",
+    租房补贴答题记录="zufang_answerrecord",
+    租房补贴答题记录明细="zufang_answerdetail",
     
 }
 
@@ -68,4 +75,11 @@ export enum TABLEID {
     软件著作权 = "sc",
     专利 = "ipr",
     图片存储='img',
+    高新企业创新能力评价答题="ga",
+    高新企业创新能力评价选项="go",
+    答题记录="gar",
+    答题记录明细="gad",
+    租房补贴企业自评="zaId",
+    租房补贴答题记录="zarId",
+    租房补贴答题记录明细="zadId",
 } 
\ No newline at end of file

src/config/enum/enum.ts

@@ -2,15 +2,22 @@
  * 行业领域
  */
 export enum INDUSTRY{
-    集成电路 = 1,
-    生物医药,
-    人工智能及智能制造,
-    航空航天,
-    汽车产业,
-    软件和信息服务业,
-    低碳环保及新材料,
-    综合,
-    文化创意
+    "信息传输、软件和信息技术服务业" = 1,
+    科学研究和技术服务业,
+    制造业,
+    建筑业,
+    租赁和商务服务业,
+    批发和零售业
+
+    // 集成电路 = 1,
+    // 生物医药,
+    // 人工智能及智能制造,
+    // 航空航天,
+    // 汽车产业,
+    // 软件和信息服务业,
+    // 低碳环保及新材料,
+    // 综合,
+    // 文化创意
 }
 
 
@@ -71,6 +78,7 @@ export enum FUHUASTATE {
  */
 export enum EMIGRATIONTYPE {
     毕业迁出 = 1,
+    毕业未迁出, //新加状态
     到期退租,
     违约退租
 }
@@ -221,6 +229,17 @@ export enum IPRALLTYPE {
 }
 
 
+/**
+ * 租房补贴题目
+ */
+export enum ANSWERTYPE {
+    是否有研发费用 = 1,
+    是否有缴纳社保,
+    是否有软著等知识产权,
+    是否认定科小或创新型中小企业
+}
+
+
 export enum IPRTYPE {
     软件著作权 = 1,
     专利 = 100,

src/config/enum/errorEnum.ts

@@ -30,6 +30,11 @@ export enum ERRORENUM {
     验证码过期,
     验证码发送失败,
     验证码不存在,
+    答题记录不存在,
+    账号密码错误,
+    密码不一致,
+    密码只能由6至18位字符和数字组成,
+    原密码错误,
 }
 
 export enum ERRORCODEENUM {

src/routers/enterpriseInfo.ts

@@ -11,12 +11,15 @@ export function setRouter(httpServer) {
     httpServer.post('/xcx/enterprise/login', asyncHandler(login));
     httpServer.post('/xcx/enterprise/email/login', asyncHandler(emailLogin));// 邮箱验证码登录
     httpServer.post('/xcx/enterprise/request/verification/code', asyncHandler(requestVerificationCode));// 发送验证码
+    httpServer.post('/xcx/enterprise/changepwd', checkUser, asyncHandler(changePassword));
+    
     /**登出 */
     httpServer.post('/xcx/enterprise/logout', checkUser, asyncHandler(logout));
 
     /**首页 */
     httpServer.post('/xcx/enterprise/home/enterpriselist', checkUser, asyncHandler(enterpriseByPhoneList));
     httpServer.post('/xcx/enterprise/home/top', checkUser, asyncHandler(homePageTop));
+    httpServer.post('/xcx/enterprise/home/baseinfo', checkUser, asyncHandler(homePageBaseInfo));
 
     httpServer.post('/xcx/enterprise/home/task', checkUser, asyncHandler(homePageTask));
     httpServer.post('/xcx/enterprise/home/tasksubmit', checkUser, asyncHandler(homePageTaskSubmit));
@@ -31,7 +34,8 @@ export function setRouter(httpServer) {
     httpServer.post('/xcx/enterprise/faren/update', checkUser, asyncHandler(updateFaRenInfo));
     /**入驻信息 */
     httpServer.post('/xcx/enterprise/ruzhu/info', checkUser, asyncHandler(ruZhuInfo));
-
+    httpServer.post('/xcx/enterprise/ruzhu/update', checkUser, asyncHandler(ruZhuUpdate));
+    
     //=============政策速递
     httpServer.post('/xcx/policy/list', checkUser, asyncHandler(policyList));
     httpServer.post('/xcx/policy/info', checkUser, asyncHandler(policyInfo));
@@ -174,6 +178,22 @@ async function login(req, res) {
     res.success(result);
 }
 
+
+/**
+ * 
+ * @param req 
+ * @param res 
+ */
+ async function changePassword(req, res) {
+    const UserInfo = req.userInfo;
+    let {pwd, newPwd, confirmPwd } = req.body
+    let result = await enterpriseInfoBiz.changePassword(UserInfo.uId, pwd, newPwd, confirmPwd );
+
+    res.success(result);
+}
+
+
+
 /**
  * 邮箱验证码登录
  * @param req 
@@ -225,6 +245,15 @@ async function ruZhuInfo(req, res) {
 }
 
 
+async function ruZhuUpdate(req, res) {
+    const UserInfo = req.userInfo;
+    let {param } = req.body;
+    let result = await enterpriseInfoBiz.enterpriseLeaseUpdate(UserInfo.eId, param);
+
+    res.success(result);
+}
+
+
 //===============================法人信息
 /**
  * 
@@ -317,6 +346,19 @@ async function enterpriseByPhoneList(req, res) {
  * @param req 
  * @param res 
  */
+async function homePageBaseInfo(req, res) {
+    const UserInfo = req.userInfo;
+    let result = await enterpriseInfoBiz.homePageBaseInfo(UserInfo.eId);
+
+    res.success(result);
+}
+
+
+/**
+ * 首页
+ * @param req 
+ * @param res 
+ */
 async function homePageTop(req, res) {
     const UserInfo = req.userInfo;
     let result = await enterpriseInfoBiz.homePage(UserInfo.eId);
@@ -324,6 +366,7 @@ async function homePageTop(req, res) {
     res.success(result);
 }
 
+
 /**
  * 首页-任务
  * @param req 

src/routers/gaoxin.ts

+/**
+ * 高新企业创新能力评价答题
+ */
+
+import * as asyncHandler from 'express-async-handler';
+import * as gaoxinBiz from '../biz/answer';
+import { checkUser } from '../middleware/user';
+
+export function setRouter(httpServer) {
+    httpServer.post('/xcx/gaoxin/answer/list', checkUser, asyncHandler(gaoxinAnswerList));
+    httpServer.post('/xcx/gaoxin/answer/option', checkUser, asyncHandler(gaoxinAnswerOption));
+    httpServer.post('/xcx/gaoxin/answer/addanswerrecord', checkUser, asyncHandler(addAnswerrecord));
+    httpServer.post('/xcx/gaoxin/answer/enterpriseresults', checkUser, asyncHandler(enterpriseResults));
+    httpServer.post('/xcx/gaoxin/answer/zufangoption', checkUser, asyncHandler(zuFangAnswerOption));
+    httpServer.post('/xcx/gaoxin/answer/addzufanganswerrecord', checkUser, asyncHandler(addZuFangAnswerrecord));
+    httpServer.post('/xcx/gaoxin/answer/enterprisezufangresults', checkUser, asyncHandler(enterpriseZuFangResults));
+    // httpServer.post('/xcx/gaoxin/answer/changeanswerstatu', checkUser, asyncHandler(changeAnswerStatu));
+    // httpServer.post('/xcx/gaoxin/answer/calculategrowthscore', checkUser, asyncHandler(calculateGrowthScore));
+    
+}
+
+
+/**
+ * 是否有资格开始测评
+ * @param req 
+ * @param res 
+ */
+async function gaoxinAnswerList(req, res) {
+    const UserInfo = req.userInfo;
+    let result = await gaoxinBiz.gaoxinAnswerList(UserInfo.eId);
+
+    res.success(result); 
+}
+
+
+/**
+ * 题目
+ * @param req 
+ * @param res 
+ */
+async function gaoxinAnswerOption(req, res) {
+    const UserInfo = req.userInfo;
+    let result = await gaoxinBiz.gaoxinAnswerOption();
+
+    res.success(result);
+}
+
+
+/**
+ * 获取高新技术企业自评结果
+ * @param req 
+ * @param res 
+ */
+async function enterpriseResults(req, res) {
+    const UserInfo = req.userInfo;
+    let {garId} = req.body;
+    let result = await gaoxinBiz.enterpriseResults(garId);
+
+    res.success(result);
+}
+
+
+/**
+ * 存储答题明细
+ * @param req 
+ * @param res 
+ */
+async function addAnswerrecord(req, res) {
+    const UserInfo = req.userInfo;
+    let {gaId, options, assetGrowth, revenueGrowth} = req.body;
+    let result = await gaoxinBiz.addAnswerrecord(UserInfo.eId, gaId, options, assetGrowth, revenueGrowth);
+
+    res.success(result);
+}
+
+
+/**
+ * 租房题目
+ * @param req 
+ * @param res 
+ */
+async function zuFangAnswerOption(req, res) {
+    const UserInfo = req.userInfo;
+    let result = await gaoxinBiz.zuFangAnswerOption();
+
+    res.success(result);
+}
+
+
+/**
+ * 租房存储答题明细
+ * @param req 
+ * @param res 
+ */
+async function addZuFangAnswerrecord(req, res) {
+    const UserInfo = req.userInfo;
+    let {zaId, options} = req.body;
+    let result = await gaoxinBiz.addZuFangAnswerrecord(UserInfo.eId, zaId, options);
+
+    res.success(result);
+}
+
+
+/**
+ * 获取高新技术企业自评结果
+ * @param req 
+ * @param res 
+ */
+async function enterpriseZuFangResults(req, res) {
+    const UserInfo = req.userInfo;
+    let {zarId} = req.body;
+    let result = await gaoxinBiz.enterpriseZuFangResults(zarId);
+
+    res.success(result);
+}
+
+
+
+/**
+ * 完成全部答题
+ * @param req 
+ * @param res 
+ */
+// async function changeAnswerStatu(req, res) {
+//     const UserInfo = req.userInfo;
+//     let {garId} = req.body;
+//     let result = await gaoxinBiz.changeAnswerStatu(garId);
+
+//     res.success(result);
+// }
+
+
+/**
+ * 企业成长性评分
+ * @param req 
+ * @param res 
+ */
+// async function calculateGrowthScore(req, res) {
+//     const UserInfo = req.userInfo;
+//     let {assetGrowth, revenueGrowth} = req.body;
+//     let result = await gaoxinBiz.calculateGrowthScore(assetGrowth, revenueGrowth);
+
+//     res.success(result);
+// }
+
+
+
+
+
+
+

src/routers/router.ts

@@ -7,7 +7,9 @@ import * as enterpriseInfoRouters from './enterpriseInfo';
 import * as teamsRouters from './teams';
 import * as qualificationRouters from './qualification';
 import * as financeRouters from './finance';
+import * as gaoxinRouters from './gaoxin';
 import * as filesInfoRouters from './files';
+
 export function setRouter(httpServer){
     /**下拉框等公用 路由 */
     publicRouters.setRouter(httpServer);
@@ -17,6 +19,7 @@ export function setRouter(httpServer){
     teamsRouters.setRouter(httpServer);
     qualificationRouters.setRouter(httpServer);
     financeRouters.setRouter(httpServer);
+    gaoxinRouters.setRouter(httpServer);
 
     filesInfoRouters.setRouter(httpServer);
 }
\ No newline at end of file

src/tools/system.ts

@@ -96,5 +96,21 @@ export function getDeclarationTime() {
     return {declarationYear:getMySqlMs(`${thisYear}-01-01 00:00:00`), declarationQuarter:thisQuarter};
 }
     
+/**
+ * 去除地址包含相同上海市上海市问题
+ * @param address 
+ */
+export function getAddresList(address) {
+    let logonAddress = [];
+    if (address) {
+        let logonAddressList = JSON.parse(address || '[]')
+        for (let i = 0; i < logonAddressList.length; i++) {
+            if (logonAddressList[i] != logonAddressList[i+1]) logonAddress.push(logonAddressList[i]);
+        } 
+    }
+    return logonAddress;
+}
+
+