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

修改bug

Browse Source
This commit is contained in:
shuo.wang
2024-04-30 16:26:27 +08:00
parent 53ca4b576a
commit 803f01e593
27 changed files with 290 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -9,15 +10,14 @@ import lombok.Data;
*/
@Data
public class AttachmentsDTO {
@ApiModelProperty("标题")
private String title;
private Long id;
@ApiModelProperty("路径")
private String path;
@ApiModelProperty("创建人")
private String create;
@ApiModelProperty("创建时间")
private String createDate;

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -11,13 +12,22 @@ import java.util.List;
*/
@Data
public class BudgetDTO {
@ApiModelProperty("预算主键")
private Long id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("计价类型")
private String type;
@ApiModelProperty("合计")
private String vzHj;
@ApiModelProperty("取费合计")
private String totalAmount;
@ApiModelProperty("成本合计")
private String totalCost;
@ApiModelProperty("创建时间")
private String createDate;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("预算详情")
private List<BudgetDetailDTO> details;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -11,25 +12,46 @@ import java.math.BigDecimal;
*/
@Data
public class BudgetDetailDTO {
@ApiModelProperty("预算详情主键")
private Long id;
@ApiModelProperty("类型")
private String nodeType;
@ApiModelProperty("项目编号")
private String number;
@ApiModelProperty("项目名称")
private String name;
@ApiModelProperty("单位")
private String unitName;
@ApiModelProperty("预算工程量")
private String amount;
@ApiModelProperty("单价")
private String unitPrice;
@ApiModelProperty("预算合计")
private String totalPrice;
@ApiModelProperty("人工单价")
private String labour;
@ApiModelProperty("材料单价")
private String material;
@ApiModelProperty("主材成本")
private String mainMaterialCostPrice;
@ApiModelProperty("辅材成本")
private String auxiliaryMaterialCostPrice;
@ApiModelProperty("人工成本")
private String labourCostPrice;
@ApiModelProperty("结算工程量")
private String remark;
@ApiModelProperty("结算合计")
private BigDecimal loss;
@ApiModelProperty("综合成本")
private BigDecimal totalCost;
@ApiModelProperty("成本单价")
private BigDecimal cost;
@ApiModelProperty("损耗单价")
private BigDecimal lossPrice;
@ApiModelProperty("计划利润")
private String planProfit;
@ApiModelProperty("利润率")
private BigDecimal profitRate;
@ApiModelProperty("唯一供应商")
private String supplierName;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
@@ -13,14 +14,23 @@ import java.util.List;
@Data
public class ConstructionScheduleDTO {
private String id;
@ApiModelProperty("施工名称")
private String name;
@ApiModelProperty("计划开始时间")
private String planBeginDate;
@ApiModelProperty("计划结束时间")
private String planEndDate;
@ApiModelProperty("实际开始时间")
private String actualBeginDate;
@ApiModelProperty("实际结束时间")
private String actualEndDate;
@ApiModelProperty("工期")
private Integer duration;
@ApiModelProperty("状态(-1.不显示 0.未开工 1.施工中 2.已完工)")
private Integer state;
@ApiModelProperty("施工进度附件")
private List<AttachmentsDTO> attachments;
@ApiModelProperty("跟进日志")
private List<TrackDataDTO> trackData;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -11,14 +12,24 @@ import java.util.List;
*/
@Data
public class DecorationDTO {
@ApiModelProperty("项目主键")
private String projectId;
@ApiModelProperty("客户编号")
private String clientCode;
@ApiModelProperty("项目编号")
private String clientName;
@ApiModelProperty("项目编码")
private String pCode;
@ApiModelProperty("客户编号")
private String clientContractCode;
@ApiModelProperty("项目地址")
private String address;
@ApiModelProperty("预算")
private List<BudgetDTO> proposedBookBudget;
@ApiModelProperty("设计进度")
private List<DesignSchemeDTO> designScheme;
@ApiModelProperty("收款单据")
private List<PaymentDTO> payment;
@ApiModelProperty("施工进度")
private List<ConstructionScheduleDTO> constructionSchedule;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -13,13 +14,22 @@ import java.util.List;
public class DesignSchemeDTO {
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("说明")
private String remark;
@ApiModelProperty("预计时间")
private String date;
@ApiModelProperty("计划开始")
private String planBeginDate;
@ApiModelProperty("计划结束")
private String planEndDate;
@ApiModelProperty("开始时间")
private String beginDate;
@ApiModelProperty("完成时间")
private String endDate;
@ApiModelProperty("状态(0.验收未通过 1.未开始 2.设计中 3.未验收 4.验收未通过 5.待审批 6.审批驳回 7.审批中 8.审批作废 9.审批通过 10.审批验收未通过 11.验收通过)")
private Integer status;
@ApiModelProperty("设计进度附件")
private List<AttachmentsDTO> attachments;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
@@ -13,9 +14,13 @@ import java.time.LocalDate;
public class FileDTO {
private Long id;
@ApiModelProperty("路径")
private String path;
@ApiModelProperty("标题")
private String title;
@ApiModelProperty("创建人")
private String create;
@ApiModelProperty("创建时间")
private String createDate;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -14,15 +15,26 @@ import java.util.List;
@Data
public class PaymentDTO {
private String id;
@ApiModelProperty("单据日期")
private String billDate;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("制单人")
private String userName;
@ApiModelProperty("应收金额")
private BigDecimal amount;
@ApiModelProperty("本次收款")
private BigDecimal bDeAmount;
@ApiModelProperty("业务类别")
private String typeCategory;
@ApiModelProperty("收款账户")
private String accountName;
@ApiModelProperty("状态(0.保存 2.审核 3.提交审批")
private Integer state;
@ApiModelProperty("审核日期")
private String auditTime;
@ApiModelProperty("审核人")
private String auditUser;
@ApiModelProperty("付款单附件")
private List<AttachmentsDTO> attachments;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -10,9 +11,14 @@ import lombok.Data;
*/
@Data
public class ProjectDTO {
@ApiModelProperty("项目主键")
private String projectId;
@ApiModelProperty("客户编号")
private String clientCode;
@ApiModelProperty("客户名称")
private String clientName;
@ApiModelProperty("项目编码")
private String pCode;
@ApiModelProperty("项目地址")
private String address;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -13,14 +14,14 @@ import java.util.List;
public class TrackDataDTO {
private Long id;
@ApiModelProperty("跟进人")
private String person;
@ApiModelProperty("备注(内容)")
private String remark;
@ApiModelProperty("日期")
private String date;
@ApiModelProperty("回复ID")
private Integer RepalyId;
@ApiModelProperty("跟进日志附件")
private List<FileDTO> file;
}

2
coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanAuditRequest.java
View File

@@ -20,7 +20,7 @@ public class OpeningOperationPlanAuditRequest {
@ApiModelProperty("店铺id")
private Long shopId;
@ApiModelProperty("结果类型 0通过,1拒绝")
@ApiModelProperty("审核结果状态：0.待审核 1. 通过 2. 拒绝")
private Integer resultType;
@ApiModelProperty("通过原因")

32
coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java
View File

@@ -3,6 +3,10 @@ package com.cool.store.request;
import com.cool.store.entity.OpeningOperationPlanDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
/**
* @Auther: WangShuo
@@ -24,16 +28,16 @@ public class OpeningOperationPlanRequest {
private String surveyResult;
@ApiModelProperty("调研结果url")
private String surveyResultUrl;
private List<String> surveyResultUrl;
@ApiModelProperty("活动主题")
private String activityTheme;
@ApiModelProperty("活动主题url")
private String activityThemeUrl;
private List<String> activityThemeUrl;
@ApiModelProperty("筹备人员ids")
private String preparationUserIds;
private List<String> preparationUserIds;
@ApiModelProperty("是否完成排车路线")
private Byte routeCompleted;
@@ -42,14 +46,20 @@ public class OpeningOperationPlanRequest {
public OpeningOperationPlanDO toOpeningOperationPlanDO() {
OpeningOperationPlanDO openingOperationPlanDO = new OpeningOperationPlanDO();
openingOperationPlanDO.setShopId(shopId);
openingOperationPlanDO.setPlanSource(planSource);
openingOperationPlanDO.setSurveyResult(surveyResult);
openingOperationPlanDO.setSurveyResultUrl(surveyResultUrl);
openingOperationPlanDO.setActivityTheme(activityTheme);
openingOperationPlanDO.setActivityThemeUrl(activityThemeUrl);
openingOperationPlanDO.setPreparationUserIds(preparationUserIds);
openingOperationPlanDO.setRouteCompleted(routeCompleted);
openingOperationPlanDO.setShopId(this.shopId);
openingOperationPlanDO.setPlanSource(this.planSource);
openingOperationPlanDO.setSurveyResult(this.surveyResult);
if (CollectionUtils.isNotEmpty(this.surveyResultUrl)) {
openingOperationPlanDO.setSurveyResultUrl(String.join(",", this.surveyResultUrl));
}
if (CollectionUtils.isNotEmpty(this.activityThemeUrl)) {
openingOperationPlanDO.setActivityThemeUrl(String.join(",", this.activityThemeUrl));
}
if (CollectionUtils.isNotEmpty(this.preparationUserIds)) {
openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds));
}
openingOperationPlanDO.setActivityTheme(this.activityTheme);
openingOperationPlanDO.setRouteCompleted(this.routeCompleted);
return openingOperationPlanDO;
}
}

21
coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationModeStageVO.java Normal file
View File

@@ -0,0 +1,21 @@
package com.cool.store.vo.Fitment;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Auther: WangShuo
* @Date: 2024/04/30/上午10:08
* @Version 1.0
* @注释:
*/
@Data
public class DecorationModeStageVO {
@ApiModelProperty("装修阶段状态")
private Integer shopSubStageStatus;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date creatTime;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/DecorationModelVO.java → coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationModelVO.java
View File

@@ -1,4 +1,4 @@
package com.cool.store.vo;
package com.cool.store.vo.Fitment;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;

11
coolstore-partner-model/src/main/java/com/cool/store/vo/DesignInfoVo.java → coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DesignInfoVo.java
View File

@@ -1,10 +1,10 @@
package com.cool.store.vo;
package com.cool.store.vo.Fitment;
import com.cool.store.dto.decoration.AttachmentsDTO;
import com.cool.store.dto.decoration.BudgetDTO;
import com.cool.store.dto.decoration.ConstructionScheduleDTO;
import com.cool.store.dto.decoration.DesignSchemeDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -17,9 +17,12 @@ import java.util.List;
*/
@Data
public class DesignInfoVo {
@ApiModelProperty("平面图+施工图")
private List<DesignSchemeDTO> designScheme;
@ApiModelProperty("量房")
private ConstructionScheduleDTO measuringRoom;
private ConstructionScheduleDTO ConstructionDrawings;
@ApiModelProperty("预算")
private BudgetDTO proposedBookBudget;
@ApiModelProperty("阶段状态")
private Integer shopSubStageStatus;
}

14
coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanVO.java
View File

@@ -5,7 +5,9 @@ import com.cool.store.entity.OpeningOperationPlanDO;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -22,13 +24,13 @@ public class OpeningOperationPlanVO {
private String surveyResult;
@ApiModelProperty("调研结果url")
private String surveyResultUrl;
private List<String> surveyResultUrl;
@ApiModelProperty("活动主题")
private String activityTheme;
@ApiModelProperty("活动主题url")
private String activityThemeUrl;
private List<String> activityThemeUrl;
@ApiModelProperty("筹备人员name")
private List<UserNameDTO> preparationUsers;
@@ -57,9 +59,13 @@ public class OpeningOperationPlanVO {
this.submittedUserId = openingOperationPlanDO.getSubmittedUserId();
this.submissionTime = openingOperationPlanDO.getSubmissionTime();
this.routeCompleted = openingOperationPlanDO.getRouteCompleted();
this.activityThemeUrl = openingOperationPlanDO.getActivityThemeUrl();
if (StringUtils.isNotBlank(openingOperationPlanDO.getActivityThemeUrl())) {
this.activityThemeUrl = Arrays.asList(openingOperationPlanDO.getActivityThemeUrl().split(",")) ;
}
if (StringUtils.isNotBlank(openingOperationPlanDO.getSurveyResultUrl())) {
this.surveyResultUrl = Arrays.asList(openingOperationPlanDO.getSurveyResultUrl().split(",")) ;
}
this.activityTheme = openingOperationPlanDO.getActivityTheme();
this.surveyResultUrl = openingOperationPlanDO.getSurveyResultUrl();
this.surveyResult = openingOperationPlanDO.getSurveyResult();
}
}