|
@@ -75,7 +75,9 @@ public class EartagServiceImpl implements IEartagService {
|
|
@Override
|
|
@Override
|
|
public Integer countAct(String earmark, String nowAct,String farmId) {
|
|
public Integer countAct(String earmark, String nowAct,String farmId) {
|
|
|
|
|
|
- EartagData eartagData = eartagData2Mapper.selectOne(new QueryWrapper<EartagData>().eq("farm_id", farmId).eq("earmark", earmark).orderByDesc("ask_time").last("limit 1"));
|
|
|
|
|
|
+ EartagData eartagData = eartagData2Mapper.selectOne(new QueryWrapper<EartagData>().eq("farm_id", farmId)
|
|
|
|
+ .eq("earmark", earmark)
|
|
|
|
+ .orderByDesc("add_time").orderByDesc("id").last("limit 1"));
|
|
Integer lastAct = 0;
|
|
Integer lastAct = 0;
|
|
if (ObjectUtil.isNotEmpty(eartagData)){
|
|
if (ObjectUtil.isNotEmpty(eartagData)){
|
|
lastAct = eartagData.getAct();
|
|
lastAct = eartagData.getAct();
|