修复下一步操作人仍然是当前用户的问题

src/main/java/com/chinaweal/aiccs/aiccs/business/service/impl/TSTaskListServiceImpl.java

@@ -197,11 +197,11 @@ public class TSTaskListServiceImpl extends BaseServiceImpl<TSTaskListMapper, TST
         taskListModel.setLauptime(LocalDateTime.now());
         updateById(taskListModel);
 
-        // 统一门户待办推送
+//        // 统一门户待办推送
-        itUserportalService.doorTaskSendUpdate(taskListModel, resultMap.isEnd());
+//        itUserportalService.doorTaskSendUpdate(taskListModel, resultMap.isEnd());
-
+//
-        // 信创门户待办推送
+//        // 信创门户待办推送
-        itUserportalService.doorTaskSendUpdate_XC(taskListModel, resultMap.isEnd());
+//        itUserportalService.doorTaskSendUpdate_XC(taskListModel, resultMap.isEnd());
     }
 
     @Override

src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java

@@ -143,8 +143,11 @@ public class TBizRemPunishmentController extends BaseController {
 //        } else {
 //            region="市";
 //        }
-        System.out.println(region);
+
-        pageRequestDto.getParamMap().put("region",region);
+        //自治区的账号可以发起所有的行政处罚，主要是针对药监局的行政处罚
+        if(!StringUtils.equals("150000",region)){
+            pageRequestDto.getParamMap().put("region",region);
+        }
         IPage<TbIlcPunInfoQuery> iPage = tbIlcPunInfoQueryService.searchByPage(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), pageRequestDto.getParamMap());
         return RestResult.ok(iPage);
     }
@@ -170,11 +173,12 @@ public class TBizRemPunishmentController extends BaseController {
             return RestResult.error(ResultCode.PARAM_IS_BLANK);
         }
 
-        //业务受理状态时，需要有下一步操作人
+        //业务不是处于审批状态时，需要有下一步操作人
-        if(StringUtils.equals(tBizRemPunishment.getLinkType(),"1")
+        if(!StringUtils.equals(tBizRemPunishment.getLinkType(),"2")
                 && StringUtils.isEmpty(tBizRemPunishment.getNextPerformerids())){
-            //除非是不予受理
+            //除非是不予受理或者是回退操作
-            if(!StringUtils.equals(tBizRemPunishment.getIsAccept(),"0")){
+            if(!StringUtils.equals(tBizRemPunishment.getIsAccept(),"0")
+                    && !"returnRemPunish".equals(tBizRemPunishment.getNextNodeId())){
                 return RestResult.error(ResultCode.PARAM_IS_BLANK);
             }
         }

src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java

@@ -147,4 +147,8 @@ public class TBizRemPunishment extends SuperEntity {
     @TableField(exist = false)
     String nextNodeId;
 
+    @ApiModelProperty(value = "下一个处理人姓名")
+    @TableField(exist = false)
+    String nextPerformerName;
+
 }

src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java

@@ -7,6 +7,7 @@ import com.chinaweal.aiccs.aiccs.abnormal.service.CreatePdfService;
 import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
 import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService;
 import com.chinaweal.aiccs.aiccs.auditing.entity.TSOpinion;
+import com.chinaweal.aiccs.aiccs.auditing.service.TSOpinionService;
 import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList;
 import com.chinaweal.aiccs.aiccs.business.service.TSTaskListService;
 import com.chinaweal.aiccs.aiccs.inspect.service.TSWorkNoService;
@@ -70,6 +71,8 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
     private CreatePdfService createPdfService;
     @Autowired
     private TSWritService tsWritService;
+    @Autowired
+    private TSOpinionService tsOpinionService;
 
     @Override
     public TBizRemPunishment saveTBizRemPunishment(TBizRemPunishment tBizRemPunishment) {
@@ -133,6 +136,10 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
         String isAccept = tBizRemPunishment.getIsAccept();
         String isAgreeRepair = tBizRemPunishment.getIsAgreeRepair();
         String nextNodeID = tBizRemPunishment.getNextNodeId();
+        String nextPerformerids = StringUtils.isEmpty(tBizRemPunishment.getNextPerformerids()) ?
+                loginUser.getPrimaryKey() : tBizRemPunishment.getNextPerformerids();    //如果没有下一步操作人则存当前用户
+        String nextPerformerName = StringUtils.isEmpty(tBizRemPunishment.getNextPerformerName()) ?
+                loginUser.getName() : tBizRemPunishment.getNextPerformerName();
 
         //封装意见表
         String opinionContent = tBizRemPunishment.getOpinion();
@@ -189,6 +196,15 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
                 } else {    //无法回退
                     throw new RuntimeException("无法回退到上一步");
                 }
+                //通过意见表找出上一个节点的人
+                TSOpinion tsOpinion = tsOpinionService.getOne(new LambdaQueryWrapper<TSOpinion>()
+                        .orderByDesc(TSOpinion::getHandledate) // 按 handledate 降序排列
+                        .last("LIMIT 1"));
+                if(tsOpinion != null){
+                    //取上一个节点的人
+                    nextPerformerids  = tsOpinion.getHandlerid();
+                    nextPerformerName = tsOpinion.getHandler();
+                }
             } else {    //流程无法找到
                 throw new RuntimeException("流程无法找到");
             }
@@ -198,7 +214,7 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
 
         // 流程推进
         taskListService.updateWorkFlow(loginUser, opinion, tsTaskList,
-                nextNodeID, new String[]{ loginUser.getPrimaryKey() }, new String[]{ loginUser.getName() });
+                nextNodeID, new String[]{ nextPerformerids }, new String[]{ nextPerformerName });
     }
 
     /**
@@ -208,13 +224,8 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
     private void insertCaseCreInformation(TBizRemPunishment tBizRemPunishment) {
         CaseCreInformation caseCreInformation = new CaseCreInformation();
         EBaseinfo eBaseinfo = eBaseInfoService.getOneByPripid(tBizRemPunishment.getPripid());
-        LambdaQueryWrapper<CasePubNbaseinfo> queryWrapper = new LambdaQueryWrapper<CasePubNbaseinfo>()
-                .eq(CasePubNbaseinfo::getPripid, tBizRemPunishment.getPripid())
-                .eq(CasePubNbaseinfo::getActype, "1");
-
         //查询行政处罚基本信息
-        List<CasePubNbaseinfo> casePubNbaseinfos = casePubNbaseinfoService.list(queryWrapper);
+        CasePubNbaseinfo casePubNbaseinfo = casePubNbaseinfoService.getById(tBizRemPunishment.getPunishmentId());
-        CasePubNbaseinfo casePubNbaseinfo = casePubNbaseinfos.get(0);
 
         caseCreInformation.setCasecreid(IdUtil.simpleUUID())
                 .setPripid(tBizRemPunishment.getPripid())