250825

mailbox-lan/src/main/java/com/biutag/lan/controller/system/RoleController.java

@@ -29,7 +29,7 @@ public class RoleController {
 
     @NotPower
     @GetMapping("/all")
-    @Operation(summary = "所有角色")
+    @Operation(summary = "根据角色权限查询角色列表")
     public AjaxResult<List<RoleVo>> all() {
         List<RoleVo> list = iRoleService.all();
         return AjaxResult.success(list);

mailbox-lan/src/main/java/com/biutag/lan/domain/vo/LedgerExcel.java

@@ -51,11 +51,8 @@ public class LedgerExcel {
     @ExcelProperty({"即接即办工作汇总台账", "举报投诉事项"})
     private String content;
 
-    @ExcelProperty({"即接即办工作汇总台账", "是否10分钟内签收\n（县市区专班）"})
-    private String secondSignTimoutFlag;
-
-    @ExcelProperty({"即接即办工作汇总台账", "是否10分钟内签收\n（所队专班）"})
-    private String threeSignTimeoutFlag;
+    @ExcelProperty({"即接即办工作汇总台账", "是否1天内签收"})
+    private String signTimoutFlag;
 
     @ExcelProperty({"即接即办工作汇总台账", "签收超时时长\n（县市区专班）"})
     private String secondSignTimeoutDuration;
@@ -69,7 +66,7 @@ public class LedgerExcel {
     @ExcelProperty({"即接即办工作汇总台账", "是否领导接访"})
     private String interviewIsLeader;
 
-    @ExcelProperty({"即接即办工作汇总台账", "是否四天内办结"})
+    @ExcelProperty({"即接即办工作汇总台账", "是否五天内办结"})
     private String isFourDays;
 
     @ExcelProperty({"即接即办工作汇总台账", "逾期办结"})

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

@@ -95,6 +95,7 @@ public class FirstApprovalFlow extends Flow {
                 .set(Mail::getNotSatisfiedReason, data.getString("notSatisfiedReason"))
                 .set(Mail::getSatisfiedAttachments, data.getString("satisfiedAttachments"))
                 .set(Mail::getProblemSolvingStatus, data.getBoolean("problemSolvingStatus"))
+                .set(Mail::getCurrentOperator, "省厅专班")
                 .set(Mail::getUpdateTime, LocalDateTime.now());
         JSONArray mailLabels = data.getJSONArray("mailLabels");
         if (Objects.nonNull(mailLabels) && !mailLabels.isEmpty()) {

mailbox-lan/src/main/java/com/biutag/lan/job/MailboxJob.java

@@ -59,7 +59,7 @@ public class MailboxJob {
     /**
      * 每30分钟执行一次
      */
-    @Scheduled(cron = "0 */5 * * * *")
+    @Scheduled(cron = "0 */30 * * * *")
     public void updateMail() {
         log.info("updateMail------------------------------------------------------------------");
         List<Mail> mails = mailService.list(new LambdaQueryWrapper<Mail>()

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

@@ -806,11 +806,9 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
             // 超时时长
             long secondSignTimeoutDuration = Optional.ofNullable(mailMark).map(MailMark::getSignTimeoutDuration).orElse(0L);
             String secondSignFlag = secondSignTimeoutDuration  <= 0 ? AppConstants.YES : AppConstants.NO;
-            ledgerExcel.setSecondSignTimoutFlag(secondSignFlag);
+            ledgerExcel.setSignTimoutFlag(secondSignFlag);
             ledgerExcel.setSecondSignTimeoutDuration(parseTimeStr(secondSignTimeoutDuration));
             long threeTimeoutDuration = Optional.ofNullable(mailMark).map(MailMark::getThreeTimeoutDuration).orElse(0L);
-            String threeSignTimeoutFlag = threeTimeoutDuration <= 0 ? AppConstants.YES : AppConstants.NO;
-            ledgerExcel.setThreeSignTimeoutFlag(threeSignTimeoutFlag);
             ledgerExcel.setThreeTimeoutDuration(parseTimeStr(threeTimeoutDuration));
 
             Long contactWriterTimeoutDuration = Optional.ofNullable(mailMark).map(MailMark::getContactWriterTimeoutDuration).orElse(0L);
@@ -854,7 +852,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
         response.setCharacterEncoding("UTF-8");
         try (OutputStream out = response.getOutputStream()) {
             // 使用EasyExcel写入数据到输出流
-            EasyExcel.write(out, LedgerExcel.class).inMemory(Boolean.TRUE).sheet("局长信箱即接即办工作汇总台账").doWrite(list);
+            EasyExcel.write(out, LedgerExcel.class).inMemory(Boolean.TRUE).sheet("“厅（局）长信箱即接即办工作汇总台账").doWrite(list);
         } catch (Exception e) {
             log.error("Exception occurred while exporting mail data" + e.getMessage(), e);
 

mailbox-lan/src/main/java/com/biutag/lan/service/impl/RoleServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.exception.BusinessException;
+import com.biutag.lan.config.AdminThreadLocal;
 import com.biutag.lan.service.IPermService;
 import com.biutag.lan.service.IRoleService;
 import com.biutag.lan.domain.validate.commons.PageValidate;
@@ -50,14 +51,13 @@ public class RoleServiceImpl implements IRoleService {
     @Override
     public List<RoleVo> all() {
         QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("id,name,sort,is_disable,create_time,update_time");
+        queryWrapper.select("id,name,sort,is_disable,create_time,update_time").ge("id", AdminThreadLocal.getRoleId());
         queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
         List<Role> Roles = roleMapper.selectList(queryWrapper);
 
         List<RoleVo> list = new ArrayList<>();
         for (Role Role : Roles) {
             RoleVo vo = new RoleVo();
-
             vo.setId(Role.getId());
             vo.setName(Role.getName());
             vo.setSort(Role.getSort());
@@ -69,7 +69,6 @@ public class RoleServiceImpl implements IRoleService {
             vo.setMenus(Collections.EMPTY_LIST);
             list.add(vo);
         }
-
         return list;
     }
 

mailbox-lan/src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ spring:
       datasource:
         master:
           driver-class-name: org.postgresql.Driver
-          url: jdbc:postgresql://59.173.13.131:10642/mailbox?currentSchema=mailbox
+          url: jdbc:postgresql://192.168.3.117:54321/mailbox?currentSchema=mailbox
           username: root
           password: 123456
         slave: