Merge branch 'feat-20240402-xinshiyi'

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

@@ -638,7 +638,7 @@ public class WmTaskController {
 
 			if (score >= wmScorePackage.getScore()) {
 				wmScorePackage.setPackageFinishStatus("1");
-				wmScorePackage.setPackageFinishTime(LocalDateTime.now());
+//				wmScorePackage.setPackageFinishTime(LocalDateTime.now());
 				wmScorePackageService.updateById(wmScorePackage);
 			}
 		}

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

@@ -14,7 +14,8 @@ import lombok.Getter;
 public enum XinShiYiCertStatus {
 	UN_SIGN(0, "未签约"),
 	CERT(1, "已认证"),
-	SIGN(2, "已签约");
+	SIGN(2, "已签约"),
+	UN_CERT(3, "未认证");
 
 	private final int code;
 

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

@@ -728,6 +728,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 						.eq(taskScorePackage.getUpdateTime() != null, WmScorePackage::getUpdateTime, taskScorePackage.getUpdateTime())
 						.eq(taskScorePackage.getUpdateUser() != null, WmScorePackage::getUpdateUser, taskScorePackage.getUpdateUser())
 						.set(WmScorePackage::getScorePackageStatus, scorePackageStatus)
+						.set(WmScorePackage::getPackageFinishTime, approvedCount >= taskScorePackage.getScore() ? null : now)
 						.set(WmScorePackage::getTaskAddFlag, taskAddFlagStr)
 						.set(WmScorePackage::getUpdateTime, now)
 						.set(WmScorePackage::getUpdateUser, operatorId));
@@ -755,6 +756,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 						.eq(taskScorePackage.getUpdateTime() != null, WmScorePackage::getUpdateTime, taskScorePackage.getUpdateTime())
 						.eq(taskScorePackage.getUpdateUser() != null, WmScorePackage::getUpdateUser, taskScorePackage.getUpdateUser())
 						.set(WmScorePackage::getScorePackageStatus, scorePackageStatus)
+						.set(WmScorePackage::getPackageFinishTime, ScorePackageStatusEnum.TO_BE_SETTLED.val().equals(scorePackageStatus) ? now : null)
 						.set(WmScorePackage::getTaskAddFlag, taskAddFlagStr)
 						.set(WmScorePackage::getUpdateTime, now)
 						.set(WmScorePackage::getUpdateUser, operatorId));
@@ -905,6 +907,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 							.mapToInt(WmTask::getScore).sum();
 					if (superApprovedScore >= taskScorePackage.getScore()) {
 						updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val());
+						updateScorePackage.setPackageFinishTime(LocalDateTime.now());
 					} else {
 						updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_APPROVAL.val());
 					}
@@ -934,6 +937,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 					WmScorePackage updateScorePackage = new WmScorePackage();
 					updateScorePackage.setId(task.getScorePackageId());
 					updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val());
+					updateScorePackage.setPackageFinishTime(LocalDateTime.now());
 					updateScorePackage.setTaskAddFlag("0");
 					wmScorePackageService.updateById(updateScorePackage);
 				}

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

@@ -309,7 +309,9 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 					wmScorePackage.setScorePackageStatus(StringUtils.isNotBlank(wmScorePackage.getRelationScoreId()) ? ScorePackageStatusEnum.TO_BE_APPROVAL.val() : ScorePackageStatusEnum.TO_BE_SETTLED.val());
 					//已完成不可以做任务
 					wmScorePackage.setTaskAddFlag(CommonConstants.STATUS_NORMAL);
-					wmScorePackage.setPackageFinishTime(LocalDateTime.now());
+					if (StringUtils.isBlank(wmScorePackage.getRelationScoreId())) {
+						wmScorePackage.setPackageFinishTime(LocalDateTime.now());
+					}
 
 				}
 			}else {

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

@@ -2629,7 +2629,10 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 				.set(WmScorePackage::getUpdateTime, now);
 		if (approvedCount >= wmScorePackage.getScore()) {
 			// 积分包完成时间
-			scorePackageUpdateWrapper.set(WmScorePackage::getPackageFinishTime, now);
+			if (!StringUtils.isNotBlank(wmScorePackage.getRelationScoreId())) {
+				// 已完成待结算 才修改结算完成时间
+				scorePackageUpdateWrapper.set(WmScorePackage::getPackageFinishTime, now);
+			}
 			// 积分包状态:有关联积分包，则设置为‘已完成待审批’；没有关联积分包，则直接设置为‘已完成待结算’
 			scorePackageUpdateWrapper.set(WmScorePackage::getScorePackageStatus, StringUtils.isNotBlank(wmScorePackage.getRelationScoreId()) ?
 					ScorePackageStatusEnum.TO_BE_APPROVAL.val() : ScorePackageStatusEnum.TO_BE_SETTLED.val());
@@ -2775,7 +2778,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		if (approvedCount >= wmScorePackage.getScore()) {
 			// 任务总积分超过积分包的值
 			// 积分包完成时间
-			scorePackageUpdateWrapper.set(WmScorePackage::getPackageFinishTime, now);
+			if (StringUtils.isBlank(wmScorePackage.getRelationScoreId())) {
+				scorePackageUpdateWrapper.set(WmScorePackage::getPackageFinishTime, now);
+			}
 			// 积分包状态:有关联积分包，则设置为‘已完成待审批’；没有关联积分包，则直接设置为‘已完成待结算’
 			scorePackageUpdateWrapper.set(WmScorePackage::getScorePackageStatus, StringUtils.isNotBlank(wmScorePackage.getRelationScoreId()) ?
 					ScorePackageStatusEnum.TO_BE_APPROVAL.val() : ScorePackageStatusEnum.TO_BE_SETTLED.val());