공통데이터 관리 수정

This commit is contained in:
yangsh
2025-12-31 15:11:40 +09:00
parent 38444fcb4f
commit 04a06f1781
36 changed files with 1351 additions and 139 deletions

View File

@@ -25,13 +25,13 @@ class Apt extends BaseController
$team = $this->aptModel->getTeamList(); // 팀
$user = $this->aptModel->getUserList(); // 유저
return view("pages/article/lists", [
'codes' => $codes,
'sido' => $sido,
'bonbu' => $bonbu,
'team' => $team,
'user' => $user,
]);
$this->data['codes'] = $codes;
$this->data['sido'] = $sido;
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['user'] = $user;
return view("pages/article/lists", $this->data);
}
// 아파트단지목록 조회
@@ -411,22 +411,20 @@ class Apt extends BaseController
}
}
// return print_r($image);
$this->data['apt'] = $apt;
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['user'] = $user;
$this->data['code1'] = $code1;
$this->data['code2'] = $code2;
$this->data['video'] = $video;
$this->data['image'] = $image;
$this->data['vdo'] = $vdo;
$this->data['history'] = $history;
$this->data['cateInfo'] = $cateInfo;
$this->data['cntAllPho'] = $cntAllPho;
return view("pages/article/detail", [
'apt' => $apt,
'bonbu' => $bonbu,
'team' => $team,
'user' => $user,
'code1' => $code1,
'code2' => $code2,
'video' => $video,
'image' => $image,
'vdo' => $vdo,
'history' => $history,
'cateInfo' => $cateInfo,
'cntAllPho' => $cntAllPho
]);
return view("pages/article/detail", $this->data);
}
public function cateJson()

View File

@@ -19,7 +19,7 @@ class DelChgApt extends BaseController
public function lists(): string
{
return view("pages/article/delChgView");
return view("pages/article/delChgView", $this->data);
}

View File

@@ -31,13 +31,13 @@ class Ground extends BaseController
$team = $this->model->getTeamList(); // 팀
$user = $this->model->getUserList(); // 유저
return view("pages/article/lists2", [
'codes' => $codes,
'sido' => $sido,
'bonbu' => $bonbu,
'team' => $team,
'user' => $user,
]);
$this->data['codes'] = $codes;
$this->data['sido'] = $sido;
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['user'] = $user;
return view("pages/article/lists2", $this->data);
}
// 아파트단지목록 조회
@@ -281,14 +281,14 @@ class Ground extends BaseController
// 변경이력
$history = $this->model->getHistory($rcpt_no);
return view("pages/article/detail2", [
'bonbu' => $bonbu,
'team' => $team,
'user' => $user,
'apt' => $apt,
'rdata' => $rdata,
'history' => $history,
]);
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['user'] = $user;
$this->data['apt'] = $apt;
$this->data['rdata'] = $rdata;
$this->data['history'] = $history;
return view("pages/article/detail2", $this->data);
}
// 메모저장

View File

@@ -3,6 +3,7 @@
namespace App\Controllers;
use App\Models\common\MenuModel;
use App\Models\manage\UserModel;
use CodeIgniter\Controller;
abstract class BaseController extends Controller
@@ -23,5 +24,20 @@ abstract class BaseController extends Controller
$menuModel = new MenuModel();
$menus = $menuModel->getMenuList(session('usr_level'));
$this->data['menus'] = $menus["mainMenu"];
if (!empty(session('usr_id'))) {
// 비밀번호 변경일 체크
$userModel = new UserModel();
$usr_id = session('usr_id');
$diff = $userModel->chkChgPwDiff($usr_id);
if ($diff >= 1) {
$this->data['pwExpire'] = true;
} else {
$this->data['pwExpire'] = false;
}
}
}
}

View File

@@ -16,7 +16,7 @@ class Notice extends BaseController
public function notice(): string
{
return view('pages/board/notice');
return view('pages/board/notice', $this->data);
}
@@ -61,7 +61,7 @@ class Notice extends BaseController
throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
}
return view('pages/board/noticeDetail', $data);
return view('pages/board/noticeDetail', array_merge($this->data, $data));
}
// 첨부파일 다운로드
@@ -103,7 +103,7 @@ class Notice extends BaseController
// 공지사항 작성 화면
public function write(): string
{
return view('pages/board/noticeWrite');
return view('pages/board/noticeWrite', $this->data);
}
// 공지사항 작성
@@ -228,7 +228,7 @@ class Notice extends BaseController
}
return view('pages/board/noticeModify', $data);
return view('pages/board/noticeModify', array_merge($this->data, $data));
}

