Explorar el Código

产业产值:修改查询问题

zhuoning hace 2 años
padre
commit
650b34441e

+ 4 - 1
huimv-cattle/src/main/java/com/huimv/cattle/controller/DoctorListController.java

@@ -1,6 +1,7 @@
 package com.huimv.cattle.controller;
 
 
+import com.huimv.common.utils.ResultCode;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -16,8 +17,10 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @CrossOrigin
 @RestController
-@RequestMapping("/doctor-list")
+@RequestMapping("/doctorList")
 public class DoctorListController {
 
+
+
 }
 

+ 1 - 3
huimv-cattle/src/main/java/com/huimv/cattle/controller/StockController.java

@@ -42,7 +42,7 @@ public class StockController {
 
     @PostMapping("/getStock")
     public Result list(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap) {
-        //        //读取模式切换
+        //读取模式切换
         DataSource dataSource = dataSourceService.getDataSourceStatus();
         if (dataSource.getViewType() == 1) {
             //view=1,显示县填写数据
@@ -54,9 +54,7 @@ public class StockController {
                 return stockService.getStock(httpServletRequest,paramsMap);
             } else {
                 //status=2,显示镇汇总(养殖云)数据
-                System.out.println("status=2,显示镇汇总(养殖云)数据");
                 return getStockFromBreedCloud(paramsMap);
-                //++++++++++++++++++++++++++++++++++++++++++++++++++
             }
         }
     }

+ 1 - 1
huimv-cattle/src/main/java/com/huimv/cattle/service/impl/IndustryOutputServiceImpl.java

@@ -47,7 +47,7 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
             yearNum = "0";
         }
         List<IndustryOutput> industryOutputs = industryOutputMapper.selectList(new QueryWrapper<IndustryOutput>()
-                .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
+//                .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
                 .eq("farm_code",farmCode)
                 .orderByDesc("year"));
         if (industryOutputs.isEmpty()) {