diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/NuBizEmployeesServcieTagsController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/NuBizEmployeesServcieTagsController.java index c864538..fda7aaa 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/NuBizEmployeesServcieTagsController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/NuBizEmployeesServcieTagsController.java @@ -83,6 +83,7 @@ public class NuBizEmployeesServcieTagsController extends JeecgController add(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) { nuBizEmployeesServcieTagsService.save(nuBizEmployeesServcieTags); @@ -112,12 +113,13 @@ public class NuBizEmployeesServcieTagsController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { nuBizEmployeesServcieTagsService.removeById(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -132,7 +134,7 @@ public class NuBizEmployeesServcieTagsController extends JeecgController addBatch(@RequestBody List serverList) { + nuBizNuCustomerServerService.addBatch(serverList); + return Result.OK("操作成功"); + } + + } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java index 3534c3b..bc9c7a9 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java @@ -19,4 +19,6 @@ public interface INuBizNuCustomerServerService extends IService serverList); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java index 3e4b543..aa95e50 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java @@ -41,7 +41,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl groupList = baseMapper.selectList(nuBizNuCustomerServerQueryWrapper); - String groupPositioning[] = {"00","01","02","03","04","05","06","07","08","09","10","11","12","13","14","15","16","17","18","19","20","21","22","23"}; + String groupPositioning[] = {"0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23"}; List> allList = new ArrayList<>(); for(String groupPositioning1 : groupPositioning){ Map posMap = new HashMap<>(); @@ -52,11 +52,13 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("id",par.getId()); map.put("directiveName",par.getDirectiveName()); + map.put("typeName",par.getTypeName()); map.put("tagName",par.getTagName()); map.put("startTime",par.getStartTime()); map.put("endTime",par.getEndTime()); map.put("cycleType",par.getCycleType()); map.put("positioningLong",par.getPositioningLong()); + map.put("positioning",par.getPositioning()); childrenList.add(map); } } @@ -93,4 +95,22 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl serverList) { + if(serverList.size()>0){ + NuBizNuCustomerServer nuBizNuCustomerServer = serverList.get(0); + String nuId = nuBizNuCustomerServer.getNuId(); + String customerId = nuBizNuCustomerServer.getCustomerId(); + + QueryWrapper nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); + nuBizNuCustomerServerQueryWrapper.eq("nu_id",nuId); + nuBizNuCustomerServerQueryWrapper.eq("customer_id",customerId); + baseMapper.delete(nuBizNuCustomerServerQueryWrapper); + + for(NuBizNuCustomerServer par : serverList){ + baseMapper.insert(par); + } + } + } }