Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/mapper/xml/CmmsInspectLineMapper.xml

@@ -12,6 +12,7 @@
         <where>
             <if test="cmmsInspectLine.linecode != null and cmmsInspectLine.linecode != ''">and (linecode like CONCAT('%',#{cmmsInspectLine.linecode},'%') or linename like CONCAT('%',#{cmmsInspectLine.linecode},'%')) </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="getCodeById" resultType="string">

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/mapper/xml/CmmsInspectPlanMapper.xml

@@ -23,12 +23,13 @@
         <result property="tasknum"    column="tasknum"    />
         <result property="ifnotice"    column="ifnotice"    />
         <result property="noticetime"    column="noticetime"    />
+        <result property="sysOrgCode"    column="sys_org_code"    />
     </resultMap>
 
     <sql id="selectCmmsInspectPlanVo">
         select id, create_by, create_time, update_by, update_time, remark, plancode,
                planname, iftimeset, begintime, repeatnum, repeattype, noticenum, noticetype, status,
-               chargeruser, nexttime, tasknum, ifnotice, noticetime
+               chargeruser, nexttime, tasknum, ifnotice, noticetime,sys_org_code
         from cmms_inspect_plan
     </sql>
 

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/impl/CmmsInspectPlanServiceImpl.java

@@ -299,7 +299,8 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
             plan.setNoticetime(noticeTime);
             plan.setIfnotice("否");
             resreshPlanList.add(plan);
-            inspectPlanMapper.refreshNextTime(resreshPlanList);
+            //inspectPlanMapper.refreshNextTime(resreshPlanList);
+            this.updateBatchById(resreshPlanList);
         }
 
         // 巡检工单生成

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/task/GenerateNoticeTask.java

@@ -59,7 +59,8 @@ public class GenerateNoticeTask implements Job {
 
         // 更新巡检计划 , 是否已通知状态
         if (subInspectPlanList != null && subInspectPlanList.size() > 0) {
-            inspectPlanService.updateNotice(subInspectPlanList);
+            //inspectPlanService.updateNotice(subInspectPlanList);
+            inspectPlanService.updateBatchById(subInspectPlanList);
 
             // 更新巡检计划缓存信息
             inspectPlanService.setRedisCache();