价格增加生效状态的筛选条件

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/entity/PriceAdjustmentSearchEntity.java

@@ -12,6 +12,7 @@ import java.util.UUID;
  */
 public class PriceAdjustmentSearchEntity<T> extends Page<T> {
     private Integer applyStatus;
+    private Integer adjustmentStatus;
     private List<UUID> stationIds;
     private List<UUID> regionalCompanyIds;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -79,4 +80,12 @@ public class PriceAdjustmentSearchEntity<T> extends Page<T> {
     public void setApplyEndDate(Date applyEndDate) {
         this.applyEndDate = applyEndDate;
     }
+
+    public Integer getAdjustmentStatus() {
+        return adjustmentStatus;
+    }
+
+    public void setAdjustmentStatus(Integer adjustmentStatus) {
+        this.adjustmentStatus = adjustmentStatus;
+    }
 }

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/service/PriceAdjustmentServiceImpl.java

@@ -8,6 +8,7 @@ import com.xyst.dinas.price.entity.PriceAdjustmentEchartReturnEntity;
 import com.xyst.dinas.price.entity.PriceAdjustmentEchartSearchEntity;
 import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
 import com.xyst.dinas.price.entity.StationDinasTypePriceDetail;
+import com.xyst.dinas.price.enumeration.PriceAdjustmentAdjustmentStatusEnum;
 import com.xyst.dinas.price.service.PriceAdjustmentService;
 import com.xyst.dinas.price.service.RegionalCompanyPriceAuthorityService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -139,8 +140,9 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
             return;
         }
         for (KObject kObject : kObjects) {
-            kObject.set("applyStatus", BizProcessState.DONE_WITH_REJECT.getValue());
-            kObject.set("failureReason", "本条数据所属生效日已有新记录审批通过,本条系统自动驳回");
+//            kObject.set("applyStatus", BizProcessState.DONE_WITH_REJECT.getValue());
+            kObject.set("adjustmentStatus", PriceAdjustmentAdjustmentStatusEnum.ABOLITION.getValue());
+//            kObject.set("failureReason", "本条数据所属生效日已有新记录审批通过,本条系统自动废弃");
             priceAdjustmentDao.modify(kObject);
         }
 

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/web/PriceAdjustmentController.java

@@ -16,6 +16,7 @@ import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
 import com.xyst.dinas.price.service.PriceAdjustmentService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -215,13 +216,29 @@ public class PriceAdjustmentController {
      */
 
     @GetMapping("getSameMessage")
-    public ResponseObj getSameAdjustmentDateAndLtCreateDateInfo(Date adjustmentDate, Date createTime, UUID stationId){
+    public ResponseObj getSameAdjustmentDateAndLtCreateDateInfo(@DateTimeFormat(pattern = "yyyy-MM-dd")@RequestParam("adjustmentDate") Date adjustmentDate, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam("createTime") Date createTime, @DateTimeFormat(pattern = "yyyy-MM-dd")@RequestParam("stationId") UUID stationId){
         List<KObject> sameAdjustmentDateAndLtCreateDateInfo = priceAdjustmentService.getSameAdjustmentDateAndLtCreateDateInfo(adjustmentDate, createTime, stationId);
         if(CollectionUtils.isEmpty(sameAdjustmentDateAndLtCreateDateInfo)){
             String formart1DateString = DateTimeUtils.getFormart1DateString(adjustmentDate);
-            String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为驳回";
-            return ResponseObj.success(message, sameAdjustmentDateAndLtCreateDateInfo);
+            String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为失效";
+            return ResponseObj.error(message, sameAdjustmentDateAndLtCreateDateInfo);
+        }
+        return ResponseObj.success();
+    }
+
+    /**
+     * 数据相同时候的提示
+     * @return
+     */
 
+    @GetMapping("getSameMessageById")
+    public ResponseObj getSameById(@RequestParam("id") UUID id){
+        KObject byId = priceAdjustmentService.getById(id);
+        List<KObject> sameAdjustmentDateAndLtCreateDateInfo = priceAdjustmentService.getSameAdjustmentDateAndLtCreateDateInfo(byId.getDate("adjustmentDate"),byId.getDate("createTime") , byId.get("station").getUuid("Id"));
+        if(CollectionUtils.isEmpty(sameAdjustmentDateAndLtCreateDateInfo)){
+            String formart1DateString = DateTimeUtils.getFormart1DateString(byId.getDate("adjustmentDate"));
+            String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为失效";
+            return ResponseObj.error(message, sameAdjustmentDateAndLtCreateDateInfo);
         }
         return ResponseObj.success();
     }