修改履职，安全检查手册和履职、安全检查、监控调阅、教育培训、预案演练任务列表排序

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -166,7 +166,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             query.between("create_time", tMonitoringRetrievalPlan.getParams().get("beginTime"), tMonitoringRetrievalPlan.getParams().get("endTime"));
         }
         query.orderByAsc(PARENT_ID);
-        query.orderByDesc("create_time");
+        query.orderByDesc("update_time");
         //获取数据
 
         page = tMonitoringRetrievalPlanMapper.selectPageList(page, tMonitoringRetrievalPlan, SecurityUtils.getLoginUser().getOrgId());
@@ -1285,6 +1285,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         }
         TMonitoringRetrievalPlan tMonitoringRetrievalPlan = new TMonitoringRetrievalPlan();
         BeanUtils.copyProperties(tMonitoringRetrievalPlanDto, tMonitoringRetrievalPlan);
+        tMonitoringRetrievalPlan.setCreateTime(DateUtils.getNowDate());
+        tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
         int result = insertTMonitoringRetrievalPlan(tMonitoringRetrievalPlan);
         batchSavePlanToExecOrg(tMonitoringRetrievalPlanDto.getPlanExecOrgIdList(), tMonitoringRetrievalPlan.getId());
         return result;
@@ -1434,6 +1436,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 SysRole sysRole = remoteRoleService.getRoleById(newPlan.getRoleId(), SecurityConstants.INNER);
                 newPlan.setRoleName(sysRole.getRoleName());
             }
+            newPlan.setUpdateTime(DateUtils.getNowDate());
             BeanUtils.copyProperties(newPlan, oldPlan);
 
             // 草稿状态 下的计划不存在任务和子计划  直接修改

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -327,6 +327,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             range = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
         }*/
 
+        plan.setUpdateTime(DateUtils.getNowDate());
         //现在能被编辑的计划一定是标准计划
         //updateStandardPlan(plan, request, range);
         if (plan.getPlanStatus() == DrillPlanStatus.DRAFT.getCode()) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -336,6 +336,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             range = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
         }*/
 
+        plan.setUpdateTime(DateUtils.getNowDate());
         //现在能被编辑的计划一定是标准计划
         //updateStandardPlan(plan, request, range);
         if (plan.getPlanStatus() == EduTrainingPlanStatus.DRAFT.getCode()) {

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

@@ -556,6 +556,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             plan.setSolidId(IDHelper.id());
             plan.setParentSolidId(-1L);
             plan.setCreateTime(new Date());
+            plan.setUpdateTime(new Date());
             //新增
             plan.setPlanOfOrgId(app.getPlanCreateOrgId());
             plan.setPlanOfOrgName(app.getPlanCreateOrgName());

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

@@ -33,6 +33,7 @@ import com.xunmei.common.core.utils.IDHelper;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -91,8 +92,11 @@ public class AppRuleServiceImpl extends ServiceImplBase<AppRuleMapper, AppRule>
             appRule.setId(IDHelper.id());
 //            appRule.setOrgId(4352539158904832L);
             appRule.setOrgId(SecurityUtils.getLoginUser().getSysUser().getOrgId());
+            appRule.setCreateTime(new Date());
+            appRule.setUpdateTime(new Date());
             save(appRule);
         } else {
+            appRule.setUpdateTime(new Date());
             updateById(appRule);
 //            appRuleMapper.updateItemRuleType(appRuleEditDto.getId(), appRuleEditDto.getRuleTypeId());
 //            appRuleMapper.updatePointRuleType(appRuleEditDto.getId(), appRuleEditDto.getRuleTypeId());

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

@@ -579,6 +579,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             coreSafecheckPlan.setPlanOfOrgId(coreSafecheckPlan.getPlanCreateOrgId());
             coreSafecheckPlan.setIsDeleted("0");
             coreSafecheckPlan.setCreateTime(DateUtils.getNowDate());
+            coreSafecheckPlan.setUpdateTime(DateUtils.getNowDate());
             coreSafecheckPlan.setModifiedBy(SecurityUtils.getUserId());
             coreSafecheckPlan.setDistribute("0");
             coreSafecheckPlan.setPlanStatus(0);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleServiceImpl.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.exception.ServiceException;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -94,8 +95,11 @@ public class SafetyCheckRuleServiceImpl extends ServiceImplBase<SafetyCheckRuleM
             appRule.setId(IDHelper.id());
 //            appRule.setOrgId(4352539158904832L);
             appRule.setOrgId(SecurityUtils.getLoginUser().getSysUser().getOrgId());
+            appRule.setCreateTime(DateUtils.getNowDate());
+            appRule.setUpdateTime(DateUtils.getNowDate());
             save(appRule);
         } else {
+            appRule.setUpdateTime(DateUtils.getNowDate());
             updateById(appRule);
 //            safetyCheckRuleMapper.updateItemRuleType(appRuleEditDto.getId(), appRuleEditDto.getRuleTypeId());
 //            safetyCheckRuleMapper.updatePointRuleType(appRuleEditDto.getId(), appRuleEditDto.getRuleTypeId());

soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -124,7 +124,7 @@
             AND        a.plan_status = #{request.planStatus}
         </if>
         ORDER BY     a.parent_id ASC,
-        a.create_time desc
+        a.update_time desc
     </select>
     <select id="selectPointByTask" resultType="com.xunmei.system.api.domain.AccessDataVo">
         SELECT

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillPlanMapper.xml

@@ -490,7 +490,7 @@
             and p.id in (<include refid="pageRoleIncludeReuqest"/>)
         </if>-->
         <include refid="pageIncludeP"/>
-        order by p.create_time desc
+        order by p.update_time desc
     </select>
     <!--<select id="selectPageData" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillPlanPageVo">
         select

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingPlanMapper.xml

@@ -458,7 +458,7 @@
             and r1.role_id = #{request.planRoleId})
         </if>-->
         <include refid="pageIncludeP"/>
-        order by p.create_time desc
+        order by p.update_time desc
     </select>
     <!--<select id="selectPageData" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo">
         select

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

@@ -113,7 +113,7 @@
                 where path like concat((select path from sys_org where id=#{info.orgId}),'%'))
             </if>
         </where>
-        order by a.plan_status asc, a.plan_name DESC,a.id desc
+        order by a.plan_status asc, a.update_time DESC
     </select>
     <!--    <select id="selectChildren" parameterType="com.xunmei.core.resumption.dto.plan.CoreResumptionPlanPageDto"-->
     <!--            resultMap="appPlans">-->

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

@@ -40,7 +40,7 @@
                 </if>
             </if>
         </where>
-        order by a.status asc,a.name desc, a.id desc
+        order by a.status asc,a.update_time desc
     </select>
 
     <select id="getRuleGroupList" resultType="com.xunmei.core.resumption.vo.appRule.AppRuleGroupVo">

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -292,7 +292,7 @@
 
         ) tem
         GROUP BY tem.id,tem.create_time
-        order by tem.plan_status asc, tem.plan_name DESC,tem.id desc
+        order by tem.plan_status asc, tem.update_time DESC
     </select>
     <select id="selectItemIdsByPlanId" resultType="java.lang.String">
         select distinct point_id as item_id

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/SafetyCheckRuleMapper.xml

@@ -39,7 +39,7 @@
                 </if>
             </if>
         </where>
-        order by a.status asc,a.name desc, a.id desc
+        order by a.status asc,a.update_time desc
     </select>
 
     <select id="getRuleGroupList" resultType="com.xunmei.core.safetyCheck.vo.rule.SafetyCheckRuleGroupVo">