|
|
@@ -475,7 +475,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
if (billPcr.getVistitType() == 0) {
|
|
|
//人员隔离中心流程
|
|
|
if (billPcr.getMidId() == 16 || billPcr.getMidId() == 29 || billPcr.getMidId() == 41 || billPcr.getMidId() == 53) {
|
|
|
- if ("29".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ if (29==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//庙贝门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "29"));
|
|
|
Date now = new Date();
|
|
|
@@ -495,7 +495,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
peopleList1.setOutTime(date1);
|
|
|
peopleList1.setImgUrl(sysAccountMultilevel.getImgUrl());
|
|
|
peopleListMapper.insert(peopleList1);
|
|
|
- } else if ("31".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ } else if (31==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//凤行门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "31"));
|
|
|
Date now = new Date();
|
|
|
@@ -590,7 +590,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
if (billPcr.getVistitType() == 0) {
|
|
|
//人员隔离中心流程
|
|
|
if (billPcr.getMidId() == 16 || billPcr.getMidId() == 29 || billPcr.getMidId() == 41 || billPcr.getMidId() == 53) {
|
|
|
- if ("29".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ if (29==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//庙贝门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "29"));
|
|
|
Date now = new Date();
|
|
|
@@ -610,7 +610,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
peopleList1.setOutTime(date1);
|
|
|
peopleList1.setImgUrl(sysAccountMultilevel.getImgUrl());
|
|
|
peopleListMapper.insert(peopleList1);
|
|
|
- } else if ("31".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ } else if (31==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//凤行门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "31"));
|
|
|
Date now = new Date();
|
|
|
@@ -806,7 +806,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
if (billPcr.getVistitType() == 0) {
|
|
|
//人员隔离中心流程
|
|
|
if (billPcr.getMidId() == 16 || billPcr.getMidId() == 29 || billPcr.getMidId() == 41 || billPcr.getMidId() == 53) {
|
|
|
- if ("29".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ if (29==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//庙贝门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "29"));
|
|
|
Date now = new Date();
|
|
|
@@ -826,7 +826,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
peopleList1.setOutTime(date1);
|
|
|
peopleList1.setImgUrl(sysAccountMultilevel.getImgUrl());
|
|
|
peopleListMapper.insert(peopleList1);
|
|
|
- } else if ("31".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ } else if (31==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
|
|
|
//凤行门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "31"));
|
|
|
@@ -1169,7 +1169,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
if (billPcr.getVistitType() == 0) {
|
|
|
//人员隔离中心流程
|
|
|
if (billPcr.getMidId() == 16 || billPcr.getMidId() == 29 || billPcr.getMidId() == 41 || billPcr.getMidId() == 53) {
|
|
|
- if ("29".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ if (29==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//庙贝门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "29"));
|
|
|
Date now = new Date();
|
|
|
@@ -1189,7 +1189,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
peopleList1.setOutTime(date1);
|
|
|
peopleList1.setImgUrl(sysAccountMultilevel.getImgUrl());
|
|
|
peopleListMapper.insert(peopleList1);
|
|
|
- } else if ("31".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ } else if (31==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//凤行门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "31"));
|
|
|
Date now = new Date();
|
|
|
@@ -1284,7 +1284,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
if (billPcr.getVistitType() == 0) {
|
|
|
//人员隔离中心流程
|
|
|
if (billPcr.getMidId() == 16 || billPcr.getMidId() == 29 || billPcr.getMidId() == 41 || billPcr.getMidId() == 53) {
|
|
|
- if ("29".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ if (29==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//庙贝门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "29"));
|
|
|
Date now = new Date();
|
|
|
@@ -1304,7 +1304,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
peopleList1.setOutTime(date1);
|
|
|
peopleList1.setImgUrl(sysAccountMultilevel.getImgUrl());
|
|
|
peopleListMapper.insert(peopleList1);
|
|
|
- } else if ("31".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ } else if (31==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//凤行门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "31"));
|
|
|
Date now = new Date();
|
|
|
@@ -1500,7 +1500,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
if (billPcr.getVistitType() == 0) {
|
|
|
//人员隔离中心流程
|
|
|
if (billPcr.getMidId() == 16 || billPcr.getMidId() == 29 || billPcr.getMidId() == 41 || billPcr.getMidId() == 53) {
|
|
|
- if ("29".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ if (29==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//庙贝门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "29"));
|
|
|
Date now = new Date();
|
|
|
@@ -1520,7 +1520,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
peopleList1.setOutTime(date1);
|
|
|
peopleList1.setImgUrl(sysAccountMultilevel.getImgUrl());
|
|
|
peopleListMapper.insert(peopleList1);
|
|
|
- } else if ("31".equals(farmId) && baseLocation.getId() == 46) {
|
|
|
+ } else if (31==billPcr.getFarmId() && billPcr.getTestLocationId() == 46) {
|
|
|
//凤行门禁单独的
|
|
|
DeviceList deviceList = deviceListMapper.selectOne(new QueryWrapper<DeviceList>().eq("farm_id", "31"));
|
|
|
Date now = new Date();
|
