minor bug fixed
Showing
10 changed files
with
154 additions
and
36 deletions
... | @@ -198,7 +198,11 @@ | ... | @@ -198,7 +198,11 @@ |
198 | <!-- 계약일 --> | 198 | <!-- 계약일 --> |
199 | <th style="height:25px;">차종</th> | 199 | <th style="height:25px;">차종</th> |
200 | <td class="center" colspan='7'> | 200 | <td class="center" colspan='7'> |
201 | <input type="text" name="vehicleTON" style="width:5%;" value="<?=$info["vehicleTON"]?>" /> TON | 201 | <select name="vehicleTON" > |
202 | <?for($i=0; $i<=25; $i++){?> | ||
203 | <option value='<?=$i?>' <?=$info["vehicleTON"] == $i ? "selected" : ""?>><?=$i?></option> | ||
204 | <?}?> | ||
205 | </select> TON | ||
202 | <input type="text" name="vehicleText" style="margin-right:50px;" value="<?=$info["vehicleText"]?>"/> | 206 | <input type="text" name="vehicleText" style="margin-right:50px;" value="<?=$info["vehicleText"]?>"/> |
203 | <input type="radio" name="vehicleType" value="HY" <?=$info["vehicleType"] == "HY" ? "CHECKED" : "" ?>>현대 | 207 | <input type="radio" name="vehicleType" value="HY" <?=$info["vehicleType"] == "HY" ? "CHECKED" : "" ?>>현대 |
204 | <input type="radio" name="vehicleType" value="DW" <?=$info["vehicleType"] == "DW" ? "CHECKED" : "" ?>>대우 | 208 | <input type="radio" name="vehicleType" value="DW" <?=$info["vehicleType"] == "DW" ? "CHECKED" : "" ?>>대우 | ... | ... |
... | @@ -17,7 +17,9 @@ | ... | @@ -17,7 +17,9 @@ |
17 | $.ajax({ | 17 | $.ajax({ |
18 | url : "/setting/agree.txt", | 18 | url : "/setting/agree.txt", |
19 | dataType : "html", | 19 | dataType : "html", |
20 | cache : false, | ||
20 | success : function(data){ | 21 | success : function(data){ |
22 | console.log(data); | ||
21 | $("#content").val(data); | 23 | $("#content").val(data); |
22 | }}); | 24 | }}); |
23 | 25 | ||
... | @@ -57,6 +59,7 @@ | ... | @@ -57,6 +59,7 @@ |
57 | $.ajax({ | 59 | $.ajax({ |
58 | url : "/setting/privacy.txt", | 60 | url : "/setting/privacy.txt", |
59 | dataType : "html", | 61 | dataType : "html", |
62 | cache : false, | ||
60 | success : function(data){ | 63 | success : function(data){ |
61 | $("#content").val(data); | 64 | $("#content").val(data); |
62 | } | 65 | } |
... | @@ -66,6 +69,7 @@ | ... | @@ -66,6 +69,7 @@ |
66 | $.ajax({ | 69 | $.ajax({ |
67 | url : "/setting/agree.txt", | 70 | url : "/setting/agree.txt", |
68 | dataType : "html", | 71 | dataType : "html", |
72 | cache : false, | ||
69 | success : function(data){ | 73 | success : function(data){ |
70 | $("#content").val(data); | 74 | $("#content").val(data); |
71 | } | 75 | } |
... | @@ -81,8 +85,8 @@ | ... | @@ -81,8 +85,8 @@ |
81 | forceSync : true, | 85 | forceSync : true, |
82 | dataType : "json", | 86 | dataType : "json", |
83 | success : function(data){ | 87 | success : function(data){ |
84 | alert(data.returnMessage); | 88 | //alert(data.returnMessage); |
85 | location.href = _rurl; | 89 | //location.href = _rurl; |
86 | } | 90 | } |
87 | 91 | ||
88 | }); | 92 | }); | ... | ... |
... | @@ -34,10 +34,11 @@ if (! class_exists("AdminProductionSpec")){ | ... | @@ -34,10 +34,11 @@ if (! class_exists("AdminProductionSpec")){ |
34 | $sql=" | 34 | $sql=" |
35 | SELECT COUNT(*) AS rn | 35 | SELECT COUNT(*) AS rn |
36 | FROM tblProductionSpec PS | 36 | FROM tblProductionSpec PS |
37 | JOIN tblUser U ON PS.userFk=U.userNo | 37 | LEFT JOIN tblUser U ON PS.userFk=U.userNo |
38 | {$where} | 38 | {$where} |
39 | ORDER BY PS.regDate DESC | 39 | ORDER BY PS.regDate DESC |
40 | "; | 40 | "; |
41 | |||
41 | $this->initPage(); | 42 | $this->initPage(); |
42 | $this->rownum=$this->getValue($sql, 'rn'); | 43 | $this->rownum=$this->getValue($sql, 'rn'); |
43 | $this->setPage($this->rownum); | 44 | $this->setPage($this->rownum); |
... | @@ -47,14 +48,14 @@ if (! class_exists("AdminProductionSpec")){ | ... | @@ -47,14 +48,14 @@ if (! class_exists("AdminProductionSpec")){ |
47 | $sql=" | 48 | $sql=" |
48 | SELECT productionNo, DATE_FORMAT(PS.requestDate, '%Y-%m-%d') AS requestDate, PS.companyName, PS.productName, U.userName | 49 | SELECT productionNo, DATE_FORMAT(PS.requestDate, '%Y-%m-%d') AS requestDate, PS.companyName, PS.productName, U.userName |
49 | FROM tblProductionSpec PS | 50 | FROM tblProductionSpec PS |
50 | JOIN tblUser U ON PS.userFk=U.userNo | 51 | LEFT JOIN tblUser U ON PS.userFk=U.userNo |
51 | {$where} | 52 | {$where} |
52 | ORDER BY PS.productionNo DESC | 53 | ORDER BY PS.productionNo DESC |
53 | {$limit} | 54 | {$limit} |
54 | "; | 55 | "; |
55 | 56 | ||
56 | $result=$this->getArray($sql); | 57 | $result=$this->getArray($sql); |
57 | //echo json_encode($result); | 58 | // echo $sql; |
58 | return $result; | 59 | return $result; |
59 | } | 60 | } |
60 | 61 | ||
... | @@ -130,6 +131,7 @@ if (! class_exists("AdminProductionSpec")){ | ... | @@ -130,6 +131,7 @@ if (! class_exists("AdminProductionSpec")){ |
130 | $specialAddition3=$this->req["specialAddition3"]; | 131 | $specialAddition3=$this->req["specialAddition3"]; |
131 | $specialAddition4=$this->req["specialAddition4"]; | 132 | $specialAddition4=$this->req["specialAddition4"]; |
132 | $specialAddition5=$this->req["specialAddition5"]; | 133 | $specialAddition5=$this->req["specialAddition5"]; |
134 | |||
133 | $sql = " | 135 | $sql = " |
134 | UPDATE `tblProductionSpec` | 136 | UPDATE `tblProductionSpec` |
135 | SET | 137 | SET | ... | ... |
... | @@ -201,6 +201,7 @@ if(!class_exists("AdminPush")){ | ... | @@ -201,6 +201,7 @@ if(!class_exists("AdminPush")){ |
201 | $type=$this->req["type"]; | 201 | $type=$this->req["type"]; |
202 | $content=$this->req["content"]; | 202 | $content=$this->req["content"]; |
203 | 203 | ||
204 | |||
204 | if($type == "AG"){ | 205 | if($type == "AG"){ |
205 | $filePath = $this->agreeInfoPath; | 206 | $filePath = $this->agreeInfoPath; |
206 | $files = fopen($filePath, "w"); | 207 | $files = fopen($filePath, "w"); | ... | ... |
... | @@ -343,8 +343,8 @@ if (! class_exists("ApiBoard")) | ... | @@ -343,8 +343,8 @@ if (! class_exists("ApiBoard")) |
343 | 343 | ||
344 | $title=$this->req["title"]; | 344 | $title=$this->req["title"]; |
345 | $targetType=$this->req["targetType"]; | 345 | $targetType=$this->req["targetType"]; |
346 | //$userFk = $this->appUser["no"]; | 346 | $userFk = $this->appUser["no"]; |
347 | $userFk=$this->req["userFk"]; | 347 | // $userFk=$this->req["userFk"]; |
348 | $content=$this->req["content"]; | 348 | $content=$this->req["content"]; |
349 | 349 | ||
350 | $imgPathCS1 = $imgResult["imgPathCS1"]["saveURL"] != null ? $imgResult["imgPathCS1"]["saveURL"] : $this->req["imgPathCS1"]; | 350 | $imgPathCS1 = $imgResult["imgPathCS1"]["saveURL"] != null ? $imgResult["imgPathCS1"]["saveURL"] : $this->req["imgPathCS1"]; |
... | @@ -380,11 +380,14 @@ if (! class_exists("ApiBoard")) | ... | @@ -380,11 +380,14 @@ if (! class_exists("ApiBoard")) |
380 | 380 | ||
381 | //고객센터 게시물 리스트 | 381 | //고객센터 게시물 리스트 |
382 | function getListOfCS(){ | 382 | function getListOfCS(){ |
383 | $userFk=$this->appUser["no"]; | ||
384 | |||
383 | $searchText=$this->req["searchText"]; | 385 | $searchText=$this->req["searchText"]; |
384 | $searchType=$this->req["searchType"]; | 386 | $searchType=$this->req["searchType"]; |
385 | 387 | ||
386 | $where="CS.status=1 AND targetType = 1"; | 388 | $where="WHERE CS.status=1 AND (targetType = 1 OR (targetType=2 AND CS.userFk='{$userFk}'))"; |
387 | /* | 389 | |
390 | |||
388 | if(!empty($searchText)){ | 391 | if(!empty($searchText)){ |
389 | if(empty($search_type)){ | 392 | if(empty($search_type)){ |
390 | $where.=" AND (U.userID LIKE '%{$searchText}%' OR CS.title LIKE '%{$searchText}%')"; | 393 | $where.=" AND (U.userID LIKE '%{$searchText}%' OR CS.title LIKE '%{$searchText}%')"; |
... | @@ -396,13 +399,13 @@ if (! class_exists("ApiBoard")) | ... | @@ -396,13 +399,13 @@ if (! class_exists("ApiBoard")) |
396 | $where.=" AND CS.title LIKE '%{$searchText}%'"; | 399 | $where.=" AND CS.title LIKE '%{$searchText}%'"; |
397 | } | 400 | } |
398 | } | 401 | } |
399 | */ | 402 | |
400 | 403 | ||
401 | $sql=" | 404 | $sql=" |
402 | SELECT COUNT(*) AS rn | 405 | SELECT COUNT(*) AS rn |
403 | FROM tblCustomerService CS | 406 | FROM tblCustomerService CS |
404 | JOIN tblUser U ON CS.userFk=U.userNo | 407 | JOIN tblUser U ON CS.userFk=U.userNo |
405 | WHERE CS.status=1 AND CS.targetType=1 | 408 | {$where} |
406 | ORDER BY csNo DESC | 409 | ORDER BY csNo DESC |
407 | "; | 410 | "; |
408 | $this->initPageForDevice(); | 411 | $this->initPageForDevice(); |
... | @@ -447,6 +450,7 @@ if (! class_exists("ApiBoard")) | ... | @@ -447,6 +450,7 @@ if (! class_exists("ApiBoard")) |
447 | WHERE targetFk='{$csNo}' AND commentType='CS' | 450 | WHERE targetFk='{$csNo}' AND commentType='CS' |
448 | "; | 451 | "; |
449 | $this->rownum=$this->getValue($sql, "rn"); | 452 | $this->rownum=$this->getValue($sql, "rn"); |
453 | $this->initPageForDevice(); | ||
450 | $this->setPageForDevice($this->rownum); | 454 | $this->setPageForDevice($this->rownum); |
451 | 455 | ||
452 | $sql=" | 456 | $sql=" |
... | @@ -458,6 +462,8 @@ if (! class_exists("ApiBoard")) | ... | @@ -458,6 +462,8 @@ if (! class_exists("ApiBoard")) |
458 | LIMIT {$this->startNum}, {$this->endNum} | 462 | LIMIT {$this->startNum}, {$this->endNum} |
459 | "; | 463 | "; |
460 | 464 | ||
465 | // echo $sql; | ||
466 | |||
461 | $commentList=$this->getArray($sql); | 467 | $commentList=$this->getArray($sql); |
462 | 468 | ||
463 | return $this->makeResultJson("1", "", $result, Array( | 469 | return $this->makeResultJson("1", "", $result, Array( |
... | @@ -473,7 +479,7 @@ if (! class_exists("ApiBoard")) | ... | @@ -473,7 +479,7 @@ if (! class_exists("ApiBoard")) |
473 | //AS엄체 리스트 | 479 | //AS엄체 리스트 |
474 | function getListOfCompany(){ | 480 | function getListOfCompany(){ |
475 | $provinceNumber=$this->req["provinceNumber"]; | 481 | $provinceNumber=$this->req["provinceNumber"]; |
476 | $productCoder=$this->req["productCode"]; | 482 | $productCode=$this->req["productCode"]; |
477 | $searchText=$this->req["searchText"]; | 483 | $searchText=$this->req["searchText"]; |
478 | 484 | ||
479 | $where="WHERE status=1"; | 485 | $where="WHERE status=1"; |
... | @@ -482,9 +488,10 @@ if (! class_exists("ApiBoard")) | ... | @@ -482,9 +488,10 @@ if (! class_exists("ApiBoard")) |
482 | $where.=" AND provinceCode='{$provinceNumber}'"; | 488 | $where.=" AND provinceCode='{$provinceNumber}'"; |
483 | } | 489 | } |
484 | 490 | ||
485 | if(!empty($productNumber)){ | 491 | if(!empty($productCode)){ |
486 | $where.=" AND productCode='{$productCode}'"; | 492 | $where.=" AND productCode='{$productCode}'"; |
487 | } | 493 | } |
494 | |||
488 | if(!empty($searchText)){ | 495 | if(!empty($searchText)){ |
489 | $where.=" AND name LIKE '%{$searchText}%'"; | 496 | $where.=" AND name LIKE '%{$searchText}%'"; |
490 | } | 497 | } |
... | @@ -680,8 +687,9 @@ if (! class_exists("ApiBoard")) | ... | @@ -680,8 +687,9 @@ if (! class_exists("ApiBoard")) |
680 | 687 | ||
681 | //제작사양서 저장 | 688 | //제작사양서 저장 |
682 | function saveProductionSpec(){ | 689 | function saveProductionSpec(){ |
683 | //$userFk = $this->appUser["no"]; | 690 | $userFk = $this->appUser["no"]; |
684 | $userFk = $this->req["userFk"]; | 691 | // $userFk = $this->req["userFk"]; |
692 | |||
685 | $requestDate=$this->req["requestDate"]; | 693 | $requestDate=$this->req["requestDate"]; |
686 | $customerName=$this->req["customerName"]; | 694 | $customerName=$this->req["customerName"]; |
687 | $companyName=$this->req["companyName"]; | 695 | $companyName=$this->req["companyName"]; |
... | @@ -724,11 +732,12 @@ if (! class_exists("ApiBoard")) | ... | @@ -724,11 +732,12 @@ if (! class_exists("ApiBoard")) |
724 | $balance=$this->req["balance"]; | 732 | $balance=$this->req["balance"]; |
725 | $specialAddition=$this->req["specialAddition"]; | 733 | $specialAddition=$this->req["specialAddition"]; |
726 | 734 | ||
727 | if(empty($requestDate) || empty($customerName) || empty($companyName) || empty($productName) || empty($telephone) || empty($userFk) || empty($balance) || empty($type) || empty($alCoil) || empty($floor) || empty($tent) || empty($sideBoard) | 735 | // if(empty($requestDate) || empty($customerName) || empty($companyName) || empty($productName) || empty($telephone) || empty($userFk) || empty($balance) || empty($type) || empty($alCoil) || empty($floor) || empty($tent) || empty($sideBoard) |
728 | || empty($windStopper) || empty($freezer) || empty($gateType) || empty($gateSize) || empty($load) || empty($frontBack) || empty($eTrackGate) || empty($eTrackWing) || empty($toolBucket) || empty($bumperFootHold) || empty($wingProtector) | 736 | // || empty($windStopper) || empty($freezer) || empty($gateType) || empty($gateSize) || empty($load) || empty($frontBack) || empty($eTrackGate) || empty($eTrackWing) || empty($toolBucket) || empty($bumperFootHold) || empty($wingProtector) |
729 | || empty($axis)){ | 737 | // || empty($axis)){ |
730 | return $this->makeResultJson("-1", "저장오류"); | 738 | // return $this->makeResultJson("-1", "저장오류"); |
731 | } | 739 | // } |
740 | |||
732 | 741 | ||
733 | $sql=" | 742 | $sql=" |
734 | INSERT INTO tblProductionSpec( | 743 | INSERT INTO tblProductionSpec( |
... | @@ -773,7 +782,11 @@ if (! class_exists("ApiBoard")) | ... | @@ -773,7 +782,11 @@ if (! class_exists("ApiBoard")) |
773 | axis, | 782 | axis, |
774 | axisValue, | 783 | axisValue, |
775 | balance, | 784 | balance, |
776 | specialAddition, | 785 | specialAddition1, |
786 | specialAddition2, | ||
787 | specialAddition3, | ||
788 | specialAddition4, | ||
789 | specialAddition5, | ||
777 | status, | 790 | status, |
778 | regDate | 791 | regDate |
779 | ) | 792 | ) |
... | @@ -820,7 +833,11 @@ if (! class_exists("ApiBoard")) | ... | @@ -820,7 +833,11 @@ if (! class_exists("ApiBoard")) |
820 | '{$axis}', | 833 | '{$axis}', |
821 | '{$axisValue}', | 834 | '{$axisValue}', |
822 | '{$balance}', | 835 | '{$balance}', |
823 | '{$specialAddition}', | 836 | '{$specialAddition1}', |
837 | '{$specialAddition2}', | ||
838 | '{$specialAddition3}', | ||
839 | '{$specialAddition4}', | ||
840 | '{$specialAddition5}', | ||
824 | 1, | 841 | 1, |
825 | NOW() | 842 | NOW() |
826 | ) | 843 | ) |
... | @@ -831,8 +848,8 @@ if (! class_exists("ApiBoard")) | ... | @@ -831,8 +848,8 @@ if (! class_exists("ApiBoard")) |
831 | 848 | ||
832 | //내 제작사양서 | 849 | //내 제작사양서 |
833 | function getListOfMyProductionSpec(){ | 850 | function getListOfMyProductionSpec(){ |
834 | //$userFk=$this->appUser["no"]; | 851 | $userFk=$this->appUser["no"]; |
835 | $userFk=1; | 852 | // $userFk=1; |
836 | 853 | ||
837 | $sql=" | 854 | $sql=" |
838 | SELECT COUNT(*) AS rn | 855 | SELECT COUNT(*) AS rn |
... | @@ -853,6 +870,7 @@ if (! class_exists("ApiBoard")) | ... | @@ -853,6 +870,7 @@ if (! class_exists("ApiBoard")) |
853 | LIMIT {$this->startNum}, {$this->endNum} | 870 | LIMIT {$this->startNum}, {$this->endNum} |
854 | "; | 871 | "; |
855 | $list=$this->getArray($sql); | 872 | $list=$this->getArray($sql); |
873 | //echo $sql; | ||
856 | 874 | ||
857 | if(sizeof($list)>0) | 875 | if(sizeof($list)>0) |
858 | return $this->makeResultJson("1", "", $list); | 876 | return $this->makeResultJson("1", "", $list); |
... | @@ -864,7 +882,8 @@ if (! class_exists("ApiBoard")) | ... | @@ -864,7 +882,8 @@ if (! class_exists("ApiBoard")) |
864 | function getListOfProductionSpec(){ | 882 | function getListOfProductionSpec(){ |
865 | $dateFormer=$this->req["dateFormer"]; | 883 | $dateFormer=$this->req["dateFormer"]; |
866 | $dateLatter=$this->req["dateLatter"]; | 884 | $dateLatter=$this->req["dateLatter"]; |
867 | $userFk=$this->req["userFk"]; | 885 | |
886 | $userFk=$this->req["userFk"]; //매니저별 검색 | ||
868 | 887 | ||
869 | $where="WHERE status=1"; | 888 | $where="WHERE status=1"; |
870 | if(!empty($dateFormer)){ | 889 | if(!empty($dateFormer)){ |
... | @@ -897,6 +916,7 @@ if (! class_exists("ApiBoard")) | ... | @@ -897,6 +916,7 @@ if (! class_exists("ApiBoard")) |
897 | LIMIT {$this->startNum}, {$this->endNum} | 916 | LIMIT {$this->startNum}, {$this->endNum} |
898 | "; | 917 | "; |
899 | $list=$this->getArray($sql); | 918 | $list=$this->getArray($sql); |
919 | // echo $sql; | ||
900 | 920 | ||
901 | if(sizeof($list)>0) | 921 | if(sizeof($list)>0) |
902 | return $this->makeResultJson("1", "", $list); | 922 | return $this->makeResultJson("1", "", $list); |
... | @@ -906,18 +926,18 @@ if (! class_exists("ApiBoard")) | ... | @@ -906,18 +926,18 @@ if (! class_exists("ApiBoard")) |
906 | 926 | ||
907 | //제작사양서 상세정보 | 927 | //제작사양서 상세정보 |
908 | function getInfoOfProductionSpec(){ | 928 | function getInfoOfProductionSpec(){ |
909 | $userNo=$this->appUser["userNo"]; | 929 | $userNo=$this->appUser["no"]; |
910 | $productionNo=$this->req["productionNo"]; | 930 | $productionNo=$this->req["productionNo"]; |
911 | //$productionNo=3; | 931 | //$productionNo=3; |
912 | $sql=" | 932 | $sql=" |
913 | SELECT PS.*, U.userNo, U.userName, IFNULL((SELECT userNo FROM tblLike WHERE userNo='{$userNo}' AND productionNo='{$productionNo}'), 0) AS likeStatus | 933 | SELECT PS.*, U.userNo, U.userName, IFNULL((SELECT userNo FROM tblLike WHERE userNo='{$userNo}' AND productionNo='{$productionNo}'), 0) AS likeStatus |
914 | FROM tblProductionSpec PS | 934 | FROM tblProductionSpec PS |
915 | JOIN tblUser U ON PS.userFk=U.userNo | 935 | LEFT JOIN tblUser U ON PS.userFk=U.userNo |
916 | WHERE productionNo='{$productionNo}' | 936 | WHERE productionNo='{$productionNo}' |
917 | "; | 937 | "; |
918 | $info=$this->getRow($sql); | 938 | $info=$this->getRow($sql); |
919 | 939 | ||
920 | if($userNo == $info["userNo"]) | 940 | if($userNo != $info["userNo"]) |
921 | $info["balance"] = null; | 941 | $info["balance"] = null; |
922 | 942 | ||
923 | return $this->makeResultJson("1", "", $info); | 943 | return $this->makeResultJson("1", "", $info); |
... | @@ -926,7 +946,7 @@ if (! class_exists("ApiBoard")) | ... | @@ -926,7 +946,7 @@ if (! class_exists("ApiBoard")) |
926 | 946 | ||
927 | //좋아요 | 947 | //좋아요 |
928 | function productionLike(){ | 948 | function productionLike(){ |
929 | $userNo=$this->appUser["userNo"]; | 949 | $userNo=$this->appUser["no"]; |
930 | $productionNo=$this->req["productionNo"]; | 950 | $productionNo=$this->req["productionNo"]; |
931 | 951 | ||
932 | $sql=" | 952 | $sql=" |
... | @@ -939,7 +959,8 @@ if (! class_exists("ApiBoard")) | ... | @@ -939,7 +959,8 @@ if (! class_exists("ApiBoard")) |
939 | 959 | ||
940 | //좋아요 취소 | 960 | //좋아요 취소 |
941 | function productionLikeCancel(){ | 961 | function productionLikeCancel(){ |
942 | $userNo=$this->req["userNo"]; | 962 | $userNo=$this->appUser["no"]; |
963 | // $userNo=$this->req["userNo"]; | ||
943 | $productionNo=$this->req["productionNo"]; | 964 | $productionNo=$this->req["productionNo"]; |
944 | 965 | ||
945 | $sql="DELETE FROM tblLike WHERE userNo='{$userNo}' AND productionNo='{$productionNo}'"; | 966 | $sql="DELETE FROM tblLike WHERE userNo='{$userNo}' AND productionNo='{$productionNo}'"; |
... | @@ -950,13 +971,14 @@ if (! class_exists("ApiBoard")) | ... | @@ -950,13 +971,14 @@ if (! class_exists("ApiBoard")) |
950 | //제작사양서 보관함 리스트(좋아요 리스트) | 971 | //제작사양서 보관함 리스트(좋아요 리스트) |
951 | function productionLikeList(){ | 972 | function productionLikeList(){ |
952 | $userNo=$this->appUser["no"]; | 973 | $userNo=$this->appUser["no"]; |
974 | // $userNo=1; | ||
953 | 975 | ||
954 | $sql=" | 976 | $sql=" |
955 | SELECT COUNT(*) AS rn | 977 | SELECT COUNT(*) AS rn |
956 | FROM tblProductionSpec PS | 978 | FROM tblProductionSpec PS |
957 | JOIN tblLike L ON PS.productionNo=L.productionNo | 979 | JOIN tblLike L ON PS.productionNo=L.productionNo |
958 | WHERE L.userNo='{$userNo}' AND PS.status=1 | 980 | WHERE L.userNo='{$userNo}' AND PS.status=1 |
959 | ORDER BY regDate DESC | 981 | ORDER BY PS.regDate DESC |
960 | "; | 982 | "; |
961 | $this->initPageForDevice(); | 983 | $this->initPageForDevice(); |
962 | $this->rownum=$this->getValue($sql, "rn"); | 984 | $this->rownum=$this->getValue($sql, "rn"); |
... | @@ -968,7 +990,7 @@ if (! class_exists("ApiBoard")) | ... | @@ -968,7 +990,7 @@ if (! class_exists("ApiBoard")) |
968 | FROM tblProductionSpec PS | 990 | FROM tblProductionSpec PS |
969 | JOIN tblLike L ON PS.productionNo=L.productionNo | 991 | JOIN tblLike L ON PS.productionNo=L.productionNo |
970 | WHERE L.userNo='{$userNo}' AND PS.status=1 | 992 | WHERE L.userNo='{$userNo}' AND PS.status=1 |
971 | ORDER BY regDate DESC | 993 | ORDER BY PS.regDate DESC |
972 | LIMIT {$this->startNum}, {$this->endNum} | 994 | LIMIT {$this->startNum}, {$this->endNum} |
973 | "; | 995 | "; |
974 | $result=$this->getArray($sql); | 996 | $result=$this->getArray($sql); |
... | @@ -1026,7 +1048,6 @@ if (! class_exists("ApiBoard")) | ... | @@ -1026,7 +1048,6 @@ if (! class_exists("ApiBoard")) |
1026 | //array_push($result, $contents); | 1048 | //array_push($result, $contents); |
1027 | //array_push($result, $imgs); | 1049 | //array_push($result, $imgs); |
1028 | 1050 | ||
1029 | |||
1030 | return $this->makeResultJson("1", "", $result); | 1051 | return $this->makeResultJson("1", "", $result); |
1031 | } | 1052 | } |
1032 | 1053 | ... | ... |
... | @@ -36,3 +36,5 @@ log Date : 2017-04-07 15:59:14 // Api : saveComment // userFk : 76 | ... | @@ -36,3 +36,5 @@ log Date : 2017-04-07 15:59:14 // Api : saveComment // userFk : 76 |
36 | ============================================================================ | 36 | ============================================================================ |
37 | log Date : 2017-04-07 16:04:16 // Api : saveComment // userFk : 76 | 37 | log Date : 2017-04-07 16:04:16 // Api : saveComment // userFk : 76 |
38 | ============================================================================ | 38 | ============================================================================ |
39 | log Date : 2017-04-07 18:23:34 // Api : saveComment // userFk : 76 | ||
40 | ============================================================================ | ... | ... |
log/simpleLog/201704/20170408.txt
0 → 100644
1 | log Date : 2017-04-08 14:19:20 // Api : saveComment // userFk : 76 | ||
2 | ============================================================================ | ||
3 | log Date : 2017-04-08 15:46:35 // Api : saveComment // userFk : 76 | ||
4 | ============================================================================ | ||
5 | log Date : 2017-04-08 15:49:30 // Api : saveComment // userFk : 76 | ||
6 | ============================================================================ | ||
7 | log Date : 2017-04-08 15:49:36 // Api : saveComment // userFk : 76 | ||
8 | ============================================================================ | ||
9 | log Date : 2017-04-08 15:57:51 // Api : saveComment // userFk : 76 | ||
10 | ============================================================================ | ||
11 | log Date : 2017-04-08 15:57:56 // Api : saveComment // userFk : 76 | ||
12 | ============================================================================ | ||
13 | log Date : 2017-04-08 16:16:43 // Api : saveComment // userFk : 76 | ||
14 | ============================================================================ | ||
15 | log Date : 2017-04-08 16:16:56 // Api : saveComment // userFk : 76 | ||
16 | ============================================================================ | ||
17 | log Date : 2017-04-08 16:17:00 // Api : saveComment // userFk : 76 | ||
18 | ============================================================================ | ||
19 | log Date : 2017-04-08 16:18:05 // Api : saveComment // userFk : 76 | ||
20 | ============================================================================ | ||
21 | log Date : 2017-04-08 16:19:11 // Api : saveComment // userFk : 76 | ||
22 | ============================================================================ | ||
23 | log Date : 2017-04-08 16:20:37 // Api : saveComment // userFk : 76 | ||
24 | ============================================================================ | ||
25 | log Date : 2017-04-08 16:20:45 // Api : saveComment // userFk : 76 | ||
26 | ============================================================================ | ||
27 | log Date : 2017-04-08 16:21:00 // Api : saveComment // userFk : 76 | ||
28 | ============================================================================ | ||
29 | log Date : 2017-04-08 16:21:23 // Api : saveComment // userFk : 76 | ||
30 | ============================================================================ | ||
31 | log Date : 2017-04-08 16:21:37 // Api : saveComment // userFk : 76 | ||
32 | ============================================================================ | ||
33 | log Date : 2017-04-08 16:25:11 // Api : saveComment // userFk : 76 | ||
34 | ============================================================================ | ||
35 | log Date : 2017-04-08 16:27:13 // Api : saveComment // userFk : 76 | ||
36 | ============================================================================ | ||
37 | log Date : 2017-04-08 16:31:00 // Api : saveComment // userFk : 76 | ||
38 | ============================================================================ | ||
39 | log Date : 2017-04-08 16:32:23 // Api : saveComment // userFk : 76 | ||
40 | ============================================================================ | ||
41 | log Date : 2017-04-08 16:40:24 // Api : saveComment // userFk : 76 | ||
42 | ============================================================================ | ||
43 | log Date : 2017-04-08 16:43:27 // Api : saveComment // userFk : 76 | ||
44 | ============================================================================ | ||
45 | log Date : 2017-04-08 16:44:40 // Api : saveComment // userFk : 76 | ||
46 | ============================================================================ | ||
47 | log Date : 2017-04-08 16:47:28 // Api : saveComment // userFk : 76 | ||
48 | ============================================================================ |
log/simpleLog/201704/20170410.txt
0 → 100644
1 | log Date : 2017-04-10 10:03:02 // Api : saveComment // userFk : 20 | ||
2 | ============================================================================ | ||
3 | log Date : 2017-04-10 10:03:07 // Api : saveComment // userFk : 20 | ||
4 | ============================================================================ | ||
5 | log Date : 2017-04-10 10:11:24 // Api : saveComment // userFk : 20 | ||
6 | ============================================================================ | ||
7 | log Date : 2017-04-10 10:11:42 // Api : saveComment // userFk : 20 | ||
8 | ============================================================================ | ||
9 | log Date : 2017-04-10 10:12:01 // Api : saveComment // userFk : 20 | ||
10 | ============================================================================ | ||
11 | log Date : 2017-04-10 10:12:16 // Api : saveComment // userFk : 20 | ||
12 | ============================================================================ | ||
13 | log Date : 2017-04-10 10:12:44 // Api : saveComment // userFk : 20 | ||
14 | ============================================================================ | ||
15 | log Date : 2017-04-10 10:12:51 // Api : saveComment // userFk : 20 | ||
16 | ============================================================================ | ||
17 | log Date : 2017-04-10 10:14:16 // Api : saveComment // userFk : 20 | ||
18 | ============================================================================ | ||
19 | log Date : 2017-04-10 10:14:54 // Api : saveComment // userFk : 20 | ||
20 | ============================================================================ | ||
21 | log Date : 2017-04-10 10:28:55 // Api : saveComment // userFk : 20 | ||
22 | ============================================================================ | ||
23 | log Date : 2017-04-10 10:29:03 // Api : saveComment // userFk : 20 | ||
24 | ============================================================================ | ||
25 | log Date : 2017-04-10 10:31:18 // Api : saveComment // userFk : 20 | ||
26 | ============================================================================ | ||
27 | log Date : 2017-04-10 10:36:57 // Api : saveComment // userFk : 20 | ||
28 | ============================================================================ | ||
29 | log Date : 2017-04-10 10:42:30 // Api : saveComment // userFk : 20 | ||
30 | ============================================================================ | ||
31 | log Date : 2017-04-10 10:43:11 // Api : saveComment // userFk : 20 | ||
32 | ============================================================================ | ||
33 | log Date : 2017-04-10 10:45:15 // Api : saveComment // userFk : 20 | ||
34 | ============================================================================ | ||
35 | log Date : 2017-04-10 10:53:49 // Api : saveComment // userFk : 20 | ||
36 | ============================================================================ |
1 | 제 1 조 (목적) | 1 | 제 1 조 (목적) aaaa |
2 | 본 이용약관(이하 '본 약관')은 그룹바이 주식회사 (이하 '회사'라 칭한다.) 가 제공하는 제휴 상점 할인 및 민원관리 모바일 서비스(이하 '서비스'라 칭한다.)를 이용함에 있어 이용자(이하 '회원'이라 칭한다.)와 회사의 권리와 의무를 규정함을 목적으로 합니다. | 2 | 본 이용약관(이하 '본 약관')은 그룹바이 주식회사 (이하 '회사'라 칭한다.) 가 제공하는 제휴 상점 할인 및 민원관리 모바일 서비스(이하 '서비스'라 칭한다.)를 이용함에 있어 이용자(이하 '회원'이라 칭한다.)와 회사의 권리와 의무를 규정함을 목적으로 합니다. |
3 | 3 | ||
4 | 제 2 조 (용어의 정의) | 4 | 제 2 조 (용어의 정의) | ... | ... |
1 | '그룹바이‘ (이하 '회사'는) | 1 | '그룹바이‘ (이하 '회사'는)asdasdasdsad |
2 | 고객님의 개인정보를 중요시하며, "정보통신망 이용촉진 및 정보보호"에 관한 법률을 준수하고 있습니다. | 2 | 고객님의 개인정보를 중요시하며, "정보통신망 이용촉진 및 정보보호"에 관한 법률을 준수하고 있습니다. |
3 | 3 | ||
4 | 회사는 개인정보취급방침을 통하여 고객님께서 제공하시는 개인정보가 어떠한 용도와 방식으로 이용되고 있으며, 개인정보보호를 위해 어떠한 조치가 취해지고 있는지 알려드립니다. | 4 | 회사는 개인정보취급방침을 통하여 고객님께서 제공하시는 개인정보가 어떠한 용도와 방식으로 이용되고 있으며, 개인정보보호를 위해 어떠한 조치가 취해지고 있는지 알려드립니다. | ... | ... |
-
Please register or sign in to post a comment