|
@@ -36,6 +36,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
|
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
@@ -285,7 +286,12 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
|
|
|
wmTaskMapper.update(new WmTask(),updateWrapper1);
|
|
|
|
|
|
wmScorePackage.setPackageFinishStatus("1");//已完成
|
|
|
- wmScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_APPROVAL.val()); // 已完成待审批
|
|
|
+ // 有关联积分包,则设置为‘已完成待审批’;没有关联积分包,则直接设置为‘已完成待结算’
|
|
|
+ if (StringUtils.isNotBlank(wmScorePackage.getRelationScoreId())) {
|
|
|
+ wmScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_APPROVAL.val()); // 已完成待审批
|
|
|
+ } else {
|
|
|
+ wmScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val()); // 已完成待结算
|
|
|
+ }
|
|
|
wmScorePackage.setTaskAddFlag("0");//已完成不可以做任务
|
|
|
wmScorePackage.setPackageFinishTime(LocalDateTime.now());
|
|
|
|