View File

@@ -3,14 +3,17 @@ namespace App\Controllers\Common;
use App\Controllers\BaseController;
use App\Models\common\CommonModel;
use App\Models\manage\UserModel;
class Common extends BaseController
{
private $model;
private $userModel;
public function __construct()
{
$this->model = new CommonModel();
$this->userModel = new UserModel();
}
public function getVrfcCode()
@@ -24,4 +27,95 @@ class Common extends BaseController
return $this->response->setJSON($data);
}
// 비밀번호 변경
public function changeUserPass()
{
$usr_id = session('usr_id');
try {
$usr_pass = $this->request->getPost('usr_pass');
$new_pass = $this->request->getPost('new_pass');
$new_pass2 = $this->request->getPost('new_pass2');
if (empty($usr_pass)) {
return $this->response->setJSON([
'code' => '9',
'msg' => '기존 비밀번호 누락',
]);
}
if (empty($new_pass)) {
return $this->response->setJSON([
'code' => '9',
'msg' => '비밀번호 누락',
]);
} else {
if (strlen($new_pass) < 8) {
return $this->response->setJSON([
'code' => '9',
'msg' => '비밀번호 최소 길이는 8자 입니다.',
]);
}
}
if (empty($new_pass2)) {
return $this->response->setJSON([
'code' => '9',
'msg' => '비밀번호 확인 누락',
]);
} else {
if ($new_pass !== $new_pass2) {
return $this->response->setJSON([
'code' => '9',
'msg' => '신규 비밀번호 불일치',
]);
}
}
// 문자조합 유효성 검사
if (!checkPasswordTypes($new_pass, 2)) {
return $this->response->setJSON([
'code' => '9',
'msg' => '비밀번호는 영문 대/소문자, 숫자, 특수문자 중 최소 2종류 이상을 조합해야 합니다.',
]);
}
if ($usr_pass === $new_pass) {
return $this->response->setJSON([
'code' => '9',
'msg' => '기존 비밀번호와 다르게 설정하세요.',
]);
}
// 기존 비밀번호 일치 확인
$usrExist = $this->userModel->chkUserExist($usr_id, $usr_pass);
if ($usrExist === 0) {
return $this->response->setJSON([
'code' => '9',
'msg' => '기존 비밀번호 불일치',
]);
} else {
// UPDATE users
$this->userModel->changeUsrPass($usr_id, $usr_pass, $new_pass);
return $this->response->setJSON([
'code' => '0',
'msg' => 'success'
]);
}
} catch (\Exception $e) {
// log_message('PASSWORD_CHG_ERROR', 'usr_id : ' . $usr_id . ', msg : ' . $e->getMessage());
return $this->response->setJSON([
'code' => '9',
'msg' => $e->getMessage(),
]);
}
}
}

View File

@@ -31,12 +31,11 @@ class Home extends BaseController
$notice = $this->homeModel->getNoticeList();
$statistics = $this->homeModel->getHomeStatistics($this->sdate, $this->edate);
$this->data['menus'] = $this->data;
$this->data['notice'] = $notice;
$this->data['statistics'] = $statistics;
return view('pages/home/dashboard', [
'menus' => $this->data,
'notice' => $notice,
'statistics' => $statistics,
]);
return view('pages/home/dashboard', $this->data);
}
// 실적조회

View File

@@ -33,12 +33,12 @@ class Areas extends BaseController
$team = $this->areaModel->getTeamList();
$user = $this->areaModel->getUserList();
return view("pages/manage/areas/lists", [
'sido' => $sido,
'bonbu' => $bonbu,
'team' => $team,
'user' => $user,
]);
$this->data['sido'] = $sido;
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['user'] = $user;
return view("pages/manage/areas/lists", $this->data);
}

View File

@@ -17,13 +17,13 @@ class Dept extends BaseController
public function dept(): string
{
return view("pages/manage/dept/lists");
return view("pages/manage/dept/lists", $this->data);
}
// 총괄팀장 페이지
public function getchkuser(): string
{
return view("pages/manage/dept/users");
return view("pages/manage/dept/users", $this->data);
}
public function getDeptList()

View File

@@ -16,7 +16,7 @@ class LoginLog extends BaseController
public function lists()
{
return view("pages/manage/log/lists");
return view("pages/manage/log/lists", $this->data);
}
public function getLogList()

View File

@@ -15,7 +15,7 @@ class Menu extends BaseController
public function lists(): string
{
return view("pages/manage/menu/lists");
return view("pages/manage/menu/lists", $this->data);
}

View File

@@ -18,9 +18,9 @@ class Permit extends BaseController
{
$usrLevel = $this->permitModel->getUsrLevel();
return view("pages/manage/permit/lists", [
'usrLevel' => $usrLevel,
]);
$this->data['usrLevel'] = $usrLevel;
return view("pages/manage/permit/lists", $this->data);
}

View File

@@ -19,7 +19,9 @@ class Phone extends BaseController
{
$codes = $this->phoneModel->getCodes();
return view("pages/manage/phone/lists", ['code' => $codes]);
$this->data['code'] = $codes;
return view("pages/manage/phone/lists", $this->data);
}
// 전화확인 목록조회

View File

@@ -17,7 +17,9 @@ class Scomplex extends BaseController
{
$codes = $this->model->getCodeList();
return view("pages/manage/scomplex/lists", ['code' => $codes,]);
$this->data['code'] = $codes;
return view("pages/manage/scomplex/lists", $this->data);
}

View File

@@ -14,7 +14,7 @@ class Sms extends BaseController
public function lists(): string
{
return view("pages/manage/sms/lists");
return view("pages/manage/sms/lists", $this->data);
}
@@ -62,7 +62,7 @@ class Sms extends BaseController
// sms 발송 - 화면
public function smsSendView(): string
{
return view("pages/manage/sms/smsSendView");
return view("pages/manage/sms/smsSendView", $this->data);
}

View File

@@ -21,12 +21,12 @@ class User extends BaseController
$teamList = $this->userModel->getTeamList();
$deptCode = $this->userModel->getDeptCode();
return view("pages/manage/user/lists", [
'userLevel' => $userLevel,
'bonbuList' => $bonbuList,
'teamList' => $teamList,
'deptCode' => $deptCode,
]);
$this->data['userLevel'] = $userLevel;
$this->data['bonbuList'] = $bonbuList;
$this->data['teamList'] = $teamList;
$this->data['deptCode'] = $deptCode;
return view("pages/manage/user/lists", $this->data);
}

View File

@@ -19,12 +19,12 @@ class Assign extends BaseController
$team = $this->assignModel->getTeamList();
$sido = $this->assignModel->getAreaList();
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['sido'] = $sido;
return view("pages/results/assign/stats_a01", [
'bonbu' => $bonbu,
'team' => $team,
'sido' => $sido,
]);
return view("pages/results/assign/stats_a01", $this->data);
}
public function getUserList()

View File

@@ -65,16 +65,16 @@ class Dept extends BaseController
$res = $this->deptModel->st_d01($data);
return view("pages/results/dept/stats_d01", [
'pBonbu' => $this->bonbu,
'pDeptSq' => $this->dept_sq,
'schDateGb' => $this->schDateGb,
'sdate' => $this->sdate,
'edate' => $this->edate,
'bonbu' => $bonbu,
'team' => $team,
'st_list' => $res,
]);
$this->data['pBonbu'] = $this->bonbu;
$this->data['pDeptSq'] = $this->dept_sq;
$this->data['schDateGb'] = $this->schDateGb;
$this->data['sdate'] = $this->sdate;
$this->data['edate'] = $this->edate;
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['st_list'] = $res;
return view("pages/results/dept/stats_d01", $this->data);
}
// 엑셀 다운로드

View File

@@ -21,10 +21,10 @@ class M409 extends BaseController
$CODE_VRFCREQ_WAY = convertArrayToHashTable($codes['VRFCREQ_WAY'], 'cd', 'cd_nm', []);
$CODE_CP_ID = convertArrayToHashTable($codes['CP_ID'], 'cd', 'cd_nm', []);
return view("pages/results/m409/stats", [
'code_vrfcreq_way' => $CODE_VRFCREQ_WAY,
'code_cp_id' => $CODE_CP_ID,
]);
$this->data['code_vrfcreq_way'] = $CODE_VRFCREQ_WAY;
$this->data['code_cp_id'] = $CODE_CP_ID;
return view("pages/results/m409/stats", $this->data);
}
public function getResultList()

View File

@@ -21,11 +21,11 @@ class M410 extends BaseController
$CODE_CP_ID = convertArrayToHashTable($codes['CP_ID'], 'cd', 'cd_nm', []);
$department = $this->model->getDepart();
return view("pages/results/m410/stats", [
'code_vrfcreq_way' => $CODE_VRFCREQ_WAY,
'code_cp_id' => $CODE_CP_ID,
'department' => $department,
]);
$this->data['code_vrfcreq_way'] = $CODE_VRFCREQ_WAY;
$this->data['code_cp_id'] = $CODE_CP_ID;
$this->data['department'] = $department;
return view("pages/results/m410/stats", $this->data);
}
public function getResultList()

