no message

src/biz/admin.ts

@@ -668,7 +668,10 @@ export async function qiyeRenZheng(enterpriseName, page) {
         selectParam.enterpriseName = {"%like%":enterpriseName};
     }
     let manyTableInfo:any = {};
-    manyTableInfo[TABLENAME.企业资质] = {column:["kxTime", "zjtxTime", "xjrTime", "xjrPyTime", "goPublicTime", "gaoXinJiShuTime", "goPublicSector"], where:{} };
+    let manyTableColumn = ["kxState","kxTime","kxNumber","kxImg", "zjtxState","zjtxTime","zjtxImg",
+        "xjrState", "xjrTime","xjrImg","xjrPyState", "xjrPyTime","xjrPyImg",
+        "gxjsState","gaoXinJiShuTime","gaoXinJiShuImg","listedState", "goPublicTime", "goPublicSector","other"];
+    manyTableInfo[TABLENAME.企业资质] = {column:manyTableColumn, where:{} };
 
     let resInfo = await selectManyTableData(OPERATIONALDATATYPE.多表分页, TABLENAME.企业基础信息表, selectParam, ["enterpriseName", "uscc"], manyTableInfo, page);
     let allDataList = await selectManyTableData(OPERATIONALDATATYPE.多表联查, TABLENAME.企业基础信息表, selectParam, ["enterpriseName", "uscc"], manyTableInfo);
@@ -680,27 +683,69 @@ export async function qiyeRenZheng(enterpriseName, page) {
             uscc, 
             enterpriseName, 
             kxTime:"-",
+            kxImg:[],
+            kxState:"否",
+            kxNumber:"-",
             zjtxTime:"-",
+            zjtxState:"否",
+            zjtxImg:[],
+            xjrState:"否",
             xjrTime:"-",
+            xjrImg:[],
             xjrPyTime:"-",
+            xjrPyImg:[],
+            xjrPyState:"否",
+            gxjsState:"否",
             goPublicTime:"-",
+            gaoXinJiShuImg:[],
             gaoXinJiShuTime:"-",
-            goPublicSector:"-",
+            listedState:"否",
+            other:"",
+            goPublicSector:[],
         };
+
+        let imgConf = ["kxImg", "zjtxImg", "xjrImg", "xjrPyImg", "gaoXinJiShuImg"];
         for (let i = 0; i < enterprise_qualifications.length; i++) {
             let item = enterprise_qualifications[i];
             if (item.kxTime) addItem.kxTime = moment(item.kxTime).format("YYYY");
+            if (item.kxState) addItem.kxState = changeEnumValue(enumConfig.STATE, item.kxState);
+            // if (item.kxImg) addItem.kxImg = JSON.parse(item.kxImg);
+
             if (item.zjtxTime) addItem.zjtxTime = moment(item.zjtxTime).format("YYYY");
+            if (item.zjtxState) addItem.zjtxState = changeEnumValue(enumConfig.STATE, item.zjtxState);
+            // if (item.zjtxImg) addItem.zjtxImg = JSON.parse(item.zjtxImg);
+
             if (item.xjrTime) addItem.xjrTime = moment(item.xjrTime).format("YYYY");
+            if (item.xjrState) addItem.xjrState = changeEnumValue(enumConfig.STATE, item.xjrState);
+            // if (item.xjrImg) addItem.xjrImg = JSON.parse(item.xjrImg);
+
             if (item.xjrPyTime) addItem.xjrPyTime = moment(item.xjrPyTime).format("YYYY");
+            if (item.xjrPyState) addItem.xjrPyState = changeEnumValue(enumConfig.STATE, item.xjrPyState);
+            // if (item.xjrPyImg) addItem.xjrPyImg = JSON.parse(item.xjrPyImg);
+            
             if (item.goPublicTime) addItem.goPublicTime = moment(item.goPublicTime).format("YYYY");
+            if (item.listedState) addItem.listedState = changeEnumValue(enumConfig.STATE, item.listedState);
+
+            if (item.gxjsState) addItem.gxjsState =changeEnumValue(enumConfig.STATE, item.gxjsState) ;
             if (item.gaoXinJiShuTime) addItem.gaoXinJiShuTime = moment(item.gaoXinJiShuTime).format("YYYY");
+            // if (item.gaoXinJiShuImg) addItem.gaoXinJiShuImg = JSON.parse(item.gaoXinJiShuImg);
+
             if (item.goPublicSector && item.goPublicSector != "[]") {
                 addItem.goPublicSector = changeEnumValue(enumConfig.FINANCINGROUNDS, JSON.parse(item.goPublicSector));
             }
+
+            for (let j = 0; j < imgConf.length; j++) {
+                let imgKey = imgConf[j];
+                if (item[imgKey]) {
+                    let imgArr = JSON.parse(item[imgKey]);
+                    for (let k = 0; k < imgArr.length; k++) {
+                        addItem[imgKey].push(`${systemConfig.imgFileUrl}${imgArr[k]}`);
+                    }
+                }
             }
 
             dataList.push(addItem);
+        };
     });
 
     return {dataList, dataCount:allDataList.length}; 
