diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java index bf85948..9493d26 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java @@ -102,6 +102,11 @@ public interface ListPerformMapper { @Param("supClassId") String supClassId, @Param("sortId") Integer sortId); + /*查询岗位*/ + ListPerform findByPerformName(@Param("performClassName") String performClassName, + @Param("supClassId") String supClassId, + @Param("performName") String performName); + //部门列表 List findUnit(@Param("superPerformId") String superPerformId); diff --git a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml index 1b92fda..ae285da 100644 --- a/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml +++ b/inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml @@ -742,6 +742,14 @@ AND lf.SortId = #{sortId} + + + diff --git a/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java b/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java index b7af299..41c7c54 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java @@ -87,7 +87,7 @@ public class PcCompanyController extends BaseController{ @ResponseBody public SingleResult companyDetail(String SysEnterpriseId)throws Exception { SingleResult singleResult = new SingleResult(); - List sysEnterprises = sysEnterpriseMapper.companyDetail(SysEnterpriseId); + ListsysEnterprises = sysEnterpriseMapper.companyDetail(SysEnterpriseId); ListsafeClass = new ArrayList<>(); if (StringUtils.isNotBlank(sysEnterprises.get(0).getBasesafeclassid())){ safeClass = super.exchange(sysEnterprises.get(0).getBasesafeclassid(),1); @@ -119,18 +119,23 @@ public class PcCompanyController extends BaseController{ List units = sysUnitMapper.findUnit(""); String sysUnitId = sysEnterprises.get(0).getSysUnitId(); String managerDept = sysEnterprises.get(0).getManagerDept(); - String [] arr=sysUnitId.split(","); + StringBuilder stringBuilder = new StringBuilder(); - for (String i:arr) { - for (SysUnit un:units) { - if (un.getSysunitid().equals(managerDept)){ - sysEnterprises.get(0).setManagerDeptName(un.getUnitname()); - } - if (un.getSysunitid().equals(i)){ - stringBuilder.append(un.getUnitname()+","); + String [] arr = null; + if(StringUtils.isNotBlank(sysUnitId)){ + arr=sysUnitId.split(","); + for (String i:arr) { + for (SysUnit un:units) { + if (un.getSysunitid().equals(managerDept)){ + sysEnterprises.get(0).setManagerDeptName(un.getUnitname()); + } + if (un.getSysunitid().equals(i)){ + stringBuilder.append(un.getUnitname()+","); + } } } } + if (StringUtils.isNotBlank(stringBuilder.toString())){ sysEnterprises.get(0).setSysUnitName(stringBuilder.toString().substring(0,stringBuilder.toString().length()-1)); } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java index dd8c5f5..3e850d2 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java @@ -976,6 +976,145 @@ public class DataController extends com.rzyc.controller.BaseController { index++; } + } + } + return result; + } + + + @ApiOperation(value = "导入用户", notes = "导入用户") + @RequestMapping(value = "/importUser", method = RequestMethod.POST) + @ResponseBody + public SingleResult importUser(@RequestBody MultipartFile multipartFile)throws Exception{ + SingleResult result = new SingleResult<>(); + Workbook wookbook = WorkbookFactory.create(multipartFile.getInputStream()); + Sheet sheet = wookbook.getSheetAt(0); + + //获得表头 + Row rowHead = sheet.getRow(0); + + System.out.println("getPhysicalNumberOfCells -> "+rowHead.getPhysicalNumberOfCells()); + //判断表头是否正确 + if(true){ + //获得数据的总行数 + int totalRowNum = sheet.getLastRowNum(); + + if(totalRowNum > 0){ + + Boolean isSubject = true; + DataFormatter dataFormatter = new DataFormatter(); + + + + Integer index = 1; + String unitNameStr = ""; + String postNameStr = ""; + String sortStrStr = ""; + //获得所有数据 + for(int i = 1 ; i <= totalRowNum ; i++) { + //获得第i行对象 + Row row = sheet.getRow(i); + if (null == row) { + break; + } + + String unitName = ""; + String postName = ""; + String name = ""; + String mobile = ""; + + + Cell cell = row.getCell((short) 1); + unitName = dataFormatter.formatCellValue(cell); + if (StringUtils.isBlank(unitName)) { + unitName = unitNameStr; + } else { + unitNameStr = unitName; + } + + cell = row.getCell((short) 2); + postName = dataFormatter.formatCellValue(cell); + if (StringUtils.isBlank(postName)) { + postName = postNameStr; + } else { + postNameStr = postName; + } + + cell = row.getCell((short) 3); + name = dataFormatter.formatCellValue(cell); + + + cell = row.getCell((short) 4); + mobile = dataFormatter.formatCellValue(cell); + + + System.out.println("-----------------"+index); + System.out.println(unitName); + System.out.println(postName); + System.out.println(name); + System.out.println(mobile); + + + ListPerform superPerform = listPerformMapper.findByName(unitName,"5bd164aa-dd43-45e3-a5a2-649bb2fd9fb9"); + if(null != superPerform){ + ListPerform listPerform = listPerformMapper.findByPerformName(postName,superPerform.getListperformid(),name); + if(null == listPerform){ + listPerform = new ListPerform(); + listPerform.setListperformid(RandomNumber.getUUid()); + listPerform.setSyslevel(superPerform.getSyslevel()+1); + listPerform.setPerformclassname(postName); + listPerform.setPerformName(name); + listPerform.setSortid(50); + listPerform.setSupclassid(superPerform.getListperformid()); + listPerform.setCompletion("0"); + listPerform.setParentPath(superPerform.getParentPath()+","+listPerform.getListperformid()); + listPerform.setParentName(superPerform.getParentName()+","+listPerform.getPerformclassname()); + listPerform.setCreatedby("excel"); + listPerform.setModifiedby("excel"); + listPerform.setCreatedon(new Date()); + listPerform.setModifiedon(new Date()); + listPerformMapper.insert(listPerform); + } + + SysUnit sysUnit = sysUnitMapper.findByUnitName(unitName,"f618c8e4-c0ea-426a-8f91-5ef31cf70299"); + + SysUser sysUser = new SysUser(); + sysUser.setSysuserid(RandomNumber.getUUid()); + sysUser.setUsertype("政府用户"); + sysUser.setAreaCode("513300"); + sysUser.setAreaPath("510000,513300"); + sysUser.setAreaName("四川省,甘孜藏族自治州"); + if(null != sysUnit){ + sysUser.setSysunitorentid(sysUnit.getSysunitid()); + sysUser.setUnitPath(sysUnit.getParentPath()); + sysUser.setUnitPathName(sysUnit.getParentName()); + } + sysUser.setSysusername(mobile); + sysUser.setSyspassword(PasswdFactory.encryptPasswd(sysUser.getSysuserid(),"",mobile)); + sysUser.setUserroles("cc89b58e-9ab4-492e-a184-82f199c75d76"); + sysUser.setChinaname(name); + sysUser.setSystitle(listPerform.getListperformid()); + sysUser.setPostPath(listPerform.getParentPath()); + sysUser.setPostName(listPerform.getParentName()); + sysUser.setMobiletel(mobile); + sysUser.setState("启用"); + sysUser.setCreatedby("excel"); + sysUser.setModifiedby("excel"); + sysUser.setCreatedon(new Date()); + sysUser.setModifiedon(new Date()); + sysUserMapper.insert(sysUser); + + } + + + + + + index++; + + } + +