履职中定制的机构树排序；机构名称改为简称

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteResumptionTaskService.java

@@ -42,4 +42,7 @@ public interface RemoteResumptionTaskService {
      */
     @GetMapping(value = "resumption/task/monthTask")
     R<Boolean> monthTask();
+
+    @GetMapping(value = "resumption/task/updatetaskstatus")
+    R<Boolean> updateTaskStatus();
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteResumptionTaskFallbackFactory.java

@@ -52,6 +52,11 @@ public class RemoteResumptionTaskFallbackFactory implements FallbackFactory<Remo
             public R<Boolean> monthTask() {
                 return null;
             }
+
+            @Override
+            public R<Boolean> updateTaskStatus() {
+                return null;
+            }
         };
     }
 

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/vo/SysOrgVO.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.api.vo;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.system.api.domain.SysOrg;
@@ -36,7 +37,7 @@ public class SysOrgVO {
 
 
     public List<SysOrgVO> getChildren() {
-        if(children.size() > 0) {
+        if(CollectionUtil.isNotEmpty(children)) {
             children.sort(Comparator.comparing(SysOrgVO::getSort));
         }
         return children;

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

@@ -79,9 +79,9 @@ public class AppRuleController  extends BaseController {
        return success(list);
     }
 
-    @ApiOperation(value = "获取")
-    @GetMapping("/orgtree")
-    public AjaxResult getRuleTree() {
-        return success(appRuleService.getRuleTree(SecurityUtils.getLoginUser().getSysUser().getOrgId()));
-    }
+//    @ApiOperation(value = "获取")
+//    @GetMapping("/orgtree")
+//    public AjaxResult getRuleTree() {
+//        return success(appRuleService.getRuleTree(SecurityUtils.getLoginUser().getSysUser().getOrgId()));
+//    }
 }

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

@@ -76,7 +76,6 @@ public class ResumptionRecordController extends BaseController {
         return success(list);
     }
 
-
     @ApiOperation(value = "履职记录NFC记录")
     @GetMapping("/nfc")
     @RequiresPermissions("resumption:taskManager:query")
@@ -85,19 +84,6 @@ public class ResumptionRecordController extends BaseController {
         return success(list);
     }
 
-    /* @ApiOperation(value = "履职记录导出")
-     @PostMapping("/export")
-     public JsonResponse<?> export(@RequestBody ResumptionRecordPageDto pageDto) {
-         String export = StringUtil.EMPTY_STRING;
-         try {
-             export = resumptionRecordService.export(pageDto);
-             return JsonResponse.success(export);
-         } catch (FileNotFoundException e) {
-             log.error("履职记录下载失败,{}", e.getMessage());
-             e.printStackTrace();
-         }
-         return JsonResponse.fail(export);
-     }*/
     @ApiOperation(value = "履职记录导出")
     @PostMapping("/export")
     @RequiresPermissions("resumption:taskManager:export")

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

@@ -46,6 +46,7 @@ public class TaskController {
     private RemoteOrgService orgService;
     @Autowired
     private ISysResumptionService resumptionService;
+
     @GetMapping("/dayTask")
     public AjaxResult dayTask() {
 //        //执行周期为每周的履职计划Plan_cycle=0,6
@@ -112,6 +113,12 @@ public class TaskController {
         return AjaxResult.success();
     }
 
+    @GetMapping("/updatetaskstatus")
+    public R<Boolean> updateTaskStatus() {
+        Boolean b = taskBusiness.updateTaskStatus();
+        return R.ok(b);
+    }
+
     @PostMapping("/createResumption")
     public void createResumption(@RequestBody doTaskDto request) {
         String time = request.getTime();
@@ -164,6 +171,7 @@ public class TaskController {
         }
 
     }
+
     private void saveResumptionByOrgAndPlan(List<Long> orgIdsByPlanListNew, AppPlan plan, List<Long> roleIds, DateTime datetime) {
         if (plan.getPlanCycle() == 2) {
             //按天生成任务
@@ -194,6 +202,7 @@ public class TaskController {
             saveResumptionByHour(orgIdsByPlanListNew, plan, roleIds, datetime);
         }
     }
+
     private void saveResumptionByHour(List<Long> orgIdsByPlanListNew, AppPlan appPlan, List<Long> roleIds, DateTime dateTime) {
         for (final Long orgId : orgIdsByPlanListNew) {
             Ymd y = ResumptionType.DAY.toYmd(dateTime);
@@ -255,6 +264,7 @@ public class TaskController {
             }
         }
     }
+
     private void saveResumptionByYear(List<Long> orgIdsByPlanListNew, AppPlan appPlan, List<Long> roleIds, DateTime dateTime) {
         DateTime time1 = new DateTime(dateTime);
         time1.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
@@ -266,6 +276,7 @@ public class TaskController {
             this.resumptionService.newbuild(orgId, ResumptionType.YEAR, dateTime, true, appPlan, null, null, roleIds, planstartTime, planendTime);
         }
     }
+
     private void saveResumptionByHalfYear(List<Long> orgIdsByPlanListNew, AppPlan appPlan, List<Long> roleIds, DateTime dateTime) {
         DateHelper dateHelper = new DateHelper(dateTime);
         KeyValue<Integer, Integer> yearHalfYear = new KeyValue<>(DateUtil.year(dateTime), dateHelper.getHalfyear());
@@ -279,6 +290,7 @@ public class TaskController {
             this.resumptionService.newbuild(orgId, ResumptionType.HALFYEAR, dateTime, true, appPlan, null, null, roleIds, planstartTime, planendTime);
         }
     }
+
     private void saveResumptionByQuarter(List<Long> orgIdsByPlanListNew, AppPlan appPlan, List<Long> roleIds, DateTime dateTime) {
         KeyValue<Integer, Integer> yearQuarter = new KeyValue<>(DateUtil.year(dateTime), DateUtil.quarter(dateTime));
         DateTime time1 = new DateTime(dateTime);
@@ -291,6 +303,7 @@ public class TaskController {
             this.resumptionService.newbuild(orgId, ResumptionType.QUARTER, dateTime, true, appPlan, null, null, roleIds, planstartTime, planendTime);
         }
     }
+
     private void saveResumptionByMonth(List<Long> orgIdsByPlanListNew, AppPlan appPlan, List<Long> roleIds, DateTime dateTime) {
         KeyValue<Integer, Integer> yearMonth = new KeyValue<>(DateUtil.year(dateTime), DateUtil.month(dateTime) + 1);
         DateTime time1 = new DateTime(dateTime);
@@ -304,6 +317,7 @@ public class TaskController {
 
         }
     }
+
     private void saveResumptionByWeek(List<Long> orgIdsByPlanListNew, AppPlan appPlan, List<Long> roleIds, DateTime dateTime) {
         KeyValue<Integer, Integer> yearWeek = new KeyValue<>(DateUtil.year(dateTime), DateUtil.weekOfYear(dateTime));
         DateTime time1 = new DateTime(dateTime);
@@ -320,6 +334,7 @@ public class TaskController {
             this.resumptionService.newbuild(orgId, ResumptionType.WEEK, dateTime, true, appPlan, null, null, roleIds, planstartTime, planendTime);
         }
     }
+
     private void saveResumptionByDay(List<Long> orgIdsByPlanListNew, AppPlan appPlan, List<Long> roleIds, DateTime dateTime) {
         for (Long orgId : orgIdsByPlanListNew) {
             Ymd y = ResumptionType.DAY.toYmd(dateTime);
@@ -370,10 +385,11 @@ public class TaskController {
             }
         }
     }
+
     private List<Long> getPlanOrgIds(AppPlan appPlan) {
         List<Long> orgIds = null;
-        if (appPlan.getExecType()!=null&&appPlan.getExecType() == 0) {//0机构类型需要安类型去机构里查询所以的机构
-            orgIds = orgService.findListByOrgType(appPlan.getExecOrgType(),SecurityConstants.INNER).getData();
+        if (appPlan.getExecType() != null && appPlan.getExecType() == 0) {//0机构类型需要安类型去机构里查询所以的机构
+            orgIds = orgService.findListByOrgType(appPlan.getExecOrgType(), SecurityConstants.INNER).getData();
         } else {
             List<SysOrg> sysOrgs = orgService.selectByOrgType(appPlan.getExecOrgType(), SecurityConstants.INNER);
             orgIds = sysOrgs.stream().map(SysOrg::getId).collect(Collectors.toList());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/IAppRuleService.java

@@ -40,5 +40,5 @@ public interface IAppRuleService extends IService<AppRule> {
 
     List<IdNameVo> ruleListForOrg(AppRuleListForOrgDto dto);
 
-    List<RuleTreeItem> getRuleTree(Long orgId);
+//    List<RuleTreeItem> getRuleTree(Long orgId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleItemServiceImpl.java

@@ -217,9 +217,23 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
     }
 
     private RuleTreeItem generateTree(SysOrgVO parent, List<SysOrgVO> allOrg, List<AppRule> allRule) {
-        RuleTreeItem item = RuleTreeItem.builder().isRule(0).id(parent.getId()).label(parent.getName()).children(new ArrayList<>()).build();
+        RuleTreeItem item = RuleTreeItem.builder()
+                .isRule(0)
+                .id(parent.getId())
+                .sort(parent.getSort())
+                .name(parent.getName())
+                .shortName(parent.getShortName())
+                .children(new ArrayList<>())
+                .build();
         List<RuleTreeItem> ruleItems = allRule.stream().filter(r -> ObjectUtil.equal(r.getOrgId(), parent.getId()))
-                .map(o -> RuleTreeItem.builder().isRule(1).id(o.getId()).label(o.getName()).orgType(o.getOrgType()).build())
+                .map(o -> RuleTreeItem.builder()
+                        .isRule(1)
+                        .id(o.getId())
+                        .sort(-1)
+                        .name(o.getName())
+                        .shortName(o.getName())
+                        .orgType(o.getOrgType())
+                        .build())
                 .collect(Collectors.toList());
         item.getChildren().addAll(ruleItems);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleServiceImpl.java

@@ -129,42 +129,42 @@ public class AppRuleServiceImpl extends ServiceImpl<AppRuleMapper, AppRule> impl
         return list;
     }
 
-    @Override
-    public List<RuleTreeItem> getRuleTree(Long orgId) {
-        List<RuleTreeItem> tree = new ArrayList<>();
-//        List<String> orgTypes = Arrays.asList(OrgTypeEnum.SHEGN_LIAN_SHE.getCode().toString(), OrgTypeEnum.BAN_SHI_CHU.getCode().toString(), OrgTypeEnum.HANG_SHE.getCode().toString());
-        List<SysOrgVO> orgs = remoteOrgService.hangsheWholePathTree(orgId, SecurityConstants.INNER)
-                .getData();
-        if (ObjectUtil.isEmpty(orgs)) {
-            return tree;
-        }
-        Map<Long, SysOrgVO> orgMap = orgs.stream().collect(Collectors.toMap(o -> o.getId(), o -> o));
-        List<SysOrgVO> tops = orgs.stream().filter(o -> !orgMap.containsKey(o.getParentId())).collect(Collectors.toList());
-        if (CollectionUtil.isEmpty(tops)) {
-            return tree;
-        }
-        List<Long> orgIds = orgs.stream().map(o -> o.getId()).collect(Collectors.toList());
-        List<AppRule> rules = appRuleMapper.selectList(new LambdaQueryWrapper<AppRule>().in(AppRule::getOrgId, orgIds));
-
-        tree = tops.stream().map(o -> generateTree(o, orgs, rules)).collect(Collectors.toList());
-
-        return tree;
-    }
-
-    private RuleTreeItem generateTree(SysOrgVO parent, List<SysOrgVO> allOrg, List<AppRule> allRule) {
-        RuleTreeItem item = RuleTreeItem.builder().isRule(0).id(parent.getId()).label(parent.getName()).children(new ArrayList<>()).build();
-        List<RuleTreeItem> ruleItems = allRule.stream().filter(r -> ObjectUtil.equal(r.getOrgId(), parent.getId()))
-                .map(o -> RuleTreeItem.builder().isRule(1).id(o.getId()).label(o.getName()).orgType(parent.getType().toString()).build())
-                .collect(Collectors.toList());
-        item.getChildren().addAll(ruleItems);
-
-        List<SysOrgVO> children = allOrg.stream()
-                .filter(o -> ObjectUtil.equal(o.getParentId(), parent.getId()))
-                .collect(Collectors.toList());
-        for (SysOrgVO child : children) {
-            item.getChildren().add(generateTree(child, allOrg, allRule));
-        }
-
-        return item;
-    }
+//    @Override
+//    public List<RuleTreeItem> getRuleTree(Long orgId) {
+//        List<RuleTreeItem> tree = new ArrayList<>();
+////        List<String> orgTypes = Arrays.asList(OrgTypeEnum.SHEGN_LIAN_SHE.getCode().toString(), OrgTypeEnum.BAN_SHI_CHU.getCode().toString(), OrgTypeEnum.HANG_SHE.getCode().toString());
+//        List<SysOrgVO> orgs = remoteOrgService.hangsheWholePathTree(orgId, SecurityConstants.INNER)
+//                .getData();
+//        if (ObjectUtil.isEmpty(orgs)) {
+//            return tree;
+//        }
+//        Map<Long, SysOrgVO> orgMap = orgs.stream().collect(Collectors.toMap(o -> o.getId(), o -> o));
+//        List<SysOrgVO> tops = orgs.stream().filter(o -> !orgMap.containsKey(o.getParentId())).collect(Collectors.toList());
+//        if (CollectionUtil.isEmpty(tops)) {
+//            return tree;
+//        }
+//        List<Long> orgIds = orgs.stream().map(o -> o.getId()).collect(Collectors.toList());
+//        List<AppRule> rules = appRuleMapper.selectList(new LambdaQueryWrapper<AppRule>().in(AppRule::getOrgId, orgIds));
+//
+//        tree = tops.stream().map(o -> generateTree(o, orgs, rules)).collect(Collectors.toList());
+//
+//        return tree;
+//    }
+//
+//    private RuleTreeItem generateTree(SysOrgVO parent, List<SysOrgVO> allOrg, List<AppRule> allRule) {
+//        RuleTreeItem item = RuleTreeItem.builder().isRule(0).id(parent.getId()).label(parent.getName()).children(new ArrayList<>()).build();
+//        List<RuleTreeItem> ruleItems = allRule.stream().filter(r -> ObjectUtil.equal(r.getOrgId(), parent.getId()))
+//                .map(o -> RuleTreeItem.builder().isRule(1).id(o.getId()).label(o.getName()).orgType(parent.getType().toString()).build())
+//                .collect(Collectors.toList());
+//        item.getChildren().addAll(ruleItems);
+//
+//        List<SysOrgVO> children = allOrg.stream()
+//                .filter(o -> ObjectUtil.equal(o.getParentId(), parent.getId()))
+//                .collect(Collectors.toList());
+//        for (SysOrgVO child : children) {
+//            item.getChildren().add(generateTree(child, allOrg, allRule));
+//        }
+//
+//        return item;
+//    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionRecordServiceImpl.java

@@ -179,12 +179,6 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
 //            RESUMPTIONOVERVIEWLOG.info("履职记录查询,查询条件: pageDto: {},hashMap:{},isTime:{}", JSON.toJSONString(pageDto), JSON.toJSONString(hashMap), isTime);
         page = baseMapper.selectPageByCondition(page, pageDto, hashMap, isTime, ymdQuarters);
         dealData(page.getRecords());
-        page.getRecords().forEach(r -> {
-            if (ObjectUtil.equal(r.getStatus(), "1") && DateUtil.endOfDay(r.getPlanEndTime()).before(DateUtil.beginOfDay(new Date()))) {
-                r.setStatus("4");
-            }
-        });
-
         return TableDataInfo.success(page);
 //        } else {
 ////            RESUMPTIONOVERVIEWLOG.info("履职记录导出,查询条件: pageDto: {},hashMap:{}", JSON.toJSONString(pageDto), JSON.toJSONString(hashMap));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
@@ -685,6 +686,13 @@ public class ResumptionTaskBusiness {
 
     }
 
+    @Async
+    public Boolean updateTaskStatus() {
+        LambdaUpdateWrapper<SysResumption> wrapper = new LambdaUpdateWrapper<SysResumption>();
+        Date date = DateUtil.beginOfDay(new Date());
+        wrapper.eq(SysResumption::getStatus, 1).lt(SysResumption::getPlanEndTime, date).set(SysResumption::getStatus, 4);
+        return resumptionService.update(wrapper);
+    }
 
     public Ymd toYmd(final Date date, String value) {
         DateHelper dateHelper = new DateHelper(date);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appRuleItem/RuleTreeItem.java

@@ -1,10 +1,14 @@
 package com.xunmei.core.resumption.vo.appRuleItem;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.xunmei.system.api.vo.SysOrgVO;
 import lombok.Builder;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 @Data
@@ -14,8 +18,9 @@ public class RuleTreeItem {
      @JsonSerialize(using = ToStringSerializer.class)
      Long id;
 
-     String label;
+     String name;
 
+     String shortName;
      int isRule;
 
      /**
@@ -23,5 +28,14 @@ public class RuleTreeItem {
       */
      String orgType;
 
+     Integer sort;
+
      List<RuleTreeItem> children;
+
+     public List<RuleTreeItem> getChildren() {
+          if(CollectionUtil.isNotEmpty(children)) {
+               children.sort(Comparator.comparing(RuleTreeItem::getSort));
+          }
+          return children;
+     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRuleController.java

@@ -78,9 +78,9 @@ public class SafetyCheckRuleController extends BaseController {
         return success(list);
     }
 
-    @ApiOperation(value = "获取")
-    @GetMapping("/orgtree")
-    public AjaxResult getRuleTree() {
-        return success(safetyCheckRuleService.getRuleTree(SecurityUtils.getLoginUser().getSysUser().getOrgId()));
-    }
+//    @ApiOperation(value = "获取")
+//    @GetMapping("/orgtree")
+//    public AjaxResult getRuleTree() {
+//        return success(safetyCheckRuleService.getRuleTree(SecurityUtils.getLoginUser().getSysUser().getOrgId()));
+//    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/ISafetyCheckRuleService.java

@@ -40,5 +40,5 @@ public interface ISafetyCheckRuleService extends IService<SafetyCheckRule> {
 
     List<IdNameVo> ruleListForOrg(SafetyCheckRuleListForOrgDto dto);
 
-    List<RuleTreeItem> getRuleTree(Long orgId);
+//    List<RuleTreeItem> getRuleTree(Long orgId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleItemServiceImpl.java

@@ -219,9 +219,18 @@ public class SafetyCheckRuleItemServiceImpl
     }
 
     private RuleTreeItem generateTree(SysOrgVO parent, List<SysOrgVO> allOrg, List<SafetyCheckRule> allRule) {
-        RuleTreeItem item = RuleTreeItem.builder().isRule(0).id(parent.getId()).label(parent.getName()).children(new ArrayList<>()).build();
+        RuleTreeItem item = RuleTreeItem.builder().isRule(0).id(parent.getId())
+                .name(parent.getName())
+                .shortName(parent.getShortName())
+                .children(new ArrayList<>())
+                .build();
         List<RuleTreeItem> ruleItems = allRule.stream().filter(r -> ObjectUtil.equal(r.getOrgId(), parent.getId()))
-                .map(o -> RuleTreeItem.builder().isRule(1).id(o.getId()).label(o.getName()).orgType(o.getOrgType()).build())
+                .map(o -> RuleTreeItem.builder()
+                        .isRule(1)
+                        .id(o.getId())
+                        .name(o.getName())
+                        .shortName(o.getName())
+                        .orgType(o.getOrgType()).build())
                 .collect(Collectors.toList());
         item.getChildren().addAll(ruleItems);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleServiceImpl.java

@@ -130,42 +130,53 @@ public class SafetyCheckRuleServiceImpl extends ServiceImpl<SafetyCheckRuleMappe
         return list;
     }
 
-    @Override
-    public List<RuleTreeItem> getRuleTree(Long orgId) {
-        List<RuleTreeItem> tree = new ArrayList<>();
-        List<SysOrg> orgs = remoteOrgService
-                .listByTypes(OrgListByTypesConditionEto.builder().orgId(orgId).orgTypes(Arrays.asList("1", "2", "3", "4", "11")).build())
-                .getData();
-        if (ObjectUtil.isEmpty(orgs)) {
-            return tree;
-        }
-        Map<Long, SysOrg> orgMap = orgs.stream().collect(Collectors.toMap(o -> o.getId(), o -> o));
-        List<SysOrg> tops = orgs.stream().filter(o -> !orgMap.containsKey(o.getParentId())).collect(Collectors.toList());
-        if (CollectionUtil.isEmpty(tops)) {
-            return tree;
-        }
-        List<Long> orgIds = orgs.stream().map(o -> o.getId()).collect(Collectors.toList());
-        List<SafetyCheckRule> rules = safetyCheckRuleMapper.selectList(new LambdaQueryWrapper<SafetyCheckRule>().in(SafetyCheckRule::getOrgId, orgIds));
-
-        tree = tops.stream().map(o -> generateTree(o, orgs, rules)).collect(Collectors.toList());
-
-        return tree;
-    }
-
-    private RuleTreeItem generateTree(SysOrg parent, List<SysOrg> allOrg, List<SafetyCheckRule> allRule) {
-        RuleTreeItem item = RuleTreeItem.builder().isRule(0).id(parent.getId()).label(parent.getName()).children(new ArrayList<>()).build();
-        List<RuleTreeItem> ruleItems = allRule.stream().filter(r -> ObjectUtil.equal(r.getOrgId(), parent.getId()))
-                .map(o -> RuleTreeItem.builder().isRule(1).id(o.getId()).label(o.getName()).orgType(parent.getType().toString()).build())
-                .collect(Collectors.toList());
-        item.getChildren().addAll(ruleItems);
-
-        List<SysOrg> children = allOrg.stream()
-                .filter(o -> ObjectUtil.equal(o.getParentId(), parent.getId()))
-                .collect(Collectors.toList());
-        for (SysOrg child : children) {
-            item.getChildren().add(generateTree(child, allOrg, allRule));
-        }
-
-        return item;
-    }
+//    @Override
+//    public List<RuleTreeItem> getRuleTree(Long orgId) {
+//        List<RuleTreeItem> tree = new ArrayList<>();
+//        List<SysOrg> orgs = remoteOrgService
+//                .listByTypes(OrgListByTypesConditionEto.builder().orgId(orgId).orgTypes(Arrays.asList("1", "2", "3", "4", "11")).build())
+//                .getData();
+//        if (ObjectUtil.isEmpty(orgs)) {
+//            return tree;
+//        }
+//        Map<Long, SysOrg> orgMap = orgs.stream().collect(Collectors.toMap(o -> o.getId(), o -> o));
+//        List<SysOrg> tops = orgs.stream().filter(o -> !orgMap.containsKey(o.getParentId())).collect(Collectors.toList());
+//        if (CollectionUtil.isEmpty(tops)) {
+//            return tree;
+//        }
+//        List<Long> orgIds = orgs.stream().map(o -> o.getId()).collect(Collectors.toList());
+//        List<SafetyCheckRule> rules = safetyCheckRuleMapper.selectList(new LambdaQueryWrapper<SafetyCheckRule>().in(SafetyCheckRule::getOrgId, orgIds));
+//
+//        tree = tops.stream().map(o -> generateTree(o, orgs, rules)).collect(Collectors.toList());
+//
+//        return tree;
+//    }
+//
+//    private RuleTreeItem generateTree(SysOrg parent, List<SysOrg> allOrg, List<SafetyCheckRule> allRule) {
+//        RuleTreeItem item = RuleTreeItem.builder()
+//                .isRule(0)
+//                .id(parent.getId())
+//                .name(parent.getName())
+//                .shortName(parent.getShortName())
+//                .children(new ArrayList<>()).build();
+//        List<RuleTreeItem> ruleItems = allRule.stream().filter(r -> ObjectUtil.equal(r.getOrgId(), parent.getId()))
+//                .map(o -> RuleTreeItem.builder()
+//                        .isRule(1)
+//                        .id(o.getId())
+//                        .name(o.getName())
+//                        .shortName(o.getName())
+//                        .orgType(parent.getType().toString())
+//                        .build())
+//                .collect(Collectors.toList());
+//        item.getChildren().addAll(ruleItems);
+//
+//        List<SysOrg> children = allOrg.stream()
+//                .filter(o -> ObjectUtil.equal(o.getParentId(), parent.getId()))
+//                .collect(Collectors.toList());
+//        for (SysOrg child : children) {
+//            item.getChildren().add(generateTree(child, allOrg, allRule));
+//        }
+//
+//        return item;
+//    }
 }

soc-modules/soc-modules-core/src/main/resources/mapper/device/ProtectionMapper.xml

@@ -18,13 +18,13 @@
         a.name as name,
         a.status as status,
         a.org_id as orgId,
-        a.org_name as orgName,
+        c.short_name as orgName,
         a.all_hour as allHour,
         a.status_update_time as statusUpdateTime
         from core_protection a
+        inner join sys_org c on a.org_id = c.id and c.deleted=0
         <if test="request.checkSub==true">
-            inner join sys_org c
-            on a.org_id = c.id and c.deleted=0 and c.path like concat((select path from sys_org where id=#{request.orgId}),  '%')
+             and c.path like concat((select path from sys_org where id=#{request.orgId}),  '%')
         </if>
         where a.deleted=0
         <if test="request.checkSub==false">

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -38,15 +38,15 @@
         d.roleNames,
         b.orgId,
         b.orgNames,
-        o.name as plan_of_org_name,
-        g.name as plan_create_org_name,
+        o.short_name as plan_of_org_name,
+        g.short_name as plan_create_org_name,
         g.type as createOrgType
         FROM
         core_resumption_plan a
         LEFT JOIN (
         SELECT
         m.plan_id,
-        GROUP_CONCAT( n.`name` ) orgNames,
+        GROUP_CONCAT( n.`short_name` ) orgNames,
         GROUP_CONCAT( n.id ) orgId
         FROM
         core_resumption_plan_to_exec_org m

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppRuleMapper.xml

@@ -9,7 +9,7 @@
         a.status as status,
         a.remark as remark,
         a.org_id as orgId,
-        org.name as orgName
+        org.short_name as orgName
         from core_resumption_rule a
         inner join sys_org org on a.org_id = org.id
         <where>

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/CoreResumptionTask.java

@@ -28,12 +28,18 @@ public class CoreResumptionTask {
     public void buildWeekTask() {
         log.info("开始执行每周履职定时任务，当前任务 时间：{}",new Date());
         R<Boolean> result = remoteResumptionTaskService.weekTask();
-        log.info("执行教育培训定时任务结束，当前任务 时间：{}，结果：{}", new Date(), JSON.toJSONString(result));
+        log.info("执行每周履职定时任务结束，当前任务 时间：{}，结果：{}", new Date(), JSON.toJSONString(result));
     }
 
     public void buildMonthTask() {
-        log.info("开始执行每周履职定时任务，当前任务 时间：{}",new Date());
+        log.info("开始执行每月履职定时任务，当前任务 时间：{}",new Date());
         R<Boolean> result = remoteResumptionTaskService.monthTask();
-        log.info("执行教育培训定时任务结束，当前任务 时间：{}，结果：{}", new Date(), JSON.toJSONString(result));
+        log.info("执行执行每月履职定时任务结束，当前任务 时间：{}，结果：{}", new Date(), JSON.toJSONString(result));
+    }
+
+    public void updateTaskStatus(){
+        log.info("开始更新履职任务状态 时间：{}",new Date());
+        R<Boolean> result = remoteResumptionTaskService.updateTaskStatus();
+        log.info("更新履职任务状态结束，当前任务 时间：{}，结果：{}", new Date(), JSON.toJSONString(result));
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -84,6 +84,9 @@ public class SysDeptController extends BaseController {
         /*if (orgService.list(new QueryWrapper<SysOrg>().eq("name", dept.getName())).size() > 0) {
             return error("新增机构'" + dept.getName() + "'失败，机构名称已存在");
         }*/
+        if(ObjectUtil.isEmpty(dept.getShortName())){
+            dept.setShortName(dept.getName());
+        }
         dept.setCreateBy(SecurityUtils.getUsername());
         dept.setCreateTime(new Date());
         dept.setSource(0);
@@ -114,6 +117,9 @@ public class SysDeptController extends BaseController {
         //获取选择的父机构数据
         SysOrg byId = orgService.getById(dept.getParentId());
         //更新机构对应的path
+        if(ObjectUtil.isEmpty(dept.getShortName())){
+            dept.setShortName(dept.getName());
+        }
         dept.setPath(byId.getPath()+dept.getId()+"-");
         dept.setTreeShowPath(byId.getTreeShowPath()+dept.getId()+"-");
         dept.setTreeShowParentId(byId.getId());

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -605,7 +605,7 @@
         where suo.id = #{userId}
     </select>
     <select id="getParentName" resultType="com.xunmei.common.core.vo.IdNameVo">
-        select so.id,so.name,p.name as extra
+        select so.id,so.short_name as name,p.short_name as extra
         from sys_org so
         left join sys_org p on so.parent_id=p.id and p.deleted=0
         where so.id in