RequirementsDao.xml(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceEvaluateVO.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * @Author small
@@ -23,6 +24,7 @@ public class ServiceEvaluateVO {
     private Integer userAccountId;
 
     @ApiModelProperty(value = "评价内容", example = "1")
+    @Length(max = 300, message = "字符过长")
     private String evaluationContent;
 
     @ApiModelProperty(value = "星级", example = "星")

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceFulfilATaskVO.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * @Author small
@@ -20,6 +21,7 @@ public class ServiceFulfilATaskVO {
     private Integer id;
 
     @ApiModelProperty(value = "完成任务描述", example = "完成任务描述一下")
+    @Length(max = 300, message = "字符过长")
     private String taskDescribe;
 
     @ApiModelProperty(value = "完成任务图片", example = "http://")

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceSettleAccountsVO.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -26,6 +27,7 @@ public class ServiceSettleAccountsVO implements Serializable {
     private BigDecimal orderAmount;
 
     @ApiModelProperty(value = "备注", example = "项目延期")
+    @Length(max = 300, message = "字符过长")
     private String remark;
 
     @ApiModelProperty(value = "需求id", example = "83")

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceOrderFormDetailsDO.java

@@ -102,6 +102,9 @@ public class ServiceOrderFormDetailsDO {
     @ApiModelProperty(value = "当前状态")
     private String doing;
 
+    @ApiModelProperty(value = "平台总收益")
+    private BigDecimal orderEarnings;
+
 
     public ServiceOrderFormDetailsDTO buildOrderFormDetails() {
         return ServiceOrderFormDetailsDTO.builder()
@@ -128,6 +131,7 @@ public class ServiceOrderFormDetailsDO {
                 .createTime(this.createTime)
                 .updateTime(this.updateTime)
                 .orderStatus(this.orderStatus)
+                .orderEarnings(this.orderEarnings)
                 .build();
     }
 }

release-service/src/main/resources/mapper/requirements/BackRequirementsDao.xml

@@ -26,6 +26,7 @@
         <result property="requireDescription" column="require_description"/>
         <result property="orderStatus" column="order_status"/>
         <result property="doing" column="doing"/>
+        <result property="orderEarnings" column="order_earnings"/>
         <collection property="orderEarningsDTO" ofType="com.mmc.csf.infomation.dto.PlatformOrderEarningsDTO"
                     select="selectOrderEarnings"
                     column="{requirementsInfoId=id}">
@@ -128,9 +129,11 @@
                ra.update_order_amount,
                ri.require_description,
                sf.order_status,
-               sf.doing
+               sf.doing,
+               ra.order_earnings
         FROM requirements_info ri
-                 LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
+                 LEFT JOIN requirements_amount ra
+                           ON ri.id = ra.requirements_info_id
                  LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
                  LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE ri.id = #{requirementsInfoId}

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -407,9 +407,10 @@
         WHERE NOT EXISTS(
                 SELECT rs.requirements_info_id FROM requirements_service rs WHERE ri.id = rs.requirements_info_id)
           AND ri.service_flow = 1
-          and ri.is_deleted = 0
+          AND ri.is_deleted = 0
+          AND ri.service_flow_id != 7
         ORDER BY ri.order_level_amount DESC,
-                 ri.id DESC
+            ri.id DESC
     </select>
 
     <select id="detailPublish" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">