调整履职登记

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ResumptionController.java

@@ -128,9 +128,7 @@ public class ResumptionController {
         List<Map<String,Object>> tasktotal = resumptionBusiness.taskarealistnew(request);
         ResumptionTaskListVo taskObj =resumptionBusiness.getTaskObjByTaskid(request);
         SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
-        TaskDetailsVo detailvo = new TaskDetailsVo();
-        List<Map<String, Object>> tasktotal = resumptionBusiness.taskarealistnew(request);
-        ResumptionTaskListVo taskObj = resumptionBusiness.getTaskObjByTaskid(request);
+
 //        SysConfig systemParame = systemParameService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
         detailvo.setTaskarealist(tasktotal);
         detailvo.setTaskObj(taskObj);
@@ -146,10 +144,7 @@ public class ResumptionController {
         List<Map<String,Object>> tasktotal = resumptionBusiness.toTaskDetails(request);
         ResumptionTaskListVo taskObj =resumptionBusiness.getTaskObjByTaskid(request);
         SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
-    AjaxResult toTaskDetails(@RequestBody @Valid final TaskDetailsDto request) throws ParseException {
-        TaskDetailsVo detailvo = new TaskDetailsVo();
-        List<Map<String, Object>> tasktotal = resumptionBusiness.toTaskDetails(request);
-        ResumptionTaskListVo taskObj = resumptionBusiness.getTaskObjByTaskid(request);
+
 //        SysConfig systemParame = systemParameService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
         detailvo.setTaskarealist(tasktotal);
         detailvo.setTaskObj(taskObj);
@@ -177,11 +172,6 @@ public class ResumptionController {
         if(!isOk){
             throw  new RuntimeException("请勿重复提交");
         }else{
-        boolean flag = redisService.redisTemplate.opsForHash().putIfAbsent("resumption" + request.getTaskid(), request.getTaskid(), request.getTaskid());//redisTemplate.opsForValue().setIfAbsent("resumption"+request.getTaskid(), "resumption"+request.getTaskid());
-        redisService.redisTemplate.expire("resumption" + request.getTaskid(), 1000 * 20, TimeUnit.MILLISECONDS);
-        if (!flag) {
-            throw new RuntimeException("请勿重复提交");
-        } else {
             try {
                 //final Resumption resumption = this.resumptionService.find(request.getTaskid());
                 final Resumption resumption = resumptionService.findOneByTaskIdAndDate(request);
@@ -193,19 +183,14 @@ public class ResumptionController {
                     throw new RuntimeException("该任务已过期不能完成提交");
                 }
                 int num = this.resumptionBusiness.submitTaskData(request, SecurityUtils.getLoginUser(), resumption);
-                redisService.redisTemplate.opsForHash().delete("resumption" + request.getTaskid(), request.getTaskid());
-                int num = this.resumptionBusiness.submitTaskData(request, SecurityUtils.getLoginUser(),resumption);
+
                 RedisUtils.deleteObject("resumption"+request.getTaskid());
                 //redisService.redisTemplate.opsForHash().delete("resumption"+request.getTaskid(),request.getTaskid());
                 return AjaxResult.success(num);
-            } catch (Exception e) {
-                redisService.redisTemplate.opsForHash().delete("resumption" + request.getTaskid(), request.getTaskid());
             }catch (Exception e){
                 RedisUtils.deleteObject("resumption"+request.getTaskid());
                 //redisService.redisTemplate.opsForHash().delete("resumption"+request.getTaskid(),request.getTaskid());
                 return AjaxResult.error(e.getMessage());
-            } finally {
-                redisService.redisTemplate.opsForHash().delete("resumption" + request.getTaskid(), request.getTaskid());
             }finally {
                 RedisUtils.deleteObject("resumption"+request.getTaskid());
                 //redisService.redisTemplate.opsForHash().delete("resumption"+request.getTaskid(),request.getTaskid());