Merge remote-tracking branch 'origin/master'

src/main/java/com/dbnt/faisp/config/BaseModel.java

@@ -35,6 +35,8 @@ public class BaseModel {
   private String startDate;
   @Transient
   private String endDate;
+  @Transient
+  private Boolean dashboardFlag = false;
 
   public void setQueryInfo(){
     setFirstIndex((getPageIndex()-1)*getRowCnt());

src/main/java/com/dbnt/faisp/config/ModalController.java

@@ -2,7 +2,9 @@ package com.dbnt.faisp.config;
 
 import com.dbnt.faisp.menuMgt.model.MenuMgt;
 import com.dbnt.faisp.menuMgt.service.MenuMgtService;
+import com.dbnt.faisp.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,11 +19,12 @@ public class ModalController {
   private final MenuMgtService menuMgtService;
 
   @GetMapping("/menuModal")
-  public ModelAndView menuModalPage(MenuMgt menuMgt){
+  public ModelAndView menuModalPage(@AuthenticationPrincipal UserInfo loginUser, MenuMgt menuMgt){
     ModelAndView mav = new ModelAndView("commonModal/menuModal");
+    menuMgt.setUserSeq(loginUser.getUserSeq());
     menuMgt.setQueryInfo();
-    mav.addObject("menuMgtList", menuMgtService.selectMenuMgtList(menuMgt));
-    menuMgt.setContentCnt(menuMgtService.selectMenuMgtListCnt(menuMgt));
+    mav.addObject("menuMgtList", menuMgtService.selectMenuMgtListToAccessAuth(menuMgt));
+    menuMgt.setContentCnt(menuMgtService.selectMenuMgtListToAccessAuthCnt(menuMgt));
     menuMgt.setPaginationInfo();
     mav.addObject("searchParams", menuMgt);
     return mav;

src/main/java/com/dbnt/faisp/equip/EquipController.java

@@ -5,8 +5,10 @@ import com.dbnt.faisp.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.equip.model.CellPhone;
 import com.dbnt.faisp.equip.model.Equip;
 import com.dbnt.faisp.equip.model.EquipLog;
+import com.dbnt.faisp.equip.model.UseList;
 import com.dbnt.faisp.equip.service.EquipService;
 import com.dbnt.faisp.fipTarget.model.PartInfo;
+import com.dbnt.faisp.fipTarget.service.FipTargetService;
 import com.dbnt.faisp.organMgt.service.OrganConfigService;
 import com.dbnt.faisp.userInfo.model.UserInfo;
 import com.dbnt.faisp.userInfo.service.UserInfoService;
@@ -40,6 +42,7 @@ public class EquipController {
   private final EquipService equipService;
   private final AuthMgtService authMgtService;
   private final OrganConfigService organConfigService;
+  private final FipTargetService fipTargetService;
   private final UserInfoService userInfoService;
   
   @GetMapping("/equipStatus")
@@ -287,6 +290,47 @@ public class EquipController {
 	  equipService.deleteCellPhone(cellPhone);
 
   }
+  
+  @GetMapping("/pvreUseList")
+  public ModelAndView pvreUseList(@AuthenticationPrincipal UserInfo loginUser,UseList useList,HttpServletResponse response) {
+    ModelAndView mav = new ModelAndView("equip/pvreUseList");
+    useList.setDownOrganCdList(loginUser.getDownOrganCdList());
+    useList.setUseType("PVRE");
+
+    //메뉴권한 확인
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/pvreUseList").get(0).getAccessAuth();
+    mav.addObject("accessAuth", accessAuth);   
+    useList.setQueryInfo();
+    mav.addObject("useList", equipService.selectUseList(useList));
+    useList.setContentCnt(equipService.selectUseListCnt(useList));
+    useList.setPaginationInfo();
+    mav.addObject("searchParams", useList);
+    
+    return mav;
+  }
+  
+  @GetMapping("/pvreEditModal")
+  public ModelAndView pvreEditModal(@AuthenticationPrincipal UserInfo loginUser,UseList useList) {
+    ModelAndView mav = new ModelAndView("equip/pvreEditModal");
+    useList.setDownOrganCdList(loginUser.getDownOrganCdList());
+    mav.addObject("organList", equipService.selectOrganList(useList));
+    mav.addObject("userOrgan", loginUser.getOgCd());
+    mav.addObject("useType", "PVRE");
+  //메뉴권한 확인
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/pvreUseList").get(0).getAccessAuth();
+    mav.addObject("accessAuth", accessAuth);
+    return mav;
+  }
+  
+  @PostMapping("/saveUse")
+  public void saveUse(@AuthenticationPrincipal UserInfo loginUser,UseList useList){
+	  useList.setWrtOrgan(loginUser.getOgCd());
+	  useList.setWrtPart(loginUser.getOfcCd());
+	  useList.setWrtUserSeq(loginUser.getUserSeq());
+	  useList.setWrtNm(loginUser.getUserId());
+	  useList.setWrtDt(LocalDateTime.now());
+	  equipService.saveUse(useList);
+  }
  
   
   

src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java

@@ -3,6 +3,7 @@ package com.dbnt.faisp.equip.mapper;
 import com.dbnt.faisp.equip.model.CellPhone;
 import com.dbnt.faisp.equip.model.Equip;
 import com.dbnt.faisp.equip.model.EquipLog;
+import com.dbnt.faisp.equip.model.UseList;
 import com.dbnt.faisp.util.ParamMap;
 
 import org.apache.ibatis.annotations.Mapper;
@@ -34,6 +35,16 @@ public interface EquipMapper {
 
 	Integer selectCellPhoneListCnt(CellPhone cellPhone);
 
+	List<ParamMap> selectOrganList(UseList useList);
+
+	UseList selectUseNoCnt(UseList useList);
+
+	Integer selectLastUseNo(UseList useList);
+
+	List<UseList> selectUseList(UseList useList);
+
+	Integer selectUseListCnt(UseList useList);
+
 
 
 }

src/main/java/com/dbnt/faisp/equip/model/UseList.java

@@ -0,0 +1,110 @@
+package com.dbnt.faisp.equip.model;
+
+import com.dbnt.faisp.config.BaseModel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@IdClass(UseList.UseListId.class)
+@Table(name = "use_list")
+public class UseList extends BaseModel implements Serializable{
+  @Id
+  @Column(name = "mgt_organ")
+  private String mgtOrgan;
+  @Id
+  @Column(name = "use_no")
+  private String useNo;
+  @Id
+  @Column(name = "version_no")
+  private Integer versionNo;
+  @Id
+  @Column(name = "use_type")
+  private String useType;
+  @Column(name = "use_dt")
+  private String useDt;
+  @Column(name = "detail_type")
+  private String detailType;
+  @Column(name = "detail_self")
+  private String detailSelf;
+  @Column(name = "people_cnt")
+  private Integer peopleCnt;
+  @Column(name = "description")
+  private String description;
+  @Column(name = "wrt_organ")
+  private String wrtOrgan;
+  @Column(name = "wrt_part")
+  private String wrtPart;
+  @Column(name = "wrt_user_grd")
+  private String wrtUserGrd;
+  @Column(name = "wrt_user_seq")
+  private Integer wrtUserSeq;
+  @Column(name = "wrt_nm")
+  private String wrtNm;
+  @Column(name = "wrt_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime wrtDt;
+  
+  @Transient
+  private String excel;
+  
+  @Transient
+  private String year;
+  @Transient
+  private String detailTypeName;
+
+  
+@Embeddable
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public static class UseListId implements Serializable { 	
+  private String mgtOrgan;
+  private String useNo;  
+  private Integer versionNo;
+  private String useType; 
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

src/main/java/com/dbnt/faisp/equip/repository/UseListRepository.java

@@ -0,0 +1,14 @@
+package com.dbnt.faisp.equip.repository;
+
+import com.dbnt.faisp.equip.model.UseList;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+
+public interface UseListRepository extends JpaRepository<UseList, UseList.UseListId> {
+
+
+
+
+}

src/main/java/com/dbnt/faisp/equip/service/EquipService.java

@@ -8,10 +8,12 @@ import com.dbnt.faisp.equip.model.Equip.EquipId;
 import com.dbnt.faisp.equip.model.EquipFile;
 import com.dbnt.faisp.equip.model.EquipFile.EquipFileId;
 import com.dbnt.faisp.equip.model.EquipLog;
+import com.dbnt.faisp.equip.model.UseList;
 import com.dbnt.faisp.equip.repository.CellPhoneRepository;
 import com.dbnt.faisp.equip.repository.EquipFileRepository;
 import com.dbnt.faisp.equip.repository.EquipLogRepository;
 import com.dbnt.faisp.equip.repository.EquipRepository;
+import com.dbnt.faisp.equip.repository.UseListRepository;
 import com.dbnt.faisp.userInfo.model.UserInfo;
 import com.dbnt.faisp.util.ParamMap;
 import com.dbnt.faisp.util.Utils;
@@ -26,6 +28,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -39,8 +42,12 @@ public class EquipService {
 	private final EquipFileRepository equipFileRepository;
 	private final EquipLogRepository equipLogRepository;
 	private final CellPhoneRepository cellPhoneRepository;
+	private final UseListRepository useListRepository;
 	private final EquipMapper equipMapper;
 	
+	SimpleDateFormat Date = new SimpleDateFormat("yyyy");
+	String year = Date.format(new Date());
+	
 	
 	@Transactional
 	public void saveEquip(Equip equip, MultipartHttpServletRequest request) {
@@ -317,6 +324,33 @@ public class EquipService {
 	public void deleteCellPhone(List<CellPhone> cellPhone) {
 		cellPhoneRepository.deleteAll(cellPhone);
 	}
+
+	public List<ParamMap> selectOrganList(UseList useList) {
+		return equipMapper.selectOrganList(useList);
+	}
+	
+	@Transactional
+	public void saveUse(UseList useList) {
+		useList.setYear(year);
+		Integer useNo = equipMapper.selectLastUseNo(useList);
+			if(useNo == null) {
+				useList.setUseNo(year+"-001");
+				useList.setVersionNo(1);
+			} else {
+				useList.setUseNo(year+"-"+String.format("%03d", useNo+1));
+				useList.setVersionNo(1);
+			}
+			useListRepository.save(useList);
+		
+	}
+
+	public List<UseList> selectUseList(UseList useList) {
+		return equipMapper.selectUseList(useList);
+	}
+
+	public Integer selectUseListCnt(UseList useList) {
+		return equipMapper.selectUseListCnt(useList);
+	}
   
 
 	

src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java

@@ -29,7 +29,13 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
 
   @GetMapping("/affairMgt")
   public ModelAndView affairMgtPage(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){
-    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairMgt");
+    ModelAndView mav;
+    if(affairBoard.getDashboardFlag()){
+      mav = new ModelAndView("igActivities/fpiMgt/affair/affairMgtDashboard");
+      affairBoard.setRowCnt(5);
+    }else{
+      mav = new ModelAndView("igActivities/fpiMgt/affair/affairMgt");
+    }
     mav.addObject("page", "main");
     mav.addObject("searchUrl", "/affair/affairMgt");
     //메뉴권한 확인

src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/PlanController.java

@@ -25,7 +25,13 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리
 
   @GetMapping("/planMgt")
   public ModelAndView monthPlanPage(@AuthenticationPrincipal UserInfo loginUser, PlanBoard planBoard){
-    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planMgt");
+    ModelAndView mav = null;
+    if(planBoard.getDashboardFlag()){
+      mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planMgtDashboard");
+      planBoard.setRowCnt(5);
+    }else{
+      mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planMgt");
+    }
     mav.addObject("page", "main");
     mav.addObject("searchUrl", "/affairPlan/planMgt");
     //메뉴권한 확인

src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java

@@ -30,7 +30,13 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관
 
   @GetMapping("/resultMgt")
   public ModelAndView resultMgtPage(@AuthenticationPrincipal UserInfo loginUser, ResultBoard resultBoard){
-    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/resultMgt");
+    ModelAndView mav = null;
+    if(resultBoard.getDashboardFlag()){
+      mav = new ModelAndView("igActivities/fpiMgt/affairResult/resultMgtDashboard");
+      resultBoard.setRowCnt(5);
+    }else{
+      mav = new ModelAndView("igActivities/fpiMgt/affairResult/resultMgt");
+    }
     mav.addObject("page", "main");
     mav.addObject("searchUrl", "/affairResult/resultMgt");
     //메뉴권한 확인

src/main/java/com/dbnt/faisp/menuMgt/mapper/MenuMgtMapper.java

@@ -13,4 +13,7 @@ public interface MenuMgtMapper {
   Integer selectMenuMgtListCnt(MenuMgt menuMgt);
 
   List<MenuMgt> selectAccessMenuListWhereUserSeq(Integer userSeq);
+
+  List<MenuMgt> selectMenuMgtListToAccessAuth(MenuMgt menuMgt);
+  Integer selectMenuMgtListToAccessAuthCnt(MenuMgt menuMgt);
 }

src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java

@@ -35,6 +35,8 @@ public class MenuMgt extends BaseModel {
 
   @Transient
   private List<MenuMgt> childList;
+  @Transient
+  private Integer userSeq;
 
   @Transient
   private Integer cat1RowspanCnt;

src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java

@@ -25,6 +25,13 @@ public class MenuMgtService {
     return menuMgtMapper.selectMenuMgtListCnt(menuMgt);
   }
 
+  public List<MenuMgt> selectMenuMgtListToAccessAuth(MenuMgt menuMgt){
+    List<MenuMgt> menuList = menuMgtMapper.selectMenuMgtListToAccessAuth(menuMgt);
+    return menuListRowspanSet(menuList);
+  }
+  public Integer selectMenuMgtListToAccessAuthCnt(MenuMgt menuMgt){
+    return menuMgtMapper.selectMenuMgtListToAccessAuthCnt(menuMgt);
+  }
   @Transient
   public String saveMenuMgt(MenuMgt menuMgt) {
     if(menuMgt.getMenuKey()==null){

src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java

@@ -25,7 +25,13 @@ public class PublicBoardController {
 
   @GetMapping("/noticePage")
   public ModelAndView organMgtPage(@AuthenticationPrincipal UserInfo loginUser, PublicBoard publicBoard) {
-    ModelAndView mav = new ModelAndView("publicBoard/notice/noticePage");
+    ModelAndView mav;
+    if(publicBoard.getDashboardFlag()){
+      mav = new ModelAndView("publicBoard/notice/noticePageDashBoard");
+      publicBoard.setRowCnt(5);
+    }else{
+      mav = new ModelAndView("publicBoard/notice/noticePage");
+    }
     publicBoard.setQueryInfo();
     publicBoard.setPublicType("PLB001");
     if (loginUser.getUserRole().contains(Role.SUB_ADMIN.getValue())) {

src/main/java/com/dbnt/faisp/translator/TranslatorController.java

@@ -31,7 +31,13 @@ public class TranslatorController {
   
   @GetMapping("/info")
   public ModelAndView translatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator,HttpServletResponse response) {
-    ModelAndView mav = new ModelAndView("translator/translator");
+    ModelAndView mav;
+    if (translator.getDashboardFlag()){
+      mav = new ModelAndView("translator/translatorDashboard");
+      translator.setRowCnt(5);
+    }else{
+      mav = new ModelAndView("translator/translator");
+    }
     translator.setDownOrganCdList(loginUser.getDownOrganCdList());
     //엑셀다운
     if(translator.getExcel() != null && translator.getExcel().equals("Y")){

src/main/java/com/dbnt/faisp/userInfo/MyInfoController.java

@@ -39,4 +39,10 @@ public class MyInfoController {
     return mav;
   }
 
+  @PostMapping("saveDashboardConfig")
+  @ResponseBody
+  public void saveDashboardConfig(@AuthenticationPrincipal UserInfo loginUser, @RequestBody List<DashboardConfig> configList){
+    userInfoService.saveDashboardConfigList(loginUser.getUserSeq(), configList);
+  }
+
 }

src/main/java/com/dbnt/faisp/userInfo/repository/DashboardConfigRepository.java

@@ -3,9 +3,7 @@ package com.dbnt.faisp.userInfo.repository;
 import com.dbnt.faisp.userInfo.model.DashboardConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
-
-
 public interface DashboardConfigRepository extends JpaRepository<DashboardConfig, DashboardConfig.DashboardConfigId> {
 
+  void deleteByUserSeq(Integer userSeq);
 }

src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java

@@ -119,4 +119,14 @@ public class UserInfoService implements UserDetailsService {
   public List<DashboardConfig> getDashboardConfigList(Integer userSeq) {
     return userInfoMapper.selectDashboardConfigList(userSeq);
   }
+
+
+  @Transactional
+  public void saveDashboardConfigList(Integer userSeq, List<DashboardConfig> configList) {
+    dashboardConfigRepository.deleteByUserSeq(userSeq);
+    for(DashboardConfig config: configList){
+      config.setUserSeq(userSeq);
+    }
+    dashboardConfigRepository.saveAll(configList);
+  }
 }

src/main/resources/mybatisMapper/EquipMapper.xml

@@ -441,7 +441,96 @@
 	        </foreach>
 			order by cm.wrt_dt desc
 		) a
-
+  </select>
+  
+  <select id="selectOrganList" resultType="com.dbnt.faisp.util.ParamMap" parameterType="UseList">
+	     select item_cd,
+		        item_value
+		 from code_mgt cm,
+		      organ_config oc
+		  where cm.item_cd = oc.organ_cd
+		  and oc.organ_type = 'OGC003'
+		  and cm.use_chk = 'T'
+		  and item_cd in
+		  <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
+      	 	#{item}
+   	      </foreach>
+     	  order by item_cd asc
+  </select>
+  
+  <select id="selectLastUseNo" resultType="Integer" parameterType="UseList">
+	     select a.useNo
+		 from(
+			 select substring(use_no, 6, 3)::int as useNo  
+			 from use_list
+			 where mgt_organ = #{mgtOrgan}
+			 and use_no  like #{year}||'%'
+			 and use_type = #{useType}
+			 group by use_no 
+			 ) a
+		 order by useNo desc
+		 limit 1
+  </select>
+  
+  <select id="selectUseList" resultType="UseList" parameterType="UseList">
+	     select (select item_value from code_mgt where item_cd = mgt_organ) as mgt_organ,
+			   ul.use_no,
+			   ul.version_no,
+			   use_dt,
+			   (select item_value from code_mgt where item_cd = detail_type) as detail_type_name,
+			   detail_type,
+			   detail_self,
+			   people_cnt,
+			   description,
+			   wrt_dt 
+		from use_list ul,
+			 (select use_no,max(version_no) as lastVer from use_list
+			 where use_type = #{useType}
+			 and mgt_organ in
+			 <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
+	         #{item}
+	         </foreach>
+			 group by use_no) b
+		where ul.use_no = b.use_no
+		and ul.version_no = b.lastVer
+		and use_type = #{useType}
+		and mgt_organ in
+		<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
+        #{item}
+        </foreach>
+		order by ul.use_no desc
+		limit #{rowCnt} offset #{firstIndex}
+  </select>
+  
+  <select id="selectUseListCnt" resultType="Integer" parameterType="UseList">
+  select count(*)
+  from(
+	     select mgt_organ,
+			   ul.use_no,
+			   ul.version_no,
+			   use_dt,
+			   (select item_value from code_mgt where item_cd = detail_type) as detail_type,
+			   detail_self,
+			   people_cnt,
+			   description,
+			   wrt_dt 
+		from use_list ul,
+			 (select use_no,max(version_no) as lastVer from use_list
+			 where use_type = #{useType}
+			 and mgt_organ in
+			 <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
+	         #{item}
+	         </foreach>
+			 group by use_no) b
+		where ul.use_no = b.use_no
+		and ul.version_no = b.lastVer
+		and use_type = #{useType}
+		and mgt_organ in
+		<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
+        #{item}
+        </foreach>
+		order by ul.use_no desc
+	) a
   </select>
 
  

src/main/resources/mybatisMapper/menuMgtMapper.xml

@@ -4,6 +4,20 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.dbnt.faisp.menuMgt.mapper.MenuMgtMapper">
+  <sql id="selectMenuMgtListWhere">
+    <if test='cat1Cd != null and cat1Cd != ""'>
+      and cat1_cd = #{cat1Cd}
+    </if>
+    <if test='cat2Cd != null and cat2Cd != ""'>
+      and cat2_cd = #{cat2Cd}
+    </if>
+    <if test='cat3Cd != null and cat3Cd != ""'>
+      and cat3_cd = #{cat3Cd}
+    </if>
+    <if test='menuUrl != null and menuUrl != ""'>
+      and menu_url like  '%'||#{menuUrl}||'%'
+    </if>
+  </sql>
   <select id="selectMenuMgtList" resultType="MenuMgt" parameterType="MenuMgt">
     select menu_key as menuKey,
            cat1_cd as cat1Cd,
@@ -13,18 +27,7 @@
            approval_chk as approvalChk
     from menu_mgt
     <where>
-      <if test='cat1Cd != null and cat1Cd != ""'>
-        and cat1_cd = #{cat1Cd}
-      </if>
-      <if test='cat2Cd != null and cat2Cd != ""'>
-        and cat2_cd = #{cat2Cd}
-      </if>
-      <if test='cat3Cd != null and cat3Cd != ""'>
-        and cat3_cd = #{cat3Cd}
-      </if>
-      <if test='menuUrl != null and menuUrl != ""'>
-        and menu_url like  '%'||#{menuUrl}||'%'
-      </if>
+      <include refid="selectMenuMgtListWhere"></include>
     </where>
     order by cat1_cd, cat2_cd, cat3_cd
     limit #{rowCnt} offset #{firstIndex}
@@ -33,18 +36,7 @@
     select count(*)
     from menu_mgt
     <where>
-      <if test='cat1Cd != null and cat1Cd != ""'>
-        and cat1_cd = #{cat1Cd}
-      </if>
-      <if test='cat2Cd != null and cat2Cd != ""'>
-        and cat2_cd = #{cat2Cd}
-      </if>
-      <if test='cat3Cd != null and cat3Cd != ""'>
-        and cat3_cd = #{cat3Cd}
-      </if>
-      <if test='menuUrl != null and menuUrl != ""'>
-        and menu_url like  '%'||#{menuUrl}||'%'
-      </if>
+      <include refid="selectMenuMgtListWhere"></include>
     </where>
   </select>
 
@@ -59,4 +51,30 @@
       and aa.access_auth is not null
     order by cat1_cd, cat2_cd, cat3_cd
   </select>
+
+  <select id="selectMenuMgtListToAccessAuth" resultType="MenuMgt" parameterType="MenuMgt">
+    select ab.menu_key,
+           ab.cat1_cd,
+           ab.cat2_cd,
+           ab.cat3_cd,
+           ab.menu_url
+    from access_config aa
+            inner join menu_mgt ab on aa.menu_key = ab.menu_key
+    where aa.user_seq = #{userSeq}
+      and aa.access_auth is not null
+    <include refid="selectMenuMgtListWhere"></include>
+    order by cat1_cd, cat2_cd, cat3_cd
+    limit #{rowCnt} offset #{firstIndex}
+  </select>
+
+  <select id="selectMenuMgtListToAccessAuthCnt" resultType="int" parameterType="MenuMgt">
+    select count(*)
+    from access_config aa
+            inner join menu_mgt ab on aa.menu_key = ab.menu_key
+    where aa.user_seq = #{userSeq}
+      and aa.access_auth is not null
+    <where>
+      <include refid="selectMenuMgtListWhere"></include>
+    </where>
+  </select>
 </mapper>

src/main/resources/static/js/dashboard.js

@@ -0,0 +1,32 @@
+$(function (){
+  $.ajax({
+    type : 'GET',
+    url : "/myInfo/getDashBoardConfig",
+    dataType:"json",
+    success : function(data) {
+      data = [{menuUrl:"/publicBoard/noticePage"}].concat(data)
+      getSubPage(data)
+    },
+    error : function(xhr, status) {
+
+    }
+  })
+})
+
+function getSubPage(menuList){
+  $.each(menuList, function(idx, menu){
+    if(idx<6){
+      $.ajax({
+        type : 'GET',
+        url : menu.menuUrl+"?dashboardFlag=true",
+        dataType:"html",
+        success : function(html) {
+          $("#subPage"+idx).append(html);
+        },
+        error : function(xhr, status) {
+
+        }
+      })
+    }
+  })
+}

src/main/resources/static/js/equip/pvre.js

@@ -0,0 +1,56 @@
+
+$(document).on('click', '#addPvre', function (){
+   $.ajax({
+    url: '/equip/pvreEditModal',
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#pvreEditModalContent").empty().append(html);
+      $("#pvreEditModal").modal('show');
+      $("#useDt").datepicker({
+                format: "mm-dd",
+                language: "ko"
+      });
+      $('#detailSelf').hide();
+    },
+    error:function(){
+
+    }
+  });
+})
+
+$(document).on('click', '#saveUse', function (){
+
+	   if(confirm("저장하시겠습니까?")){
+		  document.getElementById("mgtOrgan").disabled = false;
+	      contentFade("in");
+	      const formData = new FormData($("#useFm")[0]);
+	      $.ajax({
+	        type : 'POST',
+	        data : formData,
+	        url : "/equip/saveUse",
+	        processData: false,
+	        contentType: false,
+	        success : function(result) {
+	          alert("저장되었습니다.");
+	          contentFade("out");
+			  location.reload();
+	        },
+	        error : function(xhr, status) {
+	          alert("저장에 실패하였습니다.")
+	          contentFade("out");
+	        }
+	      })
+	    }  
+})
+
+$(document).on('change', '#detailType', function (){
+	if($(this).val() == 'USE007'){
+		$('#detailSelf').show();
+	}else{
+		$('#detailSelf').hide();
+		$('#detailSelf').val('');
+	}
+	
+
+});

src/main/resources/static/js/user/info.js

@@ -5,17 +5,40 @@ $(function (){
     url : "/myInfo/getDashBoardConfig",
     dataType:"json",
     success : function(data) {
-
+      selectedList = data;
     },
     error : function(xhr, status) {
 
     }
   })
 })
+
+$(document).on('click', '.configTr', function (event){
+  const target = event.target;
+  if(!(target.className === "moveTd" || $(target).parents(".moveTd").length>0)){
+    const chkBox = $(this).find(".configChkBox")[0];
+    chkBox.checked = !chkBox.checked;
+  }
+})
 $(document).on('click', '#configAddBtn', function (){
   searchModalSubmit(1);
   $("#menuModal").modal('show');
 })
+$(document).on('click', '#configDeleteBtn', function (){
+  $.each($(".configChkBox:checked"), function (idx, chkBox){
+    $(chkBox).parents(".configTr").remove();
+  })
+  const tempList = [];
+  $.each($(".configChkBox"), function (idx, chkBox){
+    $.each(selectedList, function (idx, menu){
+      if(menu.menuKey === Number($(chkBox).attr('data-menukey'))){
+        tempList.push(menu);
+      }
+    })
+  })
+  selectedList = tempList;
+  orderNumSort();
+})
 
 $(document).on('click', '.menuTr', function (){
   const checkBox = $(this).find(".menuCheckBox")[0]
@@ -23,6 +46,7 @@ $(document).on('click', '.menuTr', function (){
   if(checkBox.checked){
     selectedList.push({
       menuKey: Number(checkBox.value),
+      orderNum: selectedList.length+1,
       cat1Cd: $(this).find(".cat1Cd").val(),
       cat2Cd: $(this).find(".cat2Cd").val(),
       cat3Cd: $(this).find(".cat3Cd").val(),
@@ -32,6 +56,7 @@ $(document).on('click', '.menuTr', function (){
     const tempList = [];
     $.each(selectedList, function (idx, menu){
       if(menu.menuKey !== Number(checkBox.value)){
+        menu.orderNum = idx+1;
         tempList.push(menu);
       }
     })
@@ -50,7 +75,6 @@ $(document).on('click', '#getMenuBtn', function (){
       xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
     },
     success : function(html) {
-      debugger
       $("#dashboardConfigTbody").empty().append($(html)[1].children[0].children);
       $("#menuModal").modal("hide");
     },
@@ -86,6 +110,16 @@ $(document).on('click', '#savePasswordBtn', function (){
     })
   }
 })
+$(document).on('click', '.upBtn', function (){
+  const targetTr = $(this).parents('tr');
+  targetTr.prev().before(targetTr);
+  orderNumSort();
+})
+$(document).on('click', '.downBtn', function (){
+  const targetTr = $(this).parents('tr');
+  targetTr.next().after(targetTr);
+  orderNumSort();
+})
 
 $(document).on('click', '#configSaveBtn', function (){
   contentFade("in");
@@ -100,7 +134,6 @@ $(document).on('click', '#configSaveBtn', function (){
     success : function(data) {
       alert("저장되었습니다.");
       contentFade("out");
-      location.reload();
     },
     error : function(xhr, status) {
       alert("저장에 실패하였습니다.")
@@ -109,6 +142,25 @@ $(document).on('click', '#configSaveBtn', function (){
   })
 })
 
+function orderNumSort(){
+  $.each($(".configTr"), function(idx, tr){
+    $(tr).find(".orderNumInput").val(idx+1);
+    for(const menu of selectedList){
+      if(Number($(tr).find(".configChkBox").attr("data-menukey"))===menu.menuKey){
+        menu.orderNum = Number($(tr).find(".orderNumInput").val());
+      }
+    }
+  })
+  selectedList.sort(function(a,b){
+    if (a.orderNum > b.orderNum) {
+      return 1;
+    }
+    if (a.orderNum < b.orderNum) {
+      return -1;
+    }
+    return 0;
+  })
+}
 function setSelectedChkBox(){
   $.each(selectedList, function (idx, item){
     $("[value="+item.menuKey+"]").prop("checked", true);

src/main/resources/templates/equip/pvreEditModal.html

@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+
+<div class="modal-header">
+  <th:block th:if="${useType eq 'PVRE'}">
+  <h5 class="modal-title" id="menuEditModalLabel" th:if="${useType eq 'PVRE'}">휴대용 녹화장비 사용대장 등록</h5>
+  </th:block>
+  <th:block th:if="${useType eq 'QIR'}">
+  <h5 class="modal-title" id="menuEditModalLabel" th:if="${useType eq 'PVRE'}">방역조사실 사용대장 등록</h5>
+  </th:block>
+  	<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+
+</div>
+<div class="modal-body">
+  <form id="useFm" method="post">
+        <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+   		<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    	<input type="hidden" name="useType" th:value="${useType}">
+          <div class="mb-3 row">
+            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용관서</label>        
+            <div class="col-sm-3">
+            	<select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
+                  <option value="">선택</option>
+                  <th:block th:each="organList:${organList}">
+		              <option th:value="${organList.item_cd}" th:text="${organList.item_value}" th:selected="${organList.item_cd eq userOrgan}"></option>
+		          </th:block>
+               </select>
+            </div>
+          </div>        
+          <div class="mb-3 row">
+            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용일시</label>
+            <div class="col-sm-4">
+                  <input type="text" class="form-control" id="useDt" name="useDt">
+            </div>
+          </div> 
+          <div class="mb-3 row">
+            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용사유</label>        
+            <div class="col-sm-3">
+               <select class="form-select form-select-sm" id="detailType" name="detailType">
+                  <option value="">선택</option>
+                  <th:block th:each="commonCode:${session.commonCode.get('USE')}">
+		              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
+		          </th:block>
+               </select>
+               <input type="text" class="form-control" id="detailSelf" name="detailSelf">
+            </div>
+          </div>
+          <div class="mb-3 row">
+            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용인원</label>
+            <div class="col-sm-4">
+                  <input type="number" class="form-control" id="peopleCnt" name="peopleCnt">
+            </div>
+          </div> 
+          <div class="mb-3 row">
+            <label for="ogCd" class="col-sm-2 col-form-label text-center">비고</label>
+            <div class="col-sm-4">
+                  <input type="text" class="form-control" id="description" name="description">
+            </div>
+          </div>                  
+      </form>
+</div>
+<div class="modal-footer justify-content-between">
+  <div class="col-auto">
+    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+    <button type="button" class="btn btn-primary" id="saveUse">저장</button>
+
+  </div>
+</div>
+</html>

src/main/resources/templates/equip/pvreUseList.html

@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/layout}">
+<th:block layout:fragment="script">
+  <script type="text/javascript" th:src="@{/js/equip/pvre.js}"></script>
+</th:block>
+<div layout:fragment="content">
+  <main class="pt-3">
+    <h4>휴대용 녹화장비 사용대장</h4>
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    <div class="row mx-0">
+      <div class="col-12 card text-center">
+        <div class="card-body">
+          <form id="searchFm" method="get" th:action="@{/equip/cellPhoneList}">
+          	<input type="hidden" name="excel">
+            <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
+            <div class="row justify-content-between pe-3 py-1">
+              <div class="col-auto">
+                <select class="form-select" name="rowCnt" id="rowCnt">
+                  <th:block th:each="num : ${#numbers.sequence(1,5)}">
+                    <option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt==num*10}"></option>
+                  </th:block>
+                </select>
+              </div>
+              <div class="col-auto">
+                <div class="row justify-content-end">
+                  <div class="col-auto">
+                    <input type="text" class="form-control form-control-sm">
+                  </div>
+                  <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
+                </div>
+              </div>
+            </div>
+          </form>
+          <button id="goExcel">엑셀다운</button>
+          <div class="row justify-content-start">
+            <div class="col-12">
+              <div class="card">
+                <div class="card-body">
+                  <div class="row">
+                    <table class="table table-striped">
+                      <thead>
+                      <tr>
+                        <th> <input type="checkbox" id="chk-all" class="equInfoCheckBox"></th>
+                        <th>연번</th>
+                        <th>경찰서</th>
+                        <th>사용일시</th>
+                        <th>사용사유</th>
+                        <th>사용인원</th>
+                        <th>비고</th>
+                        <th>최종수정일</th>
+                      </tr>
+                      </thead>
+                      <tbody>
+                      <tr class="cellPhoneTr" th:each="list:${useList}">
+                      	<td><input type="checkbox" name="cpChk" class="cellPhoneCheckBox"></td>
+                      	<td th:text="${list.useNo}"></td>
+                      	<td th:text="${list.mgtOrgan}"></td>
+                      	<td th:text="${list.useDt}"></td>
+                      	<td th:text="${list.detailTypeName}" th:if="${list.detailType != 'USE007'}"></td>
+                      	<td th:text="${list.detailSelf}" th:unless="${list.detailType != 'USE007'}"></td>
+                      	<td th:text="${list.peopleCnt}"></td>                     	
+                      	<td th:text="${list.description}"></td>
+                      	<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                      	                                
+                      </tr>
+                      </tbody>
+                    </table>
+                  </div>                
+                   <div class="row justify-content-center">
+                    <div class="col-auto">
+                      <nav aria-label="Page navigation">
+                        <ul class="pagination">
+                          <th:block th:if="${searchParams.pageIndex>3}">
+                            <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
+                              <a class="page-link" href="#" aria-label="Previous">
+                                <span aria-hidden="true">&laquo;</span>
+                              </a>
+                            </li>
+                          </th:block>
+                          <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
+                            <li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex==num?'active':''}">
+                              <a class="page-link" href="#" th:text="${num}"></a>
+                            </li>
+                          </th:block>
+                          <th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
+                            <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
+                              <a class="page-link" href="#" aria-label="Next">
+                                <span aria-hidden="true">&raquo;</span>
+                              </a>
+                            </li>
+                          </th:block>
+                        </ul>
+                      </nav>
+                    </div>
+                  </div>
+                  <div class="col-auto">
+                  	<button type="button" class="btn btn-danger"id="deleteCellPhone" th:if="${accessAuth eq 'ACC003'}">삭제</button>
+                    <button type="button" class="btn btn-success"id="addPvre" th:unless="${accessAuth eq 'ACC001'}">등록</button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </main>
+
+	<div class="modal fade" id="pvreEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg modal-dialog-scrollable">
+      <div class="modal-content" id="pvreEditModalContent">
+        <div class="modal-header">
+        </div>
+        <div class="modal-body">
+          <div class="tab-content border border-top-0" id="configCellPhone">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+</div>
+</html>

src/main/resources/templates/igActivities/fpiMgt/affair/affairMgtDashboard.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="card-header bg-white">
+  <div class="row justify-content-between">
+    <div class="col-auto">외사경찰 견문관리</div>
+    <div class="col-auto"><a href="/affair/affairMgt" class="link-dark"><i class="bi bi-list"></i></a></div>
+  </div>
+</div>
+<div class="card-body">
+  <table class="table table-hover">
+    <thead>
+    <tr>
+      <th>제목</th>
+      <th>작성일시</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr class="affairTr" th:each="affair:${affairList}">
+      <td th:text="${affair.title}"></td>
+      <td th:text="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+    </tr>
+    </tbody>
+  </table>
+</div>
+</html>

src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgtDashboard.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="card-header bg-white">
+  <div class="row justify-content-between">
+    <div class="col-auto">월간계획</div>
+    <div class="col-auto"><a href="/affairPlan/planMgt" class="link-dark"><i class="bi bi-list"></i></a></div>
+  </div>
+</div>
+<div class="card-body">
+  <table class="table table-hover">
+    <thead>
+    <tr>
+      <th>제목</th>
+      <th>작성일시</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr class="planTr" th:each="plan:${planList}">
+      <td th:text="${plan.contentTitle}"></td>
+      <td th:text="${#temporals.format(plan.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+    </tr>
+    </tbody>
+  </table>
+</div>
+</html>

src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgtDashboard.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="card-header bg-white">
+  <div class="row justify-content-between">
+    <div class="col-auto">청산보고서</div>
+    <div class="col-auto"><a href="/affairResult/resultMgt" class="link-dark"><i class="bi bi-list"></i></a></div>
+  </div>
+</div>
+<div class="card-body">
+  <table class="table table-hover">
+    <thead>
+    <tr>
+      <th>제목</th>
+      <th>작성일시</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr class="resultTr" th:each="result:${resultList}">
+      <td th:text="${result.resultTitle}"></td>
+      <td th:text="${#temporals.format(result.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+    </tr>
+    </tbody>
+  </table>
+</div>
+</html>

src/main/resources/templates/login/dashboard.html

@@ -3,7 +3,7 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
-  <!--<script type="text/javascript" th:src="@{/js/admin/userMgt.js}"></script>-->
+  <script type="text/javascript" th:src="@{/js/dashboard.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main class="pt-3">
@@ -13,219 +13,27 @@
         <div class="card-body">
           <div class="row">
             <div class="col-4 py-1">
-              <div class="card">
-                <div class="card-header bg-white">
-                  <div class="row justify-content-between">
-                    <div class="col-auto">목록1</div>
-                    <div class="col-auto"><a href="#" class="link-dark"><i class="bi bi-list"></i></a></div>
-                  </div>
-                </div>
-                <div class="card-body">
-                  <table class="table table-hover">
-                    <tbody>
-                    <tr>
-                      <td>제목1</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목2</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목3</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목4</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목5</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    </tbody>
-                  </table>
-                </div>
+              <div class="card" id="subPage0">
               </div>
             </div>
             <div class="col-4 py-1">
-              <div class="card">
-                <div class="card-header bg-white">
-                  <div class="row justify-content-between">
-                    <div class="col-auto">목록2</div>
-                    <div class="col-auto"><a href="#" class="link-dark"><i class="bi bi-list"></i></a></div>
-                  </div>
-                </div>
-                <div class="card-body">
-                  <table class="table table-hover">
-                    <tbody>
-                    <tr>
-                      <td>제목1</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목2</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목3</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목4</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목5</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    </tbody>
-                  </table>
-                </div>
+              <div class="card" id="subPage1">
               </div>
             </div>
             <div class="col-4 py-1">
-              <div class="card">
-                <div class="card-header bg-white">
-                  <div class="row justify-content-between">
-                    <div class="col-auto">목록3</div>
-                    <div class="col-auto"><a href="#" class="link-dark"><i class="bi bi-list"></i></a></div>
-                  </div>
-                </div>
-                <div class="card-body">
-                  <table class="table table-hover">
-                    <tbody>
-                    <tr>
-                      <td>제목1</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목2</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목3</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목4</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목5</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    </tbody>
-                  </table>
-                </div>
+              <div class="card" id="subPage2">
               </div>
             </div>
             <div class="col-4 py-1">
-              <div class="card">
-                <div class="card-header bg-white">
-                  <div class="row justify-content-between">
-                    <div class="col-auto">목록4</div>
-                    <div class="col-auto"><a href="#" class="link-dark"><i class="bi bi-list"></i></a></div>
-                  </div>
-                </div>
-                <div class="card-body">
-                  <table class="table table-hover">
-                    <tbody>
-                    <tr>
-                      <td>제목1</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목2</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목3</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목4</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목5</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    </tbody>
-                  </table>
-                </div>
+              <div class="card" id="subPage3">
               </div>
             </div>
             <div class="col-4 py-1">
-              <div class="card">
-                <div class="card-header bg-white">
-                  <div class="row justify-content-between">
-                    <div class="col-auto">목록5</div>
-                    <div class="col-auto"><a href="#" class="link-dark"><i class="bi bi-list"></i></a></div>
-                  </div>
-                </div>
-                <div class="card-body">
-                  <table class="table table-hover">
-                    <tbody>
-                    <tr>
-                      <td>제목1</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목2</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목3</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목4</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목5</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    </tbody>
-                  </table>
-                </div>
+              <div class="card" id="subPage4">
               </div>
             </div>
             <div class="col-4 py-1">
-              <div class="card">
-                <div class="card-header bg-white">
-                  <div class="row justify-content-between">
-                    <div class="col-auto">목록6</div>
-                    <div class="col-auto"><a href="#" class="link-dark"><i class="bi bi-list"></i></a></div>
-                  </div>
-                </div>
-                <div class="card-body">
-                  <table class="table table-hover">
-                    <tbody>
-                    <tr>
-                      <td>제목1</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목2</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목3</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목4</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    <tr>
-                      <td>제목5</td>
-                      <td class="text-end">2022-08-19</td>
-                    </tr>
-                    </tbody>
-                  </table>
-                </div>
+              <div class="card" id="subPage5">
               </div>
             </div>
           </div>

src/main/resources/templates/publicBoard/notice/noticePageDashboard.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="card-header bg-white">
+  <div class="row justify-content-between">
+    <div class="col-auto">공지사항</div>
+    <div class="col-auto"><a href="/publicBoard/noticePage" class="link-dark"><i class="bi bi-list"></i></a></div>
+  </div>
+</div>
+<div class="card-body">
+  <table class="table table-hover">
+    <thead>
+    <tr>
+      <th>제목</th>
+      <th>작성자</th>
+      <th>작성일시</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr class="planTr" th:each="notice:${noticeList}">
+      <td th:text="${notice.title}"></td>
+      <td th:text="${notice.wrtUserNm}"></td>
+      <td th:text="${#temporals.format(notice.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+    </tr>
+    </tbody>
+  </table>
+</div>
+</html>

src/main/resources/templates/translator/translatorDashBoard.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="card-header bg-white">
+  <div class="row justify-content-between">
+    <div class="col-auto">민간통역인현황</div>
+    <div class="col-auto"><a href="/translator/info" class="link-dark"><i class="bi bi-list"></i></a></div>
+  </div>
+</div>
+<div class="card-body">
+  <table class="table table-striped">
+    <thead>
+    <tr>
+      <th>관서명</th>
+      <th>언어</th>
+      <th>성명</th>
+      <th>위촉일</th>
+      <th>연락처</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr class="userInfoTr" th:each="trInfo:${translatorList}">
+      <td th:text="${trInfo.ogdp1}"></td>
+      <td th:text="${trInfo.trLang}"></td>
+      <td th:text="${trInfo.trName}"></td>
+      <td th:text="${trInfo.aptDt}"></td>
+      <td th:text="${trInfo.trPhone}"></td>
+    </tr>
+    </tbody>
+  </table>
+</div>
+</html>

src/main/resources/templates/user/dashboardConfigTable.html

@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <table>
-  <tr th:each="dashboardConfig:${dashboardConfigList}">
+  <tr class="configTr" th:each="dashboardConfig:${dashboardConfigList}">
     <td><input type="checkbox" class="configChkBox" th:data-menukey="${dashboardConfig.menuKey}"></td>
-    <td></td>
+    <td>
+      <input type="text" class="border-0 orderNumInput" th:value="${dashboardConfig.orderNum}" readonly>
+    </td>
     <th:block th:each="commonCode:${session.commonCode.get('CAT1')}">
       <td th:if="${commonCode.itemCd eq dashboardConfig.cat1Cd}" th:text="${commonCode.itemValue}"></td>
     </th:block>
@@ -16,6 +18,9 @@
       <td th:if="${commonCode.itemCd eq dashboardConfig.cat3Cd}" th:text="${commonCode.itemValue}"></td>
     </th:block>
     <td th:text="${dashboardConfig.menuUrl}"></td>
-    <td></td>
+    <td class="moveTd">
+      <input type="button" class="btn btn-sm btn-outline-dark upBtn" value="▲">
+      <input type="button" class="btn btn-sm btn-outline-dark downBtn" value="▼">
+    </td>
   </tr>
 </table>

src/main/resources/templates/user/myInfo.html

@@ -2,6 +2,14 @@
 <html lang="ko" xmlns:th="http://www.thymeleaf.org"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
+<th:block layout:fragment="css">
+  <style>
+    .orderNumInput{
+      width:60px;
+      text-align: center;
+    }
+  </style>
+</th:block>
 <th:block layout:fragment="script">
   <script type="text/javascript" th:src="@{/js/user/info.js}"></script>
 </th:block>
@@ -26,40 +34,50 @@
 
             </div>
             <div class="tab-pane fade p-2" id="dashboardTabPanel" role="tabpanel" aria-labelledby="dashboardTab" tabindex="0">
-              <form action="#" id="dashboardConfigForm">
-                <table class="table table-hover">
-                  <thead>
-                  <tr>
-                    <th><input type="checkbox" class="allChk"></th>
-                    <th>순번</th>
-                    <th>대분류</th>
-                    <th>중분류</th>
-                    <th>소분류</th>
-                    <th>url</th>
-                    <th>위치변경</th>
-                  </tr>
-                  </thead>
-                  <tbody id="dashboardConfigTbody">
-                  <tr th:each="dashboardConfig, idx:${dashboardConfigList}">
-                    <td><input type="checkbox" class="configChkBox" th:data-menukey="${dashboardConfig.menuKey}"></td>
-                    <td th:text="${idx.count}"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('CAT1')}">
-                      <td th:if="${commonCode.itemCd eq dashboardConfig.cat1Cd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
-                    <th:block th:if="${#strings.isEmpty(dashboardConfig.cat2Cd)}"><td></td></th:block>
-                    <th:block th:unless="${#strings.isEmpty(dashboardConfig.cat2Cd)}" th:each="commonCode:${session.commonCode.get('CAT2')}">
-                      <td th:if="${commonCode.itemCd eq dashboardConfig.cat2Cd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
-                    <th:block th:if="${#strings.isEmpty(dashboardConfig.cat3Cd)}"><td></td></th:block>
-                    <th:block th:unless="${#strings.isEmpty(dashboardConfig.cat3Cd)}" th:each="commonCode:${session.commonCode.get('CAT3')}">
-                      <td th:if="${commonCode.itemCd eq dashboardConfig.cat3Cd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
-                    <td th:text="${dashboardConfig.menuUrl}"></td>
-                    <td></td>
-                  </tr>
-                  </tbody>
-                </table>
-              </form>
+              <div class="row justify-content-end">
+                <div class="col-auto">
+                  <button type="button" class="btn btn-outline-info" data-bs-toggle="modal" data-bs-target="#questionModal">
+                    <i class="bi bi-question-lg"></i>
+                  </button>
+                </div>
+              </div>
+              <table class="table table-hover">
+                <thead>
+                <tr>
+                  <th><input type="checkbox" class="allChk"></th>
+                  <th>순번</th>
+                  <th>대분류</th>
+                  <th>중분류</th>
+                  <th>소분류</th>
+                  <th>url</th>
+                  <th>위치변경</th>
+                </tr>
+                </thead>
+                <tbody id="dashboardConfigTbody">
+                <tr class="configTr" th:each="dashboardConfig, idx:${dashboardConfigList}">
+                  <td><input type="checkbox" class="configChkBox" th:data-menukey="${dashboardConfig.menuKey}"></td>
+                  <td>
+                    <input type="text" class="border-0 orderNumInput" th:value="${dashboardConfig.orderNum}" readonly>
+                  </td>
+                  <th:block th:each="commonCode:${session.commonCode.get('CAT1')}">
+                    <td th:if="${commonCode.itemCd eq dashboardConfig.cat1Cd}" th:text="${commonCode.itemValue}"></td>
+                  </th:block>
+                  <th:block th:if="${#strings.isEmpty(dashboardConfig.cat2Cd)}"><td></td></th:block>
+                  <th:block th:unless="${#strings.isEmpty(dashboardConfig.cat2Cd)}" th:each="commonCode:${session.commonCode.get('CAT2')}">
+                    <td th:if="${commonCode.itemCd eq dashboardConfig.cat2Cd}" th:text="${commonCode.itemValue}"></td>
+                  </th:block>
+                  <th:block th:if="${#strings.isEmpty(dashboardConfig.cat3Cd)}"><td></td></th:block>
+                  <th:block th:unless="${#strings.isEmpty(dashboardConfig.cat3Cd)}" th:each="commonCode:${session.commonCode.get('CAT3')}">
+                    <td th:if="${commonCode.itemCd eq dashboardConfig.cat3Cd}" th:text="${commonCode.itemValue}"></td>
+                  </th:block>
+                  <td th:text="${dashboardConfig.menuUrl}"></td>
+                  <td class="moveTd">
+                    <input type="button" class="btn btn-sm btn-outline-dark upBtn" value="▲">
+                    <input type="button" class="btn btn-sm btn-outline-dark downBtn" value="▼">
+                  </td>
+                </tr>
+                </tbody>
+              </table>
               <div class="row justify-content-between">
                 <div class="col-auto">
                   <input type="button" class="btn btn-danger" id="configDeleteBtn" value="삭제">
@@ -140,5 +158,22 @@
       </div>
     </div>
   </div>
+  <div class="modal fade" id="questionModal" tabindex="-1" aria-labelledby="questionModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h1 class="modal-title fs-5" id="questionModalLabel">안내</h1>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+          <p>대시보드에 노출될 게시판을 선택하여 저장합니다.</p>
+          <p>저장에 제한은 없으나 상위 5건과 공지사항만 대시보드에 노출됩니다.</p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
 </html>