作息变更

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/worktime/domain/SysWorkTime.java

@@ -230,7 +230,8 @@ public class SysWorkTime extends BaseEntity {
      */
     @ApiModelProperty(value = "分钟")
     private Long ymdMinute;
-
+    @TableField(exist = false)
+    private Long orgType;
     /**
      * 是否手动配置1是0否
      */

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

@@ -50,6 +50,8 @@ public class SysWorkTimeSet extends BaseEntity {
     private String workDay;
     @TableField(exist = false)
     private Integer timeCheck;
+    @TableField(exist = false)
+    private Long orgType;
     /**
      * 机构 ID
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysWorkTimeSetMapper.java

@@ -3,8 +3,12 @@ package com.xunmei.system.mapper;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
 import com.xunmei.system.domain.SysWorkTimeSet;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.MapKey;
@@ -69,4 +73,6 @@ public interface SysWorkTimeSetMapper extends BaseMapper<SysWorkTimeSet> {
      * @return 结果
      */
      int deleteSysWorkTimeSetByIds(Long[] ids);
+
+    Page<SysWorkTimeSet> selectWorkTimeSetPage(Page<SysWorkTimeSet> page, @Param(Constants.WRAPPER) Wrapper<SysWorkTimeSet> queryWrapper);
 }

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

@@ -102,6 +102,9 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
         if (sysWorkTime.getModifiedName() != null) {
             query.eq("t.modified_name", sysWorkTime.getModifiedName());
         }
+        if (sysWorkTime.getOrgType() != null) {
+            query.eq("o.type", sysWorkTime.getOrgType());
+        }
         //下穿
         if (sysWorkTime.getCheckSub()) {
             query.like("o.path", sysWorkTime.getOrgId());
@@ -142,8 +145,8 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
             Map<Long, List<SysWorkTimeSet>> orgMap = list.stream().collect(Collectors.groupingBy(SysWorkTimeSet::getOrgId));
             //遍历orgMap
             StringBuffer sbf = new StringBuffer(1000);
-          //  for (Long key : orgMap.keySet()) {
-            for(Map.Entry<Long, List<SysWorkTimeSet>> setMap:orgMap.entrySet()){
+            //  for (Long key : orgMap.keySet()) {
+            for (Map.Entry<Long, List<SysWorkTimeSet>> setMap : orgMap.entrySet()) {
                 List<SysWorkTimeSet> wo = setMap.getValue();//orgMap.get(key);
                 //遍历wo
                 List<Date> dateList = new ArrayList<>();
@@ -459,7 +462,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
                 .select(SysWorkTime::getId,
                         SysWorkTime::getIsEnable,
                         SysWorkTime::getYmdDate,
-                        SysWorkTime::getOrgId,SysWorkTime::getOpenTime,
+                        SysWorkTime::getOrgId, SysWorkTime::getOpenTime,
                         SysWorkTime::getCloseTime,
                         SysWorkTime::getWorkTime,
                         SysWorkTime::getWorkOffTime,
@@ -475,7 +478,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
 
     @Override
     public SysWorkTime findWorkTimeByOrgIdAndYmd(Date ymdDate, Long orgId) {
-        return sysWorkTimeMapper.selectOne(new LambdaQueryWrapper<SysWorkTime>().eq(SysWorkTime::getYmdDate,ymdDate).eq(SysWorkTime::getOrgId,orgId));
+        return sysWorkTimeMapper.selectOne(new LambdaQueryWrapper<SysWorkTime>().eq(SysWorkTime::getYmdDate, ymdDate).eq(SysWorkTime::getOrgId, orgId));
     }
 
     @Override

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

@@ -130,16 +130,19 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
             //清空前端传递的org_id
             sysWorkTimeSet.setOrgId(null);
             //添加in条件
-            query.in("org_id", ids);
+            query.in("t.org_id", ids);
+        }
+        if(sysWorkTimeSet.getOrgType()!=null){
+            query.eq("o.type", sysWorkTimeSet.getOrgType());
         }
         query.orderByDesc
-                ("effective_date");
+                ("t.effective_date");
         //时间范围查询
         if (sysWorkTimeSet.getParams().get("beginTime") != null && sysWorkTimeSet.getParams().get("endTime") != null) {
-            query.between("effective_date", extractDate(sysWorkTimeSet.getParams().get("beginTime").toString(), "yyyy-MM-dd HH:mm:ss"), extractDate(sysWorkTimeSet.getParams().get("endTime").toString(), "yyyy-MM-dd HH:mm:ss"));
+            query.between("t.effective_date", extractDate(sysWorkTimeSet.getParams().get("beginTime").toString(), "yyyy-MM-dd HH:mm:ss"), extractDate(sysWorkTimeSet.getParams().get("endTime").toString(), "yyyy-MM-dd HH:mm:ss"));
         }
         //获取数据
-        page = sysWorkTimeSetMapper.selectPage(page, query);
+        page = sysWorkTimeSetMapper.selectWorkTimeSetPage(page, query);
 
 
         List<SysWorkTimeSet> list = page.getRecords();

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

@@ -148,6 +148,14 @@ select  * from sys_work_time_set
 
 
     </select>
+    <select id="selectWorkTimeSetPage" resultType="com.xunmei.system.domain.SysWorkTimeSet">
+        SELECT
+            t.*
+        FROM
+            sys_work_time_set t
+                LEFT JOIN sys_org o ON t.org_id = o.id
+            ${ew.customSqlSegment}
+    </select>
 
 
     <insert id="insertSysWorkTimeSet" parameterType="com.xunmei.system.domain.SysWorkTimeSet"            useGeneratedKeys="true" keyProperty="id">