@@ -709,6 +754,8 @@ export async function qiyeRenZheng(enterpriseName, page) {
 
 
 
+
+
 export async function enterpriseHonor(enterpriseName, page) {
     let selectParam:any = {};
     let manyTableInfo:any = {};

src/biz/zhengCe.ts

@@ -12,7 +12,7 @@ import { eccFormParam } from "../util/verificationParam";
 import { PolicyUpdateConfig } from "../config/eccParam/enterprise";
 
 
-export async function enterprisePolicyList(keywords:string, page:number) {
+export async function enterprisePolicyList(keywords:string, state:number, page:number) {
     let selectParam:any = {};
     if (keywords) selectParam.desc = {"%like%":keywords};
     let filesList = ["poId", "title", "source", "createTimeMs", "closeTimeMs", "isPermanent","coverImg"];
@@ -40,17 +40,48 @@ export async function enterprisePolicyList(keywords:string, page:number) {
             status = policyEndTime >= now ? '进行中' : '往期';
         }
 
+        if (state == 1) {
+            if (info.isPermanent == 1 || closeTimeMs > getMySqlMs()) {
                 dataList.push({
                     poId:info.poId,
                     title:info.title,
                     source:info.source,
-            createTimeMs:info.createTimeMs,
+                    createTimeMs: info.createTimeMs ? moment(info.createTimeMs).format("YYYY-MM-DD") : "-",
                     closeTimeMs:formattedCloseTimeMs,
                     isPermanent: info.isPermanent,
                     //图片
                     coverImg:JSON.parse(info.coverImg),
                     //coverImg:info.coverImg ?  JSON.parse(info.coverImg) : [],
                 });
+            }
+        } else if (state == 2) {
+            if (info.isPermanent == 0 && getMySqlMs() > closeTimeMs) {
+                dataList.push({
+                    poId:info.poId,
+                    title:info.title,
+                    source:info.source,
+                    createTimeMs: info.createTimeMs ? moment(info.createTimeMs).format("YYYY-MM-DD") : "-",
+                    closeTimeMs:formattedCloseTimeMs,
+                    isPermanent: info.isPermanent,
+                    //图片
+                    coverImg:JSON.parse(info.coverImg),
+                    //coverImg:info.coverImg ?  JSON.parse(info.coverImg) : [],
+                });
+            }
+        } else {
+            dataList.push({
+                poId:info.poId,
+                title:info.title,
+                source:info.source,
+                createTimeMs: info.createTimeMs ? moment(info.createTimeMs).format("YYYY-MM-DD") : "-",
+                closeTimeMs:formattedCloseTimeMs,
+                isPermanent: info.isPermanent,
+                //图片
+                coverImg:JSON.parse(info.coverImg),
+                //coverImg:info.coverImg ?  JSON.parse(info.coverImg) : [],
+            });
+        }
+        
     });
 
     return {dataList, dataCount};
@@ -100,6 +131,7 @@ export async function enterprisePolicyAdd( param) {
     if (!param.coverImg.length) param.coverImg =  "[\"/yuyi/files/默认图片.png\"]";
     else param.coverImg = JSON.stringify(param.coverImg);
     param.poId = randomId(TABLEID.政策表);
+    param.createTimeMs = getMySqlMs();
     await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.政策表, param, {});
 
     return {isSuccess:true};

src/main.ts

@@ -6,7 +6,6 @@ async function lanuch() {
     await initConfig();
     httpServer.createServer(systemConfig.port);
     console.log('This indicates that the server is started successfully.');
-
 }
 
 

src/routers/admin.ts

@@ -232,8 +232,8 @@ async function enterpriseLogout(req, res) {
  */
 async function policyList(req, res) {
     const UserInfo = req.userInfo;
-    let {keywords, page } = req.body
-    let result = await zhengCeBiz.enterprisePolicyList(keywords, page);
+    let {keywords, state, page } = req.body
+    let result = await zhengCeBiz.enterprisePolicyList(keywords, state, page);
 
     res.success(result);
 }

src/routers/dbinit.ts

@@ -19,7 +19,7 @@ export function setRouter(httpServer) {
 }
 
 
-async function data1210(req, res) {
+export async function data1210(req, res) {
     //读取文件
     let {sheetMap} = getExcel(path.join(__dirname.substring(0,__dirname.indexOf("out")), "res", '在孵企业导入1210.xlsx' ));
     let dataList = sheetMap['Sheet1'];
@@ -207,8 +207,9 @@ async function data1210(req, res) {
                 annual:getMySqlMs(`${ qccInfo.canbaoYear.match(/\d+/g)[0]}-01-01 00:00:00`),
                 zhuanKe:0,
                 benKe:0,
-                yanJiuSheng:0,
+                shuoshi:0,
                 boShi:0,
+                boshiyishang:0,
                 qiTa:qccInfo.canbaoNumber
             }
             await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.参保记录, enterprise_canbaoInfo, {});
@@ -220,7 +221,17 @@ async function data1210(req, res) {
                 iprId:randomId(TABLEID.知识产权),
                 eId,
                 year:getMySqlMs("2022-01-01 00:00:00"),
-                number:subList[31]
+                number:subList[31],
+                iprType:0,
+                selectedValue:null,
+                iprName:null,
+                iprUrl:null,
+                softwareCopyrightCount:null,
+                inventionPatentCount:null,
+                overseasPatentCount:null,
+                plantVarietyCount:null,
+                icLayoutCount:null,
+
             }
             await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.知识产权, enterprise_2022iprInfo, {});
         }
@@ -229,7 +240,16 @@ async function data1210(req, res) {
                 iprId:randomId(TABLEID.知识产权),
                 eId,
                 year:getMySqlMs("2023-01-01 00:00:00"),
-                number:subList[32]
+                number:subList[32],
+                iprType:0,
+                selectedValue:null,
+                iprName:null,
+                iprUrl:null,
+                softwareCopyrightCount:null,
+                inventionPatentCount:null,
+                overseasPatentCount:null,
+                plantVarietyCount:null,
+                icLayoutCount:null,
             }
             await operationalData(OPERATIONALDATATYPE.增加, TABLENAME.知识产权, enterprise_2023iprInfo, {});
         }