优化完善

mailbox-lan/src/main/java/com/biutag/lan/domain/Mail.java

@@ -457,4 +457,10 @@ public class Mail {
     // 提交办结时间
     private LocalDateTime submitCompletionTime;
 
+    // 本级办理流程
+    private Boolean localProcessingFlag = false;
+
+    // 本级办理
+    private String localProcessing;
+
 }

mailbox-lan/src/main/java/com/biutag/lan/flow/node/DistributeFlow.java

@@ -136,6 +136,7 @@ public class DistributeFlow extends Flow {
                 .setDistributeTime(now)
                 .setMainDeptLevel(mainDeptLevel)
                 .setFirstDeptId(mainDeptId)
+                .setLocalProcessingFlag(data.getBoolean("localProcessingFlag"))
                 .setDistributeFiles(data.getString("files"))
                 .setDistributeComment(data.getString("comments"));
         mailService.updateById(mail);

mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java

@@ -655,22 +655,24 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
             if (workVo.getStep() == null) {
                 workVo.setStep("0");
             }
-            switch (workVo.getStep()) {
-                case "1":
-                    if (AdminThreadLocal.getRoleId().equals(RoleEnum.SECOND_DEPT_CLASSES.getRoleId())) {
-                        workVo.setIfHandle(1);
-                    }
-                    break;
-                case "2":
-                    if (AdminThreadLocal.getRoleId().equals(RoleEnum.MUNICIPAL_DEPT_CLASSES.getRoleId())) {
-                        workVo.setIfHandle(1);
-                    }
-                    break;
-                case "3":
-                    if (AdminThreadLocal.getRoleId().equals(RoleEnum.PROVINCIAL_CLASSES.getRoleId())) {
-                        workVo.setIfHandle(1);
-                    }
-                    break;
+            if (AppealState.ON_APPEAL.getValue().equals(workVo.getAppealState())) {
+                switch (workVo.getStep()) {
+                    case "1":
+                        if (AdminThreadLocal.getRoleId().equals(RoleEnum.SECOND_DEPT_CLASSES.getRoleId())) {
+                            workVo.setIfHandle(1);
+                        }
+                        break;
+                    case "2":
+                        if (AdminThreadLocal.getRoleId().equals(RoleEnum.MUNICIPAL_DEPT_CLASSES.getRoleId())) {
+                            workVo.setIfHandle(1);
+                        }
+                        break;
+                    case "3":
+                        if (AdminThreadLocal.getRoleId().equals(RoleEnum.PROVINCIAL_CLASSES.getRoleId())) {
+                            workVo.setIfHandle(1);
+                        }
+                        break;
+                }
             }
         }
         return result;
@@ -686,7 +688,8 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 .eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel())
                 .and(query -> {
                     query.eq("mm.satisfied", AppConstants.FALSE).or().eq("ma.appeal_state", AppealState.SUCCESS.getValue());
-                });
+                })
+                .eq("ma.appeal_state", AppealState.ON_APPEAL.getValue());
         if (StrUtil.isNotBlank(mailQuery.getAppealState())) {
             if (mailQuery.getAppealState().equals(AppealState.UN_APPEAL.getValue()))
                 queryWrapper.nested(q -> q.eq("ma.appeal_state", AppealState.UN_APPEAL.getValue()).or().isNull("ma.appeal_state"));