diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java index 85487bb1..fcc4ff10 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java @@ -287,7 +287,7 @@ public class FipTargetController { mav.addObject("partWorkList", fipTargetService.selectPartWorkList(partWork)); partWork.setContentCnt(fipTargetService.selectPartWorkListCnt(partWork)); partWork.setPaginationInfo(); - mav.addObject("uesrId", loginUser.getUserId()); + mav.addObject("uesrSeq", loginUser.getUserSeq()); mav.addObject("searchParams", partWork); return mav; } diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml index 1d2dbe7e..8788aa6d 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -330,6 +330,7 @@ pi.terminal_nm, (select item_value from code_mgt where item_cd = pw.wrt_title) as wrt_title, pw.wrt_nm, + pw.wrt_user_seq, pw.work_dt, pw.save_yn, work_type, diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 0fadeb44..1b428011 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -83,4 +83,7 @@ } .pl-15{ padding-left: 15%; +} +.display-none{ + display:none } \ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/ipShipEditModal.html b/src/main/resources/templates/fipTarget/ipShipEditModal.html index 960970c6..459baff4 100644 --- a/src/main/resources/templates/fipTarget/ipShipEditModal.html +++ b/src/main/resources/templates/fipTarget/ipShipEditModal.html @@ -34,36 +34,40 @@

-
+
-
+
-
- -
+
+
+
+ +


-
+
-
+
-
+
-
- -
- -
+
+
+ +
+ +
+
-
+
+
diff --git a/src/main/resources/templates/fipTarget/ipShipList.html b/src/main/resources/templates/fipTarget/ipShipList.html index 339a8044..8de9ec19 100644 --- a/src/main/resources/templates/fipTarget/ipShipList.html +++ b/src/main/resources/templates/fipTarget/ipShipList.html @@ -11,7 +11,7 @@
-
+
-
+
@@ -43,7 +43,7 @@ th:value="${partInfo.versionNo}"> + th:text="${#temporals.format(partInfo.wrtDt, 'yyyy-MM-dd HH:mm')}"> @@ -51,69 +51,76 @@
-
+
+
- -
+ +
- -
+
+
+ +
- -
+ +
- -
+ +

-
해경
+
해경
- -
+ +
- -
+
+
+ +
- -
+ +
-
육경
+
육경
- -
+ +
- -
+
+
+ +
- -
+ +

- +
@@ -122,7 +129,7 @@
- +
@@ -133,7 +140,7 @@
-
+
diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html index a3c2881a..381d4b56 100644 --- a/src/main/resources/templates/fipTarget/partInfoList.html +++ b/src/main/resources/templates/fipTarget/partInfoList.html @@ -16,14 +16,15 @@
-
-
+
+
+
@@ -46,7 +47,7 @@ -
+
+
- +
+
+ +
+
diff --git a/src/main/resources/templates/fipTarget/partInfoModifyModal.html b/src/main/resources/templates/fipTarget/partInfoModifyModal.html index c463ee1f..5a460f00 100644 --- a/src/main/resources/templates/fipTarget/partInfoModifyModal.html +++ b/src/main/resources/templates/fipTarget/partInfoModifyModal.html @@ -19,6 +19,7 @@ +
@@ -49,12 +50,12 @@
-
+


-
해경
+
해경
@@ -74,7 +75,8 @@
-
육경
+
+
육경
@@ -144,8 +146,10 @@
diff --git a/src/main/resources/templates/fipTarget/partWorkEditModal.html b/src/main/resources/templates/fipTarget/partWorkEditModal.html index 6e877a1e..e1746712 100644 --- a/src/main/resources/templates/fipTarget/partWorkEditModal.html +++ b/src/main/resources/templates/fipTarget/partWorkEditModal.html @@ -76,9 +76,13 @@
- - +
@@ -56,7 +56,7 @@ - + diff --git a/src/main/resources/templates/fipTarget/partWorkModifyModal.html b/src/main/resources/templates/fipTarget/partWorkModifyModal.html index 038674fe..1bd525a7 100644 --- a/src/main/resources/templates/fipTarget/partWorkModifyModal.html +++ b/src/main/resources/templates/fipTarget/partWorkModifyModal.html @@ -82,11 +82,13 @@
-