作息新增 未配置查询条件

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

@@ -242,6 +242,9 @@ public class SysWorkTime extends BaseEntity {
     @TableField(exist = false)
     private Integer size;
 
+    @TableField(exist = false)
+    private Boolean noWorkTime;
+
 
     @Override
     public String toString() {

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -42,11 +42,10 @@
                                            0), 0))                                                 AS ga382015prev
                             FROM sys_org_physical_defense_construction
                             WHERE type = 1
-                               OR type = 3
                             GROUP BY org_id) m on o.id = m.org_id
         WHERE o.deleted = 0
           and o.is_lock = 0
-          and (o.type = 4 OR o.type = 5)
+          and (o.type = 4)
           and o.path like concat(#{orgPath}, '%')
     </select>
     <select id="selectOverViewResumptionTaskInfo" resultType="com.xunmei.core.board.dto.app.AppOverviewTaskInfoDto">
@@ -158,7 +157,6 @@
                                   FROM sys_org_physical_defense_construction
                                   WHERE type = 1
                                      or type = 2
-                                     OR type = 3
                                   GROUP BY org_id) t1) oh ON o.id = oh.org_id
                  LEFT JOIN sys_org_extend oe on o.id = oe.org_id
         WHERE o.deleted = 0

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.dto.SysWorkTimeDto;
@@ -56,6 +57,8 @@ public interface SysWorkTimeMapper extends BaseMapper<SysWorkTime> {
     @MapKey("id")
      IPage<SysWorkTimeDto> selectByPage(Page<SysWorkTime> page, @Param(Constants.WRAPPER) Wrapper<SysWorkTime> queryWrapper);
 
+    @MapKey("id")
+    IPage<SysWorkTimeDto> selectNoWorkTimeByPage(Page<SysWorkTime> page, @Param(Constants.WRAPPER) Wrapper<SysWorkTime> queryWrapper1,@Param("request") SysWorkTime request);
     /**
      * 新增【请填写功能名称】
      *

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

@@ -93,32 +93,43 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
         }
         //查询条件
         QueryWrapper<SysWorkTime> query = new QueryWrapper<>();
-        if (sysWorkTime.getIsEnable() != null) {
-            query.eq("t.is_enable", sysWorkTime.getIsEnable());
-        }
-        if (sysWorkTime.getOrgId() != null && !sysWorkTime.getCheckSub()) {
-            query.eq("t.org_id", sysWorkTime.getOrgId());
-        }
-        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());
-        } else {
-            query.likeLeft("o.path", sysWorkTime.getOrgId() + "-");
-        }
-        sysWorkTime.setOrgId(null);
-        query.orderByDesc("ymd_date");
-        //时间范围查询
-        if (sysWorkTime.getRange() != null && sysWorkTime.getRange().length > 1) {
-            query.between("t.ymd_date", extractDate(sysWorkTime.getRange()[0].toString(), "EEE MMM dd HH:mm:ss zzz yyyy"), extractDate(sysWorkTime.getRange()[1].toString(), "EEE MMM dd HH:mm:ss zzz yyyy"));
-        }
+
+            if (sysWorkTime.getIsEnable() != null) {
+                query.eq("t.is_enable", sysWorkTime.getIsEnable());
+            }
+            if (sysWorkTime.getOrgId() != null && !sysWorkTime.getCheckSub()) {
+                query.eq("t.org_id", sysWorkTime.getOrgId());
+            }
+            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());
+            } else {
+                query.likeLeft("o.path", sysWorkTime.getOrgId() + "-");
+            }
+//            sysWorkTime.setOrgId(null);
+
+            //时间范围查询
+            if (sysWorkTime.getRange() != null && sysWorkTime.getRange().length > 1) {
+                query.between("t.ymd_date", extractDate(sysWorkTime.getRange()[0].toString(), "EEE MMM dd HH:mm:ss zzz yyyy"), extractDate(sysWorkTime.getRange()[1].toString(), "EEE MMM dd HH:mm:ss zzz yyyy"));
+            }
+            query.orderByDesc("ymd_date");
+
         //获取数据
-        IPage<SysWorkTimeDto> page1 = sysWorkTimeMapper.selectByPage(page, query);
+        IPage<SysWorkTimeDto> page1= null;
+            if(sysWorkTime.getNoWorkTime())
+            {
+                page1 = sysWorkTimeMapper.selectNoWorkTimeByPage(page, query,sysWorkTime);
+            }
+            else{
+                page1 = sysWorkTimeMapper.selectByPage(page, query);
+            }
+
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page1);
 

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

@@ -717,7 +717,7 @@ and
         </foreach>
     </select>
     <select id="selectNetworkNumberByPath" resultType="java.lang.Integer">
-        SELECT COUNT(1) FROM sys_org WHERE path LIKE  concat( #{orgPath}, '%') AND type=4 AND deleted=0
+        SELECT COUNT(1) FROM sys_org WHERE path LIKE  concat( #{orgPath}, '%') AND type=4 AND deleted=0 AND is_lock=0
     </select>
     <select id="complianceStatus" resultType="com.xunmei.system.util.OrgPhysicalDefenseConstructionExport">
         SELECT
@@ -733,7 +733,7 @@ and
                 ) AS reachRate
         FROM
             sys_org_physical_defense_construction a
-                LEFT JOIN sys_org b ON a.org_id = b.id
+                INNER JOIN sys_org b ON a.org_id = b.id AND b.deleted=0 AND b.is_lock=0
         WHERE
             b.type=4 AND
             b.path LIKE concat(#{orgPath}, '%')

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

@@ -129,9 +129,35 @@
             o.short_name as orgName
         FROM
             sys_work_time t
-                LEFT JOIN sys_org o ON t.org_id = o.id
+            LEFT JOIN sys_org o ON t.org_id = o.id AND o.deleted=0 AND o.is_lock=0
             ${ew.customSqlSegment}
-
+    </select>
+    <select id="selectNoWorkTimeByPage" resultType="com.xunmei.system.dto.SysWorkTimeDto">
+        SELECT
+        o1.short_name as orgName,
+        c.*
+        FROM
+            sys_org o1 LEFT JOIN
+            (
+                select  t.*
+                from sys_org o
+                 left join sys_work_time t on t.org_id = o.id
+                 ${ew.customSqlSegment}
+            ) c
+            ON c.org_id = o1.id
+            where c.id is null AND o1.deleted=0 AND o1.is_lock=0
+        <choose>
+            <when test="request.checkSub==true">
+               AND o1.path like concat('%',#{request.orgId}, '%')
+            </when>
+            <otherwise>
+               AND o1.id = #{request.orgId}
+            </otherwise>
+         </choose>
+        <if test="request.orgType!= null">
+            and o1.type=#{request.orgType}
+        </if>
+        order by c.ymd_date
     </select>
     <select id="findByOrgAndMonth" resultType="com.xunmei.common.core.domain.worktime.domain.SysWorkTime">