생산계획&생산실적 등록일, 등록자 추가

src/com/pms/controller/ProductionPlanningController.java

@@ -1779,6 +1779,9 @@ public class ProductionPlanningController extends BaseService {
 			// 고객사 (SUPPLY_MNG + CLIENT_MNG 통합)
 			code_map.put("customer_cd", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("customer_objid")), "common.getsupplyselect"));
 			
+			// 등록자
+			code_map.put("writer", commonService.bizMakeOptionList("", "", "common.getUserselect"));
+			
 			request.setAttribute("code_map", code_map);
 		}catch(Exception e){
 			e.printStackTrace();

src/com/pms/mapper/productionplanning.xml

@@ -4525,7 +4525,11 @@
 				COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PM.OBJID::VARCHAR AND PR.RESULT_TYPE = 'SHIP_WAIT' AND PR.STATUS = 'active'), 0) AS SHIP_WAIT_QTY,
 				'' AS EQUIPMENT_WBS,
 				PP.OBJID AS PROD_PLAN_OBJID,
-				PM.REGDATE AS SORT_DATE
+				PM.REGDATE AS SORT_DATE,
+				PP.WRITER,
+				USER_NAME(PP.WRITER) AS WRITER_NAME,
+				TO_CHAR(PP.REGDATE, 'YYYY-MM-DD') AS REGDATE_TITLE,
+				PP.REGDATE
 			FROM 
 				PROJECT_MGMT PM
 				LEFT JOIN CONTRACT_MGMT CM ON PM.CONTRACT_OBJID = CM.OBJID
@@ -4575,7 +4579,11 @@
 				COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PP.OBJID::VARCHAR AND PR.RESULT_TYPE = 'SHIP_WAIT' AND PR.STATUS = 'active'), 0) AS SHIP_WAIT_QTY,
 				'' AS EQUIPMENT_WBS,
 				PP.OBJID AS PROD_PLAN_OBJID,
-				PP.REGDATE AS SORT_DATE
+				PP.REGDATE AS SORT_DATE,
+				PP.WRITER,
+				USER_NAME(PP.WRITER) AS WRITER_NAME,
+				TO_CHAR(PP.REGDATE, 'YYYY-MM-DD') AS REGDATE_TITLE,
+				PP.REGDATE
 			FROM PRODUCTION_PLAN PP
 			WHERE PP.STATUS = 'active'
 				AND (PP.PROJECT_OBJID IS NULL OR PP.PROJECT_OBJID = '')
@@ -4627,6 +4635,17 @@
 			<if test="search_serial_no != null and search_serial_no != ''">
 				AND UPPER(T.SERIAL_NO) LIKE '%' || UPPER(#{search_serial_no}) || '%'
 			</if>
+			<!-- 등록자 검색 -->
+			<if test="search_writer != null and search_writer != ''">
+				AND T.WRITER = #{search_writer}
+			</if>
+			<!-- 등록일 검색 -->
+			<if test="search_regdate_from != null and search_regdate_from != ''">
+				AND T.REGDATE >= TO_DATE(#{search_regdate_from}, 'YYYY-MM-DD')
+			</if>
+			<if test="search_regdate_to != null and search_regdate_to != ''">
+				AND T.REGDATE &lt;= TO_DATE(#{search_regdate_to}, 'YYYY-MM-DD')
+			</if>
 		ORDER BY T.SORT_DATE DESC, T.PROJECT_NO DESC
 	</select>
 	
@@ -4699,8 +4718,9 @@
 			PP.TOTAL_PROD_QTY,
 			PP.CUSTOMER_REQUEST,
 			PP.STATUS,
-			PP.REGDATE,
-			PP.WRITER
+			TO_CHAR(PP.REGDATE, 'YYYY-MM-DD') AS REGDATE,
+			PP.WRITER,
+			(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = PP.WRITER) AS WRITER_NAME
 		FROM PRODUCTION_PLAN PP
 		WHERE PP.OBJID = #{objid}
 	</select>