修改

bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java

@@ -2,12 +2,15 @@ package com.bonus.material.codeCollection.controller;
 
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.common.log.annotation.SysLog;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.codeCollection.domain.WsMaInfo;
 import com.bonus.material.codeCollection.service.WsMaInfoService;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
+import com.bonus.material.ma.domain.Machine;
+import com.bonus.material.ma.domain.vo.MachineVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
@@ -94,4 +97,13 @@ public class WsMaInfoController extends BaseController {
     }
 
 
+
+
+    @ApiOperation(value = "查询小工具编码信息列表")
+    @GetMapping("/getGadgetList")
+    public TableDataInfo getGadgetList(WsMaInfo info) {
+        startPage();
+        List<WsMaInfo> list = service.getGadgetList(info);
+        return getDataTable(list);
+    }
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/domain/WsMaInfo.java

@@ -1,5 +1,6 @@
 package com.bonus.material.codeCollection.domain;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -108,4 +109,15 @@ public class WsMaInfo {
      * 二维码
      */
     private String qrCode;
+
+    /**
+     * 关键字
+     */
+    private String keyWord;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java

@@ -93,4 +93,11 @@ public interface WsMaInfoMapper {
      * @return 条数
      */
     int updateCheckTime(WsMaInfo  info);
+
+    /**
+     * 获取机具信息
+     * @param info 查询条件
+     * @return 机具信息集合
+     */
+    List<WsMaInfo> getGadgetList(WsMaInfo info);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java

@@ -85,4 +85,11 @@ public interface WsMaInfoService {
      * @return 条数
      */
     AjaxResult updateCheckTime(WsMaInfo info);
+
+    /**
+     * 查询小工具编码信息列表
+     * @param info
+     * @return
+     */
+    List<WsMaInfo> getGadgetList(WsMaInfo info);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -209,4 +210,14 @@ public class WsMaInfoServiceImpl implements WsMaInfoService {
             return AjaxResult.error("更新失败");
         }
     }
+
+    @Override
+    public List<WsMaInfo> getGadgetList(WsMaInfo info) {
+        try {
+            return mapper.getGadgetList(info);
+        } catch (Exception e) {
+            log.error("查询小工具编码信息列表：", e.getMessage());
+            return new ArrayList<>();
+        }
+    }
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml

@@ -121,6 +121,36 @@
         ) AS t2
 
     </select>
+    <select id="getGadgetList" resultType="com.bonus.material.codeCollection.domain.WsMaInfo">
+        SELECT id,
+        ma_name AS maName,
+        ma_model AS maModel,
+        ma_code AS maCode,
+        this_check_time AS thisCheckTime,
+        next_check_time AS nextCheckTime,
+        repair_man AS repairMan,
+        check_man AS checkMan,
+        phone,
+        result
+        FROM ws_ma_info wmi
+        WHERE is_active = '1'
+        <if test="keyWord != null and keyWord != ''">
+            and ( ma_name like concat('%', #{keyWord}, '%') or
+            ma_model like concat('%', #{keyWord}, '%') or
+            ma_code like concat('%', #{keyWord}, '%') or
+            repair_man like concat('%', #{keyWord}, '%') or
+            check_man like concat('%', #{keyWord}, '%')
+            )
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            <![CDATA[
+          and (
+              DATE_FORMAT( this_check_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} or
+              DATE_FORMAT( next_check_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+          )
+            ]]>
+        </if>
+    </select>
 
 
     <insert id="insert" parameterType="com.bonus.material.codeCollection.domain.WsMaInfo" useGeneratedKeys="true"