View File

@@ -15,8 +15,7 @@ class M411 extends BaseController
public function stats(): string
{
return view("pages/results/m411/stats", [
]);
return view("pages/results/m411/stats", $this->data);
}
public function getResultList()

View File

@@ -28,14 +28,15 @@ class M412 extends BaseController
$sendJ = $this->model->get_send_yn('J');
$sendO = $this->model->get_send_yn('O');
return view("pages/results/m412/stats", [
'sendH' => $sendH,
'sendD' => $sendD,
'sendT' => $sendT,
'sendN' => $sendN,
'sendJ' => $sendJ,
'sendO' => $sendO,
]);
$this->data['sendH'] = $sendH;
$this->data['sendD'] = $sendD;
$this->data['sendT'] = $sendT;
$this->data['sendN'] = $sendN;
$this->data['sendJ'] = $sendJ;
$this->data['sendO'] = $sendO;
return view("pages/results/m412/stats", $this->data);
}
public function getResultList()

View File

@@ -14,8 +14,7 @@ class M415 extends BaseController
public function stats(): string
{
return view("pages/results/m415/stats", [
]);
return view("pages/results/m415/stats", $this->data);
}

View File

@@ -19,11 +19,11 @@ class M416 extends BaseController
$team = $this->model->getTeamList();
$sido = $this->model->getAreaList();
return view("pages/results/m416/stats", [
'bonbu' => $bonbu,
'team' => $team,
'sido' => $sido,
]);
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['sido'] = $sido;
return view("pages/results/m416/stats", $this->data);
}

View File

@@ -18,9 +18,9 @@ class M417 extends BaseController
{
$department = $this->model->getDepart();
return view("pages/results/m417/stats", [
'department' => $department,
]);
$this->data['department'] = $department;
return view("pages/results/m417/stats", $this->data);
}

View File

@@ -22,11 +22,11 @@ class Person extends BaseController
$team = $this->personModel->getTeamList();
$sido = $this->personModel->getAreaList();
return view("pages/results/person/stats_p01", [
'bonbu' => $bonbu,
'team' => $team,
'sido' => $sido,
]);
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['sido'] = $sido;
return view("pages/results/person/stats_p01", $this->data);
}
public function getUserList()

View File

@@ -87,13 +87,13 @@ class Summary extends BaseController
}
}
return view("pages/results/summary/stats_s01", [
'schDateGb' => $this->schDateGb,
'sdate' => $this->sdate,
'edate' => $this->edate,
'st_list' => $res,
'st_agent' => $res2,
'totalAmount' => $totalAmount,
]);
$this->data['schDateGb'] = $this->schDateGb;
$this->data['sdate'] = $this->sdate;
$this->data['edate'] = $this->edate;
$this->data['st_list'] = $res;
$this->data['st_agent'] = $res2;
$this->data['totalAmount'] = $totalAmount;
return view("pages/results/summary/stats_s01", $this->data);
}
}

View File

@@ -24,13 +24,13 @@ class M701 extends BaseController
$team = $this->model->getTeamList();
$user = $this->model->getUserList();
return view("pages/v2/m701/lists", [
"sido" => $sido,
"bonbu" => $bonbu,
"team" => $team,
"user" => $user,
"codes" => $codes,
]);
$this->data['sido'] = $sido;
$this->data['bonbu'] = $bonbu;
$this->data['team'] = $team;
$this->data['user'] = $user;
$this->data['codes'] = $codes;
return view("pages/v2/m701/lists", $this->data);
}
public function getResultList()
@@ -114,6 +114,31 @@ class M701 extends BaseController
$e->getPrevious()->getTraceAsString();
}
}
// 상세화면
public function detail($id = null)
{
$id = (int) $id;
if ($id <= 0) {
throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
}
$codes = $this->codeModel->getCodeLists(['VRFCREQ_WAY', 'CONFIRM_RESULT_D11', 'CONFIRM_RESULT_T11', 'CONSULTANT_COMMENT', 'STEP_VERIFICATION', 'TEL_FAIL_CAUSE']); // 코드조회
$data = $this->model->getDetail($id);
$history = $this->model->getHistory($id);
$this->data['codes'] = $codes;
$this->data['data'] = $data;
$this->data['history'] = $history;
return view("pages/v2/m701/detail", $this->data);
}
}