no message

src/biz/enterpriseInfo.ts

@@ -22,13 +22,22 @@ import { sendVerificationCode } from "./mail";
 export async function enterpriseLogin(phone:string, pwd:string) {
     // let dbInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc}, ["eId"]);
 
+
     let filesList = ["userName", "eId", "pwd", "uId",  "phone"];
-    let enterpriseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {phone}, filesList);
+    let includeConf = {};
+    includeConf[TABLENAME.企业孵化信息] = {colum:["state", "startTime", "endTime"], where:{state:{"%ne%":enumConfig.FUHUASTATE.迁出}} };
+    includeConf[TABLENAME.企业用户表] = {colum:filesList, where:{phone} };
+    let enterpriseInfo = await selectManyTableData(OPERATIONALDATATYPE.多表单个, TABLENAME.企业基础信息表, {}, ["enterpriseName"], includeConf);
 
-    if (!enterpriseInfo || !enterpriseInfo.eId) {
+    if (!enterpriseInfo || !enterpriseInfo.enterpriseName) {
         throw new BizError(ERRORENUM.账号或密码错误);
     }
-    if (enterpriseInfo.pwd != pwd) {
+    let {enterprise_users} = enterpriseInfo;
+    let enterpriseUserInfo = enterprise_users[0];
+    if (!enterpriseUserInfo || !enterpriseUserInfo.phone) {
+        throw new BizError(ERRORENUM.账号或密码错误);
+    }
+    if (enterpriseUserInfo.pwd != pwd) {
         throw new BizError(ERRORENUM.账号或密码错误);
     }
 
@@ -36,12 +45,12 @@ export async function enterpriseLogin(phone:string, pwd:string) {
         token : getToken(enterpriseInfo.uId),
         tokenMs : getMySqlMs()
     };
-    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业用户表, updateUserInfo, {uId:enterpriseInfo.uId});
+    await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业用户表, updateUserInfo, {uId:enterpriseUserInfo.uId});
     
     let userInfo = {
-        userId:enterpriseInfo.uId,
-        userName:enterpriseInfo.userName,
-        phone:enterpriseInfo.phone,
+        userId:enterpriseUserInfo.uId,
+        userName:enterpriseUserInfo.userName,
+        phone:enterpriseUserInfo.phone,
         token:updateUserInfo.token,
     };
 

src/biz/qualification.ts

@@ -40,6 +40,11 @@ export async function enterpriseHonorInfo(eId) {
         });
     });
 
+    //倒序排列
+    dataList.sort(function(a, b) {
+        return parseInt(moment(b.awardTime).format("YYYY")) - parseInt(moment(a.awardTime).format("YYYY"));
+    });
+
     return {dataList};
 }
 
@@ -157,19 +162,18 @@ export async function enterpriseIPRInfo(eId:string) {
 
 
 export async function enterpriseIPRByType(eId:string, iprType:number) {
+    eccEnumValue("企业知识产权", "iprType", enumConfig.IPRTYPE, iprType);
+
     let filesList = ["iprId", "year","number", "iprType","selectedValue","iprName", "iprUrl"];
     let selecParam:any = {eId};
-    // if (iprType == enumConfig.IPRTYPECLIENT.其他) {
-    //     selecParam.iprType = {"%notIn%":[enumConfig.IPRTYPECLIENT.软件著作, enumConfig.IPRTYPECLIENT.海外专利, enumConfig.IPRTYPECLIENT.发明专利]};
-    // } else {
-    //     selecParam.iprType = iprType;
-    // }
-    if (iprType == enumConfig.IPRTYPECLIENT.专利) {
-        selecParam.iprType = { "%in%": [enumConfig.IPRTYPECLIENT.发明专利, enumConfig.IPRTYPECLIENT.海外专利] };
-    } else if (iprType == enumConfig.IPRTYPECLIENT.其他) {
-        selecParam.iprType = { "%notIn%": [enumConfig.IPRTYPECLIENT.软件著作权, enumConfig.IPRTYPECLIENT.发明专利, enumConfig.IPRTYPECLIENT.海外专利] };
+    
+
+    if (iprType == enumConfig.IPRTYPE.软件著作权) {
+        selecParam.iprType = enumConfig.IPRALLTYPE.软件著作权
+    } else if (iprType == enumConfig.IPRTYPE.专利) {
+        selecParam.iprType = { "%in%": [enumConfig.IPRALLTYPE.海外专利, enumConfig.IPRALLTYPE.发明专利] };
     } else {
-        selecParam.iprType = iprType;
+        selecParam.iprType = { "%in%": [enumConfig.IPRALLTYPE.植物新品种, enumConfig.IPRALLTYPE.集成电路布图] };
     }
     
     let iprList = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.知识产权, selecParam, filesList);
@@ -184,7 +188,7 @@ export async function enterpriseIPRByType(eId:string, iprType:number) {
             year,
             yearStr:`${yearStr}年`, 
             number:1,
-            iprType:changeEnumValue(enumConfig.INTELLECTUALPROPERTYRIGHT, iprType),//新增知识产权类型
+            iprType:changeEnumValue(enumConfig.IPRALLTYPE, iprType),//新增知识产权类型
             selectedValue:iprType,//新增选中value
             iprName,//新增名称
             // iprUrl:JSON.stringify(iprUrl),//新增证材料证明

src/biz/teams.ts

@@ -146,6 +146,11 @@ export async function enterpriseCanBaoInfo(eId) {
         });
     });
 
