From b2b8a75a8f5a35717bb89a07c2fe35ea16b6a99c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 09:55:16 +0900
Subject: [PATCH] 이슈 히스토리 - 중복되어서 나오는 문제 해결 및 업체에 추가된 항목들도 변경 시 이력 남기도록 수정
---
src/main/resources/mybatis/query-template/companyField-template.xml | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index 0aac445..466d7e2 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -5,20 +5,34 @@
<select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.CompanyFieldCondition">
SELECT
- c.id as id,
- c.name as name,
- c.email as email,
- c.tel as tel,
- c.desc as desc
+ cf.id as id,
+ cf.name as name,
+ cf.manager as manager,
+ cf.tel as tel,
+ cf.email as email,
+ cf.url as url,
+ cf.memo as memo,
+ cf.isp_id as ispId,
+ cf.hosting_id as hostingId,
+ cf.company_type_id as companyTypeId,
+ cf.parent_sector_id as parentSectorId,
+ cf.child_sector_id as childSectorId,
+ cf.region_id as regionId,
+ cf.status_id as statusId,
+ cf.status_name as statusName
FROM
- company c
+ company_field cf
WHERE 1=1
<if test="name != '' and name != null">
- AND c.name like CONCAT('%',#{name},'%')
+ AND cf.name like CONCAT('%',#{name},'%')
</if>
<if test="id != '' and id != null">
- AND c.id like CONCAT('%',#{id},'%')
+ AND cf.id like CONCAT('%',#{id},'%')
</if>
+ <if test="url != '' and id != url">
+ AND cf.url like CONCAT('%',#{url},'%')
+ </if>
+ ORDER BY cf.register_date DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
@@ -26,15 +40,15 @@
<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.CompanyFieldCondition">
SELECT
- count(c.id)
+ count(DISTINCT cf.id)
FROM
- company c
+ company_field cf
WHERE 1=1
<if test="name != '' and name != null">
- AND c.name like CONCAT('%',#{name},'%')
+ AND cf.name like CONCAT('%',#{name},'%')
</if>
<if test="id != '' and id != null">
- AND c.id like CONCAT('%',#{id},'%')
+ AND cf.id like CONCAT('%',#{id},'%')
</if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0