Skip to content

S
simas-blitar
Commit 2f06cdaf authored by Deddy Vita Kurniawan's avatar Deddy Vita Kurniawan
Browse files
Options

* revisi modul Reviu Konsep Laporan

parent dd174a15
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
application/modules/konsep_laporan/models/konsep_laporan_model.php
View file @ 2f06cdaf
...@@ -283,16 +283,15 @@ class Konsep_laporan_model extends Base_Model ...@@ -283,16 +283,15 @@ class Konsep_laporan_model extends Base_Model
b.id_rinci_tim, b.id_rinci_tim,
b.id_surat, b.id_surat,
b.id_rincian_tim_penugasan, b.id_rincian_tim_penugasan,
a.id_jab_tim_audit, d.id_jab_tim_audit,
b.urut, b.urut,
c.nama, c.nama,
d.uraian, d.uraian,
d.no_urut d.no_urut
'); ');
$this->db->from('surat_penugasan_tim b'); $this->db->from('surat_penugasan_tim b');
$this->db->join('rincian_tim_penugasan a', 'a.id_rincian_tim_penugasan = b.id_rincian_tim_penugasan'); $this->db->join("ref_pejabat_spi c","c.id_pejabat_spi = b.id_pejabat_spi");
$this->db->join("ref_pejabat_spi c","c.id_pejabat_spi = a.id_pejabat_spi"); $this->db->join("ref_jab_tim_audit d","d.id_jab_tim_audit = b.id_jab_tim_audit");
$this->db->join("ref_jab_tim_audit d","d.id_jab_tim_audit = a.id_jab_tim_audit");
$this->db->join("ref_jabatan e","e.id_ref_jabatan = c.id_ref_jabatan",'left'); $this->db->join("ref_jabatan e","e.id_ref_jabatan = c.id_ref_jabatan",'left');
$this->db->where_in('d.uraian', array('Penanggung Jawab', 'Wakil Penanggung Jawab', 'Pengendali Teknis')); $this->db->where_in('d.uraian', array('Penanggung Jawab', 'Wakil Penanggung Jawab', 'Pengendali Teknis'));
$this->db->where('b.id_surat', $id); $this->db->where('b.id_surat', $id);
......
application/modules/pilih/models/pilih_dasar_model.php
View file @ 2f06cdaf
...@@ -2468,7 +2468,7 @@ class Pilih_dasar_model extends Pilih_Model ...@@ -2468,7 +2468,7 @@ class Pilih_dasar_model extends Pilih_Model
b.id_rinci_tim, b.id_rinci_tim,
b.id_surat, b.id_surat,
b.id_rincian_tim_penugasan, b.id_rincian_tim_penugasan,
a.id_jab_tim_audit, d.id_jab_tim_audit,
b.urut, b.urut,
b.tanggal_mulai, b.tanggal_mulai,
b.tanggal_selesai, b.tanggal_selesai,
...@@ -2480,9 +2480,9 @@ class Pilih_dasar_model extends Pilih_Model ...@@ -2480,9 +2480,9 @@ class Pilih_dasar_model extends Pilih_Model
e.id_ref_jabatan e.id_ref_jabatan
'); ');
$this->db->from('surat_penugasan_tim b'); $this->db->from('surat_penugasan_tim b');
$this->db->join('rincian_tim_penugasan a', 'a.id_rincian_tim_penugasan = b.id_rincian_tim_penugasan'); //$this->db->join('rincian_tim_penugasan a', 'a.id_rincian_tim_penugasan = b.id_rincian_tim_penugasan');
$this->db->join("ref_pejabat_spi c","c.id_pejabat_spi = a.id_pejabat_spi"); $this->db->join("ref_pejabat_spi c","c.id_pejabat_spi = b.id_pejabat_spi");
$this->db->join("ref_jab_tim_audit d","d.id_jab_tim_audit = a.id_jab_tim_audit"); $this->db->join("ref_jab_tim_audit d","d.id_jab_tim_audit = b.id_jab_tim_audit");
$this->db->join("ref_jabatan e","e.id_ref_jabatan = c.id_ref_jabatan",'left'); $this->db->join("ref_jabatan e","e.id_ref_jabatan = c.id_ref_jabatan",'left');
$this->db->where('b.id_surat', $param['id_surat']); $this->db->where('b.id_surat', $param['id_surat']);
$this->db->order_by('b.urut', 'ASC'); $this->db->order_by('b.urut', 'ASC');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment