订单增加其他金额以及备注

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDetailsDTO.java

@@ -116,4 +116,7 @@ public class ServiceOrderFormDetailsDTO {
 
     @ApiModelProperty(value = "1:双方无责 2:发布者责任 3：飞手责任")
     private Integer duty;
+
+    @ApiModelProperty(value = "订单对应的项目号")
+    private String projectCode;
 }

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

@@ -77,6 +77,12 @@ public class OrderAmountDetailDO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date workDate;
 
+    @ApiModelProperty(value = "其他")
+    private BigDecimal otherSubsidy;
+
+    @ApiModelProperty(value = "备注，解释为什么有其他费用")
+    private String remark;
+
     private static final long serialVersionUID = 1L;
 
     /**

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

@@ -113,6 +113,8 @@ public class ServiceOrderFormDetailsDO {
     private Integer duty;
 
 
+    @ApiModelProperty(value = "订单对应的项目号")
+    private String projectCode;
 
 
     public ServiceOrderFormDetailsDTO buildOrderFormDetails() {
@@ -143,6 +145,7 @@ public class ServiceOrderFormDetailsDO {
                 .orderEarnings(this.orderEarnings)
                 .duty(this.duty)
                 .decisionContent(this.decisionContent)
+                .projectCode(this.projectCode)
                 .build();
     }
 }

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

@@ -188,6 +188,7 @@
             ri.task_address,
             ri.latitude,
             ri.longitude,
+            ri.project_code,
             ra.cash_amount,
             ra.salary_amount,
             ra.we_chat,

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

@@ -21,7 +21,7 @@
         id,requirements_info_id,daily_wage,
         subsidy_festival,rental_subsidy,traffic_subsidy,
         high_temperature_subsidy,settle_accounts_proportion,real_wages,
-        work_date,create_time,update_time
+        work_date,create_time,update_time,other_subsidy,remark
     </sql>
 
 
@@ -53,12 +53,12 @@
     <insert id="batchInsert" parameterType="java.util.List">
         insert into order_amount_detail
         (id, requirements_info_id, daily_wage, subsidy_festival, rental_subsidy, traffic_subsidy,
-        high_temperature_subsidy, settle_accounts_proportion, real_wages, work_date, create_time)
+        high_temperature_subsidy, settle_accounts_proportion, real_wages, work_date, create_time,other_subsidy,remark)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.id}, #{item.requirementsInfoId}, #{item.dailyWage}, #{item.subsidyFestival}, #{item.rentalSubsidy},
             #{item.trafficSubsidy}, #{item.highTemperatureSubsidy}, #{item.settleAccountsProportion}, #{item.realWages},
-            #{item.workDate}, NOW())
+            #{item.workDate}, NOW(),#{item.otherSubsidy},#{item.remark})
         </foreach>
     </insert>