Merge branch 'V0.1.0' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.1.0

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -92,8 +92,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 r.setOverdueStatus(QuestionReformEnum.OverDue.getValue());
             }
         });
-//        Page<QuestionPageDto> r =page.
-        //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/question/QuestionMapper.xml

@@ -294,12 +294,6 @@
             and q.org_id=#{params.orgId}
         </if>
         <if test="params.confirmStatus!=null">
-<!--            <if test="params.confirmStatus==4">-->
-<!--                and (q.confirm_status!=3) and q.reform_deadline &lt; #{today}-->
-<!--            </if>-->
-<!--            <if test="params.confirmStatus!=4">-->
-<!--                and q.confirm_status=#{params.confirmStatus}-->
-<!--            </if>-->
             <if test="params.confirmStatus==12">
                 and q.reform_status=10 and q.reform_deadline &lt; #{today}
             </if>
@@ -501,10 +495,19 @@
             and q.org_id=#{params.orgId}
         </if>
         <if test="params.confirmStatus!=null">
-            <if test="params.confirmStatus==4">
-                and (q.confirm_status!=3) and q.reform_deadline &lt; #{today}
+            <if test="params.confirmStatus==12">
+                and q.reform_status=10 and q.reform_deadline &lt; #{today}
+            </if>
+            <if test="params.confirmStatus==11 or params.confirmStatus==13">
+                and q.reform_status=#{params.confirmStatus}
+            </if>
+            <if test="params.confirmStatus==10">
+                and q.reform_status=#{params.confirmStatus} and q.reform_deadline > #{today}
+            </if>
+            <if test="params.confirmStatus &lt; 10 and params.confirmStatus!=3">
+                and q.confirm_status=#{params.confirmStatus}
             </if>
-            <if test="params.confirmStatus!=4">
+            <if test="params.confirmStatus==3">
                 and q.confirm_status=#{params.confirmStatus}
             </if>
         </if>
