From f7f2cb962c5523be7d7f5cf6a50db24dc53fc1ae Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 8 Jul 2025 14:08:18 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluate/evaluate/beans/ProjectBean.java | 2 + .../controller/ProjectController.java | 4 +- .../sub/evaluate/evaluate/dao/ProjectDao.java | 2 + .../evaluate/service/ProjectServiceImpl.java | 5 + .../controller/ViolationController.java | 1195 +++++++++-------- .../mappers/evaluate/OrganizationalMapper.xml | 3 +- .../mappers/evaluate/ProjectMapper.xml | 12 + .../static/js/evaluate/project/editForm.js | 1 + .../static/js/evaluate/team/evaluateTable.js | 13 +- .../pages/evaluate/team/evaluateTable.html | 2 +- 10 files changed, 636 insertions(+), 603 deletions(-) diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java index ec27434..17f67c3 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java @@ -19,5 +19,7 @@ public class ProjectBean { private Integer subcontractorNum; private Integer evaluateDeptId; private Integer personInChargeId; + // 所属事业部Id + private Integer departmentId; private String keyWord; } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/ProjectController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/ProjectController.java index 8a93bbb..97fea8f 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/ProjectController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/ProjectController.java @@ -46,7 +46,9 @@ public class ProjectController { AjaxRes ar = new AjaxRes(); try { Integer i = service.updateName(projectBean); - if (i > 0) { + if (i == 100) { + ar.setFailMsg("该事业部下班组名称已重复"); + } else if (i > 0) { ar.setSucceedMsg("修改成功"); } else { ar.setFailMsg("修改失败"); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java index 16eb73f..b4a2ac9 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java @@ -29,4 +29,6 @@ public interface ProjectDao { Integer delProjectSubcontractor(ViolationBean bean); List getNoBindSubcontractorSelect(ViolationBean bean); + + int getProjectByName(ProjectBean projectBean); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java index 4ac6761..bf83f42 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java @@ -30,7 +30,12 @@ public class ProjectServiceImpl implements ProjectService { @Override public Integer updateName(ProjectBean projectBean) { + if (projectDao.getProjectByName(projectBean) > 0) { + return 100; + } return projectDao.updateName(projectBean); + + } @Override diff --git a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java index 1f227bc..fc6440a 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java @@ -42,640 +42,649 @@ import java.util.regex.Pattern; @RequestMapping("/backstage/violations/") public class ViolationController extends BaseController { - @Autowired - private ViolationService service; - @Autowired - private ViolationDao dao; + @Autowired + private ViolationService service; + @Autowired + private ViolationDao dao; - @Autowired - private TeamGroupService teamGroupService; + @Autowired + private TeamGroupService teamGroupService; - @GetMapping("outsourceEnterpriseByPage") - @ResponseBody - public AjaxRes outsourceEnterpriseByPage(ViolationBean o){ - AjaxRes ar = getAjaxRes(); - List list = service.getOutsourceEnterpriseByPage(o); - for (ViolationBean violationBean : list) { - String phone = violationBean.getPhone(); - if (StringUtils.isNotBlank(phone)) { - violationBean.setPhone(AesCbcUtils.encrypt(phone)); - } - String idCard = violationBean.getIdCard(); - if (StringUtils.isNotBlank(idCard)) { - violationBean.setIdCard(AesCbcUtils.encrypt(idCard)); - } - } - ar.setListSucceed(list); - return ar; - } + @GetMapping("outsourceEnterpriseByPage") + @ResponseBody + public AjaxRes outsourceEnterpriseByPage(ViolationBean o) { + AjaxRes ar = getAjaxRes(); + List list = service.getOutsourceEnterpriseByPage(o); + for (ViolationBean violationBean : list) { + String phone = violationBean.getPhone(); + if (StringUtils.isNotBlank(phone)) { + violationBean.setPhone(AesCbcUtils.encrypt(phone)); + } + String idCard = violationBean.getIdCard(); + if (StringUtils.isNotBlank(idCard)) { + violationBean.setIdCard(AesCbcUtils.encrypt(idCard)); + } + } + ar.setListSucceed(list); + return ar; + } - /** - * 添加外包企业 - * @param o - * @return - */ - @RequestMapping(value = "addOutsourceEnterprise", method = RequestMethod.POST) - @ResponseBody - public AjaxRes addOutsourceEnterprise(@RequestBody ViolationBean o) { - ViolationBean pmBean = AesCbcUtils.decryptAllStringFields(o); - AjaxRes ar = getAjaxRes(); - try { - ar = service.addOutsourceEnterprise(pmBean); - } catch (Exception e) { - e.printStackTrace(); - ar.setFailMsg("添加外包企业失败!"); - } - return ar; - } + /** + * 添加外包企业 + * + * @param o + * @return + */ + @RequestMapping(value = "addOutsourceEnterprise", method = RequestMethod.POST) + @ResponseBody + public AjaxRes addOutsourceEnterprise(@RequestBody ViolationBean o) { + ViolationBean pmBean = AesCbcUtils.decryptAllStringFields(o); + AjaxRes ar = getAjaxRes(); + try { + ar = service.addOutsourceEnterprise(pmBean); + } catch (Exception e) { + e.printStackTrace(); + ar.setFailMsg("添加外包企业失败!"); + } + return ar; + } - @RequestMapping(value = "formValidation", method = RequestMethod.POST) - @ResponseBody - public AjaxRes formValidation(@RequestBody ViolationBean o) { + @RequestMapping(value = "formValidation", method = RequestMethod.POST) + @ResponseBody + public AjaxRes formValidation(@RequestBody ViolationBean o) { - AjaxRes ar = getAjaxRes(); - try { - int count = dao.formValidation(o.getEnterpriseName(), o.getId()); - if (count > 0) { - ar.setSucceed('"' + o.getEnterpriseName() + '"' + "已存在,请重新输入!"); - ar.setRes(2); - } else { - ar.setSucceed("名称可用!"); - } - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg("名称查重错误,请软件管理员!"); - } - return ar; - } + AjaxRes ar = getAjaxRes(); + try { + int count = dao.formValidation(o.getEnterpriseName(), o.getId()); + if (count > 0) { + ar.setSucceed('"' + o.getEnterpriseName() + '"' + "已存在,请重新输入!"); + ar.setRes(2); + } else { + ar.setSucceed("名称可用!"); + } + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg("名称查重错误,请软件管理员!"); + } + return ar; + } - /** - * 外包企业表单复现 - * @param model - * @return - */ - @RequestMapping("toViewOutsourceEnterprise") - public String toViewOutsourceEnterprise(Model model, ViolationBean o) { - try { - o = service.toViewOutsourceEnterprise(o); - model.addAttribute("user", o); - } catch (Exception e) { - e.printStackTrace(); - } - return "/outsourceEnterprise/outsourceEnterpriseFrom"; - } + /** + * 外包企业表单复现 + * + * @param model + * @return + */ + @RequestMapping("toViewOutsourceEnterprise") + public String toViewOutsourceEnterprise(Model model, ViolationBean o) { + try { + o = service.toViewOutsourceEnterprise(o); + model.addAttribute("user", o); + } catch (Exception e) { + e.printStackTrace(); + } + return "/outsourceEnterprise/outsourceEnterpriseFrom"; + } - /** - * 修改外包企业 - * @param o - * @return - */ - @RequestMapping(value = "updateOutsourceEnterprise", method = RequestMethod.POST) - @ResponseBody - public AjaxRes updateOutsourceEnterprise(@RequestBody ViolationBean o) { - ViolationBean pmBean = AesCbcUtils.decryptAllStringFields(o); - AjaxRes ar = getAjaxRes(); - try { - ar = service.updateOutsourceEnterprise(pmBean); - } catch (Exception e) { - e.printStackTrace(); - ar.setFailMsg("修改外包企业失败!"); - } - return ar; - } + /** + * 修改外包企业 + * + * @param o + * @return + */ + @RequestMapping(value = "updateOutsourceEnterprise", method = RequestMethod.POST) + @ResponseBody + public AjaxRes updateOutsourceEnterprise(@RequestBody ViolationBean o) { + ViolationBean pmBean = AesCbcUtils.decryptAllStringFields(o); + AjaxRes ar = getAjaxRes(); + try { + ar = service.updateOutsourceEnterprise(pmBean); + } catch (Exception e) { + e.printStackTrace(); + ar.setFailMsg("修改外包企业失败!"); + } + return ar; + } - /** - * 删除外包企业 - * @param id - * @return - */ - @RequestMapping("outsourceEnterpriseDelete") - @ResponseBody - public AjaxRes outsourceEnterpriseDelete(String id) { - AjaxRes ar = getAjaxRes(); - try { - String[] idArr = id.split(","); - int result = service.outsourceEnterpriseDelete(idArr); - if(result > 0) { - ar.setRes(GlobalConst.SUCCEED); - ar.setResMsg("删除成功"); - }else { - ar.setFailMsg(GlobalConst.DATA_FAIL); - ar.setResMsg("删除失败,请联系系统管理员"); - } + /** + * 删除外包企业 + * + * @param id + * @return + */ + @RequestMapping("outsourceEnterpriseDelete") + @ResponseBody + public AjaxRes outsourceEnterpriseDelete(String id) { + AjaxRes ar = getAjaxRes(); + try { + String[] idArr = id.split(","); + int result = service.outsourceEnterpriseDelete(idArr); + if (result > 0) { + ar.setRes(GlobalConst.SUCCEED); + ar.setResMsg("删除成功"); + } else { + ar.setFailMsg(GlobalConst.DATA_FAIL); + ar.setResMsg("删除失败,请联系系统管理员"); + } - }catch(Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping("getOutsourceEnterpriseById") - @ResponseBody - public AjaxRes getOutsourceEnterpriseById(String id) { - AjaxRes ar = getAjaxRes(); - try { - ViolationBean o = new ViolationBean(); - o.setId(id); - ViolationBean result = service.toViewOutsourceEnterprise(o); - result.setPhone(AesCbcUtils.encrypt(result.getPhone())); - ar.setSucceed(result); + @RequestMapping("getOutsourceEnterpriseById") + @ResponseBody + public AjaxRes getOutsourceEnterpriseById(String id) { + AjaxRes ar = getAjaxRes(); + try { + ViolationBean o = new ViolationBean(); + o.setId(id); + ViolationBean result = service.toViewOutsourceEnterprise(o); + result.setPhone(AesCbcUtils.encrypt(result.getPhone())); + ar.setSucceed(result); - }catch(Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } - @RequestMapping("exportOutsourceEnterprise") - public void exportOutsourceEnterprise(HttpServletRequest request, HttpServletResponse response, ViolationBean bean) { - String filename = "外包公司详情表"; - List gradelist = service.exportOutsourceEnterprise(bean); - // 导出所有人员基本信息 - try { - excelOut(response, gradelist, filename, "外包公司详情表"); - } catch (Exception e) { - e.printStackTrace(); - } - } - @RequestMapping("exportTeamGroupPerson") - public void exportTeamGroupPerson(HttpServletRequest request, HttpServletResponse response, TeamGroupBean teamGroupBean) { - String filename = "班组人员详情表"; - List teamGroupPersons = teamGroupService.getTeamGroupPersons(teamGroupBean); - // 导出所有人员基本信息 - try { - excelOutTeamGroupPersons(response, teamGroupPersons, filename, "班组人员详情表"); - } catch (Exception e) { - e.printStackTrace(); - } - } + @RequestMapping("exportOutsourceEnterprise") + public void exportOutsourceEnterprise(HttpServletRequest request, HttpServletResponse response, ViolationBean bean) { + String filename = "外包公司详情表"; + List gradelist = service.exportOutsourceEnterprise(bean); + // 导出所有人员基本信息 + try { + excelOut(response, gradelist, filename, "外包公司详情表"); + } catch (Exception e) { + e.printStackTrace(); + } + } - @RequestMapping(value = "toLeadInto", method = RequestMethod.POST) - @ResponseBody - public AjaxRes toLeadInto(@RequestParam("file") MultipartFile file) { - AjaxRes ar = getAjaxRes(); - AjaxRes ars = getAjaxRes(); - Integer result = 0; - int errorNum = 0; - Map map=new HashMap(); - try { - String fileName = file.getOriginalFilename(); - System.out.println("OriginalFilename：" + fileName); - if (!StringUtils.endsWithAny(fileName, ".xls", ".xlsx")) { - throw new RuntimeException("不支持excel以外的文件导入！"); - } - //根据指定的文件输入流导入Excel从而产生Workbook对象 - Workbook wb = null; - Sheet hssfSheet = null; - InputStream inputStream = file.getInputStream(); - if (fileName.endsWith(".xls")) { - // 处理xls格式的Excel - POIFSFileSystem poifsFileSystem = new POIFSFileSystem(inputStream); - wb = new HSSFWorkbook(poifsFileSystem); - } else if (fileName.endsWith(".xlsx")) { - // 处理xlsx格式的Excel - wb = new XSSFWorkbook(inputStream); - } - // 读取第一个sheet - hssfSheet = wb.getSheetAt(0); - // 判断Sheet是否为空 - if (hssfSheet != null) { - // 遍历行row，continue只是终止本次循环，接着还执行后面的循环 - int rowNum = hssfSheet.getLastRowNum(); - // 从第三行开始 - for (int rownum = 2; rownum <= rowNum; rownum++) { - // 获取到每一行 - errorNum = rownum; - Row sheetRow = hssfSheet.getRow(rownum); + @RequestMapping("exportTeamGroupPerson") + public void exportTeamGroupPerson(HttpServletRequest request, HttpServletResponse response, TeamGroupBean teamGroupBean) { + String filename = "班组人员详情表"; + List teamGroupPersons = teamGroupService.getTeamGroupPersons(teamGroupBean); + // 导出所有人员基本信息 + try { + excelOutTeamGroupPersons(response, teamGroupPersons, filename, "班组人员详情表"); + } catch (Exception e) { + e.printStackTrace(); + } + } - // 获得第i行对象 - Row row = hssfSheet.getRow(rownum); - if (sheetRow != null && !isRowEmpty(sheetRow)) { - // 先去判断 - ars = compareSaveData(sheetRow, rownum + 1,map); - if (ars.getRes() == 2) { - ar.setFailMsg(ars.getResMsg()); - result = 2; - return ar; - } - } - } - if (result != 2) { - for (int rownums = 2; rownums <= rowNum; rownums++) { - Row sheetRows = hssfSheet.getRow(rownums); - if (sheetRows != null && !isRowEmpty(sheetRows)) { - ar = addSaveData(sheetRows,rownums+1); - if (ar.getRes() == 0) { - return ar; - } - } - } - if (ar.getRes() == 1) { - ar.setSucceedMsg("外包公司导入成功!"); - return ar; - } - }else { - ar.setFailMsg("第" + (errorNum-1) + "行数据有误字段不能为空，导入失败"); - } - } - if (wb != null) { - wb.close(); - } - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg("模板错误，请重新选择模板！"); - } - return ar; - } + @RequestMapping(value = "toLeadInto", method = RequestMethod.POST) + @ResponseBody + public AjaxRes toLeadInto(@RequestParam("file") MultipartFile file) { + AjaxRes ar = getAjaxRes(); + AjaxRes ars = getAjaxRes(); + Integer result = 0; + int errorNum = 0; + Map map = new HashMap(); + try { + String fileName = file.getOriginalFilename(); + System.out.println("OriginalFilename：" + fileName); + if (!StringUtils.endsWithAny(fileName, ".xls", ".xlsx")) { + throw new RuntimeException("不支持excel以外的文件导入！"); + } + //根据指定的文件输入流导入Excel从而产生Workbook对象 + Workbook wb = null; + Sheet hssfSheet = null; + InputStream inputStream = file.getInputStream(); + if (fileName.endsWith(".xls")) { + // 处理xls格式的Excel + POIFSFileSystem poifsFileSystem = new POIFSFileSystem(inputStream); + wb = new HSSFWorkbook(poifsFileSystem); + } else if (fileName.endsWith(".xlsx")) { + // 处理xlsx格式的Excel + wb = new XSSFWorkbook(inputStream); + } + // 读取第一个sheet + hssfSheet = wb.getSheetAt(0); + // 判断Sheet是否为空 + if (hssfSheet != null) { + // 遍历行row，continue只是终止本次循环，接着还执行后面的循环 + int rowNum = hssfSheet.getLastRowNum(); + boolean hasEmptyRow = false; + // 从第三行开始 + for (int rownum = 2; rownum <= rowNum; rownum++) { + // 获取到每一行 + errorNum = rownum; + Row sheetRow = hssfSheet.getRow(rownum); - private AjaxRes compareSaveData(Row sheetRow, int rownum,Map map) throws Exception { - AjaxRes ar = getAjaxRes(); - try { - String enterpriseName = getValue(sheetRow.getCell(0)).trim(); - String socialCreditCode = translateToPlainStr(getValue(sheetRow.getCell(1)).trim()).replace(".0", ""); - String setTime = getValue(sheetRow.getCell(2)).trim(); - String corporateName = getValue(sheetRow.getCell(3)).trim(); - String idCard = getValue(sheetRow.getCell(4)).trim(); - String phone = translateToPlainStr(getValue(sheetRow.getCell(5)).trim()); - if (StringUtils.isBlank(enterpriseName) || StringUtils.isBlank(socialCreditCode) || StringUtils.isBlank(setTime) || StringUtils.isBlank(corporateName) || StringUtils.isBlank(idCard) || StringUtils.isBlank(phone)) { - ar.setFailMsg("第" + (rownum-1) + "行数据有误字段不能为空，导入失败"); - ar.setRes(2); - return ar; - } - ImportUserDataVo importUserDataVo=new ImportUserDataVo(); - importUserDataVo.setName(enterpriseName); - Integer num=service.getImportDataCheck(importUserDataVo); - if (num!=null && num>0) { - ar.setFailMsg("第" + (rownum-1) + "行企业名称已存在"); - ar.setRes(2); - return ar; - } - importUserDataVo=new ImportUserDataVo(); - importUserDataVo.setUserPhone(phone); - num=service.getImportDataCheck(importUserDataVo); - if (num!=null && num>0) { - ar.setFailMsg("第" + (rownum-1) + "手机号已存在"); - ar.setRes(2); - return ar; - } - importUserDataVo=new ImportUserDataVo(); - importUserDataVo.setIdCard(idCard); - num=service.getImportDataCheck(importUserDataVo); - if (num!=null && num>0) { - ar.setFailMsg("第" + (rownum-1) + "身份证号码已存在"); - ar.setRes(2); - return ar; - } - importUserDataVo=new ImportUserDataVo(); - importUserDataVo.setCode(socialCreditCode); - num=service.getImportDataCheck(importUserDataVo); - if (num!=null && num>0) { - ar.setFailMsg("第" + (rownum-1) + "统一社会信用代码已存在"); - ar.setRes(2); - return ar; - } + // 获得第i行对象 + Row row = hssfSheet.getRow(rownum); + if (sheetRow != null && !isRowEmpty(sheetRow)) { + // 先去判断 + ars = compareSaveData(sheetRow, rownum + 1, map); + if (ars.getRes() == 2) { + ar.setFailMsg(ars.getResMsg()); + result = 2; + return ar; + } + } else { + ar.setFailMsg("第 " + (rownum + 1) + " 行数据为空，导入失败"); + ar.setRes(0); + return ar; + } + } + if (result != 2) { + for (int rownums = 2; rownums <= rowNum; rownums++) { + Row sheetRows = hssfSheet.getRow(rownums); + if (sheetRows != null && !isRowEmpty(sheetRows)) { + ar = addSaveData(sheetRows, rownums + 1); + if (ar.getRes() == 0) { + return ar; + } + } + } + if (ar.getRes() == 1) { + ar.setSucceedMsg("外包公司导入成功!"); + return ar; + } + } else { + ar.setFailMsg("第" + (errorNum - 1) + "行数据有误字段不能为空，导入失败"); + } + } + if (wb != null) { + wb.close(); + } + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg("模板错误，请重新选择模板！"); + } + return ar; + } - importUserDataVo.setRow(rownum-1); - ImportUserDataVo his=map.get(socialCreditCode); - if(his!=null){ - ar.setFailMsg("第" + (rownum-1) + "行与"+his.getRow()+"行统一社会信用代码重复!"); - ar.setRes(2); - return ar; - }else{ - map.put(socialCreditCode,importUserDataVo); - } + private AjaxRes compareSaveData(Row sheetRow, int rownum, Map map) throws Exception { + AjaxRes ar = getAjaxRes(); + try { + String enterpriseName = getValue(sheetRow.getCell(0)).trim(); + String socialCreditCode = translateToPlainStr(getValue(sheetRow.getCell(1)).trim()).replace(".0", ""); + String setTime = getValue(sheetRow.getCell(2)).trim(); + String corporateName = getValue(sheetRow.getCell(3)).trim(); + String idCard = getValue(sheetRow.getCell(4)).trim(); + String phone = translateToPlainStr(getValue(sheetRow.getCell(5)).trim()); + if (StringUtils.isBlank(enterpriseName) || StringUtils.isBlank(socialCreditCode) || StringUtils.isBlank(setTime) || StringUtils.isBlank(corporateName) || StringUtils.isBlank(idCard) || StringUtils.isBlank(phone)) { + ar.setFailMsg("第" + (rownum - 1) + "行数据有误字段不能为空，导入失败"); + ar.setRes(2); + return ar; + } + ImportUserDataVo importUserDataVo = new ImportUserDataVo(); + importUserDataVo.setName(enterpriseName); + Integer num = service.getImportDataCheck(importUserDataVo); + if (num != null && num > 0) { + ar.setFailMsg("第" + (rownum - 1) + "行企业名称已存在"); + ar.setRes(2); + return ar; + } + importUserDataVo = new ImportUserDataVo(); + importUserDataVo.setUserPhone(phone); + num = service.getImportDataCheck(importUserDataVo); + if (num != null && num > 0) { + ar.setFailMsg("第" + (rownum - 1) + "手机号已存在"); + ar.setRes(2); + return ar; + } + importUserDataVo = new ImportUserDataVo(); + importUserDataVo.setIdCard(idCard); + num = service.getImportDataCheck(importUserDataVo); + if (num != null && num > 0) { + ar.setFailMsg("第" + (rownum - 1) + "身份证号码已存在"); + ar.setRes(2); + return ar; + } + importUserDataVo = new ImportUserDataVo(); + importUserDataVo.setCode(socialCreditCode); + num = service.getImportDataCheck(importUserDataVo); + if (num != null && num > 0) { + ar.setFailMsg("第" + (rownum - 1) + "统一社会信用代码已存在"); + ar.setRes(2); + return ar; + } - his=map.get(idCard); - if(his!=null){ - ar.setFailMsg("第" + (rownum-1) + "行与"+his.getRow()+"行身份证号码重复!"); - ar.setRes(2); - return ar; - }else{ - map.put(idCard,importUserDataVo); - } + importUserDataVo.setRow(rownum - 1); + ImportUserDataVo his = map.get(socialCreditCode); + if (his != null) { + ar.setFailMsg("第" + (rownum - 1) + "行与" + his.getRow() + "行统一社会信用代码重复!"); + ar.setRes(2); + return ar; + } else { + map.put(socialCreditCode, importUserDataVo); + } - his=map.get(phone); - if(his!=null){ - ar.setFailMsg("第" + (rownum-1) + "行与"+his.getRow()+"行手机号重复!"); - ar.setRes(2); - }else{ - map.put(idCard,importUserDataVo); - } + his = map.get(idCard); + if (his != null) { + ar.setFailMsg("第" + (rownum - 1) + "行与" + his.getRow() + "行身份证号码重复!"); + ar.setRes(2); + return ar; + } else { + map.put(idCard, importUserDataVo); + } - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg("第" + rownum + "行数据有误，导入失败"); - } - return ar; - } + his = map.get(phone); + if (his != null) { + ar.setFailMsg("第" + (rownum - 1) + "行与" + his.getRow() + "行手机号重复!"); + ar.setRes(2); + } else { + map.put(idCard, importUserDataVo); + } - private AjaxRes addSaveData(Row sheetRow,int row) throws Exception { - AjaxRes ar = getAjaxRes(); - try { - ViolationBean bean = new ViolationBean(); - String enterpriseName = getValue(sheetRow.getCell(0)).trim(); - String socialCreditCode = translateToPlainStr(getValue(sheetRow.getCell(1)).trim()).replace(".0", ""); - String setTime = getValue(sheetRow.getCell(2)).trim(); - String corporateName = getValue(sheetRow.getCell(3)).trim(); - String idCard = getValue(sheetRow.getCell(4)).trim(); - String phone = translateToPlainStr(getValue(sheetRow.getCell(5)).trim()); - String address = translateToPlainStr(getValue(sheetRow.getCell(6)).trim()); - bean.setEnterpriseName(enterpriseName); - bean.setSocialCreditCode(socialCreditCode); - bean.setSetTime(setTime); - bean.setCorporateName(corporateName); - bean.setIdCard(idCard); - bean.setPhone(phone); - bean.setAddress(address); - ar=service.updateShopBaseInfo(bean,row); - } catch (Exception e) { - logger.error(e.toString(), e); - ar.setFailMsg(GlobalConst.IMP_FAIL); - } finally { - } - return ar; - } + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg("第" + rownum + "行数据有误，导入失败"); + } + return ar; + } - /*****************************************************************人员违章详情记录******************************************************/ + private AjaxRes addSaveData(Row sheetRow, int row) throws Exception { + AjaxRes ar = getAjaxRes(); + try { + ViolationBean bean = new ViolationBean(); + String enterpriseName = getValue(sheetRow.getCell(0)).trim(); + String socialCreditCode = translateToPlainStr(getValue(sheetRow.getCell(1)).trim()).replace(".0", ""); + String setTime = getValue(sheetRow.getCell(2)).trim(); + String corporateName = getValue(sheetRow.getCell(3)).trim(); + String idCard = getValue(sheetRow.getCell(4)).trim(); + String phone = translateToPlainStr(getValue(sheetRow.getCell(5)).trim()); + String address = translateToPlainStr(getValue(sheetRow.getCell(6)).trim()); + bean.setEnterpriseName(enterpriseName); + bean.setSocialCreditCode(socialCreditCode); + bean.setSetTime(setTime); + bean.setCorporateName(corporateName); + bean.setIdCard(idCard); + bean.setPhone(phone); + bean.setAddress(address); + ar = service.updateShopBaseInfo(bean, row); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.IMP_FAIL); + } finally { + } + return ar; + } + + /*****************************************************************人员违章详情记录******************************************************/ - @RequestMapping("exportSubpageList") - public void exportSubpageList(HttpServletRequest request, HttpServletResponse response, ViolationBean bean) { - String filename = "人员违章记录表"; - List gradelist = service.exportSubpageList(bean); - // 导出所有人员基本信息 - try { - excelOut(response, gradelist, filename, "人员违章记录表"); - } catch (Exception e) { - e.printStackTrace(); - } - } + @RequestMapping("exportSubpageList") + public void exportSubpageList(HttpServletRequest request, HttpServletResponse response, ViolationBean bean) { + String filename = "人员违章记录表"; + List gradelist = service.exportSubpageList(bean); + // 导出所有人员基本信息 + try { + excelOut(response, gradelist, filename, "人员违章记录表"); + } catch (Exception e) { + e.printStackTrace(); + } + } - /*****************************************************************公共方法******************************************************/ + /*****************************************************************公共方法******************************************************/ - // 判断该行是否为空 - public static boolean isRowEmpty(Row row) { - int count = 0; - for (int c = row.getFirstCellNum(); c < row.getLastCellNum(); c++) { - Cell cell = row.getCell(c); - if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK) { - count++; - } - } - if (count >= 1) { // 表示是有效数据行 - return false; - } - return true; - } + // 判断该行是否为空 + public static boolean isRowEmpty(Row row) { + int count = 0; + for (int c = row.getFirstCellNum(); c < row.getLastCellNum(); c++) { + Cell cell = row.getCell(c); + if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK) { + count++; + } + } + if (count >= 1) { // 表示是有效数据行 + return false; + } + return true; + } - private static String getValue(Cell hssfCell) { - if (hssfCell == null) { - return ""; - } + private static String getValue(Cell hssfCell) { + if (hssfCell == null) { + return ""; + } - CellType cellType = CellType.forInt(hssfCell.getCellType()); + CellType cellType = CellType.forInt(hssfCell.getCellType()); - switch (cellType) { - case BOOLEAN: - return String.valueOf(hssfCell.getBooleanCellValue()); - case NUMERIC: - // 处理日期和时间 - if (DateUtil.isCellDateFormatted(hssfCell)) { - return new SimpleDateFormat("yyyy-MM-dd").format(hssfCell.getDateCellValue()); - } else { - return String.valueOf(hssfCell.getNumericCellValue()); - } - case STRING: - return String.valueOf(hssfCell.getStringCellValue()); - case BLANK: - return ""; - case ERROR: - return "ERROR"; - default: - // 处理未来可能添加的新单元格类型 - throw new IllegalArgumentException("Unsupported cell type: " + cellType); - } - } + switch (cellType) { + case BOOLEAN: + return String.valueOf(hssfCell.getBooleanCellValue()); + case NUMERIC: + // 处理日期和时间 + if (DateUtil.isCellDateFormatted(hssfCell)) { + return new SimpleDateFormat("yyyy-MM-dd").format(hssfCell.getDateCellValue()); + } else { + return String.valueOf(hssfCell.getNumericCellValue()); + } + case STRING: + return String.valueOf(hssfCell.getStringCellValue()); + case BLANK: + return ""; + case ERROR: + return "ERROR"; + default: + // 处理未来可能添加的新单元格类型 + throw new IllegalArgumentException("Unsupported cell type: " + cellType); + } + } - public String translateToPlainStr(String number) { - String regEx="^([\\+|-]?\\d+(.{0}|.\\d+))[Ee]{1}([\\+|-]?\\d+)$"; - // 编译正则表达式 - Pattern pattern = Pattern.compile(regEx); - // 忽略大小写的写法 - // Pattern pat = Pattern.compile(regEx, Pattern.CASE_INSENSITIVE); - Matcher matcher = pattern.matcher(number); - // 字符串是否与正则表达式相匹配 - boolean rs = matcher.matches(); - // 判断是否为字符串的科学计数法 - if(rs){ - // 科学计数法转数字 - BigDecimal originValue = new BigDecimal(number); - // 数字转字符串 - return originValue.toPlainString(); - } - return number; - } + public String translateToPlainStr(String number) { + String regEx = "^([\\+|-]?\\d+(.{0}|.\\d+))[Ee]{1}([\\+|-]?\\d+)$"; + // 编译正则表达式 + Pattern pattern = Pattern.compile(regEx); + // 忽略大小写的写法 + // Pattern pat = Pattern.compile(regEx, Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(number); + // 字符串是否与正则表达式相匹配 + boolean rs = matcher.matches(); + // 判断是否为字符串的科学计数法 + if (rs) { + // 科学计数法转数字 + BigDecimal originValue = new BigDecimal(number); + // 数字转字符串 + return originValue.toPlainString(); + } + return number; + } - private void excelOut(HttpServletResponse response, List registlist, String filename, String sheetname) - throws Exception { - if (registlist != null) { - List> results = new ArrayList>(); - int size = registlist.size(); - for (int i = 0; i < size; i++) { - ViolationBean bean = registlist.get(i); - Map maps = outVehicleOilBeanMap(i, bean, sheetname); - results.add(maps); - } - List headers = outVehicleOilHeaders(sheetname); - HSSFWorkbook workbook = POIOutputHelperNumBer.excel(results, headers, filename); - OutputStream out = null; - response.setContentType("application/vnd.ms-excel;charset=UTF-8"); - response.addHeader("Content-Disposition", - "attachment;filename=" + URLEncoder.encode(filename, "UTF-8") + ".xls"); - response.setHeader("Pragma", "No-cache"); - out = response.getOutputStream(); - workbook.write(out); - out.flush(); - out.close(); - } - } - private void excelOutTeamGroupPersons(HttpServletResponse response, List registlist, String filename, String sheetname) - throws Exception { - if (registlist != null) { - List> results = new ArrayList>(); - int size = registlist.size(); - for (int i = 0; i < size; i++) { - TeamGroupBean bean = registlist.get(i); - Map maps = outVehicleOilBeanMap(i, bean, sheetname); - results.add(maps); - } - List headers = outVehicleOilHeaders(sheetname); - HSSFWorkbook workbook = POIOutputHelperNumBer.excel(results, headers, filename); - OutputStream out = null; - response.setContentType("application/vnd.ms-excel;charset=UTF-8"); - response.addHeader("Content-Disposition", - "attachment;filename=" + URLEncoder.encode(filename, "UTF-8") + ".xls"); - response.setHeader("Pragma", "No-cache"); - out = response.getOutputStream(); - workbook.write(out); - out.flush(); - out.close(); - } - } + private void excelOut(HttpServletResponse response, List registlist, String filename, String sheetname) + throws Exception { + if (registlist != null) { + List> results = new ArrayList>(); + int size = registlist.size(); + for (int i = 0; i < size; i++) { + ViolationBean bean = registlist.get(i); + Map maps = outVehicleOilBeanMap(i, bean, sheetname); + results.add(maps); + } + List headers = outVehicleOilHeaders(sheetname); + HSSFWorkbook workbook = POIOutputHelperNumBer.excel(results, headers, filename); + OutputStream out = null; + response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + response.addHeader("Content-Disposition", + "attachment;filename=" + URLEncoder.encode(filename, "UTF-8") + ".xls"); + response.setHeader("Pragma", "No-cache"); + out = response.getOutputStream(); + workbook.write(out); + out.flush(); + out.close(); + } + } - private Map outVehicleOilBeanMap(int i, ViolationBean bean, String sheetname) { - Map maps = new LinkedHashMap(); - maps.put("id", i + 1); - switch (sheetname) { - case "违章详情表": - maps.put("violator", bean.getViolator()); - maps.put("violationNumber", bean.getViolationNumber()); - maps.put("typeViolation", bean.getTypeViolation()); - maps.put("violationLevel", bean.getViolationLevel()); - maps.put("personInCharge", bean.getPersonInCharge()); - maps.put("penaltyScore", bean.getPenaltyScore()); - maps.put("affiliatedEnterprise", bean.getAffiliatedEnterprise()); - maps.put("jointLiability", bean.getJointLiability()); - maps.put("jointPenaltyScore", bean.getJointPenaltyScore()); - maps.put("illegalContent", bean.getIllegalContent()); - maps.put("inspector", bean.getInspector()); - maps.put("inspectorUnit", bean.getInspectorUnit()); - maps.put("inspectionTime", bean.getInspectionTime()); - break; - case "黑名单详情表": - maps.put("userName", bean.getUserName()); - maps.put("idCard", bean.getIdCard()); - maps.put("sex", bean.getSex()); - maps.put("phone", bean.getPhone()); - maps.put("unit", bean.getUnit()); - maps.put("reason", bean.getReason()); - maps.put("enterTime", bean.getEnterTime()); - maps.put("operatorId", bean.getOperatorId()); - maps.put("createTime", bean.getCreateTime()); - break; - case"外包公司详情表": - maps.put("enterpriseName", bean.getEnterpriseName()); - maps.put("socialCreditCode", bean.getSocialCreditCode()); - maps.put("setTime", bean.getSetTime()); - maps.put("corporateName", bean.getCorporateName()); - maps.put("idCard", bean.getIdCard()); - maps.put("phone", bean.getPhone()); - maps.put("proNum", bean.getProNum()); - maps.put("address", bean.getAddress()); - break; - case"人员违章记录表": - maps.put("name", bean.getName()); - maps.put("sex", bean.getSex()); - maps.put("idCard", bean.getIdCard()); - maps.put("phone", bean.getPhone()); - maps.put("deptName", bean.getDeptName()); - maps.put("inThoseDays", bean.getInThoseDays()); - maps.put("deductionOfPoints", bean.getDeductionOfPoints()); - maps.put("violationCount", bean.getViolationCount()); - break; - default: - break; - } + private void excelOutTeamGroupPersons(HttpServletResponse response, List registlist, String filename, String sheetname) + throws Exception { + if (registlist != null) { + List> results = new ArrayList>(); + int size = registlist.size(); + for (int i = 0; i < size; i++) { + TeamGroupBean bean = registlist.get(i); + Map maps = outVehicleOilBeanMap(i, bean, sheetname); + results.add(maps); + } + List headers = outVehicleOilHeaders(sheetname); + HSSFWorkbook workbook = POIOutputHelperNumBer.excel(results, headers, filename); + OutputStream out = null; + response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + response.addHeader("Content-Disposition", + "attachment;filename=" + URLEncoder.encode(filename, "UTF-8") + ".xls"); + response.setHeader("Pragma", "No-cache"); + out = response.getOutputStream(); + workbook.write(out); + out.flush(); + out.close(); + } + } - return maps; - } - private Map outVehicleOilBeanMap(int i, TeamGroupBean bean, String sheetname) { - Map maps = new LinkedHashMap(); - maps.put("id", i + 1); - switch (sheetname) { - case "班组人员详情表": - maps.put("subContractor", bean.getSubContractor()); - maps.put("project", bean.getProject()); - maps.put("teamGroupName", bean.getTeamGroupName()); - maps.put("name", bean.getName()); - maps.put("idCard", bean.getIdCard()); - maps.put("phone", bean.getPhone()); - maps.put("sex", bean.getSex()); - maps.put("workType", bean.getWorkType()); - maps.put("isTeamLeader", bean.getIsTeamLeader()); - break; - default: - break; - } + private Map outVehicleOilBeanMap(int i, ViolationBean bean, String sheetname) { + Map maps = new LinkedHashMap(); + maps.put("id", i + 1); + switch (sheetname) { + case "违章详情表": + maps.put("violator", bean.getViolator()); + maps.put("violationNumber", bean.getViolationNumber()); + maps.put("typeViolation", bean.getTypeViolation()); + maps.put("violationLevel", bean.getViolationLevel()); + maps.put("personInCharge", bean.getPersonInCharge()); + maps.put("penaltyScore", bean.getPenaltyScore()); + maps.put("affiliatedEnterprise", bean.getAffiliatedEnterprise()); + maps.put("jointLiability", bean.getJointLiability()); + maps.put("jointPenaltyScore", bean.getJointPenaltyScore()); + maps.put("illegalContent", bean.getIllegalContent()); + maps.put("inspector", bean.getInspector()); + maps.put("inspectorUnit", bean.getInspectorUnit()); + maps.put("inspectionTime", bean.getInspectionTime()); + break; + case "黑名单详情表": + maps.put("userName", bean.getUserName()); + maps.put("idCard", bean.getIdCard()); + maps.put("sex", bean.getSex()); + maps.put("phone", bean.getPhone()); + maps.put("unit", bean.getUnit()); + maps.put("reason", bean.getReason()); + maps.put("enterTime", bean.getEnterTime()); + maps.put("operatorId", bean.getOperatorId()); + maps.put("createTime", bean.getCreateTime()); + break; + case "外包公司详情表": + maps.put("enterpriseName", bean.getEnterpriseName()); + maps.put("socialCreditCode", bean.getSocialCreditCode()); + maps.put("setTime", bean.getSetTime()); + maps.put("corporateName", bean.getCorporateName()); + maps.put("idCard", bean.getIdCard()); + maps.put("phone", bean.getPhone()); + maps.put("proNum", bean.getProNum()); + maps.put("address", bean.getAddress()); + break; + case "人员违章记录表": + maps.put("name", bean.getName()); + maps.put("sex", bean.getSex()); + maps.put("idCard", bean.getIdCard()); + maps.put("phone", bean.getPhone()); + maps.put("deptName", bean.getDeptName()); + maps.put("inThoseDays", bean.getInThoseDays()); + maps.put("deductionOfPoints", bean.getDeductionOfPoints()); + maps.put("violationCount", bean.getViolationCount()); + break; + default: + break; + } - return maps; - } + return maps; + } - private List outVehicleOilHeaders(String sheetname) { - ArrayList list = new ArrayList(); - list.add("序号"); - - switch (sheetname) { - case "违章详情表": - list.add("违章单位"); - list.add("违章编号"); - list.add("违章类型"); - list.add("违章级别"); - list.add("直接负责人"); - list.add("处罚记分"); - list.add("所属企业"); - list.add("连带责任人"); - list.add("连带责任人处罚记分"); - list.add("违章内容"); - list.add("检查人员"); - list.add("检查人员单位"); - list.add("检查时间"); - break; - case "黑名单详情表": - list.add("姓名"); - list.add("身份证号码"); - list.add("性别"); - list.add("联系电话"); - list.add("所属部门/项目"); - list.add("加入黑名单原因"); - list.add("进入日期"); - list.add("操作人"); - list.add("操作时间"); - break; - case"外包公司详情表": - list.add("企业名称"); - list.add("统一社会信用代码"); - list.add("成立日期"); - list.add("法人姓名"); - list.add("法人身份证号码"); - list.add("法人手机号码"); - list.add("项目数量"); - list.add("单位地址"); - break; - case"人员违章记录表": - list.add("姓名"); - list.add("性别"); - list.add("身份证号码"); - list.add("联系电话"); - list.add("所属部门"); - list.add("记分年"); - list.add("剩余记分"); - list.add("违章次数"); - break; - case"班组人员详情表": - list.add("所属分包商"); - list.add("所属项目"); - list.add("所属班组"); - list.add("姓名"); - list.add("身份证"); - list.add("电话"); - list.add("性别"); - list.add("工种"); - list.add("是否班组长"); - break; - default: - break; - } - return list; - } + private Map outVehicleOilBeanMap(int i, TeamGroupBean bean, String sheetname) { + Map maps = new LinkedHashMap(); + maps.put("id", i + 1); + switch (sheetname) { + case "班组人员详情表": + maps.put("subContractor", bean.getSubContractor()); + maps.put("project", bean.getProject()); + maps.put("teamGroupName", bean.getTeamGroupName()); + maps.put("name", bean.getName()); + maps.put("idCard", bean.getIdCard()); + maps.put("phone", bean.getPhone()); + maps.put("sex", bean.getSex()); + maps.put("workType", bean.getWorkType()); + maps.put("isTeamLeader", bean.getIsTeamLeader()); + break; + default: + break; + } + return maps; + } + private List outVehicleOilHeaders(String sheetname) { + ArrayList list = new ArrayList(); + list.add("序号"); + switch (sheetname) { + case "违章详情表": + list.add("违章单位"); + list.add("违章编号"); + list.add("违章类型"); + list.add("违章级别"); + list.add("直接负责人"); + list.add("处罚记分"); + list.add("所属企业"); + list.add("连带责任人"); + list.add("连带责任人处罚记分"); + list.add("违章内容"); + list.add("检查人员"); + list.add("检查人员单位"); + list.add("检查时间"); + break; + case "黑名单详情表": + list.add("姓名"); + list.add("身份证号码"); + list.add("性别"); + list.add("联系电话"); + list.add("所属部门/项目"); + list.add("加入黑名单原因"); + list.add("进入日期"); + list.add("操作人"); + list.add("操作时间"); + break; + case "外包公司详情表": + list.add("企业名称"); + list.add("统一社会信用代码"); + list.add("成立日期"); + list.add("法人姓名"); + list.add("法人身份证号码"); + list.add("法人手机号码"); + list.add("项目数量"); + list.add("单位地址"); + break; + case "人员违章记录表": + list.add("姓名"); + list.add("性别"); + list.add("身份证号码"); + list.add("联系电话"); + list.add("所属部门"); + list.add("记分年"); + list.add("剩余记分"); + list.add("违章次数"); + break; + case "班组人员详情表": + list.add("所属分包商"); + list.add("所属项目"); + list.add("所属班组"); + list.add("姓名"); + list.add("身份证"); + list.add("电话"); + list.add("性别"); + list.add("工种"); + list.add("是否班组长"); + break; + default: + break; + } + return list; + } } diff --git a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml index f91dbf5..db12a8a 100644 --- a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml +++ b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml @@ -169,7 +169,8 @@ status, org_type orgType FROM pm_org_info - WHERE status = 1 and level in (1, 2) + WHERE status = 1 +-- and level in (1, 2) + diff --git a/src/main/resources/static/js/evaluate/project/editForm.js b/src/main/resources/static/js/evaluate/project/editForm.js index b4e27e3..671d236 100644 --- a/src/main/resources/static/js/evaluate/project/editForm.js +++ b/src/main/resources/static/js/evaluate/project/editForm.js @@ -32,6 +32,7 @@ function updateName(data,id) { let url = `${ctxPath}` + "/project/updateName"; let item = { id: id, + departmentId: objParam.departmentId, projectName: data.field.projectName, }; // console.log(JSON.stringify(data)+"data") diff --git a/src/main/resources/static/js/evaluate/team/evaluateTable.js b/src/main/resources/static/js/evaluate/team/evaluateTable.js index bea6b1f..7d43d4a 100644 --- a/src/main/resources/static/js/evaluate/team/evaluateTable.js +++ b/src/main/resources/static/js/evaluate/team/evaluateTable.js @@ -122,13 +122,12 @@ function submitApply(data) { // 关闭页面 function closePage(type) { - let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引 + // 获取当前 iframe 层的索引 + let index = parent.layer.getFrameIndex(window.name); if (type === 1) { - if (objParam.operType === 'back') { - window.parent.reloadTreeTable(); - }else{ - window.parent.search(1); - } + // 调用父页面的方法（例如刷新列表） + window.parent.search(1); } - parent.layer.close(index); // 再执行关闭 + // 关闭当前弹出层 + parent.layer.close(index); } \ No newline at end of file diff --git a/src/main/resources/static/pages/evaluate/team/evaluateTable.html b/src/main/resources/static/pages/evaluate/team/evaluateTable.html index 4498e57..aea6075 100644 --- a/src/main/resources/static/pages/evaluate/team/evaluateTable.html +++ b/src/main/resources/static/pages/evaluate/team/evaluateTable.html @@ -164,7 +164,7 @@
- +