diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 4226d50..2a79118 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -256,7 +256,8 @@ public class SieveApplyOrderModel extends BaseModel { private boolean huaDaPushResult; //iAssistantl数据传输格式说明,导出excel自动不足添加在此处，让前端输入 - + //导出状态 1导出 + private Integer ieStatus; //胎数 private Integer noOfFetuses; //孕妇编号 30个字符以内，只能包含字母，数字，下划线和短杠 @@ -299,6 +300,14 @@ public class SieveApplyOrderModel extends BaseModel { //孕妇筛查类型 0：一般；1：早中联合筛查孕妇 private Integer patientType; + public Integer getIeStatus() { + return ieStatus; + } + + public void setIeStatus(Integer ieStatus) { + this.ieStatus = ieStatus; + } + public Integer getNoOfFetuses() { return noOfFetuses; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index d1af54f..e0b8589 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -348,6 +348,82 @@ public class UsersController extends BaseController { // ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } + + /** + * 功能描述 根据机构id获取用户列表 + * @author 武涛涛 + * @date 2020/6/17 + */ + @RequestMapping(value = "/usersList", method = RequestMethod.GET) + @ResponseBody + public FrontEndResult getPermissions2(HttpServletResponse response, + HttpServletRequest request, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "rolesId", required = false) Integer rolesId, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit, + @RequestParam(value = "orgId", required = false) String orgId, + @RequestParam(value = "deptId", required = false) Integer deptId) { + List ids = null; + if (null != orgId) { + try { + ids = new ArrayList<>(); + ids.add(Integer.parseInt(orgId)); + } catch (Exception e) { + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setData(null); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); + return frontEndResult; + } + + } + UsersQuery usersQuery = new UsersQuery(); + limit = limit == null ? 10 : limit; + page = page == null ? 1 : page; + + usersQuery.setNeed("true"); + usersQuery.setSort("modified desc"); + usersQuery.setYn(YnEnums.YES.getId()); + usersQuery.setDeptId(deptId); + usersQuery.setKeyword(keyword); + usersQuery.setType(1); + usersQuery.setOrgIds(ids); + usersQuery.setPage(page); + usersQuery.setLimit(limit); + usersQuery.setRoleId(rolesId); + + List users = usersService.queryUsers2(usersQuery); + List organizations = null; + //设置用户角色信息 + for (Users user : users) { + organizations = new ArrayList<>(); + Organization organization = organizationService.getOrganization(user.getOrgId()); + user.setOrganization(organization); + organizations.add(organization); + user.setOrganizations(organizations); + + user.setRoles(this.getUserRoles(user.getId())); + user.setDepartmentses(departmentsService.getDepartments(user.getDeptId())); + if (null != user.getZhiChenId()) { + user.setZhiChen(ZhiChenEnums.getById(user.getZhiChenId())); + } + List permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(user.getId()); + user.setOrganizations(accessPermissionFacade.getOrganization(permissionsModelList)); + if (permissionsModelList != null && permissionsModelList.size() > 0) { + user.setAreaPermission(permissionsModelList.get(0).getAreaPermission()); + } +// user.setPwd(StringUtils.isEmpty(user.getPwd())?user.getPwd():user.getPwd().replaceAll(".","*")); + user.setPwd(replacePwd); + } + + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setPageInfo(usersQuery.getPageInfo()); + frontEndResult.setData(users); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); + return frontEndResult; + } + + //获取用户角色信息 private List getUserRoles(Integer userId) { UserRoleMapsQuery query = new UserRoleMapsQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 1944eea..69346bb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -2577,6 +2577,14 @@ public class SieveFacade { /* data.put("Ethnicity", sive.getEthnicity());//种族(名族) data.put("IdCard", sive.getCardNo());//身份证号 data.put("Monozygous", sive.getMonozygous());//单卵*/ + if(StringUtils.isEmpty(sive.getSieveApplyOrderModelId())){ + continue; + } + SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel(); + sieveApplyOrderModel.setId(sive.getSieveApplyOrderModelId()); + sieveApplyOrderModel.setIeStatus(1);//1导出，没有该字段没有导出 + applyOrderService.updateSieve(sieveApplyOrderModel); + datas.add(data); } } @@ -2635,12 +2643,12 @@ public class SieveFacade { * @date 2020/6/15 */ public void importSerologySieve(MultipartFile file, Integer id, HttpServletResponse response) { - //把MultipartFile转化为File 第一种 - CommonsMultipartFile cmf = (CommonsMultipartFile) file; - DiskFileItem dfi = (DiskFileItem) cmf.getFileItem(); - File fo = dfi.getStoreLocation(); Workbook wb = null; try { + //把MultipartFile转化为File 第一种 + CommonsMultipartFile cmf = (CommonsMultipartFile) file; + DiskFileItem dfi = (DiskFileItem) cmf.getFileItem(); + File fo = dfi.getStoreLocation(); wb = Workbook.getWorkbook(fo); Sheet s = wb.getSheet(0); System.out.println(s.getName() + " : "); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult2.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult2.java index 2f6379e..a06e66c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult2.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult2.java @@ -17,6 +17,7 @@ public class SieveListResult2 implements IBasicResultConvert> { Date collectionDate = null; if (CollectionUtils.isNotEmpty(applyOrderModels)) { SieveApplyOrderModel sieveApplyOrderModel = applyOrderModels.get(0); + //产筛申请单id + sieveListResult.setSieveApplyOrderModelId(sieveApplyOrderModel.getId()); //体重 sieveListResult.setWeight(sieveApplyOrderModel.getWeight()); //送检日期