단가관련 정보 수정

src/main/java/com/oqpo/api/entity/stinfo/StoreItemUnitEntity.java

@@ -23,7 +23,7 @@ public class StoreItemUnitEntity implements Serializable {
     private String unitNm ;
     private String curr ;
     private String currNm ;
-    private Integer unitAmt ;
+    private Long unitAmt ;
     private String storeId ;
     private String storeNm ;
     private String brandId ;
@@ -38,8 +38,9 @@ public class StoreItemUnitEntity implements Serializable {
     private String sysChgDttm ;
     private String sysChgId ;
     private Integer itemCnt;
-    private Integer spplyUnitAmt;
+    private Long spplyUnitAmt;
     private String unitTargetCd;
     private String unitTargetNm;
+
     private List<FileEntity> fileEntity ;
 }

src/main/java/com/oqpo/api/enums/SystemMessageCode.java

@@ -45,6 +45,9 @@ public enum SystemMessageCode {
     ERR_NOTWAREHOUSE (40018, "입고수량은 납품수량보다 적거나 같아야 합니다.", HttpStatus.BAD_REQUEST),
     ERR_NONEXISTBRAND (40019, "브랜드에 소속된 사용자가 아닙니다.", HttpStatus.BAD_REQUEST),
     ERR_NOTEQWRITE (40020, "생성자만 수정 가능합니다.", HttpStatus.BAD_REQUEST),
+    ERR_EXISTUNIT (40021, "진행중인 단가계약가 있습니다.", HttpStatus.BAD_REQUEST),
+    ERR_CHGDTOPP (40022, "시작일과 종료일이 잘 못되어져 있습니다.", HttpStatus.BAD_REQUEST),
+    ERR_NOTCHGDT (40023, "시작일은 변경 불가 합니다.", HttpStatus.BAD_REQUEST),
     ;
 
 

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

@@ -14,7 +14,12 @@ public interface ItemUnitMapper {
     int selectItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sUnitStCd") String sUnitStCd, @Param("sSpplyId") String sSpplyId, @Param("sClass1") String sClass1, @Param("sClass2") String sClass2, @Param("sClass3") String sClass3, @Param("sClass4") String sClass4, @Param("sItemNm") String sItemNm)throws Exception;
 
     ItemUnitEntity selectItemUnitInfo(@Param("brandId") String brandId, @Param("brandUnitUnqNo") String brandUnitUnqNo)throws Exception;
-    ItemUnitEntity selectItemUnitDupContInfoNo(@Param("brandId") String brandId, @Param("spplyId") String spplyId, @Param("itemId") String itemId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt)throws Exception;
+
+    int selectItemUnitDupCnt(@Param("brandId") String brandId, @Param("spplyId") String spplyId, @Param("itemId") String itemId, @Param("contSttDt") String contSttDt)throws Exception;
+
+    String selectItemUnitChaPass(@Param("brandUnitUnqNo") String brandUnitUnqNo, @Param("contSttDt") String contSttDt)throws Exception;
+
+
     int updateItemUnitContEnd(@Param("brandId") String brandId, @Param("brandUnitUnqNo") String brandUnitUnqNo, @Param("contEndDt") String contEndDt) throws Exception;
 
     int insertMergItemUnitInfo(@Param("userId") String userId, ItemUnitEntity entity) throws Exception;

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

@@ -21,7 +21,11 @@ public interface StoreItemUnitMapper {
     List<StoreItemUnitEntity> selectStoreItemUnitInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt, @Param("contEndDt") String contEndDt)throws Exception;
 
     String selectStoreItemUnitContDateInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt,  @Param("contEndDt") String contEndDt)throws Exception;
+
+
+
     String selectStoreItemUnitExistYn(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contSttDt") String contSttDt,  @Param("contEndDt") String contEndDt)throws Exception;
+    StoreItemUnitEntity selectStoreItemUnitContDtInfo(@Param("brandId") String brandId, @Param("storeId") String storeId)throws Exception;
 
 
     int updateStoreItemUnitContEnd(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("contEndDt") String contEndDt,  @Param("contSttDt") String contSttDt) throws Exception;

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

@@ -30,7 +30,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.lang.reflect.GenericDeclaration;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -174,10 +177,18 @@ public class ItemUnitService extends CommonService {
 
             if ("C".equals(saveItemUnitInfolRequest.getViewCd())) {
                 //selectItemUnitDupContInfoNo  날짜 기준 계약 존재여부 파악
-                ItemUnitEntity condtEntity = itemUnitMapper.selectItemUnitDupContInfoNo(entity.getBrandId(), entity.getSpplyId(), entity.getItemId(), entity.getContSttDt(), entity.getContEndDt());
+                int dupCnt = itemUnitMapper.selectItemUnitDupCnt(entity.getBrandId(), entity.getSpplyId(), entity.getItemId(), entity.getContSttDt());
 
-                if (condtEntity != null && !"".equals(condtEntity.getBrandUnitUnqNo())) {
-                    itemUnitMapper.updateItemUnitContEnd(entity.getBrandId(), entity.getBrandUnitUnqNo(), entity.getContEndDt());
+                if (dupCnt != 0) {
+                    // 이미 진행중인 계약단가가 있습니다.
+                    throw new GlobalException(SystemMessageCode.ERR_EXISTUNIT);
+                }
+            } else {
+                String passChk = itemUnitMapper.selectItemUnitChaPass(entity.getBrandUnitUnqNo(),entity.getContSttDt());
+
+                if ("N".equals(passChk)) {
+                    // 시작일은 변경 불가
+                    throw new GlobalException(SystemMessageCode.ERR_NOTCHGDT);
                 }
             }
 
@@ -288,12 +299,19 @@ public class ItemUnitService extends CommonService {
             entity.setBrandId(saveStoreItemUnitInfolRequest.getBrandId());
             entity.setStoreId(saveStoreItemUnitInfolRequest.getStoreId());
 
+            //신규
+            if ("C".toString().equals(saveStoreItemUnitInfolRequest.getViewCd())) {
+                entity.setContSttDt(saveStoreItemUnitInfolRequest.getContSttDt().replaceAll("\\.",""));
+                entity.setContEndDt(saveStoreItemUnitInfolRequest.getContEndDt().replaceAll("\\.",""));
+            }
+
             List<StoreItemUnitEntity> gridUpdateData = saveStoreItemUnitInfolRequest.toCodeEntities(saveStoreItemUnitInfolRequest.getGridUpdateData());
             List<StoreItemUnitEntity> gridInsertData = saveStoreItemUnitInfolRequest.toCodeEntities(saveStoreItemUnitInfolRequest.getGridInsertData());
 
-            String contSttDt = "";
-            String contEndDt = "";
+            //String contSttDt = "";
+            //String contEndDt = "";
 
+            /*
             if (gridUpdateData.size() > 0) {
                 for (int k = 0; k < gridUpdateData.size(); k++) {
 
@@ -301,35 +319,53 @@ public class ItemUnitService extends CommonService {
                     contEndDt = gridUpdateData.get(k).getContEndDt().replaceAll("\\.", "");
                     gridUpdateData.get(k).setContSttDt(contSttDt);
                     gridUpdateData.get(k).setContEndDt(contEndDt);
-
                     entity.setContSttDt(contSttDt);
                     entity.setContEndDt(contEndDt);
                 }
             }
+            */
+
+                if (gridInsertData.size() > 0) {
+                    for (int k = 0; k < gridInsertData.size(); k++) {
+                        if ("C".toString().equals(saveStoreItemUnitInfolRequest.getViewCd())) {
+                            gridInsertData.get(k).setContSttDt(entity.getContSttDt());
+                            gridInsertData.get(k).setContEndDt(entity.getContEndDt());
+                        } else {
+                            gridInsertData.get(k).setContSttDt(gridInsertData.get(k).getContSttDt().replaceAll("\\.",""));
+                            gridInsertData.get(k).setContEndDt(gridInsertData.get(k).getContEndDt().replaceAll("\\.",""));
+                        }
+                    }
+                }
 
-            if (gridInsertData.size() > 0) {
-                for (int k = 0; k < gridInsertData.size(); k++) {
 
-                    contSttDt = gridInsertData.get(k).getContSttDt().replaceAll("\\.", "");
-                    contEndDt = gridInsertData.get(k).getContEndDt().replaceAll("\\.", "");
-                    gridInsertData.get(k).setContSttDt(contSttDt);
-                    gridInsertData.get(k).setContEndDt(contEndDt);
 
-                    entity.setContSttDt(contSttDt);
-                    entity.setContEndDt(contEndDt);
+            // 신규일경우 계약기간 날짜 체크함
+            if ("C".toString().equals(saveStoreItemUnitInfolRequest.getViewCd())) {
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+                Date chkenddate = formatter.parse(entity.getContEndDt());
+                Date chksttdate = formatter.parse(entity.getContSttDt());
+                int result1 = chkenddate.compareTo(chksttdate);
+                // 시작일과 종료일이 반대기간으로 되어져있을 경우
+                if (result1 < 0) {
+                    throw new GlobalException(SystemMessageCode.ERR_CHGDTOPP);
                 }
-            }
+
+                StoreItemUnitEntity dtEntity = storeItemUnitMapper.selectStoreItemUnitContDtInfo(entity.getBrandId(), entity.getStoreId());
+
+
+                if (dtEntity.getContSttDt() != null && !dtEntity.getContSttDt().equals("")) {
+                    // 서로 상이하면 기존 종료일자는 전송시작일보다 클경우 오류
 
 
-            // 동일 단가계약일자 존재시
-            String rcontEndDt = "";
-            String existYn = storeItemUnitMapper.selectStoreItemUnitExistYn(entity.getBrandId(), entity.getStoreId(), entity.getContSttDt(), entity.getContEndDt());
+                    // 문자열 -> Date
+                    Date dtEnddate = formatter.parse(dtEntity.getContEndDt());
+                    Date sttdate = formatter.parse(entity.getContSttDt());
+                    int result = dtEnddate.compareTo(sttdate);
 
-            if ("N".equals(existYn)) {
-                rcontEndDt =  storeItemUnitMapper.selectStoreItemUnitContDateInfo(entity.getBrandId(), entity.getStoreId(), entity.getContSttDt(), entity.getContEndDt());
-                if (!"".equals(rcontEndDt))
-                {
-                    storeItemUnitMapper.updateStoreItemUnitContEnd(entity.getBrandId(), entity.getStoreId(), rcontEndDt,  entity.getContSttDt());
+                    if (result > 0) {
+                        // 진행중 단가계약이 있습니다.
+                        throw new GlobalException(SystemMessageCode.ERR_EXISTUNIT);
+                    }
                 }
             }
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/SaveStoreItemUnitInfolRequest.java

@@ -84,7 +84,7 @@ public class SaveStoreItemUnitInfolRequest {
         private String curr;
 
         @ApiModelProperty(value = "단가금액")
-        private Integer unitAmt;
+        private Long unitAmt;
 
         @ApiModelProperty(value = "계약문서첨부파일번호")
         private String shortContFileNo;

src/main/java/com/oqpo/api/web/dto/response/stinfo/itemUnit/StoreItemUnitInfoResponse.java

@@ -41,6 +41,7 @@ public class StoreItemUnitInfoResponse {
                 .gridRows(entities.stream()
                         .map(m -> StoreItemUnitInfoData.builder()
                                 .viewCd(m.getViewCd())
+                                .viewNm("C".toString().equals(m.getViewCd()) ? "추가" : "" )
                                 .storeUnitUnqNo(m.getStoreUnitUnqNo() == null ? "" :m.getStoreUnitUnqNo())
                                 .brandUnitUnqNo(m.getBrandUnitUnqNo() == null ? "" :m.getBrandUnitUnqNo())
                                 .brandId(m.getBrandId())
@@ -71,6 +72,9 @@ public class StoreItemUnitInfoResponse {
         @ApiModelProperty(value = "작업구분")
         private String viewCd;
 
+        @ApiModelProperty(value = "작업구분명")
+        private String viewNm;
+
         @ApiModelProperty(value = "매장단가고유번호")
         private String storeUnitUnqNo;
 
@@ -108,7 +112,7 @@ public class StoreItemUnitInfoResponse {
         private String currNm;
 
         @ApiModelProperty(value = "단가금액")
-        private Integer unitAmt;
+        private Long unitAmt;
 
         @ApiModelProperty(value = "대상여부")
         private String unitTargetCd;
@@ -117,7 +121,7 @@ public class StoreItemUnitInfoResponse {
         private String unitTargetNm;
 
         @ApiModelProperty(value = "공급사단가")
-        private Integer spplyUnitAmt ;
+        private Long spplyUnitAmt ;
     }
 
 

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

@@ -110,14 +110,20 @@
         and   iunit.brand_id = #{brandId}
     </select>
 
-    <select id="selectItemUnitDupContInfoNo" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
-        select /* selectItemUnitDupContInfoNo */
-               brand_unit_unq_no
+    <select id="selectItemUnitDupCnt" resultType="int">
+        select /* selectItemUnitDupCnt */
+               count(*) as cnt
         from   brand_item_unit_info
         where  brand_id = #{brandId}
         and    spply_id = #{spplyId}
         and    item_id  = #{itemId}
-        and    cont_end_dt between #{contSttDt} and #{contEndDt}
+        and    date_format(cont_end_dt,'%Y%m%d') <![CDATA[ >= ]]> date_format(#{contSttDt} ,'%Y%m%d')
+    </select>
+
+    <select id="selectItemUnitChaPass" resultType="String">
+        select  case when cont_stt_dt = #{contSttDt} then 'Y' else 'N' end
+        from  brand_item_unit_info
+        where brand_unit_unq_no =#{brandUnitUnqNo}
     </select>
 
     <update id="updateItemUnitContEnd" >

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

@@ -118,6 +118,7 @@
                                   and unit.cont_stt_dt = #{contSttDt} and unit.cont_end_dt = #{contEndDt}
                 left outer join store_base_info store on unit.store_id = store.store_id and store.store_id = #{storeId}
                 where item.brand_id = #{brandId}
+                order by view_cd
     </select>
 
     <select id="selectStoreItemUnitContDateInfo" resultType="String">
@@ -139,6 +140,14 @@
         and    cont_end_dt = #{contEndDt}
     </select>
 
+    <select id="selectStoreItemUnitContDtInfo" resultType="com.oqpo.api.entity.stinfo.StoreItemUnitEntity">
+        select  distinct nvl(max(cont_stt_dt) ,'') as cont_stt_dt, nvl(max(cont_end_dt) ,'') as cont_end_dt
+        from  store_item_unit_info
+        where  brand_id = #{brandId}
+        and    store_id = #{storeId}
+    </select>
+
+
     <update id="updateStoreItemUnitContEnd" >
         update /* updateStoreItemUnitContEnd */
                 store_item_unit_info
@@ -218,7 +227,7 @@
                  item.store_sale_unit_amt as usit_amt, 'Y' as unit_target_cd,
                  fn_code_nm('DSTRBT_COST_UNIT','Y') as unit_target_nm,
                  item.unit_amt as spply_unit_amt,
-                 item.brand_unit_unq_no
+                 item.brand_unit_unq_no, item.store_sale_unit_amt as unit_amt
 
          from   brand_item_unit_info item
          where  item.brand_id = #{brandId}