@@ -515,7 +518,7 @@
             and (q.question_desc like concat('%',#{params.searchKey},'%') or q.check_content like
             concat('%',#{params.searchKey},'%'))
         </if>
-        order by q.id desc
+        order by q.submit_time desc,q.id desc
     </select>
     <select id="selectReformExportList" resultType="com.xunmei.core.question.dto.QuestionExportDto">
         SELECT q.org_name,

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -118,10 +118,27 @@
                     and #{request.dateRange[1]}>=a.ymd_date
                 </if>-->
         <if test="request.dateRange != null and request.dateRange.length>0">
-            and (a.plan_start_time BETWEEN #{request.dateRange[0]}
+           <!-- and (a.plan_start_time BETWEEN #{request.dateRange[0]}
             and #{request.dateRange[1]}
             OR a.plan_end_time BETWEEN #{request.dateRange[0]}
-            and #{request.dateRange[1]})
+            and #{request.dateRange[1]})-->
+
+
+            and (
+            (
+            #{request.dateRange[0]}   <![CDATA[<=]]> a.plan_start_time
+            and #{request.dateRange[1]}     <![CDATA[>=]]> a.plan_start_time
+            )
+            or
+            (
+            #{request.dateRange[0]}   <![CDATA[<=]]> a.plan_end_time
+            and #{request.dateRange[1]}     <![CDATA[>=]]> a.plan_end_time
+            )
+            or (
+            #{request.dateRange[0]}   <![CDATA[>=]]> a.plan_start_time
+            and #{request.dateRange[1]}     <![CDATA[<=]]> a.plan_end_time
+            )
+            )
         </if>
 
         <if test="request.status != null ">
@@ -220,8 +237,23 @@
             and a.cycle = #{request.cycle}
         </if>
         <if test="request.dateRange != null and request.dateRange.length>0">
-            and a.ymd_date >= #{request.dateRange[0]}
-            and #{request.dateRange[1]}>=a.ymd_date
+          <!--  and a.ymd_date >= #{request.dateRange[0]}
+            and #{request.dateRange[1]}>=a.ymd_date-->
+                and (
+                (
+                #{request.dateRange[0]}   <![CDATA[<=]]> a.plan_start_time
+                and #{request.dateRange[1]}     <![CDATA[>=]]> a.plan_start_time
+                )
+                or
+                (
+                #{request.dateRange[0]}   <![CDATA[<=]]> a.plan_end_time
+                and #{request.dateRange[1]}     <![CDATA[>=]]> a.plan_end_time
+                )
+                or (
+                #{request.dateRange[0]}   <![CDATA[>=]]> a.plan_start_time
+                and #{request.dateRange[1]}     <![CDATA[<=]]> a.plan_end_time
+                )
+                )
         </if>
         <if test="request.status != null ">
             and a.status = #{request.status}

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -204,7 +204,7 @@ public class PdfUtil {
         PdfUtil.createPDFCell(tableFont, table, "检查人", Element.ALIGN_MIDDLE, 2, 0);
         PdfUtil.createPDFCell(tableFont, table, data.get("submiterNames").toString(), Element.ALIGN_MIDDLE, 8, 0);
         // 第三行
-        PdfUtil.createPDFCell(tableFont, table, "检查时段", Element.ALIGN_MIDDLE, 2, 0);
+        PdfUtil.createPDFCell(tableFont, table, "任务时段", Element.ALIGN_MIDDLE, 2, 0);
         PdfUtil.createPDFCell(tableFont, table, "检查内容", Element.ALIGN_MIDDLE, 6, 0);
         PdfUtil.createPDFCell(tableFont, table, "检查情况", Element.ALIGN_MIDDLE, 2, 0);
         final List<SysDictData> dictCache = DictUtils.getDictCache(DictConstants.RESUMPTION_PLAN_EXEC);

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotAlarmDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.iot.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -43,25 +44,26 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
             page = new Page<>();
         }
 
-        if(ObjectUtil.isNotEmpty(request.getAlarmTime()) && request.getAlarmTime().size() > 0){
-            LocalDateTime alarmStartTime =LocalDateTime.parse(request.getAlarmTime().get(0), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            LocalDateTime alarmEndTime =LocalDateTime.parse(request.getAlarmTime().get(1), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            request.getParams().put("alarmStartTime",alarmStartTime);
-            request.getParams().put("alarmEndTime",alarmEndTime);
+        if(ObjectUtil.isNotEmpty(request.getAlarmTime())){
+            DateTime startTime = DateUtil.parse(request.getAlarmTime().get(0), "yyyy-MM-dd HH:mm:ss");
+            DateTime endTime = DateUtil.parse(request.getAlarmTime().get(1), "yyyy-MM-dd HH:mm:ss");
+            request.getParams().put("alarmStartTime",DateUtil.beginOfDay(startTime));
+            request.getParams().put("alarmEndTime",DateUtil.endOfDay(endTime));
         }
 
-        if(ObjectUtil.isNotEmpty(request.getAlarmEndTime()) && request.getAlarmEndTime().size() > 0){
-            LocalDateTime endAlarmStartTime =LocalDateTime.parse(request.getAlarmEndTime().get(0), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            LocalDateTime endAlarmEndTime =LocalDateTime.parse(request.getAlarmEndTime().get(1), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            request.getParams().put("endAlarmStartTime",endAlarmStartTime);
-            request.getParams().put("endAlarmEndTime",endAlarmEndTime);
+        if(ObjectUtil.isNotEmpty(request.getAlarmEndTime())){
+            DateTime startTime = DateUtil.parse(request.getAlarmEndTime().get(0), "yyyy-MM-dd HH:mm:ss");
+            DateTime endTime = DateUtil.parse(request.getAlarmEndTime().get(1), "yyyy-MM-dd HH:mm:ss");
+            request.getParams().put("endAlarmStartTime",DateUtil.beginOfDay(startTime));
+            request.getParams().put("endAlarmEndTime",DateUtil.endOfDay(endTime));
+
         }
 
-        if(ObjectUtil.isNotEmpty(request.getAlarmDealTime()) && request.getAlarmDealTime().size() > 0){
-            LocalDateTime dealAlarmStartTime =LocalDateTime.parse(request.getAlarmDealTime().get(0), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            LocalDateTime dealAlarmEndTime =LocalDateTime.parse(request.getAlarmDealTime().get(1), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            request.getParams().put("dealAlarmStartTime",dealAlarmStartTime);
-            request.getParams().put("dealAlarmEndTime",dealAlarmEndTime);
+        if(ObjectUtil.isNotEmpty(request.getAlarmDealTime())){
+            DateTime startTime = DateUtil.parse(request.getAlarmDealTime().get(0), "yyyy-MM-dd HH:mm:ss");
+            DateTime endTime = DateUtil.parse(request.getAlarmDealTime().get(1), "yyyy-MM-dd HH:mm:ss");
+            request.getParams().put("dealAlarmStartTime",DateUtil.beginOfDay(startTime));
+            request.getParams().put("dealAlarmEndTime",DateUtil.endOfDay(endTime));
         }