feat: pkg rdp

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/WmPkgDTO.java

@@ -5,7 +5,9 @@ import com.qunzhixinxi.hnqz.admin.api.model.WmQuizResultModel;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;

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

@@ -31,7 +31,6 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEntDrugtable;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageRedemptionNotice;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPkgQuizRelation;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.TargetType;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
@@ -4119,4 +4118,12 @@ public class WmScorePackageController {
     }
 
 
+    @GetMapping(value = "/redemption/pkg/list")
+    public R<List<WmScorePackage>> listPkgs() {
+
+        List<WmScorePackage> list = wmScorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getSendPackageDeptId, SecurityUtils.getUser().getDeptId()));
+
+        return R.ok(list);
+    }
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

@@ -188,8 +188,9 @@ public class WmPackageManager {
         WmScorePackage scorePackage = scorePackageService.getById(packageId);
         List<WmTask> tasks = taskService.list(Wrappers.<WmTask>lambdaQuery().eq(WmTask::getScorePackageId, packageId));
         Set<Integer> taskIds = tasks.stream().map(WmTask::getId).mapToInt(Integer::valueOf).boxed().collect(Collectors.toSet());
-        List<SysCheckChainNodeCheckHistory> okTasks = checkChainNodeCheckHistoryService.list(Wrappers.<SysCheckChainNodeCheckHistory>lambdaQuery().eq(SysCheckChainNodeCheckHistory::getNodeId, OK_CHAIN_TASK_NODE)
-                .in(SysCheckChainNodeCheckHistory::getTargetId, taskIds));
+
+        List<SysCheckChainNodeCheckHistory> okTasks = CollUtil.isNotEmpty(tasks) ? checkChainNodeCheckHistoryService.list(Wrappers.<SysCheckChainNodeCheckHistory>lambdaQuery().eq(SysCheckChainNodeCheckHistory::getNodeId, OK_CHAIN_TASK_NODE)
+                .in(SysCheckChainNodeCheckHistory::getTargetId, taskIds)) : Collections.emptyList();
 
         Map<String, Object> result = new HashMap<>(10);
         result.put("id", packageId);

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

@@ -80,12 +80,13 @@ public class WmPackageRedemptionNoticeServiceImpl extends ServiceImpl<WmPackageR
     @Override
     public Boolean doAcceptNotice(WmPkgDTO.OnAcceptNotice resource, HnqzUser user) {
 
-        boolean accept = WmPackageRedemptionNotice.NoticeState.READ.getState().equals(resource.getState());
+        boolean accept = WmPackageRedemptionNotice.NoticeState.CONFIRM.getState().equals(resource.getState());
 
         WmPackageRedemptionNotice notice = new WmPackageRedemptionNotice();
         notice.setNoticeId(resource.getNoticeId());
         notice.setAccept(accept);
-        notice.setState(accept ? WmPackageRedemptionNotice.NoticeState.READ.getState() : WmPackageRedemptionNotice.NoticeState.ARGUE.getState());
+        notice.setState(accept ? WmPackageRedemptionNotice.NoticeState.CONFIRM.getState() : WmPackageRedemptionNotice.NoticeState.ARGUE.getState());
+        notice.setAcceptRemarks(resource.getRemarks());
         notice.setAcceptTime(LocalDateTime.now());
         notice.setUpdateBy(user.getUsername());
         notice.setUpdateTime(LocalDateTime.now());