Commit @b0d890beef7ae50b41e2f9dc545a35960a0763ca

박정하 07-09

240709 박정하 공무원용 수정

@b0d890beef7ae50b41e2f9dc545a35960a0763ca

d362400

b0d890b

src/main/java/com/takensoft/common/Pagination.java

--- src/main/java/com/takensoft/common/Pagination.java

+++ src/main/java/com/takensoft/common/Pagination.java


     private String cateValue;       // 상세 분류 내용
 
     private String mvnInten;        // 입주의향 (기업정보 전용)
-    private String ivstInten;       // 투자의향 (기업정보 전용)
     private String mouInten;        // MOU의향 (기업정보 전용)
-    private String ivstDscsnInten;  // 상담의향 (기업정보 전용)
 
     private String type;            // 형태 (검토사항 전용)
     private String prgrsCrs;        // 진행단계 (검토사항 전용)

         this.cateId = (String)params.get("cateId");
         this.cateValue = (String)params.get("cateValue");
         this.mvnInten = (String)params.get("mvnInten");
-        this.ivstInten = (String)params.get("ivstInten");
         this.mouInten = (String)params.get("mouInten");
-        this.ivstDscsnInten = (String)params.get("ivstDscsnInten");
         this.type = (String)params.get("type");
         this.prgrsCrs = (String)params.get("prgrsCrs");
         this.mbrId = (String)params.get("mbrId");

d362400

b0d890b

src/main/java/com/takensoft/common/excel/service/ExcelCreateService.java

--- src/main/java/com/takensoft/common/excel/service/ExcelCreateService.java

