销售订单重新一键重发

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java

@@ -26,7 +26,6 @@
 package com.yxt.anrui.base.api.basemodelmodprice;
 
 import com.yxt.anrui.base.api.basemodelmodprice.flow.*;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleExportQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -34,9 +33,12 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.text.ParseException;
@@ -109,11 +111,10 @@ public interface BaseModelModpriceFeign {
     @PostMapping(value = "/breakProcess")
     public ResultBean breakProcess(@Valid @RequestBody BaseModelModPriceTaskQuery query);
 
-    @ApiOperation(value = "导入")
+    @ApiOperation(value = "")
-    @PostMapping("/getExcelInfo")
+    @RequestMapping(value = "/getExcelInfo", method = RequestMethod.POST)
     @ResponseBody
-    public ResultBean<BaseModelModpriceImportReturn> getExcelInfo(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "file") MultipartFile file) throws IOException, ParseException;
+    public ResultBean<BaseModelModpriceImportReturn> getExcelInfo(@RequestParam("sid") String sid, @RequestParam("file") MultipartFile file, @RequestParam("request")HttpServletRequest request,@RequestParam("response")HttpServletResponse response)throws IOException,ParseException;
-
 
     @PostMapping("/downloadExcel")
     @ApiOperation(value = "下载模板")
@@ -121,4 +122,8 @@ public interface BaseModelModpriceFeign {
     public void downloadExcel();
 
 
+    @ApiOperation(value = "下载模板")
+    @GetMapping("/downloadModPriceExcel")
+    public void downloadModPriceExcel(HttpServletResponse response);
+
 }

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

@@ -214,9 +214,13 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
 
     List<String> checkConfigNameBySid(@Param("sid") String sid, @Param("createOrgSid") String createOrgSid);
 
-    List<AppModelConfigListVo> getModelConfigLableList(@Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("lockedStateKey") String lockedStateKey, @Param("orgSid") String orgSid,@Param("label") String label);
+    List<AppModelConfigListVo> getModelConfigLableList(@Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("lockedStateKey") String lockedStateKey, @Param("orgSid") String orgSid, @Param("label") String label);
 
     ModelConfigVo getStockModelConfigList(@Param("modelSid") String modelSid, @Param("useOrgSid") String useOrgSid);
 
-    BaseModelConfigVo selectByConfigName(@Param("sid") String sid,@Param("configName") String configName);
+    BaseModelConfigVo selectByConfigName(@Param("sid") String sid, @Param("configName") String configName);
+
+    @Select("Select * from base_model_config where configCode = #{configCode}")
+    BaseModelConfig getConfigByConfigCode(@Param("configCode") String configCode);
+
 }

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

@@ -1150,4 +1150,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         }
         return configName;
     }
+
+    public BaseModelConfig getConfigByConfigCode(String configCode) {
+        return baseMapper.getConfigByConfigCode(configCode);
+    }
 }