From 3f5be5d844e7e9a5b0a8aec31e739da0ac842497 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 2 Jul 2025 10:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TeamGroupController.java | 15 +- .../evaluate/service/TeamGroupService.java | 2 +- .../service/TeamGroupServiceImpl.java | 40 +++--- .../resources/download/班组人员导入模版.xls | Bin 22528 -> 22528 bytes .../js/evaluate/teamGroup/teamMemBer.js | 7 +- .../js/evaluate/teamGroup/teamMemBerPerson.js | 6 +- .../outsourceAudit/outsourceAuditForm.html | 136 ++++++++++-------- 7 files changed, 112 insertions(+), 94 deletions(-) diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java index f032461..20e55b1 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java @@ -83,6 +83,7 @@ public class TeamGroupController extends BaseController { } return ar; } + // 获取班组人员-综合查询 @GetMapping("getTeamGroupPersons") public AjaxRes getTeamGroupPersons(TeamGroupBean teamGroupBean) { @@ -100,11 +101,11 @@ public class TeamGroupController extends BaseController { public AjaxRes addTeamGroupPerson(@ModelAttribute TeamGroupBean bean, @RequestParam("file") MultipartFile file) { AjaxRes ar = new AjaxRes(); - if (!UserUtil.isPhone(bean.getPhone())){ + if (!UserUtil.isPhone(bean.getPhone())) { ar.setFailMsg("手机号格式错误"); return ar; } - if (!UserUtil.isIdCard(bean.getIdCard())){ + if (!UserUtil.isIdCard(bean.getIdCard())) { ar.setFailMsg("身份证号格式错误"); return ar; } @@ -135,13 +136,13 @@ public class TeamGroupController extends BaseController { @PostMapping("updateTeamPerson") public AjaxRes updateTeamPerson(@ModelAttribute TeamGroupBean bean, - @RequestParam(value = "file", required = false)MultipartFile file) { + @RequestParam(value = "file", required = false) MultipartFile file) { AjaxRes ar = new AjaxRes(); - if (!UserUtil.isPhone(bean.getPhone())){ + if (!UserUtil.isPhone(bean.getPhone())) { ar.setFailMsg("手机号格式错误"); return ar; } - if (!UserUtil.isIdCard(bean.getIdCard())){ + if (!UserUtil.isIdCard(bean.getIdCard())) { ar.setFailMsg("身份证号格式错误"); return ar; } @@ -190,8 +191,8 @@ public class TeamGroupController extends BaseController { @RequestMapping(value = "importTeamPerson", method = RequestMethod.POST) @ResponseBody - public AjaxRes importTeamPerson(@RequestParam("file") MultipartFile file) { - return teamGroupService.importTeamPerson(file); + public AjaxRes importTeamPerson(@RequestParam String id, @RequestParam("file") MultipartFile file) { + return teamGroupService.importTeamPerson(id,file); } } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupService.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupService.java index 226ce17..9a35706 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupService.java @@ -26,7 +26,7 @@ public interface TeamGroupService { Integer delTeamPerson(TeamGroupBean teamGroupBean); - AjaxRes importTeamPerson(MultipartFile file); + AjaxRes importTeamPerson(String id, MultipartFile file); List getTeamGroupPersons(TeamGroupBean teamGroupBean); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java index 28e895f..d2dd9b6 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java @@ -111,7 +111,7 @@ public class TeamGroupServiceImpl implements TeamGroupService { } @Override - public AjaxRes importTeamPerson(MultipartFile file) { + public AjaxRes importTeamPerson(String teamId, MultipartFile file) { AjaxRes ar = new AjaxRes(); List> successList = new ArrayList<>(); @@ -133,8 +133,8 @@ public class TeamGroupServiceImpl implements TeamGroupService { Row row = sheet.getRow(i); if (row == null) continue; - String idCard = getCellValue(row.getCell(2)); - String phone = getCellValue(row.getCell(3)); + String idCard = getCellValue(row.getCell(1)); + String phone = getCellValue(row.getCell(2)); if (StringUtils.isBlank(idCard)) { ar.setFailMsg("身份证号不能为空"); return ar; @@ -181,7 +181,7 @@ public class TeamGroupServiceImpl implements TeamGroupService { Row row = sheet.getRow(i); if (row == null) continue; - Map rowData = processRow(row, existIdCards, existPhones); + Map rowData = processRow(teamId, row, existIdCards, existPhones); if (rowData.containsKey("error")) { ar.setFailMsg(rowData.get("error")); return ar; @@ -213,23 +213,16 @@ public class TeamGroupServiceImpl implements TeamGroupService { } // 处理单行数据 - private Map processRow(Row row, Map existIdCards, Map existPhones) { + private Map processRow(String teamId, Row row, Map existIdCards, Map existPhones) { Map rowData = new HashMap<>(); StringBuilder errorMsg = new StringBuilder(); // 获取单元格值 - String teamName = getCellValue(row.getCell(0)); - String name = getCellValue(row.getCell(1)); - String idCard = getCellValue(row.getCell(2)); - String phone = getCellValue(row.getCell(3)); - String sex = getCellValue(row.getCell(4)); - String workType = getCellValue(row.getCell(5)); - - // 校验班组名称是否存在 - Integer teamId = teamGroupDao.getIdByName(teamName); - if (teamId == null) { - errorMsg.append(teamName + "名称不存在; "); - } + String name = getCellValue(row.getCell(0)); + String idCard = getCellValue(row.getCell(1)); + String phone = getCellValue(row.getCell(2)); + String sex = getCellValue(row.getCell(3)); + String workType = getCellValue(row.getCell(4)); // 校验身份证 if (idCard == null || idCard.isEmpty()) { @@ -268,7 +261,7 @@ public class TeamGroupServiceImpl implements TeamGroupService { } // 如果没有错误，保存数据 - rowData.put("teamId", String.valueOf(teamId)); + rowData.put("teamId", teamId); rowData.put("name", name); rowData.put("idCard", idCard); rowData.put("phone", phone); @@ -281,12 +274,11 @@ public class TeamGroupServiceImpl implements TeamGroupService { private boolean validateHeader(Row headerRow) { if (headerRow == null) return false; - return "班组名称".equals(getCellValue(headerRow.getCell(0))) && - "姓名".equals(getCellValue(headerRow.getCell(1))) && - "身份证".equals(getCellValue(headerRow.getCell(2))) && - "电话".equals(getCellValue(headerRow.getCell(3))) && - "性别".equals(getCellValue(headerRow.getCell(4))) && - "工种".equals(getCellValue(headerRow.getCell(5))); + return "姓名".equals(getCellValue(headerRow.getCell(0))) && + "身份证".equals(getCellValue(headerRow.getCell(1))) && + "电话".equals(getCellValue(headerRow.getCell(2))) && + "性别".equals(getCellValue(headerRow.getCell(3))) && + "工种".equals(getCellValue(headerRow.getCell(4))); } private TeamGroupBean convertToTeamPerson(Map rowData) { diff --git a/src/main/resources/download/班组人员导入模版.xls b/src/main/resources/download/班组人员导入模版.xls index 0c009e1817645a98e4b0a3ddf1406a4682b96631..8c09cec9339c65974efadaa7618c30c8082ca64c 100644 GIT binary patch delta 636 zcmYL`&r94;5XZlhykt{tcem>nD+sj+D%A>$AhuA6MqPiDB8adTVGjyDw1Obs#4Sbi z{w@l=wWppI_ih9IBMR-Ir{0Q0Jqa!CcM>6ayf^ciOumzu*J?|vE$uhPi;M5~F71vv zl1H5zGd|t-b{c$qS;K2=aqXgpLsU_)Vbm+uHlq3A21-D(s)_KE5jADN&^X+3yM6oE z^bADkP98GyPG*4Mi4}03>qbez78avg z!4V={9xu4WmPb|3?q@66;@1%e<4 zhNdt0IcmQCXTeW4r+^ePBd2hlsH4u&knDf5q=>ZRuZhs4l<yRvknUiPmDbLrXV+Ftpqe?_yw(`~8vzH$zo kbml^i+MVgVFgoIA=Z_9c-Opxw<+L>yUiYSkXII~uKZ);N_W%F@ diff --git a/src/main/resources/static/js/evaluate/teamGroup/teamMemBer.js b/src/main/resources/static/js/evaluate/teamGroup/teamMemBer.js index 1015d6c..88a507e 100644 --- a/src/main/resources/static/js/evaluate/teamGroup/teamMemBer.js +++ b/src/main/resources/static/js/evaluate/teamGroup/teamMemBer.js @@ -95,7 +95,11 @@ function initTable() { align: "center", title: "人脸", templet: function (d) { - return ' 查看 '; + if (d.faceUrl) { + return ' 查看 '; + }else { + return ''; + } } }, {field: "isTeamLeader", align: "center", title: "是否班组长"}, @@ -280,6 +284,7 @@ function importData() { $("#articleImageFile").val(""); return; } + formData.append("id", id); formData.append("file", $("#articleImageFile")[0].files[0]); var idx = layer.msg('正在提交数据,请稍等...', { icon: 16 diff --git a/src/main/resources/static/js/evaluate/teamGroup/teamMemBerPerson.js b/src/main/resources/static/js/evaluate/teamGroup/teamMemBerPerson.js index 92b9c0e..be86387 100644 --- a/src/main/resources/static/js/evaluate/teamGroup/teamMemBerPerson.js +++ b/src/main/resources/static/js/evaluate/teamGroup/teamMemBerPerson.js @@ -124,7 +124,11 @@ function initTable() { align: "center", title: "人脸", templet: function (d) { - return ' 查看 '; + if (d.faceUrl) { + return ' 查看 '; + }else { + return ''; + } } }, {field: "isTeamLeader", align: "center", title: "是否班组长"}, diff --git a/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditForm.html b/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditForm.html index 202fb6d..a2a2011 100644 --- a/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditForm.html +++ b/src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditForm.html @@ -36,7 +36,7 @@