点价确认单附件

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -85,6 +85,10 @@ public enum StatusEnum {
     PUR_PAY("3", "部分付款", ""),
     PUR_PAYaLL("5", "全部付款", ""),
     PUR_RETURN("7", "已驳回", ""),
+
+    // 点价确认单附件状态
+    Not_UPLOADED("0", "未上传", ""),
+    UPLOADED("1", "已上传", ""),
     ;
     @Getter
     private String flag;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PriceConfirmationSheet.java

@@ -9,10 +9,12 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -94,6 +96,8 @@ public class PriceConfirmationSheet extends BaseModel<PriceConfirmationSheet> {
     /**
      * 成交日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date transactionDate;
     /**
      * 备注

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PriceConfirmationSheetServiceImpl.java

@@ -3,7 +3,9 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.PriceConfirmationSheet;
 import com.yh.saas.plugin.yiliangyiyun.mapper.PriceConfirmationSheetMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IPriceConfirmationSheetService;
@@ -43,6 +45,16 @@ public class PriceConfirmationSheetServiceImpl extends ServiceImpl<PriceConfirma
     public String addPriceConfirmationSheet(PriceConfirmationSheet priceConfirmationSheet){
         //新增主键id
         priceConfirmationSheet.setId(IdGenerator.generateUUID());
+        //上传了附件
+        if(!StringUtils.isEmpty(priceConfirmationSheet.getAddressUrl())){
+            priceConfirmationSheet.setEnclosureTypeFlag(StatusEnum.UPLOADED.getFlag());
+            priceConfirmationSheet.setEnclosureType(StatusEnum.UPLOADED.getName());
+        }
+        //未上传附件
+        else {
+            priceConfirmationSheet.setEnclosureTypeFlag(StatusEnum.Not_UPLOADED.getFlag());
+            priceConfirmationSheet.setEnclosureType(StatusEnum.Not_UPLOADED.getName());
+        }
         priceConfirmationSheet.setContractNo(priceConfirmationSheet.getContractNo());
         // 操作主表数据
         boolean one = this.insert(priceConfirmationSheet);
@@ -60,6 +72,11 @@ public class PriceConfirmationSheetServiceImpl extends ServiceImpl<PriceConfirma
      */
     @Override
     public String editPriceConfirmationSheet(PriceConfirmationSheet priceConfirmationSheet) {
+        //上传了附件
+        if(!StringUtils.isEmpty(priceConfirmationSheet.getAddressUrl())){
+            priceConfirmationSheet.setEnclosureTypeFlag(StatusEnum.UPLOADED.getFlag());
+            priceConfirmationSheet.setEnclosureType(StatusEnum.UPLOADED.getName());
+        }
         boolean one = this.updateById(priceConfirmationSheet);
         if (one) {
             return "OK";