保养项查询按创建时间降序排列，保养名称、保养编号模糊查询修改

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/task/CmmsUpkeepCreateJob.java

@@ -25,7 +25,9 @@ import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -66,19 +68,20 @@ public class CmmsUpkeepCreateJob implements Job {
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
 
         System.out.println("进入生成保养工单任务函数");
-        DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
-        ThreadContext.bind(manager);
+//        DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
+//        ThreadContext.bind(manager);
 
         // 获取登录人用户信息 V1.0版本：
 //        SysUser user= (SysUser)SecurityUtils.getSubject().getPrincipal();
         // 获取登录人用户信息 V2.0版本：
-        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(user == null){
-            log.info("用户还未登陆，无法获取创建人！");
-            return;
-        }
-        // 用户名
-        String userName=user.getUsername();
+//        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        if(user == null){
+//            log.info("用户还未登陆，无法获取创建人！");
+//            return;
+//        }
+//        // 用户名
+//        String userName=user.getUsername();
+        String userName = "admin";
 
         PlanToOrderUtils planToOrderUtils = new PlanToOrderUtils();
         // 获取所有保养计划（根据状态来获取，获取启用的保养计划）
@@ -110,7 +113,7 @@ public class CmmsUpkeepCreateJob implements Job {
             //生成保养工单
             CmmsUpkeep cmmsUpkeep = new CmmsUpkeep();
             cmmsUpkeep.setId(IdWorker.getIdStr());//生成雪花id
-            cmmsUpkeep.setCreateBy("admin");
+            cmmsUpkeep.setCreateBy(userName);
             cmmsUpkeep.setUpkeepcode(autoCodeUtil.genSerialCode(UserConstants.CMMSUPKEEP_CODE, null));//保养工单编号
             cmmsUpkeep.setUpkeepname(cmmsUpkeepPlan.getPlanname() + "-" + dateNowStr);//保养工单名称:保养计划名称-当前时间
             cmmsUpkeep.setUpkeepplanid(cmmsUpkeepPlan.getId());//保养计划id

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/mapper/xml/CmmsUpkeepItemMapper.xml

@@ -20,10 +20,11 @@
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
         from cmms_upkeep_item as c left join tpm_equipment_tree as t on c.equipdefid = t.id
         <where>
-            <if test="cmmsUpkeepItem.itemcode != null  and cmmsUpkeepItem.itemcode != ''"> and (c.itemcode like concat('%', #{cmmsUpkeepItem.itemcode}, '%') or c.itemname like concat('%', #{cmmsUpkeepItem.itemcode}, '%'))</if>
+            <if test="cmmsUpkeepItem.itemcode != null  and cmmsUpkeepItem.itemcode != ''"> and c.itemcode like concat('%', #{cmmsUpkeepItem.itemcode}, '%')</if>
             <if test="cmmsUpkeepItem.equipdefid != null  and cmmsUpkeepItem.equipdefid != ''"> and c.equipdefid = #{cmmsUpkeepItem.equipdefid}</if>
-            <if test="cmmsUpkeepItem.itemname != null and cmmsUpkeepItem.itemname != ''"> and c.itemname = #{cmmsUpkeepItem.itemname}</if>
+            <if test="cmmsUpkeepItem.itemname != null and cmmsUpkeepItem.itemname != ''"> and c.itemname like concat('%', #{cmmsUpkeepItem.itemname}, '%')</if>
         </where>
+        order by c.create_time desc
     </select>
 
     <select id="getCmmsUpkeepItemByEqid" parameterType="String" resultMap="CmmsUpkeepItemResult">