+++ src/main/java/com/takensoft/common/excel/service/ExcelCreateService.java


     public int createVerticalByEntInfo(ExcelRenderResource resource, List<T> dataList, int rowIndex) throws NoSuchFieldException, IllegalAccessException {
         String isIvstDscsn = null;
         for (String dataFieldName : resource.getDataFieldNames()) {
-            if (dataFieldName!= "isIvstDscsn" && dataFieldName != "mvnInten" && dataFieldName != "ivstInten" && dataFieldName != "mouInten" && dataFieldName != "ivstDscsnInten" && dataFieldName != "rmrk") {
+            if (dataFieldName!= "isIvstDscsn" && dataFieldName != "mvnInten" &&  dataFieldName != "mouInten" &&  dataFieldName != "rmrk") {
                 rowIndex = createTableByEntInfo(resource, rowIndex, dataFieldName);
             }
         }

         rowIndex = createTableByEntInfo(resource, rowIndex, "isIvstDscsn");
         if (isIvstDscsn == "Y") {
             for (String dataFieldName : resource.getDataFieldNames()) {
-                if (dataFieldName == "mvnInten" || dataFieldName == "ivstInten" || dataFieldName == "mouInten" || dataFieldName != "ivstDscsnInten") {
+                if (dataFieldName == "mvnInten" || dataFieldName == "mouInten") {
                     rowIndex = createTableByEntInfo(resource, rowIndex, dataFieldName);
                 }
             }

d362400

b0d890b

src/main/java/com/takensoft/common/excel/service/Impl/ExcelServiceImpl.java

--- src/main/java/com/takensoft/common/excel/service/Impl/ExcelServiceImpl.java

+++ src/main/java/com/takensoft/common/excel/service/Impl/ExcelServiceImpl.java


         rowIndex = mainExcel.createHr(rowIndex); // 구분선
         rowIndex = mainExcel.createCaption(rowIndex, "주요사업장");
         ExcelCreateService<BplcExcelDTO> bplcExcel = new ExcelCreateService(workbook, sheet, bplcList, bplcList.getClass());
-        rowIndex = bplcExcel.createVertical(bplcResource, bplcList, rowIndex);
+        bplcExcel.createVertical(bplcResource, bplcList, rowIndex);
 
         // 엑셀 사이즈 지정
         sheetSize(sheet, 2);

d362400

b0d890b

src/main/java/com/takensoft/portal/entDscsnAply/web/EntDscsnAplyController.java

--- src/main/java/com/takensoft/portal/entDscsnAply/web/EntDscsnAplyController.java

+++ src/main/java/com/takensoft/portal/entDscsnAply/web/EntDscsnAplyController.java


      *
      * 기업상담신청 등록
      */
-    @PostMapping(path = "/company/entDscsnAply/insertProc.file")
+    @PostMapping(path = "/sys/entDscsnAply/insertProc.file")
     public ResponseEntity<?> insertProc(HttpServletRequest request, EntDscsnAplyVO entDscsnAplyVO) throws Exception {
         HashMap<String, Object> result = entDscsnAplyService.entDscsnAplyInsert(request, entDscsnAplyVO);
         int insertResult = (int)result.get("insertResult");

      *
      * 기업상담신청 상세 조회
      */
-    @PostMapping(path = "/government/entDscsnAply/detailProc.json")
+    @PostMapping(path = "/sys/entDscsnAply/detailProc.json")
     public ResponseEntity<?> detailProc(@RequestBody EntDscsnAplyVO entDscsnAplyVO) throws Exception {
         EntDscsnAplyVO result = entDscsnAplyService.entDscsnAplyDetail(entDscsnAplyVO);
 

      *
      * 기업상담신청 수정
      */
-    @PostMapping(path = "/government/entDscsnAply/update.json")
+    @PostMapping(path = "/sys/entDscsnAply/update.json")
     public ResponseEntity<?> entDscsnAplyUpdate(@RequestBody EntDscsnAplyVO entDscsnAplyVO) throws Exception {
         int result = entDscsnAplyService.entDscsnAplyUpdate(entDscsnAplyVO);
 

d362400

b0d890b

src/main/java/com/takensoft/portal/entInfo/dto/EntInfoExcelDTO.java

--- src/main/java/com/takensoft/portal/entInfo/dto/EntInfoExcelDTO.java

+++ src/main/java/com/takensoft/portal/entInfo/dto/EntInfoExcelDTO.java


     private String rprsvNm;
 
     @Column
+    @ExcelColumnName(headerName = "소재지")
+    private String lctn;
+
+    @Column
+    @ExcelColumnName(headerName = "대지면적")
+    private String bplcSiar;
+
+    @Column
+    @ExcelColumnName(headerName = "공장면적")
+    private String fctryArea;
+
+    @Column
     @ExcelColumnName(headerName = "표준산업분류")
     private String ksic;
 

     private String mainPrdct;
 
     @Column
-    @ExcelColumnName(headerName = "폐업여부")
-    private String clsbizYn;
-
-    @Column
     @ExcelColumnName(headerName = "기업신용")
     private String entCrdt;
 
     @Column
     @ExcelColumnName(headerName = "설립일")
     private String fndnDt;
+
+    @Column
+    @ExcelColumnName(headerName = "고용인원수")
+    private String wrkrCnt;
 
     // 세부정보
     @Column

     private String mvnInten;
 
     @Column
-    @ExcelColumnName(headerName = "투자의향")
-    private String ivstInten;
-
-    @Column
     @ExcelColumnName(headerName = "MOU의향")
     private String mouInten;
-
-    @Column
-    @ExcelColumnName(headerName = "투자상담의향")
-    private String ivstDscsnInten;
 
     @Column
     @ExcelColumnName(headerName = "비고")
     private String rmrk;
 
     @Builder
-    public EntInfoExcelDTO(String entNm, String brno, String rprsvNm, String ksic, String mainPrdct, String clsbizYn, String entCrdt, String fndnDt, String isIvstDscsn, String mvnInten, String ivstInten, String mouInten, String ivstDscsnInten, String rmrk) {
+    public EntInfoExcelDTO(String entNm, String brno, String rprsvNm, String lctn, String bplcSiar, String fctryArea, String ksic, String mainPrdct, String entCrdt, String fndnDt, String wrkrCnt, String isIvstDscsn, String mvnInten, String mouInten, String rmrk) {
         this.entNm = entNm;
         this.brno = brno;
         this.rprsvNm = rprsvNm;
+        this.lctn = lctn;
+        this.bplcSiar = bplcSiar;
+        this.fctryArea = fctryArea;
         this.ksic = ksic;
         this.mainPrdct = mainPrdct;
-        this.clsbizYn = clsbizYn;
         this.entCrdt = entCrdt;
         this.fndnDt = fndnDt;
+        this.wrkrCnt = wrkrCnt;
         this.isIvstDscsn = isIvstDscsn;
         this.mvnInten = mvnInten;
-        this.ivstInten = ivstInten;
         this.mouInten = mouInten;
-        this.ivstDscsnInten = ivstDscsnInten;
         this.rmrk = rmrk;
     }
 }

d362400

b0d890b

src/main/java/com/takensoft/portal/entInfo/service/Impl/EntInfoServiceImpl.java

--- src/main/java/com/takensoft/portal/entInfo/service/Impl/EntInfoServiceImpl.java

+++ src/main/java/com/takensoft/portal/entInfo/service/Impl/EntInfoServiceImpl.java


         }
         // entInfoId가 없는 경우
         else {
-            newEntInfoVO.setClsbizYn("N"); // 폐업여부
             newEntInfoVO.setUseYn("Y"); // 사용유무
             newEntInfoVO.setIsBrnoChange(false); // 사업자번호 변경 여부
         }

 
         // 면적 단위
         List<CodeManageVO> bplcCodeList = codeManageService.findByChildCdCache("areaUnit");
+        List<CodeManageVO> lctnCodeList = codeManageService.findByChildCdCache("admdsp");
 
         HashMap<String, Object> result = new HashMap<>();
         result.put("entInfoVO", newEntInfoVO);
         result.put("bplcCodeList", bplcCodeList);
+        result.put("lctnCodeList", lctnCodeList);
         return result;
     }
 

             entInfoExcelDTO.setEntNm(entInfo.get("ent_nm"));
             entInfoExcelDTO.setBrno(entInfo.get("brno"));
             entInfoExcelDTO.setRprsvNm(entInfo.get("rprsv_nm"));
+            entInfoExcelDTO.setLctn(entInfo.get("lctn"));
+            entInfoExcelDTO.setBplcSiar(entInfo.get("bplc_siar"));
+            entInfoExcelDTO.setFctryArea(entInfo.get("fctry_area"));
             entInfoExcelDTO.setKsic(entInfo.get("ksic"));
             entInfoExcelDTO.setMainPrdct(entInfo.get("main_prdct"));
-            entInfoExcelDTO.setClsbizYn(entInfo.get("clsbiz_yn").equals("Y") ? "폐업" : "정상");
             entInfoExcelDTO.setEntCrdt(entInfo.get("ent_crdt"));
             entInfoExcelDTO.setFndnDt(entInfo.get("fndn_dt"));
+            entInfoExcelDTO.setWrkrCnt(entInfo.get("wrkr_cnt"));
             entInfoExcelDTO.setIsIvstDscsn(entInfo.get("mvn_inten") != null ? "Y" : "N");
             entInfoExcelDTO.setMvnInten(convertInten(entInfo.get("mvn_inten")));
-            entInfoExcelDTO.setIvstInten(convertInten(entInfo.get("ivst_inten")));
             entInfoExcelDTO.setMouInten(convertInten(entInfo.get("mou_inten")));
-            entInfoExcelDTO.setIvstDscsnInten(convertInten(entInfo.get("ivst_dscsn_inten")));
             entInfoExcelDTO.setRmrk(entInfo.get("rmrk"));
 
             entInfoExcelList.add(entInfoExcelDTO);

d362400

b0d890b

src/main/java/com/takensoft/portal/entInfo/vo/EntInfoVO.java

--- src/main/java/com/takensoft/portal/entInfo/vo/EntInfoVO.java

+++ src/main/java/com/takensoft/portal/entInfo/vo/EntInfoVO.java


     private String brno;
     // 대표자명
     private String rprsvNm;
-    // 표준사업분류
-    private String ksicNm;
+    // 소재지 (행정구역)
+    private String lctnAdmdsp = "";
+    // 소재지 (시군구)
+    private String lctnSsg;
+    // 대지면적
+    private int bplcSiar;
+    // 대지면적 단위
+    private String bplcSiarUnit = "";
+    // 공장면적
+    private int fctryArea;
+    // 공장면적 단위
+    private String fctryAreaUnit = "";
     // 표준사업분류코드 상위 분류
     private String ksicUpCd;
     // 표준사업분류코드 하위 분류
     private String ksicCd;
+    // 표준사업분류
+    private String ksicNm;
     // 주요제품
     private String mainPrdct;
+    // 기업신용
+    private String entCrdt;
+    // 설립일
+    private String fndnDt;
+    // 고용인원수
+    private int wrkrCnt;
+
     // 비고
     private String rmrk;
-    // 폐업여부
-    private String clsbizYn;
+    // 파일매니저아이디
+    private String fileMngId;
+    // 첨부파일 목록
+    private List<HashMap<String, Object>> fileList = new ArrayList<>();
+    // 첨부파일 삭제 목록
+    private List<HashMap<String, Object>> deleteFileList = new ArrayList<>();
+
     // 사용여부
     private String useYn;
     // 등록자

     private String mdfr;
     // 수정일
     private String mdfcnDt;
-    // 기업신용
-    private String entCrdt;
-    // 설립일
-    private String fndnDt;
 
     // 사업자번호변경여부
     private Boolean isBrnoChange = false;

 
     // 입주의향 (목록 조회시 사용)
     private String mvnInten;
-    // 투자의향 (목록 조회시 사용)
-    private String ivstInten;
     // MOU의향 (목록 조회시 사용)
     private String mouInten;
-    // 상담의향 (목록 조회시 사용)
-    private String ivstDscsnInten;
-
-    // 파일매니저아이디
-    private String fileMngId;
-    // 첨부파일 목록
-    private List<HashMap<String, Object>> fileList = new ArrayList<>();
-    // 첨부파일 삭제 목록
-    private List<HashMap<String, Object>> deleteFileList = new ArrayList<>();
 }

d362400

b0d890b

src/main/java/com/takensoft/portal/ivstDscsn/dto/IvstDscsnExcelDTO.java

--- src/main/java/com/takensoft/portal/ivstDscsn/dto/IvstDscsnExcelDTO.java

+++ src/main/java/com/takensoft/portal/ivstDscsn/dto/IvstDscsnExcelDTO.java


     private String mvnInten;
 
     @Column
-    @ExcelColumnName(headerName = "투자의향")
-    private String ivstInten;
-
-    @Column
     @ExcelColumnName(headerName = "MOU의향")
     private String mouInten;
 
-    @Column
-    @ExcelColumnName(headerName = "투자상담의향")
-    private String ivstDscsnInten;
-
     @Builder
-    public IvstDscsnExcelDTO(String ttl, String dt, String plc, String entNm, String prtpnt, String dscsnPbofc, String mainCn, String mvnInten, String ivstInten, String mouInten, String ivstDscsnInten) {
+    public IvstDscsnExcelDTO(String ttl, String dt, String plc, String entNm, String prtpnt, String dscsnPbofc, String mainCn, String mvnInten, String mouInten) {
         this.ttl = ttl;
         this.dt = dt;
         this.plc = plc;

         this.dscsnPbofc = dscsnPbofc;
         this.mainCn = mainCn;
         this.mvnInten = mvnInten;
-        this.ivstInten = ivstInten;
         this.mouInten = mouInten;
-        this.ivstDscsnInten = ivstDscsnInten;
     }
 }

d362400

b0d890b

src/main/java/com/takensoft/portal/ivstDscsn/vo/IvstDscsnVO.java

--- src/main/java/com/takensoft/portal/ivstDscsn/vo/IvstDscsnVO.java

+++ src/main/java/com/takensoft/portal/ivstDscsn/vo/IvstDscsnVO.java


     private String fileMngId;
     // 입주의향
     private String mvnInten = "0";
-    // 투자의향
-    private String ivstInten = "0";
     // MOU의향
     private String mouInten = "0";
-    // 투자상담의향
-    private String ivstDscsnInten = "0";
     // 사용여부
     private String useYn;
     // 등록자

d362400

b0d890b

src/main/resources/mybatis/mapper/entInfo/entInfo-SQL.xml

--- src/main/resources/mybatis/mapper/entInfo/entInfo-SQL.xml

+++ src/main/resources/mybatis/mapper/entInfo/entInfo-SQL.xml


         <result property="entNm" column="ent_nm" />
         <result property="brno" column="brno" />
         <result property="rprsvNm" column="rprsv_nm" />
-        <result property="ksicNm" column="ksic_nm" />
-        <result property="ksicCd" column="ksic_cd" />
+        <result property="lctnAdmdsp" column="lctn_admdsp" />
+        <result property="lctnSsg" column="lctn_ssg" />
+        <result property="bplcSiar" column="bplc_siar" />
+        <result property="bplcSiarUnit" column="bplc_siar_unit" />
+        <result property="fctryArea" column="fctry_area" />
+        <result property="fctryAreaUnit" column="fctry_area_unit" />
         <result property="ksicUpCd" column="ksic_up_cd" />
+        <result property="ksicCd" column="ksic_cd" />
+        <result property="ksicNm" column="ksic_nm" />
         <result property="mainPrdct" column="main_prdct" />
+        <result property="entCrdt" column="ent_crdt" />
+        <result property="fndnDt" column="fndn_dt" />
+        <result property="wrkrCnt" column="wrkr_cnt" />
         <result property="rmrk" column="rmrk" />
-        <result property="clsbizYn" column="clsbiz_yn" />
         <result property="useYn" column="use_yn" />
         <result property="rgtr" column="rgtr" />
         <result property="regDt" column="reg_dt" />
         <result property="mdfr" column="mdfr" />
         <result property="mdfcnDt" column="mdfcn_dt" />
         <result property="mvnInten" column="mvn_inten" />
-        <result property="ivstInten" column="ivst_inten" />
         <result property="mouInten" column="mou_inten" />
-        <result property="ivstDscsnInten" column="ivst_dscsn_inten" />
-        <result property="entCrdt" column="ent_crdt" />
-        <result property="fndnDt" column="fndn_dt" />
         <result property="fileMngId" column="file_mng_id" />
         <collection property="bplcList" column="{entId = ent_id}" javaType="java.util.ArrayList" ofType="BplcVO" select="selectBplcList" />
     </resultMap>

             , ent_nm
             , brno
             , rprsv_nm
-            , ksic_nm
-            , ksic_cd
+            , lctn_admdsp
+            , lctn_ssg
+            , bplc_siar
+            , bplc_siar_unit
+            , fctry_area
+            , fctry_area_unit
             , ksic_up_cd
+            , ksic_cd
+            , ksic_nm
             , main_prdct
+            , ent_crdt
+            , fndn_dt
+            , wrkr_cnt
             , rmrk
-            , clsbiz_yn
+            , file_mng_id
             , use_yn
             , rgtr
             , reg_dt
-            , ent_crdt
-            , fndn_dt
-            , file_mng_id
         ) VALUES (
             #{entId}
             , #{entNm}
             , #{brno}
             , #{rprsvNm}
-            , #{ksicNm}
-            , #{ksicCd}
+            , #{lctnAdmdsp}
+            , #{lctnSsg}
+            , #{bplcSiar}
+            , #{bplcSiarUnit}
+            , #{fctryArea}
+            , #{fctryAreaUnit}
             , #{ksicUpCd}
+            , #{ksicCd}
+            , #{ksicNm}
             , #{mainPrdct}
+            , #{entCrdt}
+            , #{fndnDt}::timestamp
+            , #{wrkrCnt}
             , #{rmrk}
-            , #{clsbizYn}
+            , #{fileMngId}
             , 'Y'
             , #{rgtr}
             , now()
-            , #{entCrdt}
-            , #{fndnDt}::timestamp
-            , #{fileMngId}
         )
     </insert>
 

              , ei.ent_nm
              , ei.brno
              , ei.rprsv_nm
-             , ei.ksic_nm
-             , ei.ksic_cd
+             , ei.lctn_admdsp
+             , ei.lctn_ssg
+             , ei.bplc_siar
+             , ei.bplc_siar_unit
+             , ei.fctry_area
+             , ei.fctry_area_unit
              , ei.ksic_up_cd
+             , ei.ksic_cd
+             , ei.ksic_nm
              , ei.main_prdct
+             , ei.ent_crdt
+             , to_char(ei.fndn_dt, 'YYYY-MM-DD') AS fndn_dt
+             , ei.wrkr_cnt
              , ei.rmrk
-             , ei.clsbiz_yn
+             , ei.file_mng_id
              , ei.use_yn
              , ei.rgtr
              , to_char(ei.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
              , ei.mdfr
              , to_char(ei.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
-             , ei.ent_crdt
-             , to_char(ei.fndn_dt, 'YYYY-MM-DD') AS fndn_dt
              , (SELECT mvn_inten <include refid="searchIvstDscsn" />) AS mvn_inten
-             , (SELECT ivst_inten <include refid="searchIvstDscsn" />) AS ivst_inten
              , (SELECT mou_inten <include refid="searchIvstDscsn" />) AS mou_inten
-             , (SELECT ivst_dscsn_inten <include refid="searchIvstDscsn" />) AS ivst_dscsn_inten
-             , ei.file_mng_id
           FROM ent_info AS ei
     </sql>
 

                     <if test="searchType == 'rprsv_nm'">
                         AND rprsv_nm LIKE '%' || #{searchText} || '%'
                     </if>
+                    <if test="searchType == 'brno'">
+                        AND brno LIKE '%' || #{searchText} || '%'
+                    </if>
                 </when>
                 <otherwise>
-                    AND (
-                        ent_nm LIKE '%' || #{searchText} || '%'
-                    OR
-                        rprsv_nm LIKE '%' || #{searchText} || '%'
-                    )
+                    AND ( ent_nm LIKE '%' || #{searchText} || '%'
+                       OR rprsv_nm LIKE '%' || #{searchText} || '%'
+                       OR brno LIKE '%' || #{searchText} || '%')
                 </otherwise>
             </choose>
         </if>

         <if test="mvnInten != null and mvnInten != ''">
             AND mvn_inten = #{mvnInten}
         </if>
-        <if test="ivstInten != null and ivstInten != ''">
-            AND ivst_inten = #{ivstInten}
-        </if>
         <if test="mouInten != null and mouInten != ''">
             AND mou_inten = #{mouInten}
-        </if>
-        <if test="ivstDscsnInten != null and ivstDscsnInten != ''">
-            AND ivst_dscsn_inten = #{ivstDscsnInten}
         </if>
     </sql>
 

        LIMIT 1
     </sql>
 
-    <sql id="searchList">
-        SELECT ent_id
-             , ent_nm
-             , brno
-             , rprsv_nm
-             , ksic_nm
-             , ksic_cd
-             , ksic_up_cd
-             , main_prdct
-             , rmrk
-             , clsbiz_yn
-             , use_yn
-             , rgtr
-             , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
-             , mdfr
-             , to_char(mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
-             , ent_crdt
-             , to_char(fndn_dt, 'YYYY-MM-DD') AS fndn_dt
-             , mvn_inten
-             , ivst_inten
-             , mou_inten
-             , ivst_dscsn_inten
-    </sql>
     <sql id="selectListInner">
         SELECT ei.ent_id
              , ei.ent_nm
              , ei.brno
              , ei.rprsv_nm
-             , ei.ksic_nm
-             , ei.ksic_cd
+             , ei.lctn_admdsp
+             , ei.lctn_ssg
+             , ei.bplc_siar
+             , ei.bplc_siar_unit
+             , ei.fctry_area
+             , ei.fctry_area_unit
              , ei.ksic_up_cd
+             , ei.ksic_cd
+             , ei.ksic_nm
              , ei.main_prdct
+             , ei.ent_crdt
+             , ei.fndn_dt
+             , ei.wrkr_cnt
              , ei.rmrk
-             , ei.clsbiz_yn
+             , ei.file_mng_id
              , ei.use_yn
              , ei.rgtr
              , ei.reg_dt
              , ei.mdfr
              , ei.mdfcn_dt
-             , ei.ent_crdt
-             , ei.fndn_dt
              , (SELECT mvn_inten <include refid="searchIvstDscsn" />) AS mvn_inten
-             , (SELECT ivst_inten <include refid="searchIvstDscsn" />) AS ivst_inten
              , (SELECT mou_inten <include refid="searchIvstDscsn" />) AS mou_inten
-             , (SELECT ivst_dscsn_inten <include refid="searchIvstDscsn" />) AS ivst_dscsn_inten
           FROM ent_info AS ei
          WHERE ei.use_yn = 'Y'
     </sql>

     내　　　용 : 기업정보 목록 조회
     -->
     <select id="entInfoSelectList" parameterType="HashMap" resultMap="entInfoMap">
-        <include refid="searchList" />
+        SELECT ent_id
+             , ent_nm
+             , brno
+             , rprsv_nm
+             , lctn_admdsp
+             , lctn_ssg
+             , bplc_siar
+             , bplc_siar_unit
+             , fctry_area
+             , fctry_area_unit
+             , ksic_up_cd
+             , ksic_cd
+             , ksic_nm
+             , main_prdct
+             , ent_crdt
+             , to_char(fndn_dt, 'YYYY-MM-DD') AS fndn_dt
+             , wrkr_cnt
+             , rmrk
+             , file_mng_id
+             , use_yn
+             , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
+             , mdfr
+             , to_char(mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
+             , mvn_inten
+             , mou_inten
         FROM (
             <include refid="selectListInner" />
             <include refid="selectRequirement" />

         FROM (
             SELECT ent_id
                  , (SELECT mvn_inten <include refid="searchIvstDscsn" />)
-                 , (SELECT ivst_inten <include refid="searchIvstDscsn" />)
                  , (SELECT mou_inten <include refid="searchIvstDscsn" />)
-                 , (SELECT ivst_dscsn_inten <include refid="searchIvstDscsn" />)
               FROM ent_info AS ei
              WHERE ei.use_yn = 'Y'
             <include refid="selectRequirement" />

            SET ent_nm = #{entNm}
              , brno = #{brno}
              , rprsv_nm = #{rprsvNm}
-             , ksic_nm = #{ksicNm}
-             , ksic_cd = #{ksicCd}
+             , lctn_admdsp = #{lctnAdmdsp}
+             , lctn_ssg = #{lctnSsg}
+             , bplc_siar = #{bplcSiar}
+             , bplc_siar_unit = #{bplcSiarUnit}
+             , fctry_area = #{fctryArea}
+             , fctry_area_unit = #{fctryAreaUnit}
              , ksic_up_cd = #{ksicUpCd}
+             , ksic_cd = #{ksicCd}
+             , ksic_nm = #{ksicNm}
              , main_prdct = #{mainPrdct}
-             , rmrk = #{rmrk}
-             , clsbiz_yn = #{clsbizYn}
-             , mdfr = #{mdfr}
-             , mdfcn_dt = now()
              , ent_crdt = #{entCrdt}
              , fndn_dt = #{fndnDt}::timestamp
+             , wrkr_cnt = #{wrkrCnt}
+             , rmrk = #{rmrk}
              , file_mng_id = #{fileMngId}
+             , mdfr = #{mdfr}
+             , mdfcn_dt = now()
          WHERE ent_id = #{entId}
     </update>
 

         SELECT ent_nm
              , brno
              , rprsv_nm
+             , (SELECT cd_nm FROM cd_mng WHERE cd = lctn_admdsp) || ' ' || lctn_ssg AS lctn
+             , bplc_siar || (SELECT cd_nm FROM cd_mng WHERE cd = bplc_siar_unit) AS bplc_siar
+             , fctry_area || (SELECT cd_nm FROM cd_mng WHERE cd = fctry_area_unit) AS fctry_area
              , '(' || ksic_up_cd || ksic_cd || ') ' || ksic_nm AS ksic
              , main_prdct
-             , clsbiz_yn
              , ent_crdt
              , to_char(fndn_dt, 'YYYY-MM-DD') AS fndn_dt
+             , wrkr_cnt || '' AS wrkr_cnt
              , mvn_inten
-             , ivst_inten
              , mou_inten
-             , ivst_dscsn_inten
              , rmrk
         FROM (<include refid="selectListInner" />) AS datas
         WHERE TRUE
         <if test="mvnInten != null and mvnInten != ''">
             AND mvn_inten = #{mvnInten}
         </if>
-        <if test="ivstInten != null and ivstInten != ''">
-            AND ivst_inten = #{ivstInten}
-        </if>
         <if test="mouInten != null and mouInten != ''">
             AND mou_inten = #{mouInten}
-        </if>
-        <if test="ivstDscsnInten != null and ivstDscsnInten != ''">
-            AND ivst_dscsn_inten = #{ivstDscsnInten}
         </if>
         <if test="ksicUpCd != null and ksicUpCd != ''">
             AND ksic_up_cd = #{ksicUpCd}

d362400

b0d890b

src/main/resources/mybatis/mapper/invtDscsn/invtDscsn-SQL.xml

--- src/main/resources/mybatis/mapper/invtDscsn/invtDscsn-SQL.xml

+++ src/main/resources/mybatis/mapper/invtDscsn/invtDscsn-SQL.xml


         <result property="mainCn" column="main_cn" />
         <result property="fileMngId" column="file_mng_id" />
         <result property="mvnInten" column="mvn_inten" />
-        <result property="ivstInten" column="ivst_inten" />
         <result property="mouInten" column="mou_inten" />
-        <result property="ivstDscsnInten" column="ivst_dscsn_inten" />
         <result property="useYn" column="use_yn" />
         <result property="rgtr" column="rgtr" />
         <result property="regDt" column="reg_dt" />

             , main_cn
             , file_mng_id
             , mvn_inten
-            , ivst_inten
             , mou_inten
-            , ivst_dscsn_inten
             , use_yn
             , rgtr
             , reg_dt

             , #{mainCn}
             , #{fileMngId}
             , #{mvnInten}
-            , #{ivstInten}
             , #{mouInten}
-            , #{ivstDscsnInten}
             , 'Y'
             , #{rgtr}
             , now()

              , id.main_cn
              , id.file_mng_id
              , id.mvn_inten
-             , id.ivst_inten
              , id.mou_inten
-             , id.ivst_dscsn_inten
              , id.use_yn
              , id.rgtr
              , to_char(id.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt

         <if test="mvnInten != null and mvnInten != ''">
             AND id.mvn_inten = #{mvnInten}
         </if>
-        <if test="ivstInten != null and ivstInten != ''">
-            AND id.ivst_inten = #{ivstInten}
-        </if>
         <if test="mouInten != null and mouInten != ''">
             AND id.mou_inten = #{mouInten}
-        </if>
-        <if test="ivstDscsnInten != null and ivstDscsnInten != ''">
-            AND id.ivst_dscsn_inten = #{ivstDscsnInten}
         </if>
     </sql>
 

              , id.main_cn
              , id.file_mng_id
              , id.mvn_inten
-             , id.ivst_inten
              , id.mou_inten
-             , id.ivst_dscsn_inten
              , id.use_yn
              , id.rgtr
              , to_char(id.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt

             , main_cn = #{mainCn}
             , file_mng_id = #{fileMngId}
             , mvn_inten = #{mvnInten}
-            , ivst_inten = #{ivstInten}
             , mou_inten = #{mouInten}
-            , ivst_dscsn_inten = #{ivstDscsnInten}
             , use_yn = #{useYn}
             , mdfr = #{mdfr}
             , mdfcn_dt = now()

              , main_cn
              , file_mng_id
              , mvn_inten
-             , ivst_inten
              , mou_inten
-             , ivst_dscsn_inten
              , use_yn
              , rgtr
              , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt

d362400

b0d890b

src/main/resources/mybatis/mapper/statistics/statistics-SQL.xml

--- src/main/resources/mybatis/mapper/statistics/statistics-SQL.xml

+++ src/main/resources/mybatis/mapper/statistics/statistics-SQL.xml


              , ent_cnt
              , id_cnt
              , mvn.mvn_cnt
-             , ivst.ivst_cnt
              , mou.mou_cnt
-             , dscsn.dscsn_cnt
         FROM (
             SELECT ksic_up_cd
                  , ksic_cd

         LEFT JOIN (SELECT COUNT(ivst_dscsn_id) AS mvn_cnt <include refid="intenMid" /> AND mvn_inten = '1' <include refid="intenBot" />) AS mvn
         ON datas.ksic_up_cd = mvn.ksic_up_cd
         AND datas.ksic_cd = mvn.ksic_cd
-        LEFT JOIN (SELECT COUNT(ivst_dscsn_id) AS ivst_cnt <include refid="intenMid" /> AND ivst_inten = '1' <include refid="intenBot" />) AS ivst
-        ON datas.ksic_up_cd = ivst.ksic_up_cd
-        AND datas.ksic_cd = ivst.ksic_cd
         LEFT JOIN (SELECT COUNT(ivst_dscsn_id) AS mou_cnt <include refid="intenMid" /> AND mou_inten = '1' <include refid="intenBot" />) AS mou
         ON datas.ksic_up_cd = mou.ksic_up_cd
         AND datas.ksic_cd = mou.ksic_cd
-        LEFT JOIN ( SELECT COUNT(ivst_dscsn_id) AS dscsn_cnt <include refid="intenMid" /> AND ivst_dscsn_inten = '1' <include refid="intenBot" />) AS dscsn
-        ON datas.ksic_up_cd = dscsn.ksic_up_cd
-        AND datas.ksic_cd = dscsn.ksic_cd
         ORDER BY datas.ksic_up_cd, datas.ksic_cd
     </select>
 

Add a comment

Open 0
Closed 0

List

...	...	@@ -231,7 +231,7 @@
231	231	public int createVerticalByEntInfo(ExcelRenderResource resource, List<T> dataList, int rowIndex) throws NoSuchFieldException, IllegalAccessException {
232	232	String isIvstDscsn = null;
233	233	for (String dataFieldName : resource.getDataFieldNames()) {
234		- if (dataFieldName!= "isIvstDscsn" && dataFieldName != "mvnInten" && dataFieldName != "ivstInten" && dataFieldName != "mouInten" && dataFieldName != "ivstDscsnInten" && dataFieldName != "rmrk") {
	234	+ if (dataFieldName!= "isIvstDscsn" && dataFieldName != "mvnInten" && dataFieldName != "mouInten" && dataFieldName != "rmrk") {
235	235	rowIndex = createTableByEntInfo(resource, rowIndex, dataFieldName);
236	236	}
237	237	}
...	...	@@ -247,7 +247,7 @@
247	247	rowIndex = createTableByEntInfo(resource, rowIndex, "isIvstDscsn");
248	248	if (isIvstDscsn == "Y") {
249	249	for (String dataFieldName : resource.getDataFieldNames()) {
250		- if (dataFieldName == "mvnInten" \|\| dataFieldName == "ivstInten" \|\| dataFieldName == "mouInten" \|\| dataFieldName != "ivstDscsnInten") {
	250	+ if (dataFieldName == "mvnInten" \|\| dataFieldName == "mouInten") {
251	251	rowIndex = createTableByEntInfo(resource, rowIndex, dataFieldName);
252	252	}
253	253	}

...	...	@@ -115,7 +115,7 @@
115	115	rowIndex = mainExcel.createHr(rowIndex); // 구분선
116	116	rowIndex = mainExcel.createCaption(rowIndex, "주요사업장");
117	117	ExcelCreateService<BplcExcelDTO> bplcExcel = new ExcelCreateService(workbook, sheet, bplcList, bplcList.getClass());
118		- rowIndex = bplcExcel.createVertical(bplcResource, bplcList, rowIndex);
	118	+ bplcExcel.createVertical(bplcResource, bplcList, rowIndex);
119	119
120	120	// 엑셀 사이즈 지정
121	121	sheetSize(sheet, 2);

...	...	@@ -38,7 +38,7 @@
38	38	*
39	39	* 기업상담신청 등록
40	40	*/
41		- @PostMapping(path = "/company/entDscsnAply/insertProc.file")
	41	+ @PostMapping(path = "/sys/entDscsnAply/insertProc.file")
42	42	public ResponseEntity<?> insertProc(HttpServletRequest request, EntDscsnAplyVO entDscsnAplyVO) throws Exception {
43	43	HashMap<String, Object> result = entDscsnAplyService.entDscsnAplyInsert(request, entDscsnAplyVO);
44	44	int insertResult = (int)result.get("insertResult");
...	...	@@ -96,7 +96,7 @@
96	96	*
97	97	* 기업상담신청 상세 조회
98	98	*/
99		- @PostMapping(path = "/government/entDscsnAply/detailProc.json")
	99	+ @PostMapping(path = "/sys/entDscsnAply/detailProc.json")
100	100	public ResponseEntity<?> detailProc(@RequestBody EntDscsnAplyVO entDscsnAplyVO) throws Exception {
101	101	EntDscsnAplyVO result = entDscsnAplyService.entDscsnAplyDetail(entDscsnAplyVO);
102	102
...	...	@@ -119,7 +119,7 @@
119	119	*
120	120	* 기업상담신청 수정
121	121	*/
122		- @PostMapping(path = "/government/entDscsnAply/update.json")
	122	+ @PostMapping(path = "/sys/entDscsnAply/update.json")
123	123	public ResponseEntity<?> entDscsnAplyUpdate(@RequestBody EntDscsnAplyVO entDscsnAplyVO) throws Exception {
124	124	int result = entDscsnAplyService.entDscsnAplyUpdate(entDscsnAplyVO);
125	125

...	...	@@ -36,6 +36,18 @@
36	36	private String rprsvNm;
37	37
38	38	@Column
	39	+ @ExcelColumnName(headerName = "소재지")
	40	+ private String lctn;
	41	+
	42	+ @Column
	43	+ @ExcelColumnName(headerName = "대지면적")
	44	+ private String bplcSiar;
	45	+
	46	+ @Column
	47	+ @ExcelColumnName(headerName = "공장면적")
	48	+ private String fctryArea;
	49	+
	50	+ @Column
39	51	@ExcelColumnName(headerName = "표준산업분류")
40	52	private String ksic;
41	53
...	...	@@ -44,16 +56,16 @@
44	56	private String mainPrdct;
45	57
46	58	@Column
47		- @ExcelColumnName(headerName = "폐업여부")
48		- private String clsbizYn;
49		-
50		- @Column
51	59	@ExcelColumnName(headerName = "기업신용")
52	60	private String entCrdt;
53	61
54	62	@Column
55	63	@ExcelColumnName(headerName = "설립일")
56	64	private String fndnDt;
	65	+
	66	+ @Column
	67	+ @ExcelColumnName(headerName = "고용인원수")
	68	+ private String wrkrCnt;
57	69
58	70	// 세부정보
59	71	@Column
...	...	@@ -65,36 +77,29 @@
65	77	private String mvnInten;
66	78
67	79	@Column
68		- @ExcelColumnName(headerName = "투자의향")
69		- private String ivstInten;
70		-
71		- @Column
72	80	@ExcelColumnName(headerName = "MOU의향")
73	81	private String mouInten;
74		-
75		- @Column
76		- @ExcelColumnName(headerName = "투자상담의향")
77		- private String ivstDscsnInten;
78	82
79	83	@Column
80	84	@ExcelColumnName(headerName = "비고")
81	85	private String rmrk;
82	86
83	87	@Builder
84		- public EntInfoExcelDTO(String entNm, String brno, String rprsvNm, String ksic, String mainPrdct, String clsbizYn, String entCrdt, String fndnDt, String isIvstDscsn, String mvnInten, String ivstInten, String mouInten, String ivstDscsnInten, String rmrk) {
	88	+ public EntInfoExcelDTO(String entNm, String brno, String rprsvNm, String lctn, String bplcSiar, String fctryArea, String ksic, String mainPrdct, String entCrdt, String fndnDt, String wrkrCnt, String isIvstDscsn, String mvnInten, String mouInten, String rmrk) {
85	89	this.entNm = entNm;
86	90	this.brno = brno;
87	91	this.rprsvNm = rprsvNm;
	92	+ this.lctn = lctn;
	93	+ this.bplcSiar = bplcSiar;
	94	+ this.fctryArea = fctryArea;
88	95	this.ksic = ksic;
89	96	this.mainPrdct = mainPrdct;
90		- this.clsbizYn = clsbizYn;
91	97	this.entCrdt = entCrdt;
92	98	this.fndnDt = fndnDt;
	99	+ this.wrkrCnt = wrkrCnt;
93	100	this.isIvstDscsn = isIvstDscsn;
94	101	this.mvnInten = mvnInten;
95		- this.ivstInten = ivstInten;
96	102	this.mouInten = mouInten;
97		- this.ivstDscsnInten = ivstDscsnInten;
98	103	this.rmrk = rmrk;
99	104	}
100	105	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -147,7 +147,6 @@
147	147	}
148	148	// entInfoId가 없는 경우
149	149	else {
150		- newEntInfoVO.setClsbizYn("N"); // 폐업여부
151	150	newEntInfoVO.setUseYn("Y"); // 사용유무
152	151	newEntInfoVO.setIsBrnoChange(false); // 사업자번호 변경 여부
153	152	}
...	...	@@ -165,10 +164,12 @@
165	164
166	165	// 면적 단위
167	166	List<CodeManageVO> bplcCodeList = codeManageService.findByChildCdCache("areaUnit");
	167	+ List<CodeManageVO> lctnCodeList = codeManageService.findByChildCdCache("admdsp");
168	168
169	169	HashMap<String, Object> result = new HashMap<>();
170	170	result.put("entInfoVO", newEntInfoVO);
171	171	result.put("bplcCodeList", bplcCodeList);
	172	+ result.put("lctnCodeList", lctnCodeList);
172	173	return result;
173	174	}
174	175
...	...	@@ -265,16 +266,17 @@
265	266	entInfoExcelDTO.setEntNm(entInfo.get("ent_nm"));
266	267	entInfoExcelDTO.setBrno(entInfo.get("brno"));
267	268	entInfoExcelDTO.setRprsvNm(entInfo.get("rprsv_nm"));
	269	+ entInfoExcelDTO.setLctn(entInfo.get("lctn"));
	270	+ entInfoExcelDTO.setBplcSiar(entInfo.get("bplc_siar"));
	271	+ entInfoExcelDTO.setFctryArea(entInfo.get("fctry_area"));
268	272	entInfoExcelDTO.setKsic(entInfo.get("ksic"));
269	273	entInfoExcelDTO.setMainPrdct(entInfo.get("main_prdct"));
270		- entInfoExcelDTO.setClsbizYn(entInfo.get("clsbiz_yn").equals("Y") ? "폐업" : "정상");
271	274	entInfoExcelDTO.setEntCrdt(entInfo.get("ent_crdt"));
272	275	entInfoExcelDTO.setFndnDt(entInfo.get("fndn_dt"));
	276	+ entInfoExcelDTO.setWrkrCnt(entInfo.get("wrkr_cnt"));
273	277	entInfoExcelDTO.setIsIvstDscsn(entInfo.get("mvn_inten") != null ? "Y" : "N");
274	278	entInfoExcelDTO.setMvnInten(convertInten(entInfo.get("mvn_inten")));
275		- entInfoExcelDTO.setIvstInten(convertInten(entInfo.get("ivst_inten")));
276	279	entInfoExcelDTO.setMouInten(convertInten(entInfo.get("mou_inten")));
277		- entInfoExcelDTO.setIvstDscsnInten(convertInten(entInfo.get("ivst_dscsn_inten")));
278	280	entInfoExcelDTO.setRmrk(entInfo.get("rmrk"));
279	281
280	282	entInfoExcelList.add(entInfoExcelDTO);

...	...	@@ -33,9 +33,7 @@
33	33	private String cateValue; // 상세 분류 내용
34	34
35	35	private String mvnInten; // 입주의향 (기업정보 전용)
36		- private String ivstInten; // 투자의향 (기업정보 전용)
37	36	private String mouInten; // MOU의향 (기업정보 전용)
38		- private String ivstDscsnInten; // 상담의향 (기업정보 전용)
39	37
40	38	private String type; // 형태 (검토사항 전용)
41	39	private String prgrsCrs; // 진행단계 (검토사항 전용)
...	...	@@ -55,9 +53,7 @@
55	53	this.cateId = (String)params.get("cateId");
56	54	this.cateValue = (String)params.get("cateValue");
57	55	this.mvnInten = (String)params.get("mvnInten");
58		- this.ivstInten = (String)params.get("ivstInten");
59	56	this.mouInten = (String)params.get("mouInten");
60		- this.ivstDscsnInten = (String)params.get("ivstDscsnInten");
61	57	this.type = (String)params.get("type");
62	58	this.prgrsCrs = (String)params.get("prgrsCrs");
63	59	this.mbrId = (String)params.get("mbrId");

...	...	@@ -20,18 +20,42 @@
20	20	private String brno;
21	21	// 대표자명
22	22	private String rprsvNm;
23		- // 표준사업분류
24		- private String ksicNm;
	23	+ // 소재지 (행정구역)
	24	+ private String lctnAdmdsp = "";
	25	+ // 소재지 (시군구)
	26	+ private String lctnSsg;
	27	+ // 대지면적
	28	+ private int bplcSiar;
	29	+ // 대지면적 단위
	30	+ private String bplcSiarUnit = "";
	31	+ // 공장면적
	32	+ private int fctryArea;
	33	+ // 공장면적 단위
	34	+ private String fctryAreaUnit = "";
25	35	// 표준사업분류코드 상위 분류
26	36	private String ksicUpCd;
27	37	// 표준사업분류코드 하위 분류
28	38	private String ksicCd;
	39	+ // 표준사업분류
	40	+ private String ksicNm;
29	41	// 주요제품
30	42	private String mainPrdct;
	43	+ // 기업신용
	44	+ private String entCrdt;
	45	+ // 설립일
	46	+ private String fndnDt;
	47	+ // 고용인원수
	48	+ private int wrkrCnt;
	49	+
31	50	// 비고
32	51	private String rmrk;
33		- // 폐업여부
34		- private String clsbizYn;
	52	+ // 파일매니저아이디
	53	+ private String fileMngId;
	54	+ // 첨부파일 목록
	55	+ private List<HashMap<String, Object>> fileList = new ArrayList<>();
	56	+ // 첨부파일 삭제 목록
	57	+ private List<HashMap<String, Object>> deleteFileList = new ArrayList<>();
	58	+
35	59	// 사용여부
36	60	private String useYn;
37	61	// 등록자
...	...	@@ -42,10 +66,6 @@
42	66	private String mdfr;
43	67	// 수정일
44	68	private String mdfcnDt;
45		- // 기업신용
46		- private String entCrdt;
47		- // 설립일
48		- private String fndnDt;
49	69
50	70	// 사업자번호변경여부
51	71	private Boolean isBrnoChange = false;
...	...	@@ -55,17 +75,6 @@
55	75
56	76	// 입주의향 (목록 조회시 사용)
57	77	private String mvnInten;
58		- // 투자의향 (목록 조회시 사용)
59		- private String ivstInten;
60	78	// MOU의향 (목록 조회시 사용)
61	79	private String mouInten;
62		- // 상담의향 (목록 조회시 사용)
63		- private String ivstDscsnInten;
64		-
65		- // 파일매니저아이디
66		- private String fileMngId;
67		- // 첨부파일 목록
68		- private List<HashMap<String, Object>> fileList = new ArrayList<>();
69		- // 첨부파일 삭제 목록
70		- private List<HashMap<String, Object>> deleteFileList = new ArrayList<>();
71	80	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -49,19 +49,11 @@
49	49	private String mvnInten;
50	50
51	51	@Column
52		- @ExcelColumnName(headerName = "투자의향")
53		- private String ivstInten;
54		-
55		- @Column
56	52	@ExcelColumnName(headerName = "MOU의향")
57	53	private String mouInten;
58	54
59		- @Column
60		- @ExcelColumnName(headerName = "투자상담의향")
61		- private String ivstDscsnInten;
62		-
63	55	@Builder
64		- public IvstDscsnExcelDTO(String ttl, String dt, String plc, String entNm, String prtpnt, String dscsnPbofc, String mainCn, String mvnInten, String ivstInten, String mouInten, String ivstDscsnInten) {
	56	+ public IvstDscsnExcelDTO(String ttl, String dt, String plc, String entNm, String prtpnt, String dscsnPbofc, String mainCn, String mvnInten, String mouInten) {
65	57	this.ttl = ttl;
66	58	this.dt = dt;
67	59	this.plc = plc;
...	...	@@ -70,8 +62,6 @@
70	62	this.dscsnPbofc = dscsnPbofc;
71	63	this.mainCn = mainCn;
72	64	this.mvnInten = mvnInten;
73		- this.ivstInten = ivstInten;
74	65	this.mouInten = mouInten;
75		- this.ivstDscsnInten = ivstDscsnInten;
76	66	}
77	67	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -34,12 +34,8 @@
34	34	private String fileMngId;
35	35	// 입주의향
36	36	private String mvnInten = "0";
37		- // 투자의향
38		- private String ivstInten = "0";
39	37	// MOU의향
40	38	private String mouInten = "0";
41		- // 투자상담의향
42		- private String ivstDscsnInten = "0";
43	39	// 사용여부
44	40	private String useYn;
45	41	// 등록자

...	...	@@ -7,23 +7,27 @@
7	7	<result property="entNm" column="ent_nm" />
8	8	<result property="brno" column="brno" />
9	9	<result property="rprsvNm" column="rprsv_nm" />
10		- <result property="ksicNm" column="ksic_nm" />
11		- <result property="ksicCd" column="ksic_cd" />
	10	+ <result property="lctnAdmdsp" column="lctn_admdsp" />
	11	+ <result property="lctnSsg" column="lctn_ssg" />
	12	+ <result property="bplcSiar" column="bplc_siar" />
	13	+ <result property="bplcSiarUnit" column="bplc_siar_unit" />
	14	+ <result property="fctryArea" column="fctry_area" />
	15	+ <result property="fctryAreaUnit" column="fctry_area_unit" />
12	16	<result property="ksicUpCd" column="ksic_up_cd" />
	17	+ <result property="ksicCd" column="ksic_cd" />
	18	+ <result property="ksicNm" column="ksic_nm" />
13	19	<result property="mainPrdct" column="main_prdct" />
	20	+ <result property="entCrdt" column="ent_crdt" />
	21	+ <result property="fndnDt" column="fndn_dt" />
	22	+ <result property="wrkrCnt" column="wrkr_cnt" />
14	23	<result property="rmrk" column="rmrk" />
15		- <result property="clsbizYn" column="clsbiz_yn" />
16	24	<result property="useYn" column="use_yn" />
17	25	<result property="rgtr" column="rgtr" />
18	26	<result property="regDt" column="reg_dt" />
19	27	<result property="mdfr" column="mdfr" />
20	28	<result property="mdfcnDt" column="mdfcn_dt" />
21	29	<result property="mvnInten" column="mvn_inten" />
22		- <result property="ivstInten" column="ivst_inten" />
23	30	<result property="mouInten" column="mou_inten" />
24		- <result property="ivstDscsnInten" column="ivst_dscsn_inten" />
25		- <result property="entCrdt" column="ent_crdt" />
26		- <result property="fndnDt" column="fndn_dt" />
27	31	<result property="fileMngId" column="file_mng_id" />
28	32	<collection property="bplcList" column="{entId = ent_id}" javaType="java.util.ArrayList" ofType="BplcVO" select="selectBplcList" />
29	33	</resultMap>
...	...	@@ -54,35 +58,47 @@
54	58	, ent_nm
55	59	, brno
56	60	, rprsv_nm
57		- , ksic_nm
58		- , ksic_cd
	61	+ , lctn_admdsp
	62	+ , lctn_ssg
	63	+ , bplc_siar
	64	+ , bplc_siar_unit
	65	+ , fctry_area
	66	+ , fctry_area_unit
59	67	, ksic_up_cd
	68	+ , ksic_cd
	69	+ , ksic_nm
60	70	, main_prdct
	71	+ , ent_crdt
	72	+ , fndn_dt
	73	+ , wrkr_cnt
61	74	, rmrk
62		- , clsbiz_yn
	75	+ , file_mng_id
63	76	, use_yn
64	77	, rgtr
65	78	, reg_dt
66		- , ent_crdt
67		- , fndn_dt
68		- , file_mng_id
69	79	) VALUES (
70	80	#{entId}
71	81	, #{entNm}
72	82	, #{brno}
73	83	, #{rprsvNm}
74		- , #{ksicNm}
75		- , #{ksicCd}
	84	+ , #{lctnAdmdsp}
	85	+ , #{lctnSsg}
	86	+ , #{bplcSiar}
	87	+ , #{bplcSiarUnit}
	88	+ , #{fctryArea}
	89	+ , #{fctryAreaUnit}
76	90	, #{ksicUpCd}
	91	+ , #{ksicCd}
	92	+ , #{ksicNm}
77	93	, #{mainPrdct}
	94	+ , #{entCrdt}
	95	+ , #{fndnDt}::timestamp
	96	+ , #{wrkrCnt}
78	97	, #{rmrk}
79		- , #{clsbizYn}
	98	+ , #{fileMngId}
80	99	, 'Y'
81	100	, #{rgtr}
82	101	, now()
83		- , #{entCrdt}
84		- , #{fndnDt}::timestamp
85		- , #{fileMngId}
86	102	)
87	103	</insert>
88	104
...	...	@@ -104,24 +120,28 @@
104	120	, ei.ent_nm
105	121	, ei.brno
106	122	, ei.rprsv_nm
107		- , ei.ksic_nm
108		- , ei.ksic_cd
	123	+ , ei.lctn_admdsp
	124	+ , ei.lctn_ssg
	125	+ , ei.bplc_siar
	126	+ , ei.bplc_siar_unit
	127	+ , ei.fctry_area
	128	+ , ei.fctry_area_unit
109	129	, ei.ksic_up_cd
	130	+ , ei.ksic_cd
	131	+ , ei.ksic_nm
110	132	, ei.main_prdct
	133	+ , ei.ent_crdt
	134	+ , to_char(ei.fndn_dt, 'YYYY-MM-DD') AS fndn_dt
	135	+ , ei.wrkr_cnt
111	136	, ei.rmrk
112		- , ei.clsbiz_yn
	137	+ , ei.file_mng_id
113	138	, ei.use_yn
114	139	, ei.rgtr
115	140	, to_char(ei.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
116	141	, ei.mdfr
117	142	, to_char(ei.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
118		- , ei.ent_crdt
119		- , to_char(ei.fndn_dt, 'YYYY-MM-DD') AS fndn_dt
120	143	, (SELECT mvn_inten <include refid="searchIvstDscsn" />) AS mvn_inten
121		- , (SELECT ivst_inten <include refid="searchIvstDscsn" />) AS ivst_inten
122	144	, (SELECT mou_inten <include refid="searchIvstDscsn" />) AS mou_inten
123		- , (SELECT ivst_dscsn_inten <include refid="searchIvstDscsn" />) AS ivst_dscsn_inten
124		- , ei.file_mng_id
125	145	FROM ent_info AS ei
126	146	</sql>
127	147
...	...	@@ -135,13 +155,14 @@
135	155	<if test="searchType == 'rprsv_nm'">
136	156	AND rprsv_nm LIKE '%' \|\| #{searchText} \|\| '%'
137	157	</if>
	158	+ <if test="searchType == 'brno'">
	159	+ AND brno LIKE '%' \|\| #{searchText} \|\| '%'
	160	+ </if>
138	161	</when>
139	162	<otherwise>
140		- AND (
141		- ent_nm LIKE '%' \|\| #{searchText} \|\| '%'
142		- OR
143		- rprsv_nm LIKE '%' \|\| #{searchText} \|\| '%'
144		- )
	163	+ AND ( ent_nm LIKE '%' \|\| #{searchText} \|\| '%'
	164	+ OR rprsv_nm LIKE '%' \|\| #{searchText} \|\| '%'
	165	+ OR brno LIKE '%' \|\| #{searchText} \|\| '%')
145	166	</otherwise>
146	167	</choose>
147	168	</if>
...	...	@@ -150,14 +171,8 @@
150	171	<if test="mvnInten != null and mvnInten != ''">
151	172	AND mvn_inten = #{mvnInten}
152	173	</if>
153		- <if test="ivstInten != null and ivstInten != ''">
154		- AND ivst_inten = #{ivstInten}
155		- </if>
156	174	<if test="mouInten != null and mouInten != ''">
157	175	AND mou_inten = #{mouInten}
158		- </if>
159		- <if test="ivstDscsnInten != null and ivstDscsnInten != ''">
160		- AND ivst_dscsn_inten = #{ivstDscsnInten}
161	176	</if>
162	177	</sql>
163	178
...	...	@@ -169,51 +184,33 @@
169	184	LIMIT 1
170	185	</sql>
171	186
172		- <sql id="searchList">
173		- SELECT ent_id
174		- , ent_nm
175		- , brno
176		- , rprsv_nm
177		- , ksic_nm
178		- , ksic_cd
179		- , ksic_up_cd
180		- , main_prdct
181		- , rmrk
182		- , clsbiz_yn
183		- , use_yn
184		- , rgtr
185		- , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
186		- , mdfr
187		- , to_char(mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
188		- , ent_crdt
189		- , to_char(fndn_dt, 'YYYY-MM-DD') AS fndn_dt
190		- , mvn_inten
191		- , ivst_inten
192		- , mou_inten
193		- , ivst_dscsn_inten
194		- </sql>
195	187	<sql id="selectListInner">
196	188	SELECT ei.ent_id
197	189	, ei.ent_nm
198	190	, ei.brno
199	191	, ei.rprsv_nm
200		- , ei.ksic_nm
201		- , ei.ksic_cd
	192	+ , ei.lctn_admdsp
	193	+ , ei.lctn_ssg
	194	+ , ei.bplc_siar
	195	+ , ei.bplc_siar_unit
	196	+ , ei.fctry_area
	197	+ , ei.fctry_area_unit
202	198	, ei.ksic_up_cd
	199	+ , ei.ksic_cd
	200	+ , ei.ksic_nm
203	201	, ei.main_prdct
	202	+ , ei.ent_crdt
	203	+ , ei.fndn_dt
	204	+ , ei.wrkr_cnt
204	205	, ei.rmrk
205		- , ei.clsbiz_yn
	206	+ , ei.file_mng_id
206	207	, ei.use_yn
207	208	, ei.rgtr
208	209	, ei.reg_dt
209	210	, ei.mdfr
210	211	, ei.mdfcn_dt
211		- , ei.ent_crdt
212		- , ei.fndn_dt
213	212	, (SELECT mvn_inten <include refid="searchIvstDscsn" />) AS mvn_inten
214		- , (SELECT ivst_inten <include refid="searchIvstDscsn" />) AS ivst_inten
215	213	, (SELECT mou_inten <include refid="searchIvstDscsn" />) AS mou_inten
216		- , (SELECT ivst_dscsn_inten <include refid="searchIvstDscsn" />) AS ivst_dscsn_inten
217	214	FROM ent_info AS ei
218	215	WHERE ei.use_yn = 'Y'
219	216	</sql>
...	...	@@ -224,7 +221,31 @@
224	221	내　　　용 : 기업정보 목록 조회
225	222	-->
226	223	<select id="entInfoSelectList" parameterType="HashMap" resultMap="entInfoMap">
227		- <include refid="searchList" />
	224	+ SELECT ent_id
	225	+ , ent_nm
	226	+ , brno
	227	+ , rprsv_nm
	228	+ , lctn_admdsp
	229	+ , lctn_ssg
	230	+ , bplc_siar
	231	+ , bplc_siar_unit
	232	+ , fctry_area
	233	+ , fctry_area_unit
	234	+ , ksic_up_cd
	235	+ , ksic_cd
	236	+ , ksic_nm
	237	+ , main_prdct
	238	+ , ent_crdt
	239	+ , to_char(fndn_dt, 'YYYY-MM-DD') AS fndn_dt
	240	+ , wrkr_cnt
	241	+ , rmrk
	242	+ , file_mng_id
	243	+ , use_yn
	244	+ , to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
	245	+ , mdfr
	246	+ , to_char(mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
	247	+ , mvn_inten
	248	+ , mou_inten
228	249	FROM (
229	250	<include refid="selectListInner" />
230	251	<include refid="selectRequirement" />
...	...	@@ -245,9 +266,7 @@
245	266	FROM (
246	267	SELECT ent_id
247	268	, (SELECT mvn_inten <include refid="searchIvstDscsn" />)
248		- , (SELECT ivst_inten <include refid="searchIvstDscsn" />)
249	269	, (SELECT mou_inten <include refid="searchIvstDscsn" />)
250		- , (SELECT ivst_dscsn_inten <include refid="searchIvstDscsn" />)
251	270	FROM ent_info AS ei
252	271	WHERE ei.use_yn = 'Y'
253	272	<include refid="selectRequirement" />
...	...	@@ -304,17 +323,23 @@
304	323	SET ent_nm = #{entNm}
305	324	, brno = #{brno}
306	325	, rprsv_nm = #{rprsvNm}
307		- , ksic_nm = #{ksicNm}
308		- , ksic_cd = #{ksicCd}
	326	+ , lctn_admdsp = #{lctnAdmdsp}
	327	+ , lctn_ssg = #{lctnSsg}
	328	+ , bplc_siar = #{bplcSiar}
	329	+ , bplc_siar_unit = #{bplcSiarUnit}
	330	+ , fctry_area = #{fctryArea}
	331	+ , fctry_area_unit = #{fctryAreaUnit}
309	332	, ksic_up_cd = #{ksicUpCd}
	333	+ , ksic_cd = #{ksicCd}
	334	+ , ksic_nm = #{ksicNm}
310	335	, main_prdct = #{mainPrdct}
311		- , rmrk = #{rmrk}
312		- , clsbiz_yn = #{clsbizYn}
313		- , mdfr = #{mdfr}
314		- , mdfcn_dt = now()
315	336	, ent_crdt = #{entCrdt}
316	337	, fndn_dt = #{fndnDt}::timestamp
	338	+ , wrkr_cnt = #{wrkrCnt}
	339	+ , rmrk = #{rmrk}
317	340	, file_mng_id = #{fileMngId}
	341	+ , mdfr = #{mdfr}
	342	+ , mdfcn_dt = now()
318	343	WHERE ent_id = #{entId}
319	344	</update>
320	345
...	...	@@ -352,29 +377,24 @@
352	377	SELECT ent_nm
353	378	, brno
354	379	, rprsv_nm
	380	+ , (SELECT cd_nm FROM cd_mng WHERE cd = lctn_admdsp) \|\| ' ' \|\| lctn_ssg AS lctn
	381	+ , bplc_siar \|\| (SELECT cd_nm FROM cd_mng WHERE cd = bplc_siar_unit) AS bplc_siar
	382	+ , fctry_area \|\| (SELECT cd_nm FROM cd_mng WHERE cd = fctry_area_unit) AS fctry_area
355	383	, '(' \|\| ksic_up_cd \|\| ksic_cd \|\| ') ' \|\| ksic_nm AS ksic
356	384	, main_prdct
357		- , clsbiz_yn
358	385	, ent_crdt
359	386	, to_char(fndn_dt, 'YYYY-MM-DD') AS fndn_dt
	387	+ , wrkr_cnt \|\| '' AS wrkr_cnt
360	388	, mvn_inten
361		- , ivst_inten
362	389	, mou_inten
363		- , ivst_dscsn_inten
364	390	, rmrk
365	391	FROM (<include refid="selectListInner" />) AS datas
366	392	WHERE TRUE
367	393	<if test="mvnInten != null and mvnInten != ''">
368	394	AND mvn_inten = #{mvnInten}
369	395	</if>
370		- <if test="ivstInten != null and ivstInten != ''">
371		- AND ivst_inten = #{ivstInten}
372		- </if>
373	396	<if test="mouInten != null and mouInten != ''">
374	397	AND mou_inten = #{mouInten}
375		- </if>
376		- <if test="ivstDscsnInten != null and ivstDscsnInten != ''">
377		- AND ivst_dscsn_inten = #{ivstDscsnInten}
378	398	</if>
379	399	<if test="ksicUpCd != null and ksicUpCd != ''">
380	400	AND ksic_up_cd = #{ksicUpCd}

...	...	@@ -13,9 +13,7 @@
13	13	<result property="mainCn" column="main_cn" />
14	14	<result property="fileMngId" column="file_mng_id" />
15	15	<result property="mvnInten" column="mvn_inten" />
16		- <result property="ivstInten" column="ivst_inten" />
17	16	<result property="mouInten" column="mou_inten" />
18		- <result property="ivstDscsnInten" column="ivst_dscsn_inten" />
19	17	<result property="useYn" column="use_yn" />
20	18	<result property="rgtr" column="rgtr" />
21	19	<result property="regDt" column="reg_dt" />
...	...	@@ -41,9 +39,7 @@
41	39	, main_cn
42	40	, file_mng_id
43	41	, mvn_inten
44		- , ivst_inten
45	42	, mou_inten
46		- , ivst_dscsn_inten
47	43	, use_yn
48	44	, rgtr
49	45	, reg_dt
...	...	@@ -58,9 +54,7 @@
58	54	, #{mainCn}
59	55	, #{fileMngId}
60	56	, #{mvnInten}
61		- , #{ivstInten}
62	57	, #{mouInten}
63		- , #{ivstDscsnInten}
64	58	, 'Y'
65	59	, #{rgtr}
66	60	, now()
...	...	@@ -79,9 +73,7 @@
79	73	, id.main_cn
80	74	, id.file_mng_id
81	75	, id.mvn_inten
82		- , id.ivst_inten
83	76	, id.mou_inten
84		- , id.ivst_dscsn_inten
85	77	, id.use_yn
86	78	, id.rgtr
87	79	, to_char(id.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
...	...	@@ -119,14 +111,8 @@
119	111	<if test="mvnInten != null and mvnInten != ''">
120	112	AND id.mvn_inten = #{mvnInten}
121	113	</if>
122		- <if test="ivstInten != null and ivstInten != ''">
123		- AND id.ivst_inten = #{ivstInten}
124		- </if>
125	114	<if test="mouInten != null and mouInten != ''">
126	115	AND id.mou_inten = #{mouInten}
127		- </if>
128		- <if test="ivstDscsnInten != null and ivstDscsnInten != ''">
129		- AND id.ivst_dscsn_inten = #{ivstDscsnInten}
130	116	</if>
131	117	</sql>
132	118
...	...	@@ -147,9 +133,7 @@
147	133	, id.main_cn
148	134	, id.file_mng_id
149	135	, id.mvn_inten
150		- , id.ivst_inten
151	136	, id.mou_inten
152		- , id.ivst_dscsn_inten
153	137	, id.use_yn
154	138	, id.rgtr
155	139	, to_char(id.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
...	...	@@ -204,9 +188,7 @@
204	188	, main_cn = #{mainCn}
205	189	, file_mng_id = #{fileMngId}
206	190	, mvn_inten = #{mvnInten}
207		- , ivst_inten = #{ivstInten}
208	191	, mou_inten = #{mouInten}
209		- , ivst_dscsn_inten = #{ivstDscsnInten}
210	192	, use_yn = #{useYn}
211	193	, mdfr = #{mdfr}
212	194	, mdfcn_dt = now()
...	...	@@ -242,9 +224,7 @@
242	224	, main_cn
243	225	, file_mng_id
244	226	, mvn_inten
245		- , ivst_inten
246	227	, mou_inten
247		- , ivst_dscsn_inten
248	228	, use_yn
249	229	, rgtr
250	230	, to_char(reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt

...	...	@@ -30,9 +30,7 @@
30	30	, ent_cnt
31	31	, id_cnt
32	32	, mvn.mvn_cnt
33		- , ivst.ivst_cnt
34	33	, mou.mou_cnt
35		- , dscsn.dscsn_cnt
36	34	FROM (
37	35	SELECT ksic_up_cd
38	36	, ksic_cd
...	...	@@ -52,15 +50,9 @@
52	50	LEFT JOIN (SELECT COUNT(ivst_dscsn_id) AS mvn_cnt <include refid="intenMid" /> AND mvn_inten = '1' <include refid="intenBot" />) AS mvn
53	51	ON datas.ksic_up_cd = mvn.ksic_up_cd
54	52	AND datas.ksic_cd = mvn.ksic_cd
55		- LEFT JOIN (SELECT COUNT(ivst_dscsn_id) AS ivst_cnt <include refid="intenMid" /> AND ivst_inten = '1' <include refid="intenBot" />) AS ivst
56		- ON datas.ksic_up_cd = ivst.ksic_up_cd
57		- AND datas.ksic_cd = ivst.ksic_cd
58	53	LEFT JOIN (SELECT COUNT(ivst_dscsn_id) AS mou_cnt <include refid="intenMid" /> AND mou_inten = '1' <include refid="intenBot" />) AS mou
59	54	ON datas.ksic_up_cd = mou.ksic_up_cd
60	55	AND datas.ksic_cd = mou.ksic_cd
61		- LEFT JOIN ( SELECT COUNT(ivst_dscsn_id) AS dscsn_cnt <include refid="intenMid" /> AND ivst_dscsn_inten = '1' <include refid="intenBot" />) AS dscsn
62		- ON datas.ksic_up_cd = dscsn.ksic_up_cd
63		- AND datas.ksic_cd = dscsn.ksic_cd
64	56	ORDER BY datas.ksic_up_cd, datas.ksic_cd
65	57	</select>
66	58

Delete comment