设备子系统———润滑导出查询数据结果按测试提的优化改

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquLubricationPlanDetailMapperDao.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.EquLubricationPlanDetailDo;
 import com.rongwei.bsentity.domain.EquLubricationPlanDetailVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,5 +22,5 @@ public interface EquLubricationPlanDetailMapperDao extends BaseMapper<EquLubrica
      * @param tenantId
      * @return
      */
-    List<EquLubricationPlanDetailVo> queryAllDetailList(String tenantId);
+    List<EquLubricationPlanDetailVo> queryAllDetailList(@Param("tenantId") String tenantId);
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquLubricationTaskDetailMapperDao.java

@@ -3,7 +3,7 @@ package com.rongwei.bscommon.sys.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.EquLubricationTaskDetailDo;
 import com.rongwei.bsentity.domain.EquLubricationTaskDetailVo;
-
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
@@ -21,5 +21,5 @@ public interface EquLubricationTaskDetailMapperDao extends BaseMapper<EquLubrica
      * @param tenantId
      * @return
      */
-    List<EquLubricationTaskDetailVo> queryAllTaskDetailList(String tenantId);
+    List<EquLubricationTaskDetailVo> queryAllTaskDetailList(@Param("tenantId") String tenantId);
 }

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquLubricationTaskManagementDo.java

@@ -122,5 +122,12 @@ public class EquLubricationTaskManagementDo extends BaseDo implements Serializab
     @TableField("EQUIPMENTWORKSHOP")
     private String equipmentworkshop;
 
+    /**
+     * 任务频率
+     */
+    @TableField("TASKFREQUENCY")
+    private String taskfrequency;
+
+
 
 }

cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquLubricationPlanController.java

@@ -3,12 +3,9 @@ package com.rongwei.bsserver.sys.controller;
 
 import com.rongwei.bscommon.sys.service.EquLubricationPlanService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
@@ -31,7 +28,7 @@ public class EquLubricationPlanController {
     /**
      * 导出润滑计划标准
      * */
-    @RequestMapping("/wordExportLubrication")
+    @PostMapping("/wordExportLubrication")
     @ResponseBody
     public void wordExportLubrication(@RequestBody Map<String, Object> parameter, HttpServletResponse response){
         equLubricationPlanService.wordExportLubrication(parameter,response);

cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquLubricationTaskManagementController.java

@@ -3,6 +3,7 @@ package com.rongwei.bsserver.sys.controller;
 
 import com.rongwei.bscommon.sys.service.EquLubricationTaskManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -30,7 +31,7 @@ public class EquLubricationTaskManagementController {
     /**
      * 导出润滑计划标准
      * */
-    @RequestMapping("/wordExportLubricationTask")
+    @PostMapping("/wordExportLubricationTask")
     @ResponseBody
     public void wordExportLubricationTask(@RequestBody Map<String, Object> parameter, HttpServletResponse response){
         equLubricationTaskManagementService.wordExportLubricationTask(parameter,response);