全部工单导出BUG修复、工单提交安装环节数据保存BUG修复

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml

@@ -67,6 +67,8 @@
                 </foreach>
             </if>
         </where>
+        group BY
+        ldpl.id
     </select>
     <select id="getTrunklines" resultType="com.logpm.aftersales.vo.AftersalesTrunklineVO">
         SELECT ltcl.cars_line_name vehicleRoute , ltcls.load_code as trainNumber

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -3038,7 +3038,7 @@
         lawo.create_time AS createTime ,
         ( lawo.create_time + INTERVAL 3 DAY ) AS endCreateTime,
         lawo.update_time AS updateTime,
-        GROUP_CONCAT( lapr.result_type ) AS  resultType,
+        GROUP_CONCAT(DISTINCT lapr.result_type ) AS  resultType,
         IFNULL( SUM( lapr.money ), 0 ) AS  money,
         lawo.warehouse_service_name AS warehouseServiceName,
         lawo.headquarters_name AS headquartersName,

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -500,6 +500,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				workOrderEntity.setWarehousingTime(aftersalesWorkOrder.getWarehousingTime());
 				break;
 			case "5":
+			case "7":
 				//车次号、配送时间、配送司机、发现时间
 				if (Objects.isNull(aftersalesWorkOrder.getTrainNumber())) {
 					return R.fail("请填写车次信息");
@@ -518,7 +519,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				workOrderEntity.setDeliveryDriver(aftersalesWorkOrder.getDeliveryDriver());
 				workOrderEntity.setDiscoveryTime(aftersalesWorkOrder.getDiscoveryTime());
 				break;
-			case "7":
+
 			case "8":
 				break;
 			default: