Merge remote-tracking branch 'origin/dev' into pre-production

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderAllPageVO.java

@@ -44,6 +44,6 @@ public class AftersalesWorkOrderAllPageVO implements Serializable {
 	private String appealStatusName;
 	private String processNumber;
 	private Date entryTime;
-	private Date entryMonthTime;
+	private String entryMonthTime;
 
 }

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderEndPageVO.java

@@ -70,7 +70,7 @@ public class AftersalesWorkOrderEndPageVO {
 	private String appealStatusName;
 	private String processNumber;
 	private Date entryTime;
-	private Date entryMonthTime;
+	private String entryMonthTime;
 
 
 }

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

@@ -1423,7 +1423,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			List<AftersalesProcessorEntity> list = aftersalesProcessorService.list(Wrappers.<AftersalesProcessorEntity>query().lambda()
 				.eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesWorkOrder.getId())
 				.ne(AftersalesProcessorEntity::getTypesOf, "3")
-				.apply("conditions in (1,2)")
+				.apply("conditions in (1,3)")
 			);
 			//需要待回复的处理方
 
@@ -1861,6 +1861,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				AftersalesProcessorEntity aftersalesProcessorEntity = processorEntityList.get(i);
 				aftersalesProcessorEntity.setWarehouseId(workOrderEntity.getWarehouseId());
 				aftersalesProcessorEntity.setProcessingStatus(ProcessorProcessingStatusStatusConstant.daichuli.getValue());
+				aftersalesProcessorEntity.setConditions("1");
 				aftersalesProcessorService.save(aftersalesProcessorEntity);
 				aaa.add(aftersalesProcessorEntity.getBusinessName());
 			}
@@ -1896,7 +1897,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		String processedBy = processorEntityList.stream().map(AftersalesProcessorEntity::getBusinessName).collect(Collectors.joining(","));
 		aftersalesWorkOrderEntity.setProcessedBy(processedBy);
 		this.updateById(aftersalesWorkOrderEntity);
-		if (!Objects.isNull(stringBuffer)){
+		if (!Objects.isNull(stringBuffer) && stringBuffer.length()>0){
 			String string = stringBuffer.deleteCharAt(stringBuffer.lastIndexOf(",")).toString();
 			surveyRecordEntity2.setContent(string);
 			surveyRecordEntity2.setProcessingResults(string);