Skip to content

I
ims-ci-test
提交 d2bf82b5 作者: 张小凤
操作

Require(update)

上级 f07e4d56
正在显示 包含 282 行增加 和 52 行删除
csf-common/csf-common-model/src/main/java/com/mmc/csf/config/IsNullConvertZero.java 0 → 100644
package com.mmc.csf.config;
import java.lang.annotation.*;
/**
* @Author small
* @Date 2023/8/23 14:16
* @Version 1.0
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
public @interface IsNullConvertZero {
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/config/IsNullConvertZeroUtil.java 0 → 100644
package com.mmc.csf.config;
import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.util.Objects;
/**
* @Author small
* @Date 2023/8/23 14:16
* @Version 1.0
*/
@Slf4j
public class IsNullConvertZeroUtil {
public static Object checkIsNull(Object obj) {
try {
Class<?> clazz = obj.getClass();
//获得私有的成员属性
Field[] fields = clazz.getDeclaredFields();
if (Objects.nonNull(fields) && fields.length > 0) {
for (Field field : fields) {
field.setAccessible(true);
//判断IsNullConvertZero注解是否存在
if (field.isAnnotationPresent(IsNullConvertZero.class)) {
if (Objects.isNull(field.get(obj))) {
field.set(obj, BigDecimal.ZERO);
}
}
}
}
} catch (Exception e) {
log.error("IsNullConvertZeroUtil出现异常：{}", e);
}
return obj;
}
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/GetOrderNumberDTO.java
package com.mmc.csf.infomation.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.mmc.csf.config.IsNullConvertZero;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
......@@ -30,6 +31,7 @@ public class GetOrderNumberDTO implements Serializable {
private String paymentOrderNumber;
@ApiModelProperty(value = "微信需要支付金额", example = "100")
@IsNullConvertZero
private BigDecimal weChatPay;
@JsonIgnore
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/FlyerWalletFlowVO.java 0 → 100644
package com.mmc.csf.infomation.vo;
import com.mmc.csf.config.IsNullConvertZero;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author small
* @Date 2023/8/23 9:44
* @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
public class FlyerWalletFlowVO {
@ApiModelProperty(value = "用户ID")
private Integer userAccountId;
@ApiModelProperty(value = "支付方式 100（订单发布） 200(无人接单取消订单）300（有人接单取消订单）400（飞手抢单）500（客服判定飞手无责取消订单）600（飞手有责取消订单）700（正常结算）800(修改订单金额状态)900（飞手未确认修改金额状态）1000（飞手确认修改金额状态）")
private Integer modeOfPayment;
@ApiModelProperty(value = "云享金（需要正负）")
@IsNullConvertZero
private BigDecimal cashAmount;
@ApiModelProperty(value = "佣金（需要正负）")
@IsNullConvertZero
private BigDecimal salaryAmount;
@ApiModelProperty(value = "支付时间")
private Date timeOfPayment;
@ApiModelProperty(value = "操作者用户id")
private Integer operateUserAccountId;
@ApiModelProperty(value = "云享金违约金（需要正负）")
@IsNullConvertZero
private BigDecimal yxjCashPledge;
@ApiModelProperty(value = "佣金违约金（需要正负）")
@IsNullConvertZero
private BigDecimal salaryCashPledge;
@ApiModelProperty(value = "订单的百分比违约金(这笔钱是给发布方的)")
@IsNullConvertZero
private BigDecimal percentagePenaltyOfOrder;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/GetOrderNumberVO.java
package com.mmc.csf.infomation.vo;
import com.mmc.csf.release.model.group.Insert;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
......@@ -21,12 +19,13 @@ import java.math.BigDecimal;
@Builder
public class GetOrderNumberVO {
@ApiModelProperty(value = "订单金额", example = "100", required = true)
@NotNull(message = "订单金额", groups = {Insert.class})
@ApiModelProperty(value = "订单金额", example = "100.00", required = true)
//@NotNull(message = "订单金额", groups = {Insert.class})
//@DecimalMin(value = "100.00", message = "amount格式不正确")
private BigDecimal orderAmount;
@ApiModelProperty(value = "订单级别 todo:前端传英文,后台自己获取金额 订单级别(REGULAR_ORDER,RUSH_ORDER,TOP_ORDER)", example = "REGULAR_ORDER", required = true)
@NotNull(message = "订单级别", groups = {Insert.class})
@ApiModelProperty(value = "订单级别 todo:前端传英文,后台自己获取金额 订单级别(REGULAR_ORDER,RUSH_ORDER,TOP_ORDER) 注意抢单的时候传固定的普通支付 REGULAR_ORDER", example = "REGULAR_ORDER", required = true)
// @NotNull(message = "订单级别", groups = {Insert.class})
private OrderLevelEnum orderLevelEnum;
......@@ -47,5 +46,7 @@ public class GetOrderNumberVO {
@ApiModelProperty(value = "订单方式 发布订单:1 ,抢单：2", example = "1", required = true)
private Integer orderMode;
@ApiModelProperty(value = "抢单时需要知道抢单的那个订单", example = "1")
private Integer requirementsInfoId;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/GrabTheOrderVO.java
......@@ -39,8 +39,8 @@ public class GrabTheOrderVO {
@ApiModelProperty(value = "微信金额", example = "10", hidden = true)
private BigDecimal weChat;
@ApiModelProperty(value = "发布者任务编号", example = "R202308192201279509820")
private String publisherNumber;
@ApiModelProperty(value = "抢单id", example = "1")
private Integer requirementsInfoId;
@JsonIgnore
private Integer userAccountId;
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/PublisherWalletFlowVO.java 0 → 100644
package com.mmc.csf.infomation.vo;
import com.mmc.csf.config.IsNullConvertZero;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author small
* @Date 2023/8/23 9:43
* @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
public class PublisherWalletFlowVO {
@ApiModelProperty(value = "用户ID")
@NotNull
private Integer userAccountId;
@ApiModelProperty(value = "支付方式 100（订单发布） 200(无人接单取消订单）300（有人接单取消订单）400（飞手抢单）500（客服判定飞手无责取消订单）" +
"600（飞手有责取消订单）700（正常结算）800(修改订单金额状态)900（飞手未确认修改金额状态）1000（飞手确认修改金额状态）")
private Integer modeOfPayment;
@ApiModelProperty(value = "云享金（需要正负）注：结算时修改金额如果大于原订单，需要支付的云享金，也传这个字段")
@IsNullConvertZero
private BigDecimal cashAmount;
@ApiModelProperty(value = "佣金（需要正负）注：结算时修改金额如果大于原订单，需要支付的佣金，也传这个字段")
@IsNullConvertZero
private BigDecimal salaryAmount;
@ApiModelProperty(value = "支付时间")
private Date timeOfPayment;
@ApiModelProperty(value = "操作者用户id")
@NotNull
private Integer operateUserAccountId;
@ApiModelProperty(value = "云享金违约金（需要正负）")
@IsNullConvertZero
private BigDecimal yxjCashPledge;
@ApiModelProperty(value = "佣金违约金（需要正负）")
@IsNullConvertZero
private BigDecimal salaryCashPledge;
@ApiModelProperty(value = "订单的百分比违约金(这笔钱是给飞手的) （需要正负）")
@IsNullConvertZero
private BigDecimal percentagePenaltyOfOrder;
@ApiModelProperty(value = "加急单云享金金额 （需要正负）")
@IsNullConvertZero
private BigDecimal urgentYxjAmount;
@ApiModelProperty(value = "加急单佣金金额 （需要正负）")
@IsNullConvertZero
private BigDecimal urgentSalaryAmount;
@ApiModelProperty(value = "置顶单云享金金额 （需要正负）")
@IsNullConvertZero
private BigDecimal topYxjAmount;
@ApiModelProperty(value = "置顶单佣金金额 （需要正负）")
@IsNullConvertZero
private BigDecimal topSalaryAmount;
@ApiModelProperty(value = "飞手应得订单金额 （正数）")
@IsNullConvertZero
private BigDecimal flyerSalaryAmount;
@ApiModelProperty(value = "修改后金额（注：①飞手未确认时，后面支付的需要退的佣金那部分钱 ②飞手确认时，修改后的金额小于原佣金，需要退多余的佣金那部分钱 ③如果全部是微信支付的则不用传值）")
@IsNullConvertZero
private BigDecimal refundSalaryAmount;
@ApiModelProperty(value = "修改后金额（注：①飞手未确认时，后面支付的需要退的云享金那部分钱 ②飞手确认时，修改后的金额小于原佣金，需要退多余的云享金那部分钱 ③如果全部是微信支付的则不用传值）")
@IsNullConvertZero
private BigDecimal refundCashAmount;
}
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/WalletFlowVO.java
package com.mmc.csf.infomation.vo;
import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.io.Serializable;
/**
* @Author small
......@@ -19,29 +16,13 @@ import java.math.BigDecimal;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class WalletFlowVO {
public class WalletFlowVO implements Serializable {
@ApiModelProperty(value = "用户ID")
private Integer userAccountId;
private static final long serialVersionUID = -8848411142632397203L;
@ApiModelProperty(value = "支付方式 200结算(完成) 300冻结 100订单取消")
private Integer modeOfPayment;
private PublisherWalletFlowVO publisherWalletFlowVO;
@ApiModelProperty(value = "云享金")
private BigDecimal cashAmount;
@ApiModelProperty(value = "佣金")
private BigDecimal salaryAmount;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private String timeOfPayment;
@ApiModelProperty(value = "操作者用户ID")
private Integer operateUserAccountId;
@ApiModelProperty(value = "微信金额")
private BigDecimal weChat;
private FlyerWalletFlowVO flyerWalletFlowVO;
}
release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java
......@@ -79,9 +79,9 @@ public interface RequirementsDao {
void addPublishService(ServiceRequirementsDO requirementsInfoDO);
ServiceRequirementsDO grabTheOrder(String publisherNumber);
ServiceRequirementsDO grabTheOrder(Integer requirementsInfoId);
void updateGrabTheOrder(String publisherNumber, Integer repertory);
void updateGrabTheOrder(Integer requirementsInfoId, Integer repertory);
void insertService(RequirementsServiceDO requirementsServiceDO);
......@@ -101,7 +101,7 @@ public interface RequirementsDao {
ServiceSettleAccountsDO settleAccountsDetails(Integer requirementsInfoId, Integer userAccountId);
void evaluate(ServiceEvaluateDO serviceEvaluateDO);
ServiceEvaluateDO evaluateDetails(Integer requirementsInfoId, Integer userAccountId);
......@@ -119,4 +119,6 @@ public interface RequirementsDao {
void updateInfo(Integer requirementsInfoId, Integer serviceFlowId);
void serviceOrder(Integer requirementsInfoId);
}
release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsAmountDO.java
package com.mmc.csf.release.entity.requirements;
import com.mmc.csf.config.IsNullConvertZero;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
......@@ -29,12 +30,15 @@ public class RequirementsAmountDO implements Serializable {
private Integer requirementsInfoId;
@ApiModelProperty(value = "发布者订单金额", example = "1")
@IsNullConvertZero
private BigDecimal orderAmount;
@ApiModelProperty(value = "发布者支付总金额", example = "1")
@IsNullConvertZero
private BigDecimal totalAmount;
@ApiModelProperty(value = "级别金额", example = "1")
@IsNullConvertZero
private BigDecimal orderLevelAmount;
......@@ -42,15 +46,18 @@ public class RequirementsAmountDO implements Serializable {
private String orderLevel;
@ApiModelProperty(value = "发布者支付微信金额", example = "1")
@IsNullConvertZero
private BigDecimal weChat;
@ApiModelProperty(value = "发布者支付佣金金额", example = "1")
@IsNullConvertZero
private BigDecimal salaryAmount;
@ApiModelProperty(value = "发布者微信支付订单", example = "1")
private String wechatPayOrderNumber;
@ApiModelProperty(value = "修改任务后的佣金", example = "1")
@IsNullConvertZero
private BigDecimal updateOrderAmount;
@ApiModelProperty(value = "原因", example = "原因")
......@@ -61,8 +68,20 @@ public class RequirementsAmountDO implements Serializable {
@ApiModelProperty(value = "后台获取token里面的用户id", hidden = true)
private Integer userAccountId;
@ApiModelProperty(value = "云享金", example = "10")
@IsNullConvertZero
private BigDecimal cashAmount;
@ApiModelProperty(value = "置顶/加急 佣金支付多少", example = "100")
@IsNullConvertZero
private BigDecimal levelSalaryAmount;
@ApiModelProperty(value = "置顶/加急 微信支付多少", example = "100")
@IsNullConvertZero
private BigDecimal levelWeChatAmount;
@ApiModelProperty(value = "置顶/加急 云享金支付多少", example = "100")
@IsNullConvertZero
private BigDecimal levelCashAmount;
public RequirementsAmountDO(ServiceRequirementsDO requirementsInfoDO) {
this.requirementsInfoId = requirementsInfoDO.getId();
this.orderAmount = requirementsInfoDO.getOrderAmount();
......@@ -74,6 +93,9 @@ public class RequirementsAmountDO implements Serializable {
this.wechatPayOrderNumber = requirementsInfoDO.getWechatPayOrderNumber();
this.userAccountId = requirementsInfoDO.getUserAccountId();
this.cashAmount = requirementsInfoDO.getCashAmount();
this.levelSalaryAmount = requirementsInfoDO.getLevelSalaryAmount();
this.levelWeChatAmount = requirementsInfoDO.getLevelWeChatAmount();
this.levelCashAmount = requirementsInfoDO.getLevelCashAmount();
}
}
release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsServiceDO.java
package com.mmc.csf.release.entity.requirements;
import com.mmc.csf.config.IsNullConvertZero;
import com.mmc.csf.infomation.dto.PilotCertificationInteriorDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
......@@ -38,18 +39,22 @@ public class RequirementsServiceDO implements Serializable {
private Integer teamUserId;
@ApiModelProperty(value = "云享金", example = "10")
@IsNullConvertZero
private BigDecimal cashAmount;
@ApiModelProperty(value = "佣金", example = "10")
@IsNullConvertZero
private BigDecimal salaryAmount;
@ApiModelProperty(value = "微信金额", example = "10")
@IsNullConvertZero
private BigDecimal weChat;
@ApiModelProperty(value = "微信支付订单编号", example = "R202308191657303116170")
private String wechatPayOrderNumber;
@ApiModelProperty(value = "抢单支付的总金额", example = "抢单支付的总金额")
@IsNullConvertZero
private BigDecimal preemptTotalAmount;
@ApiModelProperty(value = "任务流程id", example = "任务流程id")
private Integer serviceFlowId;
......@@ -59,6 +64,5 @@ public class RequirementsServiceDO implements Serializable {
this.pilotCertificationId = pilot.getId();
this.pilotCertificationUserId = pilot.getUserAccountId();
this.requirementsInfoId = requirementsInfoDO.getId();
this.serviceDictionaryId = 2;
}
}
release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsDO.java
package com.mmc.csf.release.entity.requirements;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mmc.csf.config.IsNullConvertZero;
import com.mmc.csf.infomation.vo.OrderLevelEnum;
import com.mmc.csf.infomation.vo.ServiceRequirementsVO;
import com.mmc.csf.release.model.group.Insert;
......@@ -65,6 +66,7 @@ public class ServiceRequirementsDO {
@ApiModelProperty(value = "订单金额", example = "订单金额", required = true)
@NotNull(message = "订单金额", groups = {Insert.class})
@IsNullConvertZero
private BigDecimal orderAmount;
@ApiModelProperty(value = "飞手保险", example = "飞手保险", required = true)
......@@ -89,6 +91,7 @@ public class ServiceRequirementsDO {
private String publisherNumber;
@ApiModelProperty(value = "0普通 100急单 300置顶")
@IsNullConvertZero
private BigDecimal orderLevelAmount;
@ApiModelProperty(value = "订单级别 REGULAR_ORDER,RUSH_ORDER,TOP_ORDER")
......@@ -96,16 +99,20 @@ public class ServiceRequirementsDO {
@ApiModelProperty(value = "总金额", example = "100", required = true)
@NotNull(message = "总金额", groups = {Insert.class})
@IsNullConvertZero
private BigDecimal totalAmount;
@ApiModelProperty(value = "云享金", example = "10")
@IsNullConvertZero
private BigDecimal cashAmount;
@ApiModelProperty(value = "佣金", example = "10")
@IsNullConvertZero
private BigDecimal salaryAmount;
@ApiModelProperty(value = "微信金额", example = "10")
@IsNullConvertZero
private BigDecimal weChat;
@ApiModelProperty(value = "微信支付订单编号", example = "R202308191657303116170")
......@@ -118,6 +125,16 @@ public class ServiceRequirementsDO {
private String paymentType;
@ApiModelProperty(value = "地区编码")
private String adcode;
@IsNullConvertZero
@ApiModelProperty(value = "置顶/加急 佣金支付多少", example = "100")
private BigDecimal levelSalaryAmount;
@ApiModelProperty(value = "置顶/加急 微信支付多少", example = "100")
@IsNullConvertZero
private BigDecimal levelWeChatAmount;
@ApiModelProperty(value = "置顶/加急 云享金支付多少", example = "100")
@IsNullConvertZero
private BigDecimal levelCashAmount;
public ServiceRequirementsDO(ServiceRequirementsVO serviceRequirementsVO) {
this.id = serviceRequirementsVO.getId();
......
release-service/src/main/resources/mapper/requirements/RequirementsDao.xml
......@@ -281,7 +281,7 @@
FROM requirements_info ri
LEFT JOIN requirements_type rt
ON rt.id = ri.requirement_type_id
LEFT JOIN service_flow sf ON sf.order_status = ri.service_flow_id
LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
AND ra.user_account_id = ri.user_account_id
WHERE ri.id = #{id}
......@@ -304,10 +304,12 @@
keyProperty="id" useGeneratedKeys="true">
INSERT INTO requirements_amount(requirements_info_id, user_account_id, create_time, update_time, order_amount,
total_amount, order_level_amount, order_level, cash_amount, we_chat,
salary_amount, wechat_pay_order_number)
salary_amount, wechat_pay_order_number, level_cash_amount,
level_we_chat_amount, level_salary_amount)
VALUES (#{requirementsInfoId}, #{userAccountId}, NOW(), NOW(), #{orderAmount},
#{totalAmount}, #{orderLevelAmount}, #{orderLevel}, #{cashAmount}, #{weChat},
#{salaryAmount}, #{wechatPayOrderNumber});
#{salaryAmount}, #{wechatPayOrderNumber}, #{levelCashAmount}, #{levelWeChatAmount},
#{levelSalaryAmount});
</insert>
<select id="grabTheOrder" resultType="com.mmc.csf.release.entity.requirements.ServiceRequirementsDO">
......@@ -326,16 +328,18 @@
ri.publish_phone,
ri.publisher_number,
ri.service_id,
ri.total_amount,
ra.total_amount,
ri.repertory,
ri.order_level,
ri.cash_amount,
ri.we_chat,
ri.salary_amount,
ri.wechat_pay_order_number
ra.order_level,
ra.cash_amount,
ra.we_chat,
ra.salary_amount,
ra.wechat_pay_order_number,
ra.order_amount
FROM requirements_info ri
LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
WHERE ri.publisher_number = #{publisherNumber}
LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
WHERE ri.id = #{requirementsInfoId}
</select>
<update id="updateGrabTheOrder">
......@@ -343,7 +347,7 @@
set repertory=#{repertory},
service_flow_id = 2,
update_time=NOW()
where publisher_number = #{publisherNumber}
where id = #{requirementsInfoId}
</update>
<insert id="insertService" parameterType="com.mmc.csf.release.entity.requirements.RequirementsServiceDO"
......@@ -354,7 +358,7 @@
wechat_pay_order_number, service_flow_id, preempt_total_amount)
VALUES (#{requirementsInfoId}, #{pilotCertificationId}, #{pilotCertificationUserId},
#{teamId}, #{teamUserId}, #{cashAmount}, #{weChat}, #{salaryAmount}, #{wechatPayOrderNumber}, 2,
preemptTotalAmount);
#{preemptTotalAmount});
</insert>
<insert id="arriveAtTheScene" parameterType="com.mmc.csf.release.entity.requirements.ServiceArriveSceneDO"
......@@ -472,7 +476,7 @@
FROM requirements_info ri
LEFT JOIN requirements_type rt
ON rt.id = ri.requirement_type_id
LEFT JOIN service_flow sf ON sf.order_status = ri.service_flow_id
LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
WHERE ri.user_account_id = #{userAccountId}
ORDER BY ri.order_level_amount desc,
ri.id desc
......@@ -507,7 +511,7 @@
ri.order_amount,
FROM requirements_info ri
LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
LEFT JOIN service_flow sf ON sf.order_status = ri.service_flow_id
LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
WHERE rs.pilot_certification_user_id = #{userAccountId}
ORDER BY ri.order_level_amount desc,
......@@ -548,7 +552,7 @@
FROM requirements_info ri
LEFT JOIN requirements_type rt
ON rt.id = ri.requirement_type_id
LEFT JOIN service_flow sf ON sf.order_status = ri.service_flow_id
LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
WHERE rs.pilot_certification_user_id = #{userAccountId}
and rs.requirements_info_id = #{requirementsInfoId}
......@@ -582,7 +586,7 @@
ri.publish
FROM requirements_info ri
LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
LEFT JOIN service_flow sf ON sf.order_status = ri.service_flow_id
LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
WHERE ri.user_account_id = #{userAccountId}
AND ri.id = #{requirementsInfoId}
</select>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论