DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

외사방첩관리 권한 점검 및 오류수정.

master
강석 최 2023-03-15 13:31:24 +09:00
parent a85d179341
commit 5ea64b14ac
14 changed files with 502 additions and 591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java
View File

@ -2,10 +2,7 @@ package com.dbnt.faisp.main.counterIntelligence;
import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
import com.dbnt.faisp.main.counterIntelligence.model.CiWorkStatistics; import com.dbnt.faisp.main.counterIntelligence.model.*;
import com.dbnt.faisp.main.counterIntelligence.model.CiaFile;
import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity;
import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork;
import com.dbnt.faisp.main.counterIntelligence.service.CounterIntelligenceService; import com.dbnt.faisp.main.counterIntelligence.service.CounterIntelligenceService;
import com.dbnt.faisp.main.equip.model.Equip; import com.dbnt.faisp.main.equip.model.Equip;
import com.dbnt.faisp.main.equip.model.EquipFile; import com.dbnt.faisp.main.equip.model.EquipFile;
@ -106,12 +103,20 @@ public class CounterIntelligenceController {
} }
} }
@GetMapping("/CiWorkStatistics") @GetMapping("/CiWorkStatistics")
public ModelAndView ciWorkStatistics(CiWorkStatistics ciWorkStatistics){ public ModelAndView ciWorkStatistics(@AuthenticationPrincipal UserInfo loginUser, CiWorkStatistics ciWorkStatistics){
if(ciWorkStatistics.getYear()==null){ if(ciWorkStatistics.getYear()==null){
ciWorkStatistics.setYear(LocalDateTime.now().getYear()); ciWorkStatistics.setYear(LocalDateTime.now().getYear());
} }
ModelAndView mav = new ModelAndView("counterIntelligence/ciWork/ciWorkStatistics"); ModelAndView mav = new ModelAndView("counterIntelligence/ciWork/ciWorkStatistics");
mav.addObject("yearList", ciService.selectCiWorkYearList()); mav.addObject("yearList", ciService.selectCiWorkYearList());
String accessAuth = authMgtService.selectAccessConfigList
(loginUser.getUserSeq(), "/counterIntelligence/ciWorkList").get(0).getAccessAuth();
if(accessAuth.equals("ACC003")) {
ciWorkStatistics.setDownOrganCdList(loginUser.getDownOrganCdList());
}else{
ciWorkStatistics.setOgCd(loginUser.getOgCd());
}
mav.addObject("ciWorkStatisticsList", ciService.selectCiWorkStatisticsList(ciWorkStatistics)); mav.addObject("ciWorkStatisticsList", ciService.selectCiWorkStatisticsList(ciWorkStatistics));
mav.addObject("searchParams", ciWorkStatistics); mav.addObject("searchParams", ciWorkStatistics);
return mav; return mav;
@ -141,8 +146,9 @@ public class CounterIntelligenceController {
ModelAndView mav = new ModelAndView("counterIntelligence/ciaSaftyDemandEditModal"); ModelAndView mav = new ModelAndView("counterIntelligence/ciaSaftyDemandEditModal");
if(cia.getCiKey() != null) { if(cia.getCiKey() != null) {
cia = ciService.selectSaftyDemandInfo(cia); cia = ciService.selectSaftyDemandInfo(cia);
}else{
cia.setSaftyDemandInfo(new SaftyDemandInfo());
} }
mav.addObject("cia", cia); mav.addObject("cia", cia);
return mav; return mav;
} }
@ -215,6 +221,8 @@ public class CounterIntelligenceController {
ModelAndView mav = new ModelAndView("counterIntelligence/ciaManageCompanyEditModal"); ModelAndView mav = new ModelAndView("counterIntelligence/ciaManageCompanyEditModal");
if(cia.getCiKey() != null) { if(cia.getCiKey() != null) {
cia = ciService.selectManageCompanyInfo(cia); cia = ciService.selectManageCompanyInfo(cia);
}else{
cia.setManageCompanyInfo(new ManageCompanyInfo());
} }
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
@ -258,6 +266,8 @@ public class CounterIntelligenceController {
ModelAndView mav = new ModelAndView("counterIntelligence/ciaForeignerEditModal"); ModelAndView mav = new ModelAndView("counterIntelligence/ciaForeignerEditModal");
if(cia.getCiKey() != null) { if(cia.getCiKey() != null) {
cia = ciService.selectForeignerInfo(cia); cia = ciService.selectForeignerInfo(cia);
}else{
cia.setForeignerInfo(new ForeignerInfo());
} }
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
@ -301,6 +311,8 @@ public class CounterIntelligenceController {
ModelAndView mav = new ModelAndView("counterIntelligence/ciaEduEditModal"); ModelAndView mav = new ModelAndView("counterIntelligence/ciaEduEditModal");
if(cia.getCiKey() != null) { if(cia.getCiKey() != null) {
cia = ciService.selectEduInfo(cia); cia = ciService.selectEduInfo(cia);
}else{
cia.setEduInfo(new EduInfo());
} }
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());

3
src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java
View File

@ -31,8 +31,9 @@ public class ActivityCaseController {
mav.addObject("ogCd", loginUser.getOgCd()); mav.addObject("ogCd", loginUser.getOgCd());
if(accessAuth.equals("ACC003")){ if(accessAuth.equals("ACC003")){
activityCase.setWrtOrgan(loginUser.getOgCd());
activityCase.setDownOrganCdList(loginUser.getDownOrganCdList()); activityCase.setDownOrganCdList(loginUser.getDownOrganCdList());
}else{
activityCase.setWrtOrgan(loginUser.getOgCd());
} }
activityCase.setWrtUserSeq(loginUser.getUserSeq()); activityCase.setWrtUserSeq(loginUser.getUserSeq());
activityCase.setQueryInfo(); activityCase.setQueryInfo();

4
src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CiWorkStatistics.java
View File

@ -4,6 +4,8 @@ import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
@ -17,4 +19,6 @@ public class CiWorkStatistics {
private Integer thisYearWorkEndCnt=0; private Integer thisYearWorkEndCnt=0;
private Integer year; private Integer year;
private String ogCd;
private List<String> downOrganCdList;
} }

17
src/main/resources/mybatisMapper/ActivityCaseMapper.xml
View File

@ -6,14 +6,6 @@
<mapper namespace="com.dbnt.faisp.main.counterIntelligence.activityCase.mapper.ActivityCaseMapper"> <mapper namespace="com.dbnt.faisp.main.counterIntelligence.activityCase.mapper.ActivityCaseMapper">
<sql id="selectActivityCaseListWhere"> <sql id="selectActivityCaseListWhere">
<where> <where>
<if test='wrtUserSeq != null and wrtUserSeq != 0'>
and (a.wrt_user_seq = #{wrtUserSeq}
or a.receipt_key in (select a.receipt_key
from activity_case_info a
inner join activity_case_apprv b
on a.case_key = b.case_key
where b.user_seq = #{wrtUserSeq}))
</if>
<if test='receiptKey != null and receiptKey != ""'> <if test='receiptKey != null and receiptKey != ""'>
and a.receipt_key = #{receiptKey} and a.receipt_key = #{receiptKey}
</if> </if>
@ -63,6 +55,15 @@
</if> </if>
<if test='wrtOrgan != null and wrtOrgan != ""'> <if test='wrtOrgan != null and wrtOrgan != ""'>
and a.wrt_organ = #{wrtOrgan} and a.wrt_organ = #{wrtOrgan}
<if test='wrtUserSeq != null and wrtUserSeq != 0'>
and (a.wrt_user_seq = #{wrtUserSeq}
or a.receipt_key in (select a.receipt_key
from activity_case_info a
inner join activity_case_apprv b
on a.case_key = b.case_key
where b.user_seq = #{wrtUserSeq}))
</if>
</if> </if>
<if test="downOrganCdList != null"> <if test="downOrganCdList != null">
and a.wrt_organ in and a.wrt_organ in

638
src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml
View File

@ -24,10 +24,10 @@
</if> </if>
<if test='hashTags != null and hashTags != ""'> <if test='hashTags != null and hashTags != ""'>
and a.ciw_key in ( and a.ciw_key in (
select aa.ciw_key select aa.ciw_key
from hash_tag_link_ciw aa from hash_tag_link_ciw aa
inner join hash_tag ab on aa.tag_key = ab.tag_key inner join hash_tag ab on aa.tag_key = ab.tag_key
where ab.tag_nm like '%'||#{hashTags}||'%' where ab.tag_nm like '%'||#{hashTags}||'%'
) )
</if> </if>
<if test='dateSelector == "workStartDate"'> <if test='dateSelector == "workStartDate"'>
@ -80,20 +80,20 @@
</sql> </sql>
<select id="selectCounterIntelligenceWorkList" parameterType="CounterIntelligenceWork" resultType="CounterIntelligenceWork"> <select id="selectCounterIntelligenceWorkList" parameterType="CounterIntelligenceWork" resultType="CounterIntelligenceWork">
select a.ciw_key, select a.ciw_key,
a.status, a.status,
a.work_rating, a.work_rating,
a.work_start_date, a.work_start_date,
a.work_end_date, a.work_end_date,
a.re_rating_date1, a.re_rating_date1,
a.re_rating_date2, a.re_rating_date2,
a.title, a.title,
a.wrt_organ, a.wrt_organ,
a.wrt_part, a.wrt_part,
a.wrt_user_seq, a.wrt_user_seq,
a.wrt_user_grd, a.wrt_user_grd,
a.wrt_user_nm, a.wrt_user_nm,
a.wrt_dt, a.wrt_dt,
b.fileCnt b.fileCnt
from counter_intelligence_work a from counter_intelligence_work a
left outer join (select ciw_key, count(*) as fileCnt from ciw_file group by ciw_key) b left outer join (select ciw_key, count(*) as fileCnt from ciw_file group by ciw_key) b
on a.ciw_key = b.ciw_key on a.ciw_key = b.ciw_key
@ -123,16 +123,25 @@
count(case when work_start_date >= (#{year}||'-01-01')::date and work_start_date &lt;= (#{year}+1||'-01-01')::date and work_end_date >= (#{year}||'-01-01')::date and work_end_date &lt; (#{year}+1||'-01-01')::date then 1 end) as thisYearWorkEndCnt count(case when work_start_date >= (#{year}||'-01-01')::date and work_start_date &lt;= (#{year}+1||'-01-01')::date and work_end_date >= (#{year}||'-01-01')::date and work_end_date &lt; (#{year}+1||'-01-01')::date then 1 end) as thisYearWorkEndCnt
from counter_intelligence_work a from counter_intelligence_work a
WHERE a.status = 'DST007' WHERE a.status = 'DST007'
<if test='ogCd != null and ogCd != ""'>
and a.wrt_organ = #{ogCd}
</if>
<if test="downOrganCdList != null">
and a.wrt_organ in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
</if>
group by work_rating group by work_rating
order by work_rating order by work_rating
</select> </select>
<select id="selectCiWorkYearList" resultType="int"> <select id="selectCiWorkYearList" resultType="int">
select year select year
from ( select EXTRACT(YEAR FROM work_start_date) AS year from ( select EXTRACT(YEAR FROM work_start_date) AS year
from counter_intelligence_work from counter_intelligence_work
where status &lt;> 'DST008' where status &lt;> 'DST008'
union union
select EXTRACT(YEAR FROM now()) AS year select EXTRACT(YEAR FROM now()) AS year
) a ) a
group by year group by year
order by year desc order by year desc
@ -141,198 +150,196 @@
<select id="selectCiaSaftyDemandList" parameterType="CounterIntelligenceActivity" resultType="CounterIntelligenceActivity"> <select id="selectCiaSaftyDemandList" parameterType="CounterIntelligenceActivity" resultType="CounterIntelligenceActivity">
select cia.ci_key, select cia.ci_key,
(select item_value from code_mgt where item_cd = cia.content_status) as content_status, (select item_value from code_mgt where item_cd = cia.content_status) as content_status,
cia.ci_type, cia.ci_type,
(select item_value from code_mgt where item_cd = cia.wrt_organ) as wrt_organ, (select item_value from code_mgt where item_cd = cia.wrt_organ) as wrt_organ,
sdi.local_info, sdi.local_info,
sdi.outlook_problem, sdi.outlook_problem,
(select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd, (select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd,
cia.wrt_user_seq, cia.wrt_user_seq,
cia.wrt_user_nm, cia.wrt_user_nm,
cia.wrt_dt cia.wrt_dt
from counter_intelligence_activity cia, from counter_intelligence_activity cia,
safty_demand_info sdi safty_demand_info sdi
where cia.ci_key = sdi.ci_key where cia.ci_key = sdi.ci_key
and cia.content_status != 'DST008' and cia.content_status != 'DST008'
and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007')
<if test='wrtOrgan != null and wrtOrgan != ""'> <if test='wrtOrgan != null and wrtOrgan != ""'>
and cia.wrt_organ = #{wrtOrgan} and cia.wrt_organ = #{wrtOrgan}
</if> </if>
<if test='wrtUserNm != null and wrtUserNm != ""'> <if test='wrtUserNm != null and wrtUserNm != ""'>
and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%' and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%'
</if> </if>
<if test='startDate != null and startDate != ""'> <if test='startDate != null and startDate != ""'>
and cia.wrt_dt >= #{startDate}::date and cia.wrt_dt >= #{startDate}::date
</if> </if>
<if test='endDate != null and endDate != ""'> <if test='endDate != null and endDate != ""'>
and cia.wrt_dt &lt;= #{endDate}::date+1 and cia.wrt_dt &lt;= #{endDate}::date+1
</if> </if>
and cia.wrt_organ in and cia.wrt_organ in
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
ORDER BY cia.ci_key DESC ORDER BY cia.ci_key DESC
LIMIT #{rowCnt} OFFSET #{firstIndex} LIMIT #{rowCnt} OFFSET #{firstIndex}
</select> </select>
<select id="selectCiaSaftyDemandListCnt" parameterType="CounterIntelligenceActivity" resultType="Integer"> <select id="selectCiaSaftyDemandListCnt" parameterType="CounterIntelligenceActivity" resultType="Integer">
select count(*) select count(*)
from( from(
select cia.ci_key, select cia.ci_key,
(select item_value from code_mgt where item_cd = cia.content_status) as content_status, (select item_value from code_mgt where item_cd = cia.content_status) as content_status,
cia.ci_type, cia.ci_type,
(select item_value from code_mgt where item_cd = cia.wrt_organ) as wrt_organ, (select item_value from code_mgt where item_cd = cia.wrt_organ) as wrt_organ,
sdi.local_info, sdi.local_info,
sdi.outlook_problem, sdi.outlook_problem,
(select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd, (select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd,
cia.wrt_user_seq, cia.wrt_user_seq,
cia.wrt_user_nm, cia.wrt_user_nm,
cia.wrt_dt cia.wrt_dt
from counter_intelligence_activity cia, from counter_intelligence_activity cia,
safty_demand_info sdi safty_demand_info sdi
where cia.ci_key = sdi.ci_key where cia.ci_key = sdi.ci_key
and cia.content_status != 'DST008' and cia.content_status != 'DST008'
and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007')
<if test='wrtOrgan != null and wrtOrgan != ""'> <if test='wrtOrgan != null and wrtOrgan != ""'>
and cia.wrt_organ = #{wrtOrgan} and cia.wrt_organ = #{wrtOrgan}
</if> </if>
<if test='wrtUserNm != null and wrtUserNm != ""'> <if test='wrtUserNm != null and wrtUserNm != ""'>
and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%' and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%'
</if> </if>
<if test='startDate != null and startDate != ""'> <if test='startDate != null and startDate != ""'>
and cia.wrt_dt >= #{startDate}::date and cia.wrt_dt >= #{startDate}::date
</if> </if>
<if test='endDate != null and endDate != ""'> <if test='endDate != null and endDate != ""'>
and cia.wrt_dt &lt;= #{endDate}::date+1 and cia.wrt_dt &lt;= #{endDate}::date+1
</if> </if>
and cia.wrt_organ in and cia.wrt_organ in
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
ORDER BY cia.ci_key DESC ORDER BY cia.ci_key DESC
)a )a
</select> </select>
<select id="selectCiaManageCompanyList" parameterType="CounterIntelligenceActivity" resultType="CounterIntelligenceActivity"> <select id="selectCiaManageCompanyList" parameterType="CounterIntelligenceActivity" resultType="CounterIntelligenceActivity">
select cia.ci_key, select cia.ci_key,
(select item_value from code_mgt where item_cd = cia.content_status) as content_status, (select item_value from code_mgt where item_cd = cia.content_status) as content_status,
cia.ci_type, cia.ci_type,
(select item_value from code_mgt where item_cd = mci.mgt_organ) as mgt_organ, (select item_value from code_mgt where item_cd = mci.mgt_organ) as mgt_organ,
mci.company_nm, mci.company_nm,
mci.company_location, mci.company_location,
mci.related_field, mci.related_field,
mci.description, mci.description,
mci.cell_phone, mci.cell_phone,
mci.department, mci.department,
mci."name", mci."name",
(select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd, (select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd,
cia.wrt_user_seq, cia.wrt_user_seq,
cia.wrt_user_nm, cia.wrt_user_nm,
cia.wrt_dt cia.wrt_dt
from counter_intelligence_activity cia, from counter_intelligence_activity cia,
manage_company_info mci manage_company_info mci
where cia.ci_key = mci.ci_key where cia.ci_key = mci.ci_key
and cia.content_status != 'DST008' and cia.content_status != 'DST008'
and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007')
<if test='wrtOrgan != null and wrtOrgan != ""'> <if test='wrtOrgan != null and wrtOrgan != ""'>
and cia.wrt_organ = #{wrtOrgan} and cia.wrt_organ = #{wrtOrgan}
</if> </if>
<if test='companyNm != null and companyNm != ""'> <if test='companyNm != null and companyNm != ""'>
and mci.company_nm like '%'||#{companyNm}||'%' and mci.company_nm like '%'||#{companyNm}||'%'
</if> </if>
<if test='wrtUserNm != null and wrtUserNm != ""'> <if test='wrtUserNm != null and wrtUserNm != ""'>
and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%' and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%'
</if> </if>
<if test='startDate != null and startDate != ""'> <if test='startDate != null and startDate != ""'>
and cia.wrt_dt >= #{startDate}::date and cia.wrt_dt >= #{startDate}::date
</if> </if>
<if test='endDate != null and endDate != ""'> <if test='endDate != null and endDate != ""'>
and cia.wrt_dt &lt;= #{endDate}::date+1 and cia.wrt_dt &lt;= #{endDate}::date+1
</if> </if>
and mci.mgt_organ in and mci.mgt_organ in
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
ORDER BY cia.ci_key DESC ORDER BY cia.ci_key DESC
LIMIT #{rowCnt} OFFSET #{firstIndex} LIMIT #{rowCnt} OFFSET #{firstIndex}
</select> </select>
<select id="selectCiaManageCompanyListCnt" parameterType="CounterIntelligenceActivity" resultType="Integer"> <select id="selectCiaManageCompanyListCnt" parameterType="CounterIntelligenceActivity" resultType="Integer">
select count(*) select count(*)
from( from(
select cia.ci_key, select cia.ci_key,
(select item_value from code_mgt where item_cd = cia.content_status) as content_status, (select item_value from code_mgt where item_cd = cia.content_status) as content_status,
cia.ci_type, cia.ci_type,
(select item_value from code_mgt where item_cd = mci.mgt_organ) as mgt_organ, (select item_value from code_mgt where item_cd = mci.mgt_organ) as mgt_organ,
mci.company_nm, mci.company_nm,
mci.company_location, mci.company_location,
mci.related_field, mci.related_field,
mci.description, mci.description,
mci.cell_phone, mci.cell_phone,
mci.department, mci.department,
mci."name", mci."name",
(select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd, (select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd,
cia.wrt_user_seq, cia.wrt_user_seq,
cia.wrt_user_nm, cia.wrt_user_nm,
cia.wrt_dt cia.wrt_dt
from counter_intelligence_activity cia, from counter_intelligence_activity cia, manage_company_info mci
manage_company_info mci where cia.ci_key = mci.ci_key
where cia.ci_key = mci.ci_key and cia.content_status != 'DST008'
and cia.content_status != 'DST008' and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007')
and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') <if test='wrtOrgan != null and wrtOrgan != ""'>
<if test='wrtOrgan != null and wrtOrgan != ""'> and cia.wrt_organ = #{wrtOrgan}
and cia.wrt_organ = #{wrtOrgan} </if>
</if> <if test='companyNm != null and companyNm != ""'>
<if test='companyNm != null and companyNm != ""'> and mci.company_nm like '%'||#{companyNm}||'%'
and mci.company_nm like '%'||#{companyNm}||'%' </if>
</if> <if test='wrtUserNm != null and wrtUserNm != ""'>
<if test='wrtUserNm != null and wrtUserNm != ""'> and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%'
and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%' </if>
</if> <if test='startDate != null and startDate != ""'>
<if test='startDate != null and startDate != ""'> and cia.wrt_dt >= #{startDate}::date
and cia.wrt_dt >= #{startDate}::date </if>
</if> <if test='endDate != null and endDate != ""'>
<if test='endDate != null and endDate != ""'> and cia.wrt_dt &lt;= #{endDate}::date+1
and cia.wrt_dt &lt;= #{endDate}::date+1 </if>
</if> and mci.mgt_organ in
and mci.mgt_organ in <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")"> #{item}
#{item} </foreach>
</foreach> ORDER BY cia.ci_key DESC
ORDER BY cia.ci_key DESC )a
)a
</select> </select>
<select id="selectCiaForeignerList" parameterType="CounterIntelligenceActivity" resultType="CounterIntelligenceActivity"> <select id="selectCiaForeignerList" parameterType="CounterIntelligenceActivity" resultType="CounterIntelligenceActivity">
select cia.ci_key, select cia.ci_key,
(select item_value from code_mgt where item_cd = cia.content_status) as content_status, (select item_value from code_mgt where item_cd = cia.content_status) as content_status,
(select item_value from code_mgt where item_cd = fi.mgt_organ) as mgt_organ, (select item_value from code_mgt where item_cd = fi.mgt_organ) as mgt_organ,
fi.manager, fi.manager,
fi.commu_location, fi.commu_location,
fi.commu_national, fi.commu_national,
fi.commu_address, fi.commu_address,
fi.select_reason, fi.select_reason,
fi.monitoring_info, fi.monitoring_info,
fi.fix_date, fi.fix_date,
(select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd, (select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd,
cia.wrt_user_seq, cia.wrt_user_seq,
cia.wrt_user_nm, cia.wrt_user_nm,
cia.wrt_dt cia.wrt_dt
from counter_intelligence_activity cia, from counter_intelligence_activity cia, foreigner_info fi
foreigner_info fi where cia.ci_key = fi.ci_key
where cia.ci_key = fi.ci_key and cia.content_status != 'DST008'
and cia.content_status != 'DST008' and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007')
and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') <if test='manager != null and manager != ""'>
<if test='manager != null and manager != ""'>
and fi.manager like '%'||#{manager}||'%' and fi.manager like '%'||#{manager}||'%'
</if> </if>
<if test='wrtOrgan != null and wrtOrgan != ""'> <if test='wrtOrgan != null and wrtOrgan != ""'>
and cia.wrt_organ = #{wrtOrgan} and cia.wrt_organ = #{wrtOrgan}
</if> </if>
<if test='wrtUserNm != null and wrtUserNm != ""'> <if test='wrtUserNm != null and wrtUserNm != ""'>
and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%' and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%'
</if> </if>
<if test='dateSelector == "fixDate"'> <if test='dateSelector == "fixDate"'>
<if test='startDate != null and startDate != ""'> <if test='startDate != null and startDate != ""'>
and fi.fix_date >= #{startDate}::date and fi.fix_date >= #{startDate}::date
</if> </if>
@ -340,101 +347,99 @@
and fi.fix_date &lt;= #{endDate}::date and fi.fix_date &lt;= #{endDate}::date
</if> </if>
</if> </if>
<if test='dateSelector == "wrtDt"'> <if test='dateSelector == "wrtDt"'>
<if test='startDate != null and startDate != ""'> <if test='startDate != null and startDate != ""'>
and cia.wrt_dt >= #{startDate}::date and cia.wrt_dt >= #{startDate}::date
</if> </if>
<if test='endDate != null and endDate != ""'> <if test='endDate != null and endDate != ""'>
and cia.wrt_dt &lt;= #{endDate}::date+1 and cia.wrt_dt &lt;= #{endDate}::date+1
</if> </if>
</if> </if>
and fi.mgt_organ in and fi.mgt_organ in
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
ORDER BY cia.ci_key DESC ORDER BY cia.ci_key DESC
LIMIT #{rowCnt} OFFSET #{firstIndex} LIMIT #{rowCnt} OFFSET #{firstIndex}
</select> </select>
<select id="selectCiaForeignerListCnt" parameterType="CounterIntelligenceActivity" resultType="Integer"> <select id="selectCiaForeignerListCnt" parameterType="CounterIntelligenceActivity" resultType="Integer">
select count(*) select count(*)
from( from(
select cia.ci_key, select cia.ci_key,
(select item_value from code_mgt where item_cd = cia.content_status) as content_status, (select item_value from code_mgt where item_cd = cia.content_status) as content_status,
(select item_value from code_mgt where item_cd = fi.mgt_organ) as mgt_organ, (select item_value from code_mgt where item_cd = fi.mgt_organ) as mgt_organ,
fi.manager, fi.manager,
fi.commu_location, fi.commu_location,
fi.commu_national, fi.commu_national,
fi.commu_address, fi.commu_address,
fi.select_reason, fi.select_reason,
fi.monitoring_info, fi.monitoring_info,
fi.fix_date, fi.fix_date,
(select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd, (select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd,
cia.wrt_user_seq, cia.wrt_user_seq,
cia.wrt_user_nm, cia.wrt_user_nm,
cia.wrt_dt cia.wrt_dt
from counter_intelligence_activity cia, from counter_intelligence_activity cia, foreigner_info fi
foreigner_info fi where cia.ci_key = fi.ci_key
where cia.ci_key = fi.ci_key and cia.content_status != 'DST008'
and cia.content_status != 'DST008' and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007')
and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') <if test='manager != null and manager != ""'>
<if test='manager != null and manager != ""'> and fi.manager like '%'||#{manager}||'%'
and fi.manager like '%'||#{manager}||'%' </if>
</if> <if test='wrtOrgan != null and wrtOrgan != ""'>
<if test='wrtOrgan != null and wrtOrgan != ""'> and cia.wrt_organ = #{wrtOrgan}
and cia.wrt_organ = #{wrtOrgan} </if>
</if> <if test='wrtUserNm != null and wrtUserNm != ""'>
<if test='wrtUserNm != null and wrtUserNm != ""'> and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%'
and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%' </if>
</if> <if test='dateSelector == "fixDate"'>
<if test='dateSelector == "fixDate"'> <if test='startDate != null and startDate != ""'>
<if test='startDate != null and startDate != ""'> and fi.fix_date >= #{startDate}::date
and fi.fix_date >= #{startDate}::date </if>
</if> <if test='endDate != null and endDate != ""'>
<if test='endDate != null and endDate != ""'> and fi.fix_date &lt;= #{endDate}::date
and fi.fix_date &lt;= #{endDate}::date </if>
</if> </if>
</if> <if test='dateSelector == "wrtDt"'>
<if test='dateSelector == "wrtDt"'> <if test='startDate != null and startDate != ""'>
<if test='startDate != null and startDate != ""'> and cia.wrt_dt >= #{startDate}::date
and cia.wrt_dt >= #{startDate}::date </if>
</if> <if test='endDate != null and endDate != ""'>
<if test='endDate != null and endDate != ""'> and cia.wrt_dt &lt;= #{endDate}::date+1
and cia.wrt_dt &lt;= #{endDate}::date+1 </if>
</if> </if>
</if> and fi.mgt_organ in
and fi.mgt_organ in <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")"> #{item}
#{item} </foreach>
</foreach> ORDER BY cia.ci_key DESC
ORDER BY cia.ci_key DESC )a
)a
</select> </select>
<select id="selectCiaEduList" parameterType="CounterIntelligenceActivity" resultType="CounterIntelligenceActivity"> <select id="selectCiaEduList" parameterType="CounterIntelligenceActivity" resultType="CounterIntelligenceActivity">
select cia.ci_key, select cia.ci_key,
(select item_value from code_mgt where item_cd = cia.content_status) as content_status, (select item_value from code_mgt where item_cd = cia.content_status) as content_status,
(select item_value from code_mgt where item_cd = ei.mgt_organ) as mgt_organ, (select item_value from code_mgt where item_cd = ei.mgt_organ) as mgt_organ,
ei.edu_date, ei.edu_date,
ei.edu_type, ei.edu_type,
ei.people_cnt, ei.people_cnt,
ei.description, ei.description,
(select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd, (select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd,
cia.wrt_user_seq, cia.wrt_user_seq,
cia.wrt_user_nm, cia.wrt_user_nm,
cia.wrt_dt cia.wrt_dt
from counter_intelligence_activity cia, from counter_intelligence_activity cia, edu_info ei
edu_info ei where cia.ci_key = ei.ci_key
where cia.ci_key = ei.ci_key and cia.content_status != 'DST008'
and cia.content_status != 'DST008' and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007')
and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') <if test='mgtOrgan != null and mgtOrgan != ""'>
<if test='mgtOrgan != null and mgtOrgan != ""'>
and ei.mgt_organ = #{mgtOrgan} and ei.mgt_organ = #{mgtOrgan}
</if> </if>
<if test='wrtUserNm != null and wrtUserNm != ""'> <if test='wrtUserNm != null and wrtUserNm != ""'>
and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%' and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%'
</if> </if>
<if test='dateSelector == "eduDate"'> <if test='dateSelector == "eduDate"'>
<if test='startDate != null and startDate != ""'> <if test='startDate != null and startDate != ""'>
and ei.edu_date >= #{startDate}::date and ei.edu_date >= #{startDate}::date
</if> </if>
@ -442,69 +447,68 @@
and ei.edu_date &lt;= #{endDate}::date and ei.edu_date &lt;= #{endDate}::date
</if> </if>
</if> </if>
<if test='dateSelector == "wrtDt"'> <if test='dateSelector == "wrtDt"'>
<if test='startDate != null and startDate != ""'> <if test='startDate != null and startDate != ""'>
and cia.wrt_dt >= #{startDate}::date and cia.wrt_dt >= #{startDate}::date
</if> </if>
<if test='endDate != null and endDate != ""'> <if test='endDate != null and endDate != ""'>
and cia.wrt_dt &lt;= #{endDate}::date+1 and cia.wrt_dt &lt;= #{endDate}::date+1
</if> </if>
</if> </if>
and ei.mgt_organ in and ei.mgt_organ in
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
ORDER BY cia.ci_key DESC ORDER BY cia.ci_key DESC
LIMIT #{rowCnt} OFFSET #{firstIndex} LIMIT #{rowCnt} OFFSET #{firstIndex}
</select> </select>
<select id="selectCiaEduListCnt" parameterType="CounterIntelligenceActivity" resultType="Integer"> <select id="selectCiaEduListCnt" parameterType="CounterIntelligenceActivity" resultType="Integer">
select count(*) select count(*)
from( from(
select cia.ci_key, select cia.ci_key,
(select item_value from code_mgt where item_cd = cia.content_status) as content_status, (select item_value from code_mgt where item_cd = cia.content_status) as content_status,
(select item_value from code_mgt where item_cd = ei.mgt_organ) as mgt_organ, (select item_value from code_mgt where item_cd = ei.mgt_organ) as mgt_organ,
ei.edu_date, ei.edu_date,
ei.edu_type, ei.edu_type,
ei.people_cnt, ei.people_cnt,
ei.description, ei.description,
(select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd, (select item_value from code_mgt where item_cd = cia.wrt_user_grd) as wrt_user_grd,
cia.wrt_user_seq, cia.wrt_user_seq,
cia.wrt_user_nm, cia.wrt_user_nm,
cia.wrt_dt cia.wrt_dt
from counter_intelligence_activity cia, from counter_intelligence_activity cia, edu_info ei
edu_info ei where cia.ci_key = ei.ci_key
where cia.ci_key = ei.ci_key and cia.content_status != 'DST008'
and cia.content_status != 'DST008' and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007')
and ((cia.wrt_user_seq = #{wrtUserSeq} and cia.content_status = 'DST001') or cia.content_status = 'DST007') <if test='mgtOrgan != null and mgtOrgan != ""'>
<if test='mgtOrgan != null and mgtOrgan != ""'> and ei.mgt_organ = #{mgtOrgan}
and ei.mgt_organ = #{mgtOrgan} </if>
</if> <if test='wrtUserNm != null and wrtUserNm != ""'>
<if test='wrtUserNm != null and wrtUserNm != ""'> and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%'
and cia.wrt_user_nm like '%'||#{wrtUserNm}||'%' </if>
</if> <if test='dateSelector == "eduDate"'>
<if test='dateSelector == "eduDate"'> <if test='startDate != null and startDate != ""'>
<if test='startDate != null and startDate != ""'> and ei.edu_date >= #{startDate}::date
and ei.edu_date >= #{startDate}::date </if>
</if> <if test='endDate != null and endDate != ""'>
<if test='endDate != null and endDate != ""'> and ei.edu_date &lt;= #{endDate}::date
and ei.edu_date &lt;= #{endDate}::date </if>
</if> </if>
</if> <if test='dateSelector == "wrtDt"'>
<if test='dateSelector == "wrtDt"'> <if test='startDate != null and startDate != ""'>
<if test='startDate != null and startDate != ""'> and cia.wrt_dt >= #{startDate}::date
and cia.wrt_dt >= #{startDate}::date </if>
</if> <if test='endDate != null and endDate != ""'>
<if test='endDate != null and endDate != ""'> and cia.wrt_dt &lt;= #{endDate}::date+1
and cia.wrt_dt &lt;= #{endDate}::date+1 </if>
</if> </if>
</if> and ei.mgt_organ in
and ei.mgt_organ in <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")"> #{item}
#{item} </foreach>
</foreach> ORDER BY cia.ci_key DESC
ORDER BY cia.ci_key DESC )a
)a
</select> </select>
</mapper> </mapper>

2
src/main/resources/static/js/counterIntelligence/ciaForeigner.js
View File

@ -24,6 +24,7 @@ function getCiaForeignerEditModal(ciKey){
autoclose: true autoclose: true
}); });
setUploadDiv(); setUploadDiv();
setEditor("editor", 450);
$("#ciaForeignerEditModal").modal('show'); $("#ciaForeignerEditModal").modal('show');
}, },
error:function(e){ error:function(e){
@ -54,6 +55,7 @@ function save(contentStatus){
formData.append('fileSeq', $(el).attr("data-fileseq")); formData.append('fileSeq', $(el).attr("data-fileseq"));
}) })
formData.append('contentStatus', contentStatus); formData.append('contentStatus', contentStatus);
formData.append("monitoringInfo", CrossEditor.GetBodyValue());
$.ajax({ $.ajax({
type : 'POST', type : 'POST',
data : formData, data : formData,

83
src/main/resources/templates/counterIntelligence/ciaEduEditModal.html
View File

@ -16,73 +16,33 @@
<input type="hidden" name="wrtUserGrd" th:value="${cia.wrtUserGrd}"> <input type="hidden" name="wrtUserGrd" th:value="${cia.wrtUserGrd}">
<input type="hidden" name="wrtUserNm" th:value="${cia.wrtUserNm}"> <input type="hidden" name="wrtUserNm" th:value="${cia.wrtUserNm}">
<input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"> <input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
<th:block th:if="${cia.ciKey eq null}">
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">시행관서</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">시행관서</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select" id="mgtOrgan" name="mgtOrgan"> <select class="form-select" id="mgtOrgan" name="mgtOrgan">
<option value="">선택</option> <option value="">선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="commonCode:${session.commonCode.get('OG')}">
<th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
</th:block>
</th:block>
</select>
</div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">시행일</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="eduDate" name="eduDate" readonly>
</div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly>
</div>
</div>
<div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">교육방식</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="eduType" name="eduType">
</div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">교육인원</label>
<div class="col-sm-2">
<input type="number" class="form-control form-control-sm" id="peopleCnt" name="peopleCnt">
</div>
</div>
<div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">내용/<br>비고</label>
<div class="col-sm-11" id="contentInfoDiv">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="description"></textarea>
</div>
</div>
</th:block>
<th:block th:unless="${cia.ciKey eq null}">
<div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">시행관서</label>
<div class="col-sm-2">
<select class="form-select" id="mgtOrgan" name="mgtOrgan">
<option value="">선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}"> <th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${cia.eduInfo.mgtOrgan eq commonCode.itemCd}"></option> <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${cia.eduInfo.mgtOrgan eq commonCode.itemCd}"></option>
</th:block> </th:block>
</th:block> </th:block>
</select> </select>
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">시행일</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">시행일</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="eduDate" name="eduDate" th:value="${cia.eduInfo.eduDate}" readonly> <input type="text" class="form-control form-control-sm" id="eduDate" name="eduDate" th:value="${cia.eduInfo.eduDate}" readonly>
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly> <input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">교육방식</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">교육방식</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="eduType" name="eduType" th:value="${cia.eduInfo.eduType}"> <input type="text" class="form-control form-control-sm" id="eduType" name="eduType" th:value="${cia.eduInfo.eduType}">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">교육인원</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">교육인원</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="number" class="form-control form-control-sm" id="peopleCnt" name="peopleCnt" th:value="${cia.eduInfo.peopleCnt}"> <input type="number" class="form-control form-control-sm" id="peopleCnt" name="peopleCnt" th:value="${cia.eduInfo.peopleCnt}">
</div> </div>
@ -90,10 +50,9 @@
<div class="row mb-1"> <div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">내용/<br>비고</label> <label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">내용/<br>비고</label>
<div class="col-sm-11" id="contentInfoDiv"> <div class="col-sm-11" id="contentInfoDiv">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="description" th:utext="${cia.eduInfo.description}"></textarea> <textarea class="form-control form-control-sm" rows="5" cols="30" name="description" th:utext="${cia.eduInfo.description}"></textarea>
</div> </div>
</div> </div>
</th:block>
<div class="row mb-1"> <div class="row mb-1">
<label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label> <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
<div class="col-sm-11" style="min-height: 70px;"> <div class="col-sm-11" style="min-height: 70px;">
@ -114,14 +73,14 @@
</form> </form>
</div> </div>
<div class="modal-footer justify-content-between bg-light"> <div class="modal-footer justify-content-between bg-light">
<div class="col-auto"> <div class="col-auto">
<!-- <!--
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
--> -->
</div> </div>
<div class="col-auto"> <div class="col-auto">
<button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button> <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
<button type="button" class="btn btn-primary" id="saveBtn">저장</button> <button type="button" class="btn btn-primary" id="saveBtn">저장</button>
</div> </div>
</div> </div>
</html> </html>

48
src/main/resources/templates/counterIntelligence/ciaEduViewModal.html
View File

@ -15,22 +15,22 @@
</ul> </ul>
<div class="tab-content bg-white border border-top-0 p-2"> <div class="tab-content bg-white border border-top-0 p-2">
<div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0"> <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1"> <div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성자</label> <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start"> <label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('JT')}"> <th:block th:each="commonCode:${session.commonCode.get('JT')}">
<option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option> <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option>
</th:block> </th:block>
</label> </label>
<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성일시</label> <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성일시</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">시행관서</label> <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">시행관서</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start"> <label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="commonCode:${session.commonCode.get('OG')}">
<option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.eduInfo.mgtOrgan}" th:text="${commonCode.itemValue}"></option> <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.eduInfo.mgtOrgan}" th:text="${commonCode.itemValue}"></option>
</th:block> </th:block>
</label> </label>
<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">시행일</label> <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">시행일</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${cia.eduInfo.eduDate}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${cia.eduInfo.eduDate}"></label>
@ -69,8 +69,8 @@
<tr class="fileInfoTr"> <tr class="fileInfoTr">
<td> <td>
<a href="#" class="fileDownLink" data-board="ciActivity" <a href="#" class="fileDownLink" data-board="ciActivity"
th:data-parentkey="${file.ciKey}" th:data-fileseq="${file.fileSeq}" th:data-parentkey="${file.ciKey}" th:data-fileseq="${file.fileSeq}"
th:text="|${file.origNm}.${file.fileExtn}|"></a> th:text="|${file.origNm}.${file.fileExtn}|"></a>
</td> </td>
<td th:text="${file.fileSize}"></td> <td th:text="${file.fileSize}"></td>
</tr> </tr>
@ -83,18 +83,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer justify-content-between bg-light"> <th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}">
<div class="col-auto"> <div class="modal-footer justify-content-between bg-light">
<!-- <div class="col-auto">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> <!--<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
--> <button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button>
<th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}"> </div>
<button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button> <div class="col-auto">
</th:block>
</div>
<div class="col-auto">
<th:block th:if="${viewUserSeq eq cia.wrtUserSeq}">
<button type="button" class="btn btn-warning" id="editBtn" th:data-cikey="${cia.ciKey}">수정</button> <button type="button" class="btn btn-warning" id="editBtn" th:data-cikey="${cia.ciKey}">수정</button>
</th:block> </div>
</div> </div>
</div> </th:block>

105
src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html
View File

@ -16,95 +16,41 @@
<input type="hidden" name="wrtUserGrd" th:value="${cia.wrtUserGrd}"> <input type="hidden" name="wrtUserGrd" th:value="${cia.wrtUserGrd}">
<input type="hidden" name="wrtUserNm" th:value="${cia.wrtUserNm}"> <input type="hidden" name="wrtUserNm" th:value="${cia.wrtUserNm}">
<input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"> <input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
<th:block th:if="${cia.ciKey eq null}">
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">관서</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">관서</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select" id="mgtOrgan" name="mgtOrgan"> <select class="form-select" id="mgtOrgan" name="mgtOrgan">
<option value="">선택</option> <option value="">선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="commonCode:${session.commonCode.get('OG')}">
<th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
</th:block>
</th:block>
</select>
</div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">선정일</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="fixDate" name="fixDate" readonly>
</div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">담당관</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="manager" name="manager">
</div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly>
</div>
</div>
<div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">소재지</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="commuLocation" name="commuLocation">
</div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">국적</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="commuNational" name="commuNational">
</div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">주소지</label>
<div class="col-sm-5">
<input type="text" class="form-control form-control-sm" id="commuAddress" name="commuAddress">
</div>
</div>
<div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">선정사유</label>
<div class="col-sm-11" id="contentInfoDiv">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="selectReason"></textarea>
</div>
</div>
<div class="row mb-1">
<label for="content" class="col-sm-1 col-form-label col-form-label-sm text-center">모니터링 사항</label>
<div class="col-sm-11">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="monitoringInfo"></textarea>
</div>
</div>
</th:block>
<th:block th:unless="${cia.ciKey eq null}">
<div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">관서</label>
<div class="col-sm-2">
<select class="form-select" id="mgtOrgan" name="mgtOrgan">
<option value="">선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}"> <th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq cia.foreignerInfo.mgtOrgan}"></option> <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq cia.foreignerInfo.mgtOrgan}"></option>
</th:block> </th:block>
</th:block> </th:block>
</select> </select>
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">선정일</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">선정일</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="fixDate" name="fixDate" th:value="${cia.foreignerInfo.fixDate}" readonly> <input type="text" class="form-control form-control-sm" id="fixDate" name="fixDate" th:value="${cia.foreignerInfo.fixDate}" readonly>
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">담당관</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">담당관</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="manager" name="manager" th:value="${cia.foreignerInfo.manager}"> <input type="text" class="form-control form-control-sm" id="manager" name="manager" th:value="${cia.foreignerInfo.manager}">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly> <input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">소재지</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">소재지</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="commuLocation" name="commuLocation" th:value="${cia.foreignerInfo.commuLocation}"> <input type="text" class="form-control form-control-sm" id="commuLocation" name="commuLocation" th:value="${cia.foreignerInfo.commuLocation}">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">국적</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">국적</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="commuNational" name="commuNational" th:value="${cia.foreignerInfo.commuNational}"> <input type="text" class="form-control form-control-sm" id="commuNational" name="commuNational" th:value="${cia.foreignerInfo.commuNational}">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">주소지</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">주소지</label>
<div class="col-sm-5"> <div class="col-sm-5">
<input type="text" class="form-control form-control-sm" id="commuAddress" name="commuAddress" th:value="${cia.foreignerInfo.commuAddress}"> <input type="text" class="form-control form-control-sm" id="commuAddress" name="commuAddress" th:value="${cia.foreignerInfo.commuAddress}">
</div> </div>
@ -112,17 +58,16 @@
<div class="row mb-1"> <div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">선정사유</label> <label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">선정사유</label>
<div class="col-sm-11" id="contentInfoDiv"> <div class="col-sm-11" id="contentInfoDiv">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="selectReason" th:utext="${cia.foreignerInfo.selectReason}"></textarea> <textarea class="form-control form-control-sm" rows="5" cols="30" name="selectReason" th:utext="${cia.foreignerInfo.selectReason}"></textarea>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="content" class="col-sm-1 col-form-label col-form-label-sm text-center">모니터링 사항</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">모니터링 사항</label>
<div class="col-sm-11"> <div class="col-sm-11">
<div id="editor"></div> <div id="editor"></div>
<textarea class="d-none" id="monitoringInfo" th:utext="${cia.foreignerInfo.monitoringInfo}"></textarea> <textarea class="d-none" id="content" th:utext="${cia.foreignerInfo.monitoringInfo}"></textarea>
</div> </div>
</div> </div>
</th:block>
<div class="row mb-1"> <div class="row mb-1">
<label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label> <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
<div class="col-sm-11" style="min-height: 70px;"> <div class="col-sm-11" style="min-height: 70px;">
@ -143,14 +88,14 @@
</form> </form>
</div> </div>
<div class="modal-footer justify-content-between bg-light"> <div class="modal-footer justify-content-between bg-light">
<div class="col-auto"> <div class="col-auto">
<!-- <!--
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
--> -->
</div> </div>
<div class="col-auto"> <div class="col-auto">
<button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button> <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
<button type="button" class="btn btn-primary" id="saveBtn">저장</button> <button type="button" class="btn btn-primary" id="saveBtn">저장</button>
</div> </div>
</div> </div>
</html> </html>

22
src/main/resources/templates/counterIntelligence/ciaForeignerViewModal.html
View File

@ -100,16 +100,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer justify-content-between bg-light"> <th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}">
<div class="col-auto"> <div class="modal-footer justify-content-between bg-light">
<!--<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>--> <div class="col-auto">
<th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}"> <!--<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
<button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button> <button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button>
</th:block> </div>
</div> <div class="col-auto">
<div class="col-auto">
<th:block th:if="${viewUserSeq eq cia.wrtUserSeq}">
<button type="button" class="btn btn-warning" id="editBtn" th:data-cikey="${cia.ciKey}">수정</button> <button type="button" class="btn btn-warning" id="editBtn" th:data-cikey="${cia.ciKey}">수정</button>
</th:block> </div>
</div> </div>
</div> </th:block>

33
src/main/resources/templates/counterIntelligence/ciaManageCompanyEditModal.html
View File

@ -17,44 +17,43 @@
<input type="hidden" name="wrtUserNm" th:value="${cia.wrtUserNm}"> <input type="hidden" name="wrtUserNm" th:value="${cia.wrtUserNm}">
<input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"> <input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">관서</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">관서</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select" id="mgtOrgan" name="mgtOrgan"> <select class="form-select" id="mgtOrgan" name="mgtOrgan">
<option value="">선택</option> <option value="">선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="commonCode:${session.commonCode.get('OG')}">
<th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}"> <th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:if="${cia.ciKey eq null}"></option> <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq cia.manageCompanyInfo.mgtOrgan}"></option>
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:unless="${cia.ciKey eq null}" th:selected="${commonCode.itemCd eq cia.manageCompanyInfo.mgtOrgan}"></option>
</th:block> </th:block>
</th:block> </th:block>
</select> </select>
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly> <input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
</div> </div>
</div> </div>
<th:block th:if="${cia.ciKey eq null}"> <th:block th:if="${cia.ciKey eq null}">
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">업체명</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">업체명</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="companyNm" name="companyNm"> <input type="text" class="form-control form-control-sm" id="companyNm" name="companyNm">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">소재지</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">소재지</label>
<div class="col-sm-5"> <div class="col-sm-5">
<input type="text" class="form-control form-control-sm" id="companyLocation" name="companyLocation"> <input type="text" class="form-control form-control-sm" id="companyLocation" name="companyLocation">
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">연락처</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">연락처</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="cellPhone" name="cellPhone"> <input type="text" class="form-control form-control-sm" id="cellPhone" name="cellPhone">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">부서</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">부서</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="department" name="department"> <input type="text" class="form-control form-control-sm" id="department" name="department">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="name" name="name"> <input type="text" class="form-control form-control-sm" id="name" name="name">
</div> </div>
@ -74,38 +73,38 @@
</th:block> </th:block>
<th:block th:unless="${cia.ciKey eq null}"> <th:block th:unless="${cia.ciKey eq null}">
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">업체명</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">업체명</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="companyNm" name="companyNm" th:value="${cia.manageCompanyInfo.companyNm}"> <input type="text" class="form-control form-control-sm" id="companyNm" name="companyNm" th:value="${cia.manageCompanyInfo.companyNm}">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">소재지</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">소재지</label>
<div class="col-sm-5"> <div class="col-sm-5">
<input type="text" class="form-control form-control-sm" id="companyLocation" name="companyLocation" th:value="${cia.manageCompanyInfo.companyLocation}"> <input type="text" class="form-control form-control-sm" id="companyLocation" name="companyLocation" th:value="${cia.manageCompanyInfo.companyLocation}">
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">연락처</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">연락처</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="cellPhone" name="cellPhone" th:value="${cia.manageCompanyInfo.cellPhone}"> <input type="text" class="form-control form-control-sm" id="cellPhone" name="cellPhone" th:value="${cia.manageCompanyInfo.cellPhone}">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">부서</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">부서</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="department" name="department" th:value="${cia.manageCompanyInfo.department}"> <input type="text" class="form-control form-control-sm" id="department" name="department" th:value="${cia.manageCompanyInfo.department}">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" id="name" name="name" th:value="${cia.manageCompanyInfo.name}"> <input type="text" class="form-control form-control-sm" id="name" name="name" th:value="${cia.manageCompanyInfo.name}">
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">관련분야</label> <label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">관련분야</label>
<div class="col-sm-11" id="contentInfoDiv"> <div class="col-sm-11">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="relatedField" th:utext="${cia.manageCompanyInfo.relatedField}"></textarea> <textarea class="form-control form-control-sm" rows="5" cols="30" name="relatedField" th:utext="${cia.manageCompanyInfo.relatedField}"></textarea>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">특이사항</label> <label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">특이사항</label>
<div class="col-sm-11" id="contentInfoDiv"> <div class="col-sm-11">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="description" th:utext="${cia.manageCompanyInfo.description}"></textarea> <textarea class="form-control form-control-sm" rows="5" cols="30" name="description" th:utext="${cia.manageCompanyInfo.description}"></textarea>
</div> </div>
</div> </div>

40
src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html
View File

@ -16,17 +16,17 @@
<div class="tab-content bg-white border border-top-0 p-2"> <div class="tab-content bg-white border border-top-0 p-2">
<div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0"> <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1"> <div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">관서</label> <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">관서</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start"> <label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="commonCode:${session.commonCode.get('OG')}">
<option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.manageCompanyInfo.mgtOrgan}" th:text="${commonCode.itemValue}"></option> <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.manageCompanyInfo.mgtOrgan}" th:text="${commonCode.itemValue}"></option>
</th:block> </th:block>
</label> </label>
<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성자</label> <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start"> <label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('JT')}"> <th:block th:each="commonCode:${session.commonCode.get('JT')}">
<option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option> <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option>
</th:block> </th:block>
</label> </label>
<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성일</label> <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성일</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
@ -78,8 +78,8 @@
<tr class="fileInfoTr"> <tr class="fileInfoTr">
<td> <td>
<a href="#" class="fileDownLink" data-board="ciActivity" <a href="#" class="fileDownLink" data-board="ciActivity"
th:data-parentkey="${file.ciKey}" th:data-fileseq="${file.fileSeq}" th:data-parentkey="${file.ciKey}" th:data-fileseq="${file.fileSeq}"
th:text="|${file.origNm}.${file.fileExtn}|"></a> th:text="|${file.origNm}.${file.fileExtn}|"></a>
</td> </td>
<td th:text="${file.fileSize}"></td> <td th:text="${file.fileSize}"></td>
</tr> </tr>
@ -92,18 +92,14 @@
</div> </div>
</div> </div>
</div> </div>
<th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}">
<div class="modal-footer justify-content-between bg-light"> <div class="modal-footer justify-content-between bg-light">
<div class="col-auto"> <div class="col-auto">
<!-- <!--<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> <button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button>
--> </div>
<th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}"> <div class="col-auto">
<button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button> <button type="button" class="btn btn-warning" id="editBtn" th:data-cikey="${cia.ciKey}">수정</button>
</th:block> </div>
</div>
<div class="col-auto">
<th:block th:if="${viewUserSeq eq cia.wrtUserSeq}">
<button type="button" class="btn btn-warning" id="editBtn" th:data-cikey="${cia.ciKey}">수정</button>
</th:block>
</div>
</div> </div>
</th:block>

22
src/main/resources/templates/counterIntelligence/ciaSaftyDemandEditModal.html
View File

@ -17,27 +17,25 @@
<input type="hidden" name="wrtUserNm" th:value="${cia.wrtUserNm}"> <input type="hidden" name="wrtUserNm" th:value="${cia.wrtUserNm}">
<input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"> <input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" placeholder="작성자자동입력" readonly> <input type="text" class="form-control form-control-sm" placeholder="작성자자동입력" readonly th:value="${cia.wrtUserNm}">
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly> <input type="text" class="form-control form-control-sm" placeholder="작성일자동입력" readonly th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">지역특성</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">지역특성</label>
<div class="col-sm-11" id="contentInfoDiv"> <div class="col-sm-11">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="localInfo" th:if="${cia.ciKey eq null}"></textarea> <textarea class="form-control form-control-sm" rows="5" cols="30" name="localInfo" th:utext="${cia.saftyDemandInfo.localInfo}"></textarea>
<textarea class="form-control form-control-sm" rows="5" cols="30" name="localInfo" th:unless="${cia.ciKey eq null}" th:utext="${cia.saftyDemandInfo.localInfo}"></textarea>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">예상<br>문제점</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">예상<br>문제점</label>
<div class="col-sm-11" id="contentInfoDiv"> <div class="col-sm-11">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="outlookProblem" th:if="${cia.ciKey eq null}"></textarea> <textarea class="form-control form-control-sm" rows="5" cols="30" name="outlookProblem" th:utext="${cia.saftyDemandInfo.outlookProblem}"></textarea>
<textarea class="form-control form-control-sm" rows="5" cols="30" name="outlookProblem" th:unless="${cia.ciKey eq null}" th:utext="${cia.saftyDemandInfo.outlookProblem}"></textarea>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">

36
src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html
View File

@ -22,9 +22,9 @@
<label class="col-sm-3 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label> <label class="col-sm-3 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성자</label> <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성자</label>
<label class="col-sm-5 col-form-label col-form-label-sm text-start"> <label class="col-sm-5 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('JT')}"> <th:block th:each="commonCode:${session.commonCode.get('JT')}">
<option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option> <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option>
</th:block> </th:block>
</label> </label>
</div> </div>
<hr class="my-1"> <hr class="my-1">
@ -59,8 +59,8 @@
<tr class="fileInfoTr"> <tr class="fileInfoTr">
<td> <td>
<a href="#" class="fileDownLink" data-board="ciActivity" <a href="#" class="fileDownLink" data-board="ciActivity"
th:data-parentkey="${file.ciKey}" th:data-fileseq="${file.fileSeq}" th:data-parentkey="${file.ciKey}" th:data-fileseq="${file.fileSeq}"
th:text="|${file.origNm}.${file.fileExtn}|"></a> th:text="|${file.origNm}.${file.fileExtn}|"></a>
</td> </td>
<td th:text="${file.fileSize}"></td> <td th:text="${file.fileSize}"></td>
</tr> </tr>
@ -73,18 +73,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer justify-content-between bg-light"> <th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}">
<div class="col-auto"> <div class="modal-footer justify-content-between bg-light">
<!-- <div class="col-auto">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> <!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> -->
--> <button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button>
<th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}"> </div>
<button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button> <div class="col-auto">
</th:block> <button type="button" class="btn btn-warning" id="editBtn" th:data-cikey="${cia.ciKey}">수정</button>
</div> </div>
<div class="col-auto"> </div>
</div> </th:block>
<th:block th:if="${viewUserSeq eq cia.wrtUserSeq}">
<button type="button" class="btn btn-warning" id="editBtn" th:data-cikey="${cia.ciKey}">수정</button>
</th:block>
</div>