Merge branch 'main' of http://git.cc-lotus.info/Information/cxyy-service

src/controller/platform/achievement.controller.ts

@@ -77,7 +77,7 @@ export class AchievementController implements BaseController {
 
   @Get('/list')
   async list() {
-    const list = await this.service.list(this.ctx.filter);
+    const list = await this.service.list(this.ctx.query);
     const data = list.data;
     const total = list.total;
     return { data, total };

src/controller/platform/demand.controller.ts

@@ -68,7 +68,7 @@ export class DemandController implements BaseController {
   }
   @Get('/list')
   async list() {
-    const list = await this.service.list(this.ctx.filter);
+    const list = await this.service.list(this.ctx.query);
     const data = list.data;
     const total = list.total;
     return { data, total };

src/controller/platform/project.controller.ts

@@ -69,7 +69,7 @@ export class ProjectController implements BaseController {
 
   @Get('/list')
   async list() {
-    const list = await this.service.list(this.ctx.filter);
+    const list = await this.service.list(this.ctx.query);
     const data = list.data;
     const total = list.total;
     return { data, total };

src/controller/platform/supply.controller.ts

@@ -69,7 +69,7 @@ export class SupplyController implements BaseController {
 
   @Get('/list')
   async list() {
-    const list = await this.service.list(this.ctx.filter);
+    const list = await this.service.list(this.ctx.query);
     const data = list.data;
     const total = list.total;
     return { data, total };

src/controller/users/company.controller.ts

@@ -45,7 +45,7 @@ export class CompanyController implements BaseController {
 
   @Get('/list')
   async list() {
-    const list = await this.service.list(this.ctx.filter);
+    const list = await this.service.list(this.ctx.query);
     const data = list.data;
     const total = list.total;
     return { data, total };

src/controller/users/expert.controller.ts

@@ -33,7 +33,7 @@ export class ExpertController implements BaseController {
   }
   @Get('/list')
   async list() {
-    const list = await this.service.list(this.ctx.filter);
+    const list = await this.service.list(this.ctx.query);
     const data = list.data;
     const total = list.total;
     return { data, total };

src/service/platform/achievement.service.ts

@@ -19,8 +19,8 @@ export class AchievementService extends BaseService<Achievement> {
     const { skip = 0, limit = 0, is_use, status, ...condition } = pick(query, ['skip', 'limit', 'is_use', 'status']);
     const { one, two, thr, four, five, six } = pick(query, ['one', 'two', 'thr', 'four', 'five', 'six']);
     const whereObject: any = {};
-    if (is_use) whereObject.is_show = Equal(is_use);
-    if (status) whereObject.status = Equal(status);
+    // if (is_use) whereObject.is_use = Equal(is_use);
+    // if (status) whereObject.status = Equal(status);
     if (one) whereObject.technology = In(one);
     if (two) whereObject.field = In(two);
     if (thr) whereObject.mature = In(thr);

src/service/platform/demand.service.ts

@@ -29,8 +29,8 @@ export class DemandService extends BaseService<Demand> {
     const four = get(query, 'four');
 
     const whereObject: any = {};
-    if (is_use) whereObject.is_show = Equal(is_use);
-    if (status) whereObject.status = Equal(status);
+    // if (is_use) whereObject.is_use = Equal(is_use);
+    // if (status) whereObject.status = Equal(status);
     if (one) whereObject.field = In(one);
     if (two) whereObject.method = In(two);
     if (thr) whereObject.area = In(thr);

src/service/users/expert.service.ts

@@ -18,8 +18,8 @@ export class ExpertService extends BaseService<Expert> {
     const { skip = 0, limit = 0, is_show, status } = pick(query, ['skip', 'limit', 'is_show', 'status']);
     const { one, two, thr, four } = pick(query, ['one', 'two', 'thr', 'four']);
     const whereObject: any = {};
-    if (is_show) whereObject.is_show = Equal(is_show);
-    if (status) whereObject.status = Equal(status);
+    // if (is_show) whereObject.is_show = Equal(is_show);
+    // if (status) whereObject.status = Equal(status);
     if (one) whereObject.field = In(one);
     if (two) whereObject.title = In(two);
     if (thr) whereObject.area = In(thr);

src/service/util.service.ts

@@ -67,13 +67,19 @@ export class UtilService {
   }
 
   @InjectEntityModel(Demand)
-  model: Repository<Demand>;
+  demandModel: Repository<Demand>;
+  @InjectEntityModel(Achievement)
+  achievementModel: Repository<Achievement>;
+  @InjectEntityModel(Expert)
+  expertModel: Repository<Expert>;
   async initData() {
     console.log('in initData');
-    return this.importRequirementFromExcel();
+    await this.importRequirementFromExcel();
+    // await this.importAchieveFromExcel();
+    // await this.importExpertFromExcel();
   }
   async importRequirementFromExcel() {
-    const path = 'E:/workspace/产学研用/项目数据资料/项目数据资料/需求库.xlsx';
+    const path = 'C:/document/需求库.xlsx';
     const wb = new Excel.Workbook();
     await wb.xlsx.readFile(path);
     const sheet = wb.getWorksheet(1);
@@ -205,7 +211,7 @@ export class UtilService {
         allData.push(obj);
       }
     });
-    const res = await this.model.insert(allData);
+    const res = await this.demandModel.insert(allData);
     return res;
   }
 
@@ -221,7 +227,7 @@ export class UtilService {
   }
 
   async importAchieveFromExcel() {
-    const path = 'E:/workspace/产学研用/项目数据资料/项目数据资料/成果库.xlsx';
+    const path = 'C:/document/成果库.xlsx';
     const wb = new Excel.Workbook();
     await wb.xlsx.readFile(path);
     const sheet = wb.getWorksheet(1);
@@ -240,7 +246,7 @@ export class UtilService {
         allData.push(obj);
       }
     });
-    return await this.model.insert(allData);
+    return await this.achievementModel.insert(allData);
   }
   achieveMeta() {
     return {
@@ -253,8 +259,8 @@ export class UtilService {
     };
   }
 
-  async importExportFromExcel() {
-    const path = 'E:/workspace/产学研用/项目数据资料/项目数据资料/专家库docx.xlsx';
+  async importExpertFromExcel() {
+    const path = 'C:/document/专家库.xlsx';
     const wb = new Excel.Workbook();
     await wb.xlsx.readFile(path);
     const sheet = wb.getWorksheet(1);
@@ -274,7 +280,7 @@ export class UtilService {
       });
       allData.push(obj);
     }
-    const res = await this.model.insert(allData);
+    const res = await this.expertModel.insert(allData);
     return res;
   }