+    //年份倒序排列
+    dataList.sort((a, b) => {
+        return b.annual - a.annual;
+    });
+
     return {dataList};
 }
 

src/config/enum/enum.ts

@@ -166,41 +166,37 @@ export enum QUARTER {
 }
 
 /**
- * 知识产权类型
+ * 知识产权 全类型
  */
-export enum INTELLECTUALPROPERTYRIGHT {
+export enum IPRALLTYPE {
     软件著作权 = 1,
-    发明专利,
-    海外专利,
-    植物新品种,
-    集成电路布图,
+    专利 = 100,
+    发明专利 = 101,
+    海外专利 = 102,
+    其他 = 200,
+    植物新品种 = 201,
+    集成电路布图 =202
 }
 
-
-/**
- * 知识产权类型 前端用
- */
-export enum IPRTYPECLIENT {
-    其他 = 0, 
+export enum IPRTYPE {
     软件著作权 = 1,
-    发明专利,
-    海外专利,
-    专利
+    专利 = 100,
+    其他 = 200
 }
 
+
 /**
  * 知识产权类型其他 前端用
  */
 export enum IPRTYPECLIENTQT {
-    植物新品种 = 4,
-    集成电路布图
-    
+    植物新品种 = 201,
+    集成电路布图 =202
 }
 
 /**
  * 知识产权类型专利 前端用
  */
 export enum IPRTYPECLIENTZL {
-    发明专利 = 2,
-    海外专利,  
+    发明专利 = 101,
+    海外专利 = 102,  
 }
\ No newline at end of file

src/routers/public.ts

@@ -16,8 +16,8 @@ const config = {
     "/public/needcategory":enumConfig.NEEDCATEGORY,
     "/public/fuhuaqilnvestmentstyle":enumConfig.FUHUAQILNVESTMENTSTYLE,
     "/public/financingrounds":enumConfig.FINANCINGROUNDS,
-    "/public/intellectualpropertyright":enumConfig.INTELLECTUALPROPERTYRIGHT,// 新增知识产权类型
-    "/public/iprtypeclient":enumConfig.IPRTYPECLIENT,// 新增知识产权类型
+    // "/public/intellectualpropertyright":enumConfig.INTELLECTUALPROPERTYRIGHT,// 新增知识产权类型
+    // "/public/iprtypeclient":enumConfig.IPRTYPECLIENT,// 新增知识产权类型
     "/public/iprtypeclientqt":enumConfig.IPRTYPECLIENTQT,// 新增知识产权类型
     "/public/iprtypeclientzl":enumConfig.IPRTYPECLIENTZL,// 新增知识产权专利
     

src/routers/qualification.ts

@@ -8,7 +8,7 @@ import { checkUser } from '../middleware/user';
 
 export function setRouter(httpServer) {
         /**知识产权 */
-        httpServer.post('/xcx/qualification/ipr/list', checkUser, asyncHandler(iprList));
+        httpServer.post('/xcx/qualification/ipr/list', checkUser, asyncHandler(iprList)); //弃用
         httpServer.post('/xcx/qualification/ipr/listbytype', checkUser, asyncHandler(iprListByType));
         httpServer.post('/xcx/qualification/ipr/update', checkUser, asyncHandler(iprUpdate));
         httpServer.post('/xcx/qualification/ipr/add', checkUser, asyncHandler(iprAdd));