suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-28 17:55:12 +08:00
parent 71a68b3a59 6cd311bf01
commit 121415c339
31 changed files with 595 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AttachmentsDTO.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.dto.decoration;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2024/4/28 15:06
* @Version 1.0
*/
@Data
public class AttachmentsDTO {
private String title;
private Long id;
private String path;
private String create;
private String createDate;
}

23
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDTO.java Normal file
View File

@@ -0,0 +1,23 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/4/28 15:17
* @Version 1.0
*/
@Data
public class BudgetDTO {
private Long id;
private String name;
private String type;
private String vzHj;
private String totalAmount;
private String totalCost;
private String createDate;
private String createBy;
private List<BudgetDetailDTO> details;
}

35
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDetailDTO.java Normal file
View File

@@ -0,0 +1,35 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.math.BigDecimal;
/**
* @Author suzhuhong
* @Date 2024/4/28 15:18
* @Version 1.0
*/
@Data
public class BudgetDetailDTO {
private Long id;
private String nodeType;
private String number;
private String name;
private String unitName;
private String amount;
private String unitPrice;
private String totalPrice;
private String labour;
private String material;
private String mainMaterialCostPrice;
private String auxiliaryMaterialCostPrice;
private String labourCostPrice;
private String remark;
private BigDecimal loss;
private BigDecimal totalCost;
private BigDecimal cost;
private BigDecimal lossPrice;
private String planProfit;
private BigDecimal profitRate;
private String supplierName;
}

26
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ConstructionScheduleDTO.java Normal file
View File

@@ -0,0 +1,26 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/4/28 15:02
* @Version 1.0
*/
@Data
public class ConstructionScheduleDTO {
private String id;
private String name;
private String planBeginDate;
private String planEndDate;
private String actualBeginDate;
private String actualEndDate;
private Integer duration;
private Integer state;
private List<AttachmentsDTO> attachments;
private List<TrackDataDTO> trackData;
}

24
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationDTO.java Normal file
View File

@@ -0,0 +1,24 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/4/28 15:21
* @Version 1.0
*/
@Data
public class DecorationDTO {
private String projectId;
private String clientCode;
private String clientName;
private String pCode;
private String clientContractCode;
private String address;
private List<BudgetDTO> proposedBookBudget;
private List<DesignSchemeDTO> designScheme;
private List<PaymentDTO> payment;
private List<ConstructionScheduleDTO> constructionSchedule;
}

25
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DesignSchemeDTO.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/4/28 15:12
* @Version 1.0
*/
@Data
public class DesignSchemeDTO {
private String id;
private String name;
private String remark;
private String date;
private String planBeginDate;
private String planEndDate;
private String beginDate;
private String endDate;
private Integer status;
private List<AttachmentsDTO> attachments;
}

21
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/FileDTO.java Normal file
View File

@@ -0,0 +1,21 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.time.LocalDate;
/**
* @Author suzhuhong
* @Date 2024/4/28 14:53
* @Version 1.0
*/
@Data
public class FileDTO {
private Long id;
private String path;
private String title;
private String create;
private String createDate;
}

28
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/PaymentDTO.java Normal file
View File

@@ -0,0 +1,28 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/4/28 15:14
* @Version 1.0
*/
@Data
public class PaymentDTO {
private String id;
private String billDate;
private String billNo;
private String userName;
private BigDecimal amount;
private BigDecimal bDeAmount;
private String typeCategory;
private String accountName;
private Integer state;
private String auditTime;
private String auditUser;
private List<AttachmentsDTO> attachments;
}

18
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ProjectDTO.java Normal file
View File

@@ -0,0 +1,18 @@
package com.cool.store.dto.decoration;
import lombok.Data;
/**
* @Auther: WangShuo
* @Date: 2024/04/28/下午5:37
* @Version 1.0
* @注释:
*/
@Data
public class ProjectDTO {
private String projectId;
private String clientCode;
private String clientName;
private String pCode;
private String address;
}

26
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/TrackDataDTO.java Normal file
View File

@@ -0,0 +1,26 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/4/28 14:54
* @Version 1.0
*/
@Data
public class TrackDataDTO {
private Long id;
private String person;
private String remark;
private String date;
private Integer RepalyId;
private List<FileDTO> file;
}

11
coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java
View File

@@ -88,17 +88,6 @@ public class ShopAuditInfoDO {
@ApiModelProperty("数据类型 0-提交 1-审批")
private Integer dataType;
@ApiModelProperty("头像")
private String avatar;
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
/**
* @return id
*/

6
coolstore-partner-model/src/main/java/com/cool/store/request/ShopStageAcceptanceRequest.java
View File

@@ -21,4 +21,10 @@ public class ShopStageAcceptanceRequest {
@ApiModelProperty("是否合格 0:不合格 1:合格")
private Boolean result;
/**
* 店铺id
*/
@ApiModelProperty("店铺id")
private Long shopId;
}

22
coolstore-partner-model/src/main/java/com/cool/store/vo/DesignInfoVo.java Normal file
View File

@@ -0,0 +1,22 @@
package com.cool.store.vo;
import com.cool.store.vo.log.DesignLogVo;
import lombok.Data;
import java.util.List;
/**
* @Auther: WangShuo
* @Date: 2024/04/28/下午3:37
* @Version 1.0
* @注释:设计阶段信息
*/
@Data
public class DesignInfoVo {
private String name;
private Integer resultType;
private String planTime;
private List<DesignLogVo> logs;
}

22
coolstore-partner-model/src/main/java/com/cool/store/vo/log/DesignLogVo.java Normal file
View File

@@ -0,0 +1,22 @@
package com.cool.store.vo.log;
import lombok.Data;
import java.util.List;
/**
* @Auther: WangShuo
* @Date: 2024/04/28/下午4:02
* @Version 1.0
* @注释:设计阶段跟踪日志
*/
@Data
public class DesignLogVo {
private String logTime;
private String name;
private String description;
private String planTime;
private String finishTime;
private List<String> attachmentUrl;
}