fix: 发起财务复核问题

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -705,7 +705,7 @@ public class WmPayOffController {
 			return R.failed("数据异常");
 		}
 
-		return wmPayOffService.settleIssueBySubType(input);
+		return wmPayOffService.financialSettle(input);
 	}
 
 	/**
@@ -750,7 +750,7 @@ public class WmPayOffController {
 
 				input.setNotes(notes);
 				// 调用单个结算
-				R<?> settleR = wmPayOffService.settleIssueBySubType(input);
+				R<?> settleR = wmPayOffService.financialSettle(input);
 				boolean failFlag;
 				if (settleR.getCode() == 0) {
 					// 结算成功，不进行页面提示
@@ -809,6 +809,7 @@ public class WmPayOffController {
 		input.setSubjectLocation(settleNote.getSubjectLocation());
 		input.setInvoiceCategory(settleNote.getInvoiceType());
 		input.setScorePackageName(wsp.getScorePackageName());
+		input.setNotes(notes);
 
 		return wmPayOffService.financialReview(input);
 	}
@@ -849,8 +850,8 @@ public class WmPayOffController {
 				input.setInvoiceCategory(settleNote.getInvoiceType());
 				input.setScorePackageName(wsp.getScorePackageName());
 				input.setNotes(notes);
-				// 调用单个结算
-				R<?> settleR = wmPayOffService.settleIssueBySubType(input);
+				// 调用单个复核
+				R<?> settleR = wmPayOffService.financialReview(input);
 				boolean failFlag;
 				if (settleR.getCode() == 0) {
 					// 结算成功，不进行页面提示

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmPayOffService.java

@@ -102,4 +102,12 @@ public interface WmPayOffService extends IService<WmPayOff> {
 	 * @return {@link R}<{@link ?}>
 	 */
 	R<?> financialReview(WmScorePackageSettleInput input);
+
+	/**
+	 * 财务结算
+	 *
+	 * @param input 参数
+	 * @return {@link R}<{@link ?}>
+	 */
+	R<?> financialSettle(WmScorePackageSettleInput input);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmPayOffServiceImpl.java

@@ -757,9 +757,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			note.setSettleDeptSubId(sysDeptSub.getSubId());
 		});
 
-		// 校验是否财务复核并更新
-		this.checkAndUpdateFinancialReviewForSettle(input, operator, sysDept);
-
 		// 人力家
 		if (SubjectTypeEnum.TYPE_RENLIJIA.getCode().equals(subType)) {
 			return settleByRenLiJia(input, sysDeptSub, operator);
@@ -822,6 +819,22 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		return this.settleIssueBySubType(input);
 	}
 
+	/**
+	 * 财务结算
+	 *
+	 * @param input 参数
+	 * @return {@link R}<{@link ?}>
+	 */
+	@Override
+	public R<?> financialSettle(WmScorePackageSettleInput input) {
+		HnqzUser operator = SecurityUtils.getUser();
+		SysDept sysDept = sysDeptService.getById(operator.getDeptId());
+		// 校验是否财务复核并更新
+		this.checkAndUpdateFinancialReviewForSettle(input, operator, sysDept);
+
+		return this.settleIssueBySubType(input);
+	}
+
 	/**
 	 * 校验是否财务复核并更新
 	 *