Compare commits
No commits in common. "1686ff808bbb1ca9c22f457166600b0be3feb140" and "acfd5504b845ff8f678415dcba0cb2a79269a34f" have entirely different histories.
1686ff808b
...
acfd5504b8
|
|
@ -67,14 +67,10 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService {
|
||||||
String masterCompanyTwCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gm") );
|
String masterCompanyTwCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gm") );
|
||||||
String masterCompanyThCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gs") );
|
String masterCompanyThCode = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gs") );
|
||||||
String masterCompanyName = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gf") );
|
String masterCompanyName = MyUtil.getStringFromObject( spGetMasterCompanyDistrictParams.get("v_gf") );
|
||||||
String sortfield = "C".equals(MyUtil.getStringFromObject(params.get("const_tag"))) ? "0" : "2";
|
|
||||||
String sorttype = "2";
|
|
||||||
params.put("masterCompanyOCode", masterCompanyOCode);
|
params.put("masterCompanyOCode", masterCompanyOCode);
|
||||||
params.put("masterCompanyTwCode", masterCompanyTwCode);
|
params.put("masterCompanyTwCode", masterCompanyTwCode);
|
||||||
params.put("masterCompanyThCode", masterCompanyThCode);
|
params.put("masterCompanyThCode", masterCompanyThCode);
|
||||||
params.put("masterCompanyName", masterCompanyName);
|
params.put("masterCompanyName", masterCompanyName);
|
||||||
params.put("sortfield", sortfield);
|
|
||||||
params.put("sorttype", sorttype);
|
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -39,10 +39,7 @@
|
||||||
#{constCompanyAdmin, jdbcType=VARCHAR},
|
#{constCompanyAdmin, jdbcType=VARCHAR},
|
||||||
#{constCompanyTel, jdbcType=VARCHAR},
|
#{constCompanyTel, jdbcType=VARCHAR},
|
||||||
NULL,
|
NULL,
|
||||||
#{sortfield},
|
2,2,#{nCount},#{nPage}))
|
||||||
#{sorttype},
|
|
||||||
#{nCount},
|
|
||||||
#{nPage}))
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getComCodes" parameterType="map" resultType="String">
|
<select id="getComCodes" parameterType="map" resultType="String">
|
||||||
|
|
|
||||||
|
|
@ -403,15 +403,8 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
|
||||||
* 발주기관 목록화면 tr 드래그 시 상세화면 이동 방지처리
|
|
||||||
* 드래그 이벤트와 클릭이벤트를 구분하여 감지한다.
|
|
||||||
*/
|
|
||||||
function handleRowClick(CID) {
|
|
||||||
if (!isDragging) {
|
|
||||||
window.location.href = 'modify.do?CID=' + CID;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
<!-- javascript end-->
|
<!-- javascript end-->
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -123,9 +123,8 @@ function handleMouseDown() {
|
||||||
function handleMouseMove() {
|
function handleMouseMove() {
|
||||||
isDragging = true;
|
isDragging = true;
|
||||||
}
|
}
|
||||||
// 클릭이벤트는 각 jsp에서 처리한다. (내부 처리가 상이함)
|
function handleRowClick(CID) {
|
||||||
//function handleRowClick(CID) {
|
if (!isDragging) {
|
||||||
// if (!isDragging) {
|
window.location.href = 'modify.do?CID=' + CID;
|
||||||
// window.location.href = 'modify.do?CID=' + CID;
|
}
|
||||||
// }
|
}
|
||||||
//}
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue