update

src/main/java/com/gyee/viewticket/controller/viewticket/EquoperationrecordController.java

@@ -27,9 +27,15 @@ public class EquoperationrecordController {
 
     @Autowired
     EquoperationrecordService equoperationrecordService;
+
     /**
-     * 按场站获取所有风机
+     *
+     * @param pageNum 当前页
+     * @param pageSize 每页显示条数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @param wtid 风机编号
+     * @param type 类型
      * @return
      */
     @CrossOrigin(origins = "*",maxAge = 3600)
@@ -39,9 +45,11 @@ public class EquoperationrecordController {
             @RequestParam(value = "pagesize") Integer pageSize,
             @RequestParam(value = "starttime", required = false) String startTime,
             @RequestParam(value = "endtime", required = false) String endTime,
-            @RequestParam(value = "wtid",required = false)String wtid) {
+            @RequestParam(value = "wtid",required = false)String wtid,
+            @RequestParam(value = "type",required = false)String type)
+     {
         Page page = new Page(pageNum, pageSize);
-        IPage<Map> list = equoperationrecordService.getEquoperationrecordPageList(page,startTime,endTime,wtid);
+        IPage<Map> list = equoperationrecordService.getEquoperationrecordPageList(page,startTime,endTime,wtid,type);
         return AjaxResult.successData(list);
     }
 

src/main/java/com/gyee/viewticket/mapper/ticket/EquoperationrecordMapper.java

@@ -26,6 +26,7 @@ public interface EquoperationrecordMapper extends BaseMapper<Equoperationrecord>
     IPage<Map> selectEquoperationrecordPageList(Page page,
                                                 @Param("startTime")String startTime,
                                                 @Param("endTime")String endTime,
-                                                @Param("wtid")String wtid);
+                                                @Param("wtid")String wtid,
+                                                @Param("type")String type);
 
 }

src/main/java/com/gyee/viewticket/service/impl/ticket/EquoperationrecordServiceImpl.java

@@ -28,8 +28,8 @@ public class EquoperationrecordServiceImpl extends ServiceImpl<Equoperationrecor
     private EquoperationrecordMapper equoperationrecordMapper;
 
     @Override
-    public IPage<Map> getEquoperationrecordPageList(Page page, String startTime, String endTime, String wtid) {
-        IPage<Map> list =  equoperationrecordMapper.selectEquoperationrecordPageList(page,startTime,endTime,wtid);
+    public IPage<Map> getEquoperationrecordPageList(Page page, String startTime, String endTime, String wtid,String type) {
+        IPage<Map> list =  equoperationrecordMapper.selectEquoperationrecordPageList(page,startTime,endTime,wtid,type);
         return list;
     }
 }

src/main/java/com/gyee/viewticket/service/ticket/EquoperationrecordService.java

@@ -20,6 +20,6 @@ import java.util.Map;
 @Service
 public interface EquoperationrecordService extends IService<Equoperationrecord> {
 
-    IPage<Map> getEquoperationrecordPageList(Page page, String startTime, String endTime, String wtid);
+    IPage<Map> getEquoperationrecordPageList(Page page, String startTime, String endTime, String wtid,String type);
 
 }

src/main/resources/application.yml

@@ -15,7 +15,7 @@ spring:
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=test
+    url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdtest
     username: sa
     password: Gyee@321#!
     maxActive: 20

src/main/resources/mapper/ticket/EquoperationrecordMapper.xml

@@ -53,6 +53,11 @@
             <if test="startTime !=null and endTime !=null">
                 and  e.STARTTIME &gt;= #{startTime} and e.ENDTIME &lt;= #{endTime}
             </if>
+
+            <if test=" '' != type and null != type ">
+                and e.type = #{type}
+            </if>
+
         </where>