Просмотр исходного кода

Merge branch 'master' of bn.git:plabudda/se

Piotr Labudda 8 лет назад
Родитель
Сommit
c8d3cc07a9

+ 13 - 0
SE/se-lib/Route/UrlAction/BiAuditGenerate.php

@@ -1,5 +1,15 @@
 <?php
 
+//TODO optimal - akcja aby doruzcic do pracownikow do analizy jakas spolke z kontekstu przegladania KRS - zapytanie przyklad:
+// insert ignore into BI_audit_ENERGA_PRACOWNICY (imiona, nazwisko, pesel, source )
+// select p.imiona, p.nazwisko, p.pesel, 'ENSO_STORA/zadanie' from `BI_audit_KRS_person` as p
+// right join `CRM__#REF_TABLE__12` as r on r.`REMOTE_PRIMARY_KEY`=p.ID
+//  right join BI_audit_KRS as k on k.ID=r.`PRIMARY_KEY`
+//  where k.`nazwa` like '%Stora%enso%';
+
+
+//TODO mozliwosc przerwania przetwarzania
+
 Lib::loadClass('RouteBase');
 Lib::loadClass('FoldersConfig');
 Lib::loadClass('FileUploader');
@@ -58,6 +68,7 @@ class Route_UrlAction_BiAuditGenerate extends RouteBase {
               <td>Pesel</td>
               <td>NIP</td>
               <td>Regon</td>
+              <td>source</td>
             </tr>
           </thead>
           <tbody>
@@ -76,6 +87,8 @@ class Route_UrlAction_BiAuditGenerate extends RouteBase {
               <td><?=$pracownik['pesel']?></td>
               <td><?=$pracownik['nip']?></td>
               <td><?=$pracownik['regon']?></td>
+              <td><?=$pracownik['source']?></td>
+
             </tr>
 <?php
 		}

+ 2 - 2
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -2100,12 +2100,12 @@ database=\"SES_USERS2\"
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'
                           where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 
-$cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
+$cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'
                           where cz.\\`TYPE\\`=\'PODMIOT\' and cz.\\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap domyslna grupa
 
-$cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
+$cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'
                           where cz.\\`TYPE\\`=\'PODMIOT\' and cz.\\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap domyslna grupa