fix: 财务复核功能相关2

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

@@ -393,7 +393,9 @@ public class WmPayOffController {
 			output.setUsername(sysUser.getUsername());
 			output.setRealname(sysUser.getRealname());
 			output.setSettleStatus(settleNote.getSettleNoteStatus());
+			output.setSettleStatusName(SettleStatusEnum.resolve(String.valueOf(settleNote.getSettleNoteStatus())).getName2());
 			output.setSubjectLocation(settleNote.getSubjectLocation());
+			output.setSubjectLocationName(settleNote.getSubjectLocation().getDescription());
 			output.setReviewStatus(settleNote.getReviewStatus());
 			outputList.add(output);
 		});
@@ -787,7 +789,7 @@ public class WmPayOffController {
 	public R<?> financialReview(@RequestBody WmScorePackageSettleInput input) {
 		log.info("财务复核参数:{}", input);
 
-		if (StringUtils.isEmpty(input.getId()) || null == input.getSubjectLocation() || null == input.getInvoiceCategory() || null == input.getReviewStatus()) {
+		if (StringUtils.isEmpty(input.getId()) || null == input.getReviewStatus()) {
 			return R.failed("必填参数为空");
 		}
 
@@ -802,8 +804,11 @@ public class WmPayOffController {
 		List<WmScorePackageSettleNote> notes = (List<WmScorePackageSettleNote>) queryData.get("notes");
 		WmScorePackage wsp = (WmScorePackage) queryData.get("wsp");
 
+		WmScorePackageSettleNote settleNote = notes.get(0);
+
+		input.setSubjectLocation(settleNote.getSubjectLocation());
+		input.setInvoiceCategory(settleNote.getInvoiceType());
 		input.setScorePackageName(wsp.getScorePackageName());
-		input.setNotes(notes);
 
 		return wmPayOffService.financialReview(input);
 	}
@@ -826,7 +831,7 @@ public class WmPayOffController {
 		List<Map<String, String>> msgList = new ArrayList<>();
 
 		for (WmScorePackageSettleInput input : inputList) {
-			if (StringUtils.isEmpty(input.getId()) || null == input.getSubjectLocation() || null == input.getInvoiceCategory() || null == input.getReviewStatus()) {
+			if (StringUtils.isEmpty(input.getId()) || null == input.getReviewStatus()) {
 				return R.failed("必填参数为空");
 			}
 
@@ -838,6 +843,10 @@ public class WmPayOffController {
 				List<WmScorePackageSettleNote> notes = (List<WmScorePackageSettleNote>) queryData.get("notes");
 				WmScorePackage wsp = (WmScorePackage) queryData.get("wsp");
 
+				WmScorePackageSettleNote settleNote = notes.get(0);
+
+				input.setSubjectLocation(settleNote.getSubjectLocation());
+				input.setInvoiceCategory(settleNote.getInvoiceType());
 				input.setScorePackageName(wsp.getScorePackageName());
 				input.setNotes(notes);
 				// 调用单个结算

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/input/WmScorePackageSettleOutput.java

@@ -27,6 +27,11 @@ public class WmScorePackageSettleOutput {
 
 	private String settleStatus;
 
+	/**
+	 * 结算状态名称
+	 */
+	private String settleStatusName;
+
 	private String enableType;
 
 	private String taskAddFlag;
@@ -80,6 +85,11 @@ public class WmScorePackageSettleOutput {
 
 	private SubjectLocation subjectLocation;
 
+	/**
+	 * 结算渠道名称
+	 */
+	private String subjectLocationName;
+
 	/**
 	 * 积分包来源， 0->手动， 1->线上
 	 */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/vo/SettleFinancialReviewSettleDetailVO.java

@@ -52,6 +52,11 @@ public class SettleFinancialReviewSettleDetailVO implements Serializable {
 	 */
 	private SubjectLocation subjectLocation;
 
+	/**
+	 * 结算渠道名称
+	 */
+	private String subjectLocationName;
+
 	/**
 	 * 结算金额
 	 */
@@ -67,6 +72,11 @@ public class SettleFinancialReviewSettleDetailVO implements Serializable {
 	 */
 	private Integer settleStatus;
 
+	/**
+	 * 结算状态名称
+	 */
+	private String settleStatusName;
+
 	/**
 	 * 折扣
 	 */

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

@@ -3496,6 +3496,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					ouPut.setSettleStatus(String.valueOf(settleNote.getSettleNoteStatus()));
 				}
 				ouPut.setSubjectLocation(settleNote.getSubjectLocation());
+				ouPut.setSubjectLocationName(settleNote.getSubjectLocation().getDescription());
 				ouPut.setSubToGigTime(settleNote.getSubToGigTime());
 				ouPut.setActualAmount(settleNote.getActualAmount());
 			}
@@ -3506,6 +3507,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					ouPut.setScore(String.format("%.2f", Integer.parseInt(scorePackage.getUserScore()) / 100.0));
 				}
 			}
+			ouPut.setSettleStatusName(SettleStatusEnum.resolve(ouPut.getSettleStatus()).getName2());
 		}
 	}
 }

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -1762,29 +1762,31 @@
 
 	<!-- 结算复核-查看 -->
 	<select id="pageFinancialReviewDetail" resultMap="packageSettleMap">
-		SELECT
-			   p.id,
-			   p.pkg_sn,
-			   p.score_package_name,
-			   p.send_package_dept_id,
-			   p.create_time,
-			   u.realname,
-			   u.id_card_number,
-			   u.username,
-			   u.dept_id,
-			   n.user_id,
-			   n.subject_location,
-			   n.settle_note_status as settle_status,
-			   n.invoice_type       as invoice_category,
-			   n.settle_amount,
-			   n.actual_amount,
-			   p.settlement_date,
-			   n.sub_time,
-			   n.sub_to_gig_time,
-			   n.notify_time
+		SELECT p.id,
+			p.pkg_sn,
+			p.score_package_name,
+			p.score,
+			p.send_package_dept_id,
+			d.name               AS packageEntName,
+			p.create_time,
+			u.realname,
+			u.id_card_number,
+			u.username,
+			u.dept_id,
+			n.user_id,
+			n.subject_location,
+			n.settle_note_status as settle_status,
+			n.invoice_type       as invoice_category,
+			n.settle_amount,
+			n.actual_amount,
+			p.settlement_date,
+			n.sub_time,
+			n.sub_to_gig_time,
+			n.notify_time
 		FROM wm_score_package_settle_note n
-				 LEFT JOIN wm_score_package p ON n.package_id = p.id
-				 LEFT JOIN sys_user u ON u.user_id = n.user_id
+		LEFT JOIN wm_score_package p ON n.package_id = p.id
+		LEFT JOIN sys_user u ON u.user_id = n.user_id
+		LEFT JOIN sys_dept d on d.dept_id = p.send_package_dept_id
 		WHERE n.id in (
 		<foreach collection="query.settleNoteIds" item="noteId" index="index" separator=",">
 			#{noteId}