diff --git a/src/main/java/com/no1/wms/product/ProductDto.java b/src/main/java/com/no1/wms/product/ProductDto.java index bb352b7..211eabf 100644 --- a/src/main/java/com/no1/wms/product/ProductDto.java +++ b/src/main/java/com/no1/wms/product/ProductDto.java @@ -4,7 +4,9 @@ import java.util.Date; import org.apache.ibatis.type.Alias; +import com.no1.wms.account.AccountDto; import com.no1.wms.category.CategoryDto; +import com.no1.wms.vendor.VendorDto; import lombok.AllArgsConstructor; import lombok.Data; @@ -14,17 +16,18 @@ import lombok.Data; @Alias("ProductDto") public class ProductDto { - private String id; - private String name; - private String company_name; - private String kan_code; - private String vendor_id; - private Date registration_date; - private String manager_id; - private boolean activation; - - + private String id;//id + private String name;//제품명 + private String company_name;//회사명 + private String kan_code;//분류코드 + private String vendor_id;//거래처 id + private Date registration_date;//등록날짜 + private String manager_id;//담당자 + private boolean activation;//활성화 + private VendorDto vendorDto; + private AccountDto accountDto; + private CategoryDto categoryDto; } diff --git a/src/main/resources/mappers/ProductMapper.xml b/src/main/resources/mappers/ProductMapper.xml index a684ac6..a456e5b 100644 --- a/src/main/resources/mappers/ProductMapper.xml +++ b/src/main/resources/mappers/ProductMapper.xml @@ -4,60 +4,53 @@ - - - - - - - - - - - + + + + + + + + + + + - - - + + - + - + + + + - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - + SELECT + p.id, p.name, p.company_name, p.kan_code, p.vendor_id, p.registration_date, + p.manager_id, p.activation, + v.name as vendor_name, v.president_name, + a.name as account_name, + pc.cls_nm_1, pc.cls_nm_2, pc.cls_nm_3, pc.cls_nm_4 + FROM product as p + left join vendor as v on p.vendor_id = v.id + left join account as a on p.manager_id = a.id + left join product_category as pc on p.kan_code = pc.kan_code + WHERE p.activation != 0 + ORDER BY p.registration_date limit #{start} , #{count} diff --git a/src/main/webapp/WEB-INF/views/product/list.jsp b/src/main/webapp/WEB-INF/views/product/list.jsp index 8eb1b2b..6e6a710 100644 --- a/src/main/webapp/WEB-INF/views/product/list.jsp +++ b/src/main/webapp/WEB-INF/views/product/list.jsp @@ -47,12 +47,17 @@ - - ${dto.cls_nm_1 } - ${dto.cls_nm_2 } - ${dto.cls_nm_3 } - ${dto.cls_nm_4 } - ${dto.kan_code } + + ${dto.name } + ${dto.company_name } + + 1 + 2 + 3 + 4