Merge branch 'feat-20230605-receivedate'

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

@@ -99,9 +99,11 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 		this.updateById(wmScorePackageStatus);
 
 		// 同意
+		wmScorePackage.setUpdateTime(LocalDateTime.now());
 		if ("2".equals(wmScorePackageStatus.getStatus())) {
 			// 进行中
 			wmScorePackage.setScorePackageStatus("3");
+			wmScorePackage.setReceiveDate(LocalDateTime.now());
 			//判断该积分包是否审核满员，如果是，其他接单对象自动改为审核不通过
 			WmScorePackageStatus wmScorePackageStatus1 = new WmScorePackageStatus();
 			wmScorePackageStatus1.setPackageId(wmScorePackageStatus.getPackageId());
@@ -123,8 +125,6 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 				updateWrapper.eq(WmScorePackageStatus::getEnableFlag, "0");
 				this.update(updateWrapper);
 				//wmScorePackage.setPackageStatus("2");
-				wmScorePackage.setUpdateTime(LocalDateTime.now());
-				wmScorePackage.setReceiveDate(LocalDateTime.now());
 				wmScorePackage.setIsReceive("1");//不允许接单
 				wmScorePackageMapper.updateById(wmScorePackage);
 			}
@@ -555,12 +555,15 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 		status.setUpdateTime(LocalDateTime.now());
 		status.setUserId(null);
 
+		wmScorePackage.setUpdateTime(LocalDateTime.now());
+
 		switch (approvalStatus) {
 			case PASSED:
 				status.setStatus("2");
 				status.setTaskAddFlag("1");
 				//进行中
 				wmScorePackage.setScorePackageStatus("3");
+				wmScorePackage.setReceiveDate(LocalDateTime.now());
 				break;
 			case REJECTED:
 				status.setStatus("3");