【功能修改】app 端:省核验人员:打卡:核验任务调整

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -117,7 +117,6 @@ public class TaskServiceImpl implements TaskService {
     public Boolean getTasks(TaskPageReqVO reqVO) {
 
         //校验是登录人可选的任务
-        reqVO.setListType(TaskPageReqVO.LIST_TYPE_TASK1);
         verifyTask(reqVO);
 
         Long loginUserId = SecurityFrameworkUtils.getLoginUserIdNotNull();
@@ -129,7 +128,7 @@ public class TaskServiceImpl implements TaskService {
         if(roleCodes.contains(RoleCodeEnum.PROVINCIAL_VERIFICATION_PERSONNEL.getCode())) {
             reqVO.getKqIds().forEach(kqId -> {
                 ProvinceDO provinceDO = new ProvinceDO()
-                        .setHyState(reqVO.getHyState() == null ? DeliveryHyState.WAIT_HY.getCode() : reqVO.getHyState())
+                        .setHyState(reqVO.getHyState())
                         .setHyryId(SecurityFrameworkUtils.getLoginUserId())
                         .setHyryName(SecurityFrameworkUtils.getLoginUserNickname());
                 provinceMapper.updateByKqId(provinceDO, kqId);
@@ -139,7 +138,7 @@ public class TaskServiceImpl implements TaskService {
         if(roleCodes.contains(RoleCodeEnum.BANK_VERIFICATION_PERSONNEL.getCode())) {
             reqVO.getKqIds().forEach(kqId -> {
                 BankDO bankDO = new BankDO()
-                        .setHyState(reqVO.getHyState() == null ? DeliveryHyState.WAIT_HY.getCode() : reqVO.getHyState())
+                        .setHyState(reqVO.getHyState())
                         .setHyryId(SecurityFrameworkUtils.getLoginUserId())
                         .setHyryName(SecurityFrameworkUtils.getLoginUserNickname());
                 bankMapper.updateByKqId(bankDO, kqId);
@@ -343,6 +342,10 @@ public class TaskServiceImpl implements TaskService {
     }
 
     private void verifyTask(TaskPageReqVO reqVO) {
+        if(reqVO.getKqIds() == null || reqVO.getKqIds().isEmpty()
+                || reqVO.getHyState() == null || reqVO.getListType() == null){
+            throw exception(ErrorCodeConstants.APP_PARAM_ERROR);
+        }
 
         TaskPageReqVO pageReqVO = new TaskPageReqVO();
         pageReqVO.setKqIds(reqVO.getKqIds());