Merge remote-tracking branch 'origin/master'
commit
6283d4b101
|
|
@ -119,7 +119,7 @@ public class StandardCodeController extends BaseController {
|
||||||
tnDocumentInfo.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
|
tnDocumentInfo.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
|
||||||
|
|
||||||
Map<String, Object> resultMap = new HashMap<>();
|
Map<String, Object> resultMap = new HashMap<>();
|
||||||
resultMap.put("resultList", standardCodeService.selectStandardcodlist(tnDocumentInfo.getListCode()));
|
resultMap.put("resultList", standardCodeService.selectStandardcodelist(tnDocumentInfo.getListCode()));
|
||||||
resultMap.put("resultCnt", standardCodeService.selectStandardCodeListCnt(tnDocumentInfo));
|
resultMap.put("resultCnt", standardCodeService.selectStandardCodeListCnt(tnDocumentInfo));
|
||||||
Integer totCnt = (Integer) resultMap.get("resultCnt");
|
Integer totCnt = (Integer) resultMap.get("resultCnt");
|
||||||
paginationInfo.setTotalRecordCount(totCnt);
|
paginationInfo.setTotalRecordCount(totCnt);
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,8 @@ public class TnDocumentInfo {
|
||||||
@Column(name = "old_seq")
|
@Column(name = "old_seq")
|
||||||
private Integer oldSeq;
|
private Integer oldSeq;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "현재페이지")
|
@Schema(description = "현재페이지")
|
||||||
private int pageIndex = 1;
|
private int pageIndex = 1;
|
||||||
@Schema(description = "페이지갯수")
|
@Schema(description = "페이지갯수")
|
||||||
|
|
|
||||||
|
|
@ -16,5 +16,5 @@ public interface StandardCodeMapper {
|
||||||
|
|
||||||
List<TnDocumentInfo> selectStandardCodeRevisionhistoryList(Integer groupseq);
|
List<TnDocumentInfo> selectStandardCodeRevisionhistoryList(Integer groupseq);
|
||||||
|
|
||||||
List<TnDocumentCodeList> selectStandardcodlist(String code);
|
List<TnDocumentCodeList> selectStandardcodelist(String code);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ public class StandardCodeService {
|
||||||
return standardCodeMapper.selectStandardCodeRevisionhistoryList(groupseq);
|
return standardCodeMapper.selectStandardCodeRevisionhistoryList(groupseq);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<TnDocumentCodeList> selectStandardcodlist(String code){
|
public List<TnDocumentCodeList> selectStandardcodelist(String code){
|
||||||
return standardCodeMapper.selectStandardcodlist(code);
|
return standardCodeMapper.selectStandardcodelist(code);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@
|
||||||
and tdi.use_yn = 'Y'
|
and tdi.use_yn = 'Y'
|
||||||
order by tdi.kcsc_cd;
|
order by tdi.kcsc_cd;
|
||||||
</select>
|
</select>
|
||||||
<select id="selectStandardcodlist" resultType="TnDocumentCodeList">
|
<select id="selectStandardcodelist" resultType="TnDocumentCodeList">
|
||||||
select
|
select
|
||||||
case
|
case
|
||||||
when a3.doc_level > 1 then a3.doc_code_name
|
when a3.doc_level > 1 then a3.doc_code_name
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue