Merge branch 'master' of http://git.fmode.cn:3000/bin/edu-textbook

projects/textbook/src/modules/common/textbook-details/textbook-details.component.scss

@@ -79,6 +79,7 @@
       text-align: left;
       color: #231C1F;
       margin: 10px 0;
+      white-space: pre-wrap;
     }
   }
 }

projects/textbook/src/services/created.service.spec.ts

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { CreatedService } from './created.service';
-
-describe('CreatedService', () => {
-  let service: CreatedService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(CreatedService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

projects/textbook/src/services/importDept.ts

@@ -2376,4 +2376,210 @@ export const updateDept = {
     '中译出版社',
     '宗教文化出版社',
   ],
+  list5: [
+    'AaZfRQ9mS5',
+    'uzJ8yHa73w',
+    'Ugl3cY2yDP',
+    '5q6dtnYpUp',
+    'HXT0e8zbRr',
+    'Ah2E7eUT9K',
+    'iMrvndtzvA',
+    'GuNqXq0SFt',
+    '3ZGme3l42o',
+    '1XudfGXRs3',
+    'WUkUbmauKi',
+    'FUSr9Pdyyc',
+    '0EKf2AsizZ',
+    '78BZUtoKGY',
+    'Fbjg3SRu2T',
+    'UEe6Zjlh7w',
+    'YjGH8MB8tb',
+    '28dA1ASLVw',
+    'iwD7cw7mEH',
+    'uJAtMwNZkM',
+    'haLlKXZSqP',
+    'D4ECINOr02',
+    'IIcMHw4MNj',
+    'gNnZVCAgxW',
+    '3Keo5jz7Mv',
+    'VjgukphqMv',
+    'rbPgEmHU3F',
+    'jzjQgx3GdJ',
+    'T8QyKa2iXB',
+    'pbjWsqK0iA',
+    'XkfxebQBne',
+    'BFMiYKzXdN',
+    'x5WpBN0p22',
+    'VtPkfTvYq8',
+    'K29fXWm4D9',
+    'LmHHnZU73F',
+    'x2jay7lWx5',
+    '5EDNA70Y34',
+    'DjfjHvEdgp',
+    'YMjOpauufo',
+    '3VRBH7yuBn',
+    '7PO1ekch4S',
+    'dIccBh5CBD',
+    'Yrp4gPSlf2',
+    'uvmtqWdMlM',
+    'svLOtr0xpk',
+    'euZ208EKUR',
+    'Vq8F29Ql0F',
+    'IBG26K8hFJ',
+    'ygRSeq29K1',
+    's97Xz6DlLw',
+    '87xq6abnSi',
+    'goqdaNcoPI',
+    'TRGJX0epCj',
+    'W6dRROJHFc',
+    'Yddzb2vC0T',
+    '7OXltuAH9N',
+    'MEjChwitSl',
+    'SULzQJ2s5e',
+    'FEjgrqsQrw',
+    'Y98xKVFbSl',
+    'Tq0W74PeGF',
+    '8LfsnglGwv',
+    'krKToc2hYP',
+    'eafUB3zCxH',
+    'qywYUC6wce',
+    'JjGXuBUruC',
+    'jJESK9CvpE',
+    'kmHecKMGHC',
+    'e3VhgxKjRQ',
+    'SBi6tOourO',
+    'p2yRFyBdvQ',
+    '0yFWbONeNF',
+    'yooSA5OWzk',
+    'ny9uWkIiQZ',
+    'Gttpcu9HSk',
+    'MqiTer5lMD',
+    's8tHRHblN2',
+    'TL1le1UN3R',
+    'utgydDhvjq',
+    'YluD9m9GIA',
+    'AYtKO9zOYQ',
+    'o7mY4jRyDz',
+    '9sBDFYBMJx',
+    '9qXdLgBPHL',
+    '3VwAl4mP6I',
+    'JnQS6aLztC',
+    'WldHELAhtD',
+    'Mty5QqSbts',
+    'NJ6FevK9Ds',
+    'wcVjc1xa4d',
+    '4WysFgHFvp',
+    'qSBkFFgIWC',
+    'ETvwP4PgiQ',
+    'Avcg6Gbkrz',
+    '7U6W8uoOTg',
+    'c8rBhFMISt',
+    'pBA8ATjfTK',
+    'ihkpUKTFNv',
+    'pCRZXYSIsj',
+    'wij4jpmj8x',
+    'cIcWNiGBse',
+    'HdZ74oXL0Q',
+    'zpT33PL0aw',
+    'ZTCxG9rawx',
+    'rCkm0o8zdZ',
+    '0udz7h5oXF',
+    'lSHLDJ4bZN',
+    'QoMzcPWGuY',
+    'fyMoeGRTi4',
+    'h1RpOoVzrY',
+    'YnyTqewNKV',
+    'yt0LXtdmXH',
+    'EfpgjanCFT',
+    'GkmmDwB4Mz',
+    'jqqkLotzGJ',
+    'aJW4BAbcga',
+    'UpLvOn9Ml5',
+    'mjSzl0j2Mf',
+    'hnZbPUdUnr',
+    'Ou4FVESeEa',
+    'Js6GHI0gcl',
+    'zPZWDjSDxB',
+    'aWV73QlJq3',
+    'VsqVzXNaoX',
+    'x2xxXs65rn',
+    'SD0NCAdscz',
+    'hBzLFskknf',
+    'YookEq7IOV',
+    'j71DgohGZB',
+    'PlrlJDzaFE',
+    'cn4nPhxLPq',
+    'oXWGbiDDHe',
+    'JTIWaAHYDK',
+    'BC0ZanM0dx',
+    'n6UBnDIDVB',
+    'Ty1FUHnhEx',
+    '4pU8DM1VXS',
+    'XBGEEu3Qai',
+    '0Ewdmf4cze',
+    '0xmDdjXDpm',
+    'amZSpB4l2S',
+    'OC8i0F8AOS',
+    'beCtpv695l',
+    'rTUPofCSrM',
+    'Ia7v2WQrDB',
+    'VN2JJcPtVA',
+    '8SQBGUrXXG',
+    'LdnIXnATXD',
+    'zpHU2dgaxw',
+    '25HIZlksPb',
+    '9pAIGJgoxq',
+    '65PFGUjwXG',
+    'NXjn2mSH2S',
+    'n7y8dbYMrx',
+    '3gdmLKMW1f',
+    'b9sU5QCxdw',
+    'sEWHdvJLA0',
+    'W93T5AktEZ',
+    'bgHaFQLbvG',
+    'onztZEPyan',
+    'go8REx26U2',
+    'qCeLyXsGbs',
+    'e2MbwJ6xeU',
+    'rjxLzmpWMX',
+    'qDhoBGNwl2',
+    'DBATRKwqF5',
+    'x4WfVjCmlW',
+    'Icttqb0yyW',
+    'ZT5MDmIaHP',
+    'pH0TByeGNe',
+    '9bBfhvTCTM',
+    'bCX20FRhei',
+    'fc5ACxqMuH',
+    'M0dJLYDGum',
+    'wHmnUnPTSo',
+    'LeuvTW01zM',
+    'LHbsHkyBM8',
+    'PPJzNzvOHJ',
+    'ZEvrOGE8WM',
+    'ICltVLWREX',
+    'uVDry9Y0OV',
+    'ZBVf7DSHME',
+    'hiicBHEG4K',
+    'NmDlzXO1u8',
+    'GKOBuNZrBg',
+    '1EiVGhwe1A',
+    'J0DepSNmjE',
+    'gPm5QBFXKo',
+    'yvTWRkU3qk',
+    'ASMJWN4BUf',
+    'IVVCVJrmXM',
+    'zrxHX3zQZ9',
+    '51GRrIDLv2',
+    'D565SVNHBX',
+    'GyDPQCcYww',
+    'DT2BOSQBgQ',
+    'MjdM2vEACP',
+    'vEx3MW3ADe',
+    'GwXy48Y7BK',
+    'fju0DVvkop',
+    'EPvjAsAqYr',
+    'BGDxy5IIms',
+    'QbPaSeAHgC',
+  ],
 };

projects/textbook/src/services/textbook.ts

@@ -318,7 +318,6 @@ export class textbookServer {
     let isDate = false;
     // 监测空值
     list?.forEach((item: Parse.Object) => {
-      // arr.add(item.get(filed))
       if (
         isDate ||
         Object.prototype.toString.call(item.get(filed)).indexOf('Date') != -1
@@ -341,7 +340,7 @@ export class textbookServer {
       let query = new Parse.Query('EduTextbook');
       query.notEqualTo('isDeleted', true);
       query.notEqualTo('discard', true);
-      query.equalTo('render', true);
+      // query.equalTo('render', true);
       query.select(
         'title',
         'childrens.ISBN',
@@ -351,22 +350,42 @@ export class textbookServer {
         'childrens.editionUnit',
         'inviteUnit',
         'user.department',
-        'department.branch'
+        'department.branch',
+        'code',
+        // 'eduProcess.profileSubmitted',
+        'eduProcess.profileSubmitted.email',
+        'eduProcess.profileSubmitted.user.name',
+        'eduProcess.profileSubmitted.user.phone'
       );
       query.limit(3000);
-      query.containedIn('status', ['103', '200', '201', '400']);
+      // query.containedIn('status', ['102','103', '200', '201', '400']);
       // query.containedIn('status',['400'])
+      query.containedIn('objectId',updateDept.list5)
       let data = await query.find();
-      let table = `<table border="1px" cellspacing="0" cellpadding="0">
+      // let table = `<table border="1px" cellspacing="0" cellpadding="0">
+      //     <thead>
+      //       <tr>
+      //         <th>序号</th>
+      //         <th>申报教材名称</th>
+      //         <th>第一主编/作者</th>
+      //         <th>ISBN</th>
+      //         <th>出版单位</th>
+      //         <th>所属院校</th>
+      //         <th>最新印次和时间</th>
+      //       </tr>
+      //     </thead>
+      //     <tbody>
+      //     `;
+          let table = `<table border="1px" cellspacing="0" cellpadding="0">
           <thead>
             <tr>
               <th>序号</th>
               <th>申报教材名称</th>
-              <th>第一主编/作者</th>
-              <th>ISBN</th>
-              <th>出版单位</th>
-              <th>所属院校</th>
-              <th>最新印次和时间</th>
+              <th>code</th>
+              <th>所属单位</th>
+              <th>单位联系人</th>
+              <th>联系人电话</th>
+              <th>联系人邮箱</th>
             </tr>
           </thead>
           <tbody>
@@ -375,80 +394,73 @@ export class textbookServer {
       for (var row = 0; row < data.length; row++) {
         // console.log(data[row].get('user')?.get('department'));
         let inviteUnit = data[row]?.get('inviteUnit');
-        if (
-          data[row]?.get('department')?.get('branch') == '省级教育行政部门' ||
-          data[row]?.get('department')?.get('branch') ==
-            '有关部门（单位）教育司（局）'
-        ) {
-          let parentMap = await this.formatNode(
-            data[row].get('user')?.get('department')?.id
-          );
-          inviteUnit = parentMap[2]?.title;
-        }
+        // if (
+        //   data[row]?.get('department')?.get('branch') == '省级教育行政部门' ||
+        //   data[row]?.get('department')?.get('branch') ==
+        //     '有关部门（单位）教育司（局）'
+        // ) {
+        //   let parentMap = await this.formatNode(
+        //     data[row].get('user')?.get('department')?.id
+        //   );
+        //   inviteUnit = parentMap[2]?.title;
+        // }
         _body += '<tr>';
         _body += '<td>';
         _body += `${row + 1}`;
         _body += '</td>';
 
-        // _body += '<td>';
-        // _body += `&nbsp;${data[row].get('code') || ''}`;
-        // _body += '</td>';
-
         _body += '<td>';
         _body += ` &nbsp;${data[row].get('title') || '-'}`;
         _body += '</td>';
 
-        // _body += '<td>';
-        // _body += ` &nbsp;${(data[row].get("discipline")?.code || "") + '/' + (data[row]?.get("discipline")?.name || "")}`;
-        // _body += '</td>';
+        _body += '<td>';
+        _body += `&nbsp;${data[row].get('code') || ''}`;
+        _body += '</td>';
 
         _body += '<td>';
-        _body += `${this.fromatFiled(data[row]?.get('childrens'), 'author')}`;
+        _body += `&nbsp;${data[row].get('inviteUnit') || ''}`;
         _body += '</td>';
 
         _body += '<td>';
-        _body += `&nbsp;${this.fromatFiled(
-          data[row]?.get('childrens'),
-          'ISBN'
-        )}`;
+        _body += `&nbsp;${data[row]?.get('eduProcess')?.get('profileSubmitted')?.get('user')?.get('name') || ''}`;
+        _body += '</td>';
+
+        _body += '<td>';
+        _body += `&nbsp;${data[row]?.get('eduProcess')?.get('profileSubmitted')?.get('user')?.get('phone') || ''}`;
+        _body += '</td>';
+
+        _body += '<td>';
+        _body += `&nbsp;${data[row]?.get('eduProcess')?.get('profileSubmitted')?.get('email') || ''}`;
         _body += '</td>';
 
         // _body += '<td>';
-        // _body += `${
-        //   data[row]?.get('type') == '单本'
-        //     ? '单本'
-        //     : '全册 - ' + data[row]?.get('typeNumber') || '-'
-        // }`;
+        // _body += `${this.fromatFiled(data[row]?.get('childrens'), 'author')}`;
         // _body += '</td>';
 
         // _body += '<td>';
-        // _body += `${data[row]?.get('approval') || '-'}`;
+        // _body += `&nbsp;${this.fromatFiled(
+        //   data[row]?.get('childrens'),
+        //   'ISBN'
+        // )}`;
         // _body += '</td>';
 
-        _body += '<td>';
-        _body += `${this.fromatFiled(
-          data[row]?.get('childrens'),
-          'editionUnit'
-        )}`;
-        _body += '</td>';
-
         // _body += '<td>';
-        // _body += `&nbsp;${this.fromatFiled(
+        // _body += `${this.fromatFiled(
         //   data[row]?.get('childrens'),
-        //   'editionFirst'
+        //   'editionUnit'
         // )}`;
         // _body += '</td>';
 
-        _body += '<td>';
-        _body += `${inviteUnit}`;
-        _body += '</td>';
+        // _body += '<td>';
+        // _body += `${inviteUnit}`;
+        // _body += '</td>';
 
-        _body += '<td>';
-        _body += `${this.fromatFiled(
-          data[row]?.get('childrens'),
-          'printDate'
-        )}`;
-        _body += '</td>';
+        // _body += '<td>';
+        // _body += `${this.fromatFiled(
+        //   data[row]?.get('childrens'),
+        //   'printDate'
+        // )}`;
+        // _body += '</td>';
 
         _body += '</tr>';
       }