|
@@ -1,6 +1,7 @@
|
|
|
package com.huimv.cattle.service.impl;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.huimv.cattle.pojo.OutStock;
|
|
@@ -64,7 +65,6 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
|
|
|
list.add(outStock);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
}
|
|
|
return new Result(ResultCode.SUCCESS, list);
|
|
|
}
|
|
@@ -75,32 +75,35 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
|
|
|
if (farmCode==null) {
|
|
|
farmCode = TokenSign.getFarmCode(httpServletRequest);
|
|
|
}
|
|
|
- String year = paramsMap.get("year");
|
|
|
- String month = paramsMap.get("month");
|
|
|
- QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("farm_code", farmCode);
|
|
|
- queryWrapper.eq("month", month).and(Wrapper -> Wrapper.eq("year", year));
|
|
|
- OutStock outStock = outStockMapper.selectOne(queryWrapper);
|
|
|
- if (ObjectUtil.isEmpty(outStock)) {
|
|
|
- OutStock outStock1 = new OutStock();
|
|
|
- outStock1.setMonth(Integer.parseInt(paramsMap.get("month")));
|
|
|
- outStock1.setYear(Integer.parseInt(paramsMap.get("year")));
|
|
|
- outStock1.setMonthName(paramsMap.get("monthName"));
|
|
|
- outStock1.setMonth(Integer.parseInt(paramsMap.get("month")));
|
|
|
- outStock1.setOutStock(Integer.parseInt(paramsMap.get("outStock")));
|
|
|
- outStock1.setFarmCode(farmCode);
|
|
|
- outStockMapper.insert(outStock1);
|
|
|
- return new Result(ResultCode.SUCCESS, "添加成功");
|
|
|
- } else {
|
|
|
- outStock.setMonth(Integer.parseInt(paramsMap.get("month")));
|
|
|
- outStock.setYear(Integer.parseInt(paramsMap.get("year")));
|
|
|
- outStock.setMonthName(paramsMap.get("monthName"));
|
|
|
- outStock.setMonth(Integer.parseInt(paramsMap.get("month")));
|
|
|
- outStock.setOutStock(Integer.parseInt(paramsMap.get("outStock")));
|
|
|
- outStock.setFarmCode(farmCode);
|
|
|
- outStockMapper.updateById(outStock);
|
|
|
- return new Result(ResultCode.SUCCESS, "修改成功");
|
|
|
+ String list = paramsMap.get("list");
|
|
|
+ JSONArray jsonArray = JSONArray.parseArray(list);
|
|
|
+ List<OutStock> outStocks = jsonArray.toJavaList(OutStock.class);
|
|
|
+ for (int i = 0; i < outStocks.size(); i++) {
|
|
|
+ Integer month = outStocks.get(i).getMonth();
|
|
|
+ Integer year = outStocks.get(i).getYear();
|
|
|
+ QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("farm_code", farmCode);
|
|
|
+ queryWrapper.eq("month", month).and(Wrapper -> Wrapper.eq("year", year));
|
|
|
+ OutStock outStock = outStockMapper.selectOne(queryWrapper);
|
|
|
+ if (ObjectUtil.isEmpty(outStock)) {
|
|
|
+ OutStock outStock1 = new OutStock();
|
|
|
+ outStock1.setMonth(outStocks.get(i).getMonth());
|
|
|
+ outStock1.setYear(outStocks.get(i).getYear());
|
|
|
+ outStock1.setMonthName(outStocks.get(i).getMonthName());
|
|
|
+ outStock1.setMonth(outStocks.get(i).getMonth());
|
|
|
+ outStock1.setOutStock(outStocks.get(i).getOutStock());
|
|
|
+ outStock1.setFarmCode(farmCode);
|
|
|
+ outStockMapper.insert(outStock1);
|
|
|
+ } else {
|
|
|
+ outStock.setMonth(outStocks.get(i).getMonth());
|
|
|
+ outStock.setYear(outStocks.get(i).getYear());
|
|
|
+ outStock.setMonthName(outStocks.get(i).getMonthName());
|
|
|
+ outStock.setMonth(outStocks.get(i).getMonth());
|
|
|
+ outStock.setOutStock(outStocks.get(i).getOutStock());
|
|
|
+ outStock.setFarmCode(farmCode);
|
|
|
+ outStockMapper.updateById(outStock);
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
+ return new Result(ResultCode.SUCCESS,"保存成功");
|
|
|
}
|
|
|
}
|