Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java
This commit is contained in:
commit
c1db62d553
|
@ -83,6 +83,7 @@ public class NuBizEmployeesServcieTagsController extends JeecgController<NuBizEm
|
|||
*/
|
||||
@AutoLog(value = "员工配置的服务标签-添加")
|
||||
@ApiOperation(value="员工配置的服务标签-添加", notes="员工配置的服务标签-添加")
|
||||
@RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) {
|
||||
nuBizEmployeesServcieTagsService.save(nuBizEmployeesServcieTags);
|
||||
|
@ -112,12 +113,13 @@ public class NuBizEmployeesServcieTagsController extends JeecgController<NuBizEm
|
|||
*/
|
||||
@AutoLog(value = "员工配置的服务标签-通过id删除")
|
||||
@ApiOperation(value="员工配置的服务标签-通过id删除", notes="员工配置的服务标签-通过id删除")
|
||||
@RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
||||
nuBizEmployeesServcieTagsService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
|
@ -132,7 +134,7 @@ public class NuBizEmployeesServcieTagsController extends JeecgController<NuBizEm
|
|||
this.nuBizEmployeesServcieTagsService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
|
|
|
@ -131,4 +131,14 @@ public class NuBizNuCustomerServerController extends JeecgController<NuBizNuCust
|
|||
}
|
||||
|
||||
|
||||
@AutoLog(value = "护理单元客户配置服务指令-添加")
|
||||
@ApiOperation(value="护理单元客户配置服务指令-添加", notes="护理单元客户配置服务指令-添加")
|
||||
// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:add")
|
||||
@PostMapping(value = "/addBatch")
|
||||
public Result<NuBizNuCustomerServer> addBatch(@RequestBody List<NuBizNuCustomerServer> serverList) {
|
||||
nuBizNuCustomerServerService.addBatch(serverList);
|
||||
return Result.OK("操作成功");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -19,4 +19,6 @@ public interface INuBizNuCustomerServerService extends IService<NuBizNuCustomerS
|
|||
NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer);
|
||||
|
||||
NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer);
|
||||
|
||||
void addBatch(List<NuBizNuCustomerServer> serverList);
|
||||
}
|
||||
|
|
|
@ -41,7 +41,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
|
|||
nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getNuId()),"nu_id",nuBizNuCustomerServer.getNuId());
|
||||
nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getCustomerId()),"customer_id",nuBizNuCustomerServer.getCustomerId());
|
||||
List<NuBizNuCustomerServer> 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<Map<String,Object>> allList = new ArrayList<>();
|
||||
for(String groupPositioning1 : groupPositioning){
|
||||
Map<String,Object> posMap = new HashMap<>();
|
||||
|
@ -52,11 +52,13 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
|
|||
Map<String,Object> 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<NuBizNuCustome
|
|||
baseMapper.updateById(nuBizNuCustomerServer);
|
||||
return nuBizNuCustomerServer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addBatch(List<NuBizNuCustomerServer> serverList) {
|
||||
if(serverList.size()>0){
|
||||
NuBizNuCustomerServer nuBizNuCustomerServer = serverList.get(0);
|
||||
String nuId = nuBizNuCustomerServer.getNuId();
|
||||
String customerId = nuBizNuCustomerServer.getCustomerId();
|
||||
|
||||
QueryWrapper<NuBizNuCustomerServer> nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>();
|
||||
nuBizNuCustomerServerQueryWrapper.eq("nu_id",nuId);
|
||||
nuBizNuCustomerServerQueryWrapper.eq("customer_id",customerId);
|
||||
baseMapper.delete(nuBizNuCustomerServerQueryWrapper);
|
||||
|
||||
for(NuBizNuCustomerServer par : serverList){
|
||||
baseMapper.insert(par);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue