fix: 财务复核功能-问题修复

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

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

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

@@ -1767,7 +1767,7 @@
 			p.score_package_name,
 			p.score,
 			p.send_package_dept_id,
-			d.name               AS packageEntName,
+			d.name,
 			p.create_time,
 			u.realname,
 			u.id_card_number,