fix:修改上传

project-order/pom.xml

@@ -141,11 +141,6 @@
         </dependency>
         </dependency>
 
 
 
 
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
-        </dependency>
 
 
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>

project-order/src/main/java/com/dituhui/pea/order/controller/FileController.java

@@ -101,6 +101,11 @@ public class FileController {
             throw new BusinessException("用户未登录");
             throw new BusinessException("用户未登录");
         }
         }
         FileRateDTO rate = orderCreateService.getsuccessRate(token);
         FileRateDTO rate = orderCreateService.getsuccessRate(token);
+
+        if (rate != null && (rate.getSuccessCount() == rate.getTotalCount())){
+            //上传成功，删除上传的进度条
+            orderCreateService.delRate(token);
+        }
         if (rate == null) {
         if (rate == null) {
             rate = new FileRateDTO();
             rate = new FileRateDTO();
             rate.setRate("100%");
             rate.setRate("100%");
@@ -112,7 +117,7 @@ public class FileController {
     /**
     /**
      * 订单批量模版下载
      * 订单批量模版下载
      *
      *
-     * @param response
+     * @param
      */
      */
     @GetMapping(value = "/file/downOrder")
     @GetMapping(value = "/file/downOrder")
     public ResponseEntity<byte[]> downOrderTemplate() {
     public ResponseEntity<byte[]> downOrderTemplate() {
@@ -127,7 +132,7 @@ public class FileController {
 
 
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
             EasyExcel.write(outputStream, OrderInfoExcelDTO.class)
             EasyExcel.write(outputStream, OrderInfoExcelDTO.class)
-                  //不设置字体  .registerWriteHandler(ExcelUtil.getDefaultWriteHandler())
+                    .registerWriteHandler(ExcelUtil.getDefaultWriteHandler())
                     .registerConverter(new DateStringConverter())
                     .registerConverter(new DateStringConverter())
                     .registerConverter(new BigDecimalStringConverter())
                     .registerConverter(new BigDecimalStringConverter())
                     .sheet("工单列表").doWrite(arrayList);
                     .sheet("工单列表").doWrite(arrayList);

project-order/src/main/java/com/dituhui/pea/order/feign/ISaaSRemoteService.java

@@ -7,7 +7,7 @@ import com.dituhui.pea.pojo.saas.req.AdministrativeDistrictReq;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
-@FeignClient(url = "${SaaS.url}", name = "saasService")
+@FeignClient(url = "${SaaS.urlBack}", name = "saasService")
 public interface ISaaSRemoteService {
 public interface ISaaSRemoteService {
 
 
     @PostMapping("/v1/bsh/area/add")
     @PostMapping("/v1/bsh/area/add")

project-order/src/main/java/com/dituhui/pea/order/service/impl/FendanServiceImpl.java

@@ -228,7 +228,7 @@ public class FendanServiceImpl implements FendanService {
     @Override
     @Override
     public Result<OrgTeamInfo> fendanToGroupCapacity(OrderDTO.OrderCreateRequest request, Integer isDate, LocalDate targetDate, LocalTime startTime, LocalTime endTime) {
     public Result<OrgTeamInfo> fendanToGroupCapacity(OrderDTO.OrderCreateRequest request, Integer isDate, LocalDate targetDate, LocalTime startTime, LocalTime endTime) {
         List<OrgGroupInfo> orgGroupTeamInfos = new ArrayList<>();
         List<OrgGroupInfo> orgGroupTeamInfos = new ArrayList<>();
-        String peaBrand = fixBrand(request.getBrand());
+        String peaBrand = request.getBrand();
         SkillInfoEntity skillInfo = skillInfoDao.getByBrandAndTypeAndSkill(peaBrand, request.getProductType(), request.getServiceType());
         SkillInfoEntity skillInfo = skillInfoDao.getByBrandAndTypeAndSkill(peaBrand, request.getProductType(), request.getServiceType());
         if (ObjectUtil.isNull(skillInfo)) {
         if (ObjectUtil.isNull(skillInfo)) {
             return Result.failed(StatusCodeEnum.ORDER_SKILL_NOT_EXISTS);
             return Result.failed(StatusCodeEnum.ORDER_SKILL_NOT_EXISTS);

project-order/src/main/resources/application.yaml

@@ -62,6 +62,7 @@ sentry:
   exception-resolver-order: -2147483647
   exception-resolver-order: -2147483647
 
 
 SaaS:
 SaaS:
+  urlBack: http://119.3.39.114:8034
   url: http://119.3.39.114:8100
   url: http://119.3.39.114:8100
   ak: 216d013687ba46f5ad990e9380ec56c6
   ak: 216d013687ba46f5ad990e9380ec56c6
   userAccount: 1YL+MfLj/Oy70Dvbvn3mYg==
   userAccount: 1YL+MfLj/Oy70Dvbvn3mYg==