공급사 api 테스트 수정 후 반영

src/main/java/com/oqpo/api/mapper/stinfo/SupplyMapper.java

@@ -22,7 +22,7 @@ public interface SupplyMapper {
     int updateSpplyInfo(@Param("userId") String userId, SpplyEntity entity) throws Exception;
 
     int insertSpplyMgrInfo(@Param("userId") String userId, List<SpplyMgrEntity> gridInsertData) throws Exception;
-    int deleteSpplyMgrInfo(@Param("userId") String userId, List<SpplyMgrEntity> gridUpdateData) throws Exception;
+    int deleteSpplyMgrInfo(@Param("spplyId") String spplyId, List<SpplyMgrEntity> gridDeleteData) throws Exception;
 
     SpplyEntity selectSpplyInfo(@Param("brandId") String brandId, @Param("spplyId") String spplyId)   throws Exception;
 

src/main/java/com/oqpo/api/service/stinfo/SpplyService.java

@@ -118,7 +118,6 @@ public class SpplyService extends CommonService {
             entity.setCorpDvsn(saveSpplyRequest.getCorpDvsn());
             entity.setMgrNm(saveSpplyRequest.getMgrNm());
             entity.setAreaCd(saveSpplyRequest.getAreaCd());
-            entity.setDeptNm(saveSpplyRequest.getDeptNm());
             entity.setMgrEmal(saveSpplyRequest.getMgrEmal());
             entity.setMgrTelNo(saveSpplyRequest.getMgrTelNo().replaceAll("-",""));
             entity.setMgrMblNo(saveSpplyRequest.getMgrMblNo().replaceAll("-",""));
@@ -188,20 +187,18 @@ public class SpplyService extends CommonService {
             if (gridInsertData.size() > 0) {
 
                 int maxSupplyMgrId = supplyMapper.selectMaxSpplyMgrId(entity.getSpplyId());
-                if ("C".equals(saveSpplyRequest.getViewCd())) {
-                    for (int i = 0 ; i < gridInsertData.size() ; i++ )
-                    {
-                        gridInsertData.get(i).setSpplyId(entity.getSpplyId());
-                        gridInsertData.get(i).setSpplyMgrId(maxSupplyMgrId + i);
-                    }
+                for (int i = 0 ; i < gridInsertData.size() ; i++ )
+                {
+                    gridInsertData.get(i).setSpplyId(entity.getSpplyId());
+                    gridInsertData.get(i).setSpplyMgrId(maxSupplyMgrId + i);
+                    gridInsertData.get(i).setRprstTelNo(gridInsertData.get(i).getRprstTelNo().replaceAll("-",""));
                 }
-
                 supplyMapper.insertSpplyMgrInfo(userId, gridInsertData) ;
             }
             // 삭제건
             List<SpplyMgrEntity> gridDeleteData = saveSpplyRequest.toCodeEntities(saveSpplyRequest.getGridDeleteData());
             if (gridDeleteData.size() > 0) {
-                supplyMapper.deleteSpplyMgrInfo(userId, gridDeleteData) ;
+                supplyMapper.deleteSpplyMgrInfo(entity.getSpplyId(), gridDeleteData) ;
             }
 
         } catch (GlobalException e) {

src/main/java/com/oqpo/api/web/controller/stinfo/SpplyController.java

@@ -106,7 +106,7 @@ public class SpplyController {
 
 
     /**
-     * 설명 : 가맹점 패스워드 초기화
+     * 설명 : 공급사 패스워드 초기화
      *
      * @param userId
      * @param
@@ -118,7 +118,7 @@ public class SpplyController {
             @ApiImplicitParam(name = "brandId", value = "브랜드아이디", required = true, dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "spplyId", value = "공급사아이디", required = true, dataType = "String", paramType = "query")
     })
-    @ApiOperation(value = "가맹점 패스워드 초기화")
+    @ApiOperation(value = "공급사 패스워드 초기화")
     @GetMapping("/inti-spplyPw")
     public ResponseEntity<SaveResponse> initSpplyPw(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "spplyId") String spplyId) throws Exception {
         spplyService.updateSpplyInitPw(brandId,spplyId);

src/main/java/com/oqpo/api/web/dto/request/stinfo/spply/SaveSpplyRequest.java

@@ -2,6 +2,7 @@ package com.oqpo.api.web.dto.request.stinfo.spply;
 
 import com.oqpo.api.entity.oper.AfflSaleInfoEntity;
 import com.oqpo.api.entity.stinfo.SpplyMgrEntity;
+import com.oqpo.api.web.dto.request.oper.affl.SaveAfflRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
@@ -55,9 +56,6 @@ public class SaveSpplyRequest {
     @ApiModelProperty(value = "지역코드")
     private String areaCd;
 
-    @ApiModelProperty(value = "부서명")
-    private String deptNm;
-
     @NotBlank
     @ApiModelProperty(value = "이메일")
     private String mgrEmal;
@@ -104,15 +102,15 @@ public class SaveSpplyRequest {
     private String longY;
 
     @ApiModelProperty(value = "공급사담당자리스트")
-    private List<SpplyMgrEntity> gridInsertData;
+    private List<SaveSpplyMgr> gridInsertData;
 
     @ApiModelProperty(value = "공급사담당자리스트")
-    private List<SpplyMgrEntity> gridUpdateData;
+    private List<SaveSpplyMgr> gridUpdateData;
 
     @ApiModelProperty(value = "공급사담당자리스트")
-    private List<SpplyMgrEntity> gridDeleteData;
+    private List<SaveSpplyMgr> gridDeleteData;
 
-    public List<SpplyMgrEntity> toCodeEntities(List<SpplyMgrEntity> gridData) {
+    public List<SpplyMgrEntity> toCodeEntities(List< SaveSpplyRequest.SaveSpplyMgr > gridData) {
         List<SpplyMgrEntity> entities = new ArrayList<>();
         if (gridData == null || gridData.size() == 0)
             return entities;
@@ -121,6 +119,7 @@ public class SaveSpplyRequest {
             SpplyMgrEntity entity = new SpplyMgrEntity();
             entity.setSpplyId(x.getSpplyId());
             entity.setSpplyMgrId(x.getSpplyMgrId());
+            entity.setSpplyMgrNm(x.getSpplyMgrNm());
             entity.setRprstTelNo(x.getRprstTelNo());
             entity.setRprstEmal(x.getRprstEmal());
             entity.setPosition(x.getPosition());
@@ -140,6 +139,9 @@ public class SaveSpplyRequest {
         @ApiModelProperty(value = "영업담당자순번")
         private Integer spplyMgrId;
 
+        @ApiModelProperty(value = "담당자명")
+        private String spplyMgrNm;
+
         @ApiModelProperty(value = "전화번호")
         private String rprstTelNo;
 

src/main/resources/mybatis/sqlmaps/stinfo/Supply.xml

@@ -135,7 +135,6 @@
             ,corp_dvsn		    = #{entity.corpDvsn}
             ,mbl_no			    = #{entity.mblNo}
             ,mgr_nm			    = #{entity.mgrNm}
-            ,dept_nm		    = #{entity.deptNm}
             ,mgr_emal		    = #{entity.mgrEmal}
             ,mgr_tel_no		    = #{entity.mgrTelNo}
             ,mgr_mbl_no		    = #{entity.mgrMblNo}
@@ -144,7 +143,9 @@
             ,zip_no			    = #{entity.zipNo}
             ,addr1			    = #{entity.addr1}
             ,addr2			    = #{entity.addr2}
-            ,bnk_cd			    = #{entitybnkCd.}
+            ,lat_x              = #{entity.latX}
+            ,long_y             = #{entity.longY}
+            ,bnk_cd			    = #{entity.bnkCd}
             ,acct_no		    = #{entity.acctNo}
             ,owac_nm		    = #{entity.owacNm}
             ,bbook_copy_file_no	= #{entity.bbookCopyFileNo}
@@ -155,15 +156,15 @@
     <insert id="insertSpplyMgrInfo" >
         insert into spply_mgr_mgnt /* insertSpplyMgrInfo */
         (
-            spply_id, spply_mgr_id, spply_mgr_nm, sale_type, rprst_tel_no,
-            rprst_fax_no, rprst_emal, position, assgn_task, sys_reg_dttm,
+            spply_id, spply_mgr_id, spply_mgr_nm,  rprst_tel_no,
+            rprst_emal, position, assgn_task, sys_reg_dttm,
             sys_reg_id, sys_chg_dttm, sys_chg_id
         )
         values
         <foreach collection="gridInsertData" item="item" separator=",">
         (
-            #{item.spplyId}, #{item.spplyMgrId}, #{item.spplyMgrNm}, #{item.saleType}, #{item.rprstTelNo},
-            #{item.rprstFaxNo}, #{item.rprstEmal}, #{item.position}, #{item.assgnTask}, now(),
+            #{item.spplyId}, #{item.spplyMgrId}, #{item.spplyMgrNm}, #{item.rprstTelNo},
+            #{item.rprstEmal}, #{item.position}, #{item.assgnTask}, now(),
             #{userId}, now(), #{userId}
         )
         </foreach>