Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderAddVO.java

@@ -357,5 +357,69 @@ public class OrderAddVO implements Serializable {
 
 
 
+	/**
+	 * 工资附件
+	 */
+	@Schema(description = "附件")
+	private MultipartFile[] wageFile;
+
+
+	/**
+	 * 薪资附件
+	 */
+	@Schema(description = "附件")
+	private MultipartFile[] salaryFile;
+
+	/**
+	 * 社保附件
+	 */
+	@Schema(description = "附件")
+	private MultipartFile[] socialFile;
+
+	/**
+	 * 公积金附件
+	 */
+	@Schema(description = "附件")
+	private MultipartFile[] fundFile;
+
+	/**
+	 * 商险附件
+	 */
+	@Schema(description = "附件")
+	private MultipartFile[] insuranceFile;
+
+	/**
+	 * 代扣附件
+	 */
+	@Schema(description = "代扣附件")
+	private MultipartFile[] withHoldingFile;
+
+	/**
+	 * 代扣附件
+	 */
+	@Schema(description = "代收附件")
+	private MultipartFile[] collectionFile;
+
+	/**
+	 * 代扣附件
+	 */
+	@Schema(description = "非扣税附件")
+	private MultipartFile[] noTaxFile;
+
+	/**
+	 * 其他
+	 */
+	@Schema(description = "其他")
+	private MultipartFile[] otherFile;
+
+
+	/**
+	 * 薪资交接手册
+	 */
+	@Schema(description = "非扣税附件")
+	private MultipartFile[]  salaryHandoverFile;
+
+
+
 
 }

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java

@@ -188,13 +188,16 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		String result;
 		switch (orderStatus){
 			case 0:
-				result = "待处理";
+				result = "待分配";
 				break;
 			case 1:
-				result = "处理中";
+				result = "制作中";
 				break;
 			case 2:
-				result = "已办结";
+				result = "待确认";
+				break;
+			case 3:
+				result = "已完结";
 				break;
 			default:
 				result = "";
@@ -505,9 +508,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		if (!Common.isEmpty(vo.getOrderContent()) && !ValidityUtil.validate2048(vo.getOrderContent())){
 			return R.failed(OrderConstants.ORDER_CONTENT_MORE_THAN_2048);
 		}
-		if (CollectionUtils.isEmpty(vo.getHandleUserList())){
-			return R.failed(OrderConstants.HANDLE_USER_IS_EMPTY);
-		}		TSettleDomain settleDomain = new TSettleDomain();
+			TSettleDomain settleDomain = new TSettleDomain();
 
 		List<TSettleDomainSelectVo> settleDomainR;
 		R<TSettleDomainListVo> listVo;