fix:去掉通知bean和删除品牌

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

@@ -156,7 +156,7 @@ public class FileController {
     /**
     /**
      * 订单批量模版下载
      * 订单批量模版下载
      *
      *
-     * @param
+     *
      */
      */
     @GetMapping(value = "/file/downOrder")
     @GetMapping(value = "/file/downOrder")
     public ResponseEntity<byte[]> downOrderTemplate() {
     public ResponseEntity<byte[]> downOrderTemplate() {

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

@@ -400,7 +400,7 @@ public class DispatchServiceImpl implements DispatchService {
             if (reqDTO.getIsSub() && entity.getIsMultiple() != 1) {
             if (reqDTO.getIsSub() && entity.getIsMultiple() != 1) {
                 return Result.failed("订单无需指派辅助工程师");
                 return Result.failed("订单无需指派辅助工程师");
             }
             }
-            SkillInfoEntity skill = skillInfoDao.getByBrandAndTypeAndSkill(CommonUtil.fixBrand(entity.getBrand()), entity.getType(), entity.getSkill());
+            SkillInfoEntity skill = skillInfoDao.getByBrandAndTypeAndSkill(entity.getBrand(), entity.getType(), entity.getSkill());
             List<OrderInfoEntity> engineerOrders = orderInfoDao.findByDtAndEngineerCode(localDate, engineer.getEngineerCode());
             List<OrderInfoEntity> engineerOrders = orderInfoDao.findByDtAndEngineerCode(localDate, engineer.getEngineerCode());
             List<OrderInfoEntity> engineerSubOrders = orderInfoDao.findByDtAndEngineerCodeSubAndAppointmentStatusNot(localDate, engineer.getEngineerCode(), OrderFlowEnum.CANCELED.name());
             List<OrderInfoEntity> engineerSubOrders = orderInfoDao.findByDtAndEngineerCodeSubAndAppointmentStatusNot(localDate, engineer.getEngineerCode(), OrderFlowEnum.CANCELED.name());
             engineerOrders.addAll(engineerSubOrders);
             engineerOrders.addAll(engineerSubOrders);

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

@@ -517,7 +517,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
 
     @Override
     @Override
     public Boolean rescheduled(OrderInfoEntity source, OrderInfoEntity target, Boolean isRescheduled, String reason, String operator, OrderEventEntity eventEntity) {
     public Boolean rescheduled(OrderInfoEntity source, OrderInfoEntity target, Boolean isRescheduled, String reason, String operator, OrderEventEntity eventEntity) {
-        if (source.getOrderId().startsWith("peatest") || Objects.equals(operator, "BEAN")) {
+        if (true) {
+            //暂时不用通知
             return true;
             return true;
         }
         }
         operator = "11020276";
         operator = "11020276";

project-order/src/main/resources/static/doc/search.js

@@ -465,6 +465,12 @@ api[1].list[12].list.push({
 api[1].list[12].list.push({
 api[1].list[12].list.push({
     order: '3',
     order: '3',
     deprecated: 'false',
     deprecated: 'false',
+    url: '/pea-order/file/errorTemplate',
+    desc: '错误模版下载',
+});
+api[1].list[12].list.push({
+    order: '4',
+    deprecated: 'false',
     url: '/pea-order/file/downOrder',
     url: '/pea-order/file/downOrder',
     desc: '订单批量模版下载',
     desc: '订单批量模版下载',
 });
 });