공지시 작성자가 수정 조치 및 구매요청 항목 추가

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

@@ -44,6 +44,7 @@ public enum SystemMessageCode {
     ERR_NONEXPRY (40017, "유통기한을 입력해주세요!", HttpStatus.BAD_REQUEST),
     ERR_NOTWAREHOUSE (40018, "입고수량은 납품수량보다 적거나 같아야 합니다.", HttpStatus.BAD_REQUEST),
     ERR_NONEXISTBRAND (40019, "브랜드에 소속된 사용자가 아닙니다.", HttpStatus.BAD_REQUEST),
+    ERR_NOTEQWRITE (40020, "생성자만 수정 가능합니다.", HttpStatus.BAD_REQUEST),
     ;
 
 

src/main/java/com/oqpo/api/service/oper/NticeService.java

@@ -4,6 +4,7 @@ package com.oqpo.api.service.oper;
 import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.oper.NticeEntity;
 import com.oqpo.api.entity.oper.NticeTargetEntity;
+import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.oper.NticeMapper;
@@ -91,6 +92,13 @@ public class NticeService extends CommonService {
                 entity.setNticeNo(fnGetKeyNo(6));
                 nticeMapper.insertNticeInfo(userId, entity);
             } else if ("U".equals(saveNticeRequest.getViewCd())) {
+                // 로그인 - 작성자 동일 여부 확인함
+                NticeEntity oldEntity = nticeMapper.selectNticeInfo(entity.getNticeNo());
+
+                if (!userId.equals(oldEntity.getAddId())) {
+                    throw new GlobalException(SystemMessageCode.ERR_NOTEQWRITE);
+                }
+
                 entity.setNticeNo(saveNticeRequest.getNticeNo());
                 nticeMapper.updateNticeInfo(userId, entity);
             }

src/main/java/com/oqpo/api/service/pomng/PchReqService.java

@@ -115,6 +115,7 @@ public class PchReqService extends CommonService {
                         .pchReqNm(m.getPchReqNm() == null ? "" :m.getPchReqNm() )
                         .pchReqStCd(m.getPchReqStCd() == null ? "" : m.getPchReqStCd())
                         .pchReqStNm(m.getPchReqStNm() == null ? "" : m.getPchReqStNm())
+                        .pchReqDt(m.getPchReqDt() == null ? "" : m.getPchReqDt())
                         .pchReqItemQty(m.getPchReqItemQty() == null ? 0 : m.getPchReqItemQty())
                         .pchReqTotalAmt(m.getPchReqTotalAmt() == null ? 0 : m.getPchReqTotalAmt())
                         .pchReqRjctDt(m.getPchReqRjctDt() == null ? "" :m.getPchReqRjctDt() )

src/main/java/com/oqpo/api/web/dto/response/pomng/pchReq/PchReqSearchListResponse.java

@@ -35,6 +35,9 @@ public class PchReqSearchListResponse {
     @ApiModelProperty(value = "구매요청상태명")
     private String pchReqStNm;
 
+    @ApiModelProperty(value = "구매요청일")
+    private String pchReqDt;
+
     @ApiModelProperty(value = "구매요청품목수량")
     private Integer pchReqItemQty;
 

src/main/resources/mybatis/sqlmaps/pomng/PchReq.xml

@@ -11,6 +11,7 @@
                 ,pch_req_item_qty, date_format(pch_req_rjct_dt,'%Y.%m.%d') as pch_req_rjct_dt, pch_req_rjct_nm
                 ,whs_id, fn_whs_nm(brand_id, whs_id) as whs_nm
                 ,location, fn_whs_location_nm(brand_id, whs_id, location) as location_nm
+                ,date_format(pch_req_dt,'%Y.%m.%d') as pch_req_dt
         from   pch_req_base_info
         where  brand_id = #{sBrandId}
         <if test="sStoreId != null and sStoreId != ''">