车型接口修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -588,7 +588,7 @@
                bmc.independentSources,
                bmc.fuelTank,
                bmc.multimedia,
-               bv.guidedPrice,
+--                bv.salePrice as price,
                bmc.otherConfig
         FROM base_vehicle bv
                  LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -39,7 +39,8 @@
         if(length(bd.nodeState) > 0, nodeState, '待提交') as contractState,
         if(length(bd.nodeState) > 0, false, true) as showUpdata,
         bd.contractNo as contractId,
-        bd.applyName as `name`,
+        bd.applyName,
+        bd.name as customerName,
         DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as `date`
         FROM bus_delivered_apply bd
         <where>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -49,6 +49,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -89,6 +90,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
     private BusDeliveredService busDeliveredService;
     @Autowired
     private CrmCustomerTempFeign crmCustomerTempFeign;
@@ -714,10 +717,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     public ResultBean saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = appDeliveredApplyDto.getSid();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(appDeliveredApplyDto.getUserSid()).getData();
         if (StringUtils.isBlank(dtoSid)) {
             BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
             BeanUtil.copyProperties(appDeliveredApplyDto, busDeliveredApply, "sid");
-            save(busDeliveredApply);
             List<AppCarListDto> carList = appDeliveredApplyDto.getCarList();
             if (carList.size() > 0) {
                 busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid());
@@ -727,6 +730,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if (stringResultBean.getSuccess()) {
                 busDeliveredApply.setOrgSid(stringResultBean.getData());
             }
+            busDeliveredApply.setApplySid(sysUserVo.getSid());
+            busDeliveredApply.setApplyName(sysUserVo.getName());
             save(busDeliveredApply);
         } else {
             BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid);

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@@ -99,7 +99,7 @@
                cv.modelName           AS model,
                cv.brandSid,
                cv.brandName           AS brand,
-               cv.saleReferencePrice  AS guidancePrice,
+               convert(cv.saleReferencePrice/10000,decimal(10,2))   AS guidancePrice,
                cv.vehicleModelOffer   AS price,
                cv.comonConfigSid      AS configSid,
                cv.remarks,

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java

@@ -36,5 +36,8 @@ public class AppScmVehicleExaminePageVo implements Vo {
     @ApiModelProperty("是否验车 未验车 1 以验车2")
     private String inspectedType;
 
+    @ApiModelProperty("保存状态（默认为0 未操作 1 已保存）")
+    private int saveStatus;
+
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java

@@ -94,5 +94,7 @@ public class ScmVehicleExamine extends BaseEntity {
     private String modelDifferenceExplain; // 车型配置差异说明
     @ApiModelProperty("保修卡卡号")
     private String guaranteeCardNo; // 保修卡卡号
+    @ApiModelProperty("保存状态（默认为0 未操作 1 已保存）")
+    private int saveStatus;
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@@ -24,7 +24,8 @@
         sve.purchaseType,
         sve.inspection as inspectedName,
         sve.inspectionDate as inspectedDate,
-        sve.inspectionResult as inspectedType
+        sve.inspectionResult as inspectedType,
+        sve.saveStatus
         FROM scm_vehicle_examine sve
         <where>
             ${ew.sqlSegment}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -355,6 +355,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (StringUtils.isNotBlank(dto.getInspectedSid())) {
             ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid());
             if ("1".equals(scmVehicleExamine.getInspectionResult())) {
+                scmVehicleExamine.setSaveStatus(1);
                 scmVehicleExamine.setVinNo(dto.getVin());
                 scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey());
                 scmVehicleExamine.setModelName(dto.getModel());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java

@@ -33,4 +33,7 @@ public class AppExaminePageVo implements Vo {
     @ApiModelProperty("是否验车 key 未验车 1 以验车2")
     private String inspectedType;
 
+    @ApiModelProperty("保存状态（默认为0 未操作 1 已保存）")
+    private int saveStatus;
+
 }