|
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.huimv.cattle.mapper.SysRegionCounTownVillMapper;
|
|
|
import com.huimv.cattle.pojo.SalesCount;
|
|
|
import com.huimv.cattle.mapper.SalesCountMapper;
|
|
|
import com.huimv.cattle.service.SalesCountService;
|
|
@@ -32,6 +33,8 @@ import java.util.Map;
|
|
|
public class SalesCountServiceImpl extends ServiceImpl<SalesCountMapper, SalesCount> implements SalesCountService {
|
|
|
@Autowired
|
|
|
private SalesCountMapper salesCountMapper;
|
|
|
+ @Autowired
|
|
|
+ private SysRegionCounTownVillMapper sysRegionCounTownVillMapper;
|
|
|
@Override
|
|
|
public Result getCount(HttpServletRequest httpServletRequest,Map<String,String> paramsMap) {
|
|
|
String farmCode =paramsMap.get("farmCode");
|
|
@@ -88,4 +91,21 @@ public class SalesCountServiceImpl extends ServiceImpl<SalesCountMapper, SalesCo
|
|
|
}
|
|
|
return new Result(ResultCode.SUCCESS, "保存成功");
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result getSalesCountScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
|
+ String farmCode =paramsMap.get("farmCode");
|
|
|
+ if (farmCode==null) {
|
|
|
+ farmCode = TokenSign.getFarmCode(httpServletRequest);
|
|
|
+ }
|
|
|
+ String[] city = sysRegionCounTownVillMapper.listSub(farmCode).split(",");
|
|
|
+ QueryWrapper<SalesCount> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.in("farm_code", city).orderByDesc("year").orderByDesc("quarter").groupBy("year").groupBy("quarter");
|
|
|
+ List<SalesCount> salesCounts = salesCountMapper.getSalesCountScreen(queryWrapper);
|
|
|
+ if (salesCounts.size() == 0) {
|
|
|
+ return new Result(ResultCode.SUCCESS,salesCounts);
|
|
|
+ } else {
|
|
|
+ return new Result(ResultCode.SUCCESS, salesCounts);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|