1.设备管理, 作息管理增加地区/行社字段;

2.机构管理列表停用机构排列至最后;

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysDevice.java

@@ -74,4 +74,12 @@ public class SysDevice extends BaseEntity {
     @TableField(exist = false)
     @ApiModelProperty(value = "是否关联登记簿",notes = "0否1是")
     private Integer inBook;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "机构所属地区")
+    private String affiliatedArea;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "机构所属行社")
+    private String affiliatedBank;
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTimeSet.java

@@ -1,24 +1,22 @@
 package com.xunmei.system.domain;
 
-import java.util.Date;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.xunmei.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 作息设置对象 sys_work_time_set
@@ -181,6 +179,15 @@ public class SysWorkTimeSet extends BaseEntity {
     private Date effectiveDate;
 
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "机构所属地区")
+    private String affiliatedArea;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "机构所属行社")
+    private String affiliatedBank;
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeviceServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
@@ -35,10 +36,8 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 【请填写功能名称】Service业务层处理
@@ -102,6 +101,26 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
             }
             page = sysDeviceMapper.selectPage(page, query);
         }
+        if (ObjectUtil.isNotEmpty(page.getRecords())) {
+            List<Long> collect = page.getRecords().stream().map(SysDevice::getOrgId).collect(Collectors.toList());
+            List<SysOrg> sysOrgs = orgService.selectByOrgIdList(collect);
+            for (SysDevice record : page.getRecords()) {
+                Optional<SysOrg> any = sysOrgs.stream().filter(r -> ObjectUtil.equal(r.getId(), record.getOrgId())).findAny();
+                if (!any.isPresent()) {
+                    continue;
+                }
+                SysOrg sysOrg = any.get();
+                if (OrgTypeEnum.DIQU_HANG_SHE.getCode().toString().equals(sysOrg.getOrgType())) {
+                    continue;
+                }
+                if (OrgTypeEnum.HANG_SHE.getCode().toString().equals(sysOrg.getOrgType())) {
+                    record.setAffiliatedArea(sysOrg.getAffiliatedArea());
+                    continue;
+                }
+                record.setAffiliatedArea(sysOrg.getAffiliatedArea());
+                record.setAffiliatedBank(sysOrg.getAffiliatedBank());
+            }
+        }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -103,6 +103,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 org.setPath(sysOrg.getPath());
             }
         }
+
         //获取数据
         page = baseMapper.selectOrgList(page, org);
         if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(page.getRecords()) && page.getTotal() > 0) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
+import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.thread.ThreadPoolConfig;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
@@ -22,6 +23,7 @@ import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.vo.SysOrgVO;
 import com.xunmei.system.domain.SysWorkTimeSet;
 import com.xunmei.system.domain.SysWorkTimeSetDayofweek;
@@ -160,11 +162,14 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
 
         List<SysWorkTimeSet> list = page.getRecords();
         List<Long> ids = new ArrayList<>();
+        List<Long> orgIds = new ArrayList<>();
         list.forEach(l -> {
             ids.add(l.getId());
+            orgIds.add(l.getOrgId());
         });
         if (list.size() > 0) {
             List<SysWorkTimeSetDayofweek> dayOfWeeks = sysWorkTimeSetDayofweekMapper.findByWorkTimeSetIdIn(ids);
+            List<SysOrg> sysOrgs = orgService.selectByOrgIdList(orgIds);
             list.forEach(l -> {
                 List<SysWorkTimeSetDayofweek> dayOfWeekList = dayOfWeeks.stream().filter(d -> d.getWorkTimeSetId().equals(l.getId())).collect(Collectors.toList());
                 String workDay = "";
@@ -199,7 +204,20 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
 
                     }
                 }
-
+                Optional<SysOrg> any = sysOrgs.stream().filter(r -> ObjectUtil.equal(r.getId(), l.getOrgId())).findAny();
+                if (!any.isPresent()) {
+                    return;
+                }
+                SysOrg sysOrg = any.get();
+                if (OrgTypeEnum.DIQU_HANG_SHE.getCode().toString().equals(sysOrg.getOrgType()) || OrgTypeEnum.SHEGN_LIAN_SHE.getCode().toString().equals(sysOrg.getOrgType())) {
+                    return;
+                }
+                if (OrgTypeEnum.HANG_SHE.getCode().toString().equals(sysOrg.getOrgType())) {
+                    l.setAffiliatedArea(sysOrg.getAffiliatedArea());
+                    return;
+                }
+                l.setAffiliatedArea(sysOrg.getAffiliatedArea());
+                l.setAffiliatedBank(sysOrg.getAffiliatedBank());
 //            if(l.getEffectiveDate().before(new Date()) || month == month1 || month+1 == month1) {
 //                l.setTimeCheck(1);
 //            }else{
@@ -396,7 +414,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
         List<SysWorkTimeSetDayofweek> dayofweekList = workTimeSet.getDayOfWeeks();
 
         for (Long orgId : orgIds) {
-            CompletableFuture.runAsync(()->{
+            CompletableFuture.runAsync(() -> {
                 List<SysWorkTime> workTimeEditDtoList = new ArrayList<SysWorkTime>();
                 for (DateTime dateTime : dateTimeList) {
                     Optional<SysWorkTimeSetDayofweek> sameDayOfWeek = dayofweekList.stream().filter(w -> ObjectUtil.equal(String.valueOf(w.getDayOfWeek()), String.valueOf(dateTime.dayOfWeek()))).findFirst();
@@ -436,7 +454,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
                     workTimeEditDtoList.add(workTime);
                 }
                 sysWorkTimeMapper.batchInsertByXML(workTimeEditDtoList);
-            },threadPoolTaskExecutor);
+            }, threadPoolTaskExecutor);
         }
         log.info("===== 构建SysWorkTime作息模板数据完成 ====");
 

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

@@ -683,8 +683,8 @@
         <if test="  org.checkSub != null and org.checkSub == false">
             and o.path like concat('%',#{org.path})
         </if>
-            and o.name != '机关'
-        ORDER BY isnull(o.sort),o.sort, o.path
+            and o.name != '机关' and o.name != '各部门'
+        ORDER BY o.is_lock, isnull(o.sort),o.sort, o.path
 
     </select>
     <select id="getOrgIdByTaskId" resultType="java.lang.Long">