fix: 结算税源地

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

@@ -2597,8 +2597,10 @@ public class WmScorePackageController {
 			}
 		}
 
-		if (wmScorePackage.getSubjectLocation() != null && !SubjectLocation.NULL.equals(wmScorePackage.getSubjectLocation())){
-			wmScorePackage.setSubType(String.valueOf(wmScorePackage.getSubjectLocation().getGigType().getCode()));
+		if (StrUtil.isNotBlank(wmScorePackage.getSubjectLocation())){
+			SubjectLocation location = Enum.valueOf(SubjectLocation.class, wmScorePackage.getSubjectLocation());
+			wmScorePackage.setLocation(location);
+			wmScorePackage.setSubType(String.valueOf(location.getGigType().getCode()));
 		}
 
 

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

@@ -466,7 +466,11 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	/**
 	 * 税源地
 	 */
-	private SubjectLocation subjectLocation;
+	@TableField(exist = false)
+	private String subjectLocation;
+
+	@TableField(value = "sub_location")
+	private SubjectLocation location;
 
 	/**
 	 * 数据来源类型（0：手动上传，1：系统对接）

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SubjectLocation.java

@@ -14,8 +14,6 @@ import java.util.List;
 @AllArgsConstructor
 public enum SubjectLocation {
 
-	NULL("", null, "非必填", -1),
-
 	// 仁励家通道
 	REN_LI_JIA("REN_LI_JIA", GigTypeEnum.REN_LI_JIA, "仁励家", 0),
 

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

@@ -757,7 +757,7 @@ public class PartyAServiceImpl implements PartyAService {
 		//已分派待申领
 		scorePackage.setScorePackageStatus(ScorePackageStatusEnum.UNCLAIMED.val());
 		scorePackage.setDescription(scorePackageDTO.getDescription());
-		scorePackage.setSubjectLocation(SubjectLocation.LUO_SHU_YUN);
+		scorePackage.setLocation(SubjectLocation.LUO_SHU_YUN);
 		scorePackage.setSubType(String.valueOf(SubjectLocation.LUO_SHU_YUN.getGigType().getCode()));
 
 		// 获取企业发包人

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

@@ -272,7 +272,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		updateEntity.setSettleFlag("1");
 		updateEntity.setDescription(input.getDescription());
 		updateEntity.setSubType(String.valueOf(location.getGigType().getCode()));
-		updateEntity.setSubjectLocation(input.getSubjectLocation());
+		updateEntity.setLocation(input.getSubjectLocation());
 		updateEntity.setSettlementDate(LocalDateTime.now());
 
 		if ("2".equals(wmScorePackage.getPackageType2())) {
@@ -323,7 +323,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		updateEntity.setId(input.getId());
 		updateEntity.setDescription(input.getDescription());
 		updateEntity.setSubType(String.valueOf(location.getGigType().getCode()));
-		updateEntity.setSubjectLocation(input.getSubjectLocation());
+		updateEntity.setLocation(input.getSubjectLocation());
 
 		wmScorePackageService.updateById(updateEntity);
 		noteService.saveOrUpdateBatch(notes);

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

@@ -167,7 +167,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 					.divide(new BigDecimal(wmScorePackage.getTaskNum()), 2, BigDecimal.ROUND_HALF_UP);
 			query.setSettleAmount(amount);
 			query.setSubType(wmScorePackage.getSubType());
-			query.setSubjectLocation(wmScorePackage.getSubjectLocation());
+			query.setSubjectLocation(wmScorePackage.getLocation());
 		}
 		query.setRealName(user.getRealname());
 		query.setIdCardNumber(user.getIdCardNumber());

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

@@ -2183,7 +2183,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 				}
 				preUserSettleAmountMap.put(user, tmp);
 
-				errorInfo = checkoutSettleLimit(user, sysDeptSub.getLimitAmount(), tmp, scorePackage.getSubjectLocation() );
+				errorInfo = checkoutSettleLimit(user, sysDeptSub.getLimitAmount(), tmp, scorePackage.getLocation() );
 				if (StringUtils.isNotEmpty(errorInfo)) {
 					log.error(errorInfo);
 					errorMap(errorMap, errorInfo, commonEvidenceDTO.getId());