修复接口问题

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1305,7 +1305,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     //查询意向车型sid查询车型信息并保存车型：品牌sid、品牌、车型sid、配置sid、车型名称、车型配置名称、常用配置、更多配置、特殊配置说明、单台指导价、单台成交价
                     //意向车型可以查询的：品牌sid、品牌、车型sid、配置sid、车型名称、车型配置、其他配置说明、数量、换选装内容为特殊配置说明、销售参考价
                     ResultBean<CrmVehicleDemandOrderVo> orderVoResultBean = crmVehicledemandFeign.getInfo(intentionSid);
-                    if (!orderVoResultBean.getSuccess()) {
+                    if (orderVoResultBean.getSuccess()) {
                         CrmVehicleDemandOrderVo crmVehicleDemandOrderVo = orderVoResultBean.getData();
                         BusSalesOrderModel busSalesOrderModel = new BusSalesOrderModel();
                         busSalesOrderModel.setSalesOrderSid(sid);
@@ -1317,6 +1317,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         busSalesOrderModel.setGuildPrice(new BigDecimal(crmVehicleDemandOrderVo.getSaleReferencePrice()));
                         busSalesOrderModel.setMoreConfig(crmVehicleDemandOrderVo.getOtherConfig());
                         busSalesOrderModel.setSpecialConfig(crmVehicleDemandOrderVo.getChangeOptions());
+                        busSalesOrderModel.setModelName(crmVehicleDemandOrderVo.getModelName());
                         busSalesOrderModelService.insert(busSalesOrderModel);
                         BusSalesOrderPrice busSalesOrderPrice = new BusSalesOrderPrice();
                         busSalesOrderPrice.setQuantity(crmVehicleDemandOrderVo.getNumber());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemRest.java

@@ -35,6 +35,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * Project: anrui-scm(供应链) <br/>
  * File: ScmVehicleInspectitemFeignFallback.java <br/>
@@ -68,7 +70,7 @@ public class ScmVehicleInspectitemRest implements ScmVehicleInspectitemFeign {
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-    public ResultBean<String> save(@RequestBody ScmVehicleInspectitemDto dto) {
+    public ResultBean<String> save(@Valid @RequestBody ScmVehicleInspectitemDto dto) {
         return scmVehicleInspectitemService.saveOrUpdateDto(dto);
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java

@@ -6,7 +6,6 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -28,7 +27,7 @@ public interface AppFeign {
     @ApiOperation("流程审核记录")
     @GetMapping("/getProgressList")
     @ResponseBody
-    ResultBean<List<AppFlowableRecordVo>> getProgressList(@SpringQueryMap AppFlowableRecordQuery appFlowableRecordQuery);
+    ResultBean<List<AppFlowableRecordVo>> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery);
 
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordQuery.java

@@ -14,8 +14,7 @@ import lombok.Data;
 public class AppFlowableRecordQuery implements Query {
     private static final long serialVersionUID = -1052692071435565128L;
     @ApiModelProperty(value = "流程实例id")
-    @JsonProperty("progressId")
-    private String procInsId;
+    private String progressId;
 
     @ApiModelProperty(value = "流程id")
     private String deployId;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java

@@ -35,6 +35,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -116,5 +117,5 @@ public interface AppScmVehicleGressionFeign {
     @ApiOperation("获取流程操作标题")
     @GetMapping("/getFlowOperateTitle")
     @ResponseBody
-    ResultBean<String> getFlowOperateTitle(GressionQuery query);
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap GressionQuery query);
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -30,7 +30,7 @@ public class AppService {
     public ResultBean<List<AppFlowableRecordVo>> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) {
         ResultBean<List<AppFlowableRecordVo>> rb = ResultBean.fireFail();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String procInsId = appFlowableRecordQuery.getProcInsId();
+        String procInsId = appFlowableRecordQuery.getProgressId();
         String deployId = appFlowableRecordQuery.getDeployId();
         ResultBean<FlowRecordVo> resultBean = flowTaskFeign.businessFlowRecord(procInsId, deployId);
         List<AppFlowableRecordVo> voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList());

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java

@@ -200,7 +200,7 @@ public class AppScmVehicleGressionService {
         //0 上一环节  1下一环节
         int next = query.getNext();
         GetNodeQuery getNodeQuery = new GetNodeQuery();
-        BeanUtil.copyProperties(getNodeQuery, query);
+        BeanUtil.copyProperties(query, getNodeQuery);
         String data = "";
         if (next == 0) {
             ResultBean<List<GetNodeVo>> getPreviousNodesForReject = scmVehicleGressionFeign.getPreviousNodesForReject(getNodeQuery);