diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java index f8cfbe7..648aa14 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java @@ -34,6 +34,8 @@ public class TeamGroupBean { private String keyWord; // 信息评审表 private String infoFileUrl; + private String applyMan; + private String createTime; private String level; private String tableSource; private Integer auditStatus; diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java index 422f60a..6d1bb81 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java @@ -178,6 +178,7 @@ public class OrganizationalController extends BaseController { } return ar; } + @RequestMapping(value = "getProjectSelect", method = RequestMethod.POST) @ResponseBody public AjaxRes getProjectSelect(OrganizationalBean bean) { @@ -193,7 +194,6 @@ public class OrganizationalController extends BaseController { } - /** * 获取班组类型下拉框 * @@ -259,6 +259,7 @@ public class OrganizationalController extends BaseController { /** * 新增数据接口 * 修改 不传 + * * @param bean * @return */ @@ -276,7 +277,6 @@ public class OrganizationalController extends BaseController { } /** - * * @param bean * @return */ @@ -285,11 +285,11 @@ public class OrganizationalController extends BaseController { public AjaxRes getsubcontractorId(@ModelAttribute OrganizationalBean bean, @RequestParam("file") MultipartFile file) { AjaxRes ar = getAjaxRes(); - if (!UserUtil.isPhone(bean.getUserPhone())){ + if (!UserUtil.isPhone(bean.getUserPhone())) { ar.setFailMsg("手机号格式错误"); return ar; } - if (!UserUtil.isIdCard(bean.getIdCard())){ + if (!UserUtil.isIdCard(bean.getIdCard())) { ar.setFailMsg("身份证号格式错误"); return ar; } @@ -328,11 +328,11 @@ public class OrganizationalController extends BaseController { @ResponseBody public AjaxRes registerTeamGroup(@RequestBody TeamGroupBean bean) { AjaxRes ar = getAjaxRes(); - 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; } @@ -340,6 +340,62 @@ public class OrganizationalController extends BaseController { return ar; } + @PostMapping("uploadFaceImg") + public AjaxRes uploadFaceImg(@RequestParam(value = "file", required = false) MultipartFile file) { + AjaxRes ar = new AjaxRes(); + try { + if (file != null && !file.isEmpty()) { + // 验证文件类型 + String originalFileName = file.getOriginalFilename(); + String fileExtension = originalFileName != null ? originalFileName.split("\\.")[1] : ""; + if (!"jpg".equalsIgnoreCase(fileExtension) && !"png".equalsIgnoreCase(fileExtension)) { + ar.setFailMsg("文件类型错误,请上传jpg或png格式的文件"); + return ar; + } + + File targetDir = new File(uploadDir); + if (!targetDir.exists()) { + targetDir.mkdirs(); + } + String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename(); + File targetFile = new File(uploadDir, fileName); + file.transferTo(targetFile); + ar.setSucceed(fileName); + } + } catch (Exception e) { + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } + @PostMapping("uploadInfo") + public AjaxRes uploadInfo(@RequestParam(value = "file", required = false) MultipartFile file) { + AjaxRes ar = new AjaxRes(); + try { + if (file != null && !file.isEmpty()) { + // 验证文件类型 + String originalFileName = file.getOriginalFilename(); + String fileExtension = originalFileName != null ? originalFileName.split("\\.")[1] : ""; + if (!"doc".equalsIgnoreCase(fileExtension) && !"docx".equalsIgnoreCase(fileExtension)&& !"png".equalsIgnoreCase(fileExtension)&& !"jpg".equalsIgnoreCase(fileExtension)&& !"pdf".equalsIgnoreCase(fileExtension)) { + ar.setFailMsg("文件类型错误,请上传jpg、png、doc、docx、pdf格式的文件"); + return ar; + } + + File targetDir = new File(uploadDir); + if (!targetDir.exists()) { + targetDir.mkdirs(); + } + String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename(); + File targetFile = new File(uploadDir, fileName); + file.transferTo(targetFile); + ar.setSucceed(fileName); + } + } catch (Exception e) { + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } + + @RequestMapping(value = "addDept", method = RequestMethod.POST) @ResponseBody public AjaxRes addDept(@RequestBody OrganizationalBean bean) { 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 66bc8ac..8063ce2 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 @@ -59,7 +59,7 @@ public class TeamGroupController extends BaseController { public AjaxRes getRegisterList(TeamGroupBean teamGroupBean) { AjaxRes ar = new AjaxRes(); try { - List teamGroupList = teamGroupService.getTeamGroupList(teamGroupBean); + List teamGroupList = teamGroupService.getRegisterList(teamGroupBean); ar.setListSucceed(teamGroupList); } catch (Exception e) { ar.setFailMsg(GlobalConst.DATA_FAIL); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/TeamGroupDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/TeamGroupDao.java index 1dc9adc..b4549fa 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/TeamGroupDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/TeamGroupDao.java @@ -58,4 +58,6 @@ public interface TeamGroupDao { String getSubContractorName(TeamGroupBean groupBean); Integer delTeamGroupTypePerson(TeamGroupBean teamGroupBean); + + List getRegisterList(TeamGroupBean teamGroupBean); } 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 9a35706..3b8ab20 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 @@ -29,4 +29,6 @@ public interface TeamGroupService { AjaxRes importTeamPerson(String id, MultipartFile file); List getTeamGroupPersons(TeamGroupBean teamGroupBean); + + List getRegisterList(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 5830fb8..82d87ff 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 @@ -246,6 +246,15 @@ public class TeamGroupServiceImpl implements TeamGroupService { return teamGroupDao.getTeamGroupPersons(teamGroupBean); } + @Override + public List getRegisterList(TeamGroupBean teamGroupBean) { + List registerList = teamGroupDao.getRegisterList(teamGroupBean); +// for (TeamGroupBean groupBean : registerList) { +// +// } + return registerList; + } + // 处理单行数据 private Map processRow(String teamId, Row row, Map existIdCards, Map existPhones) { Map rowData = new HashMap<>(); diff --git a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml index f880a0a..8536be0 100644 --- a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml +++ b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml @@ -191,4 +191,15 @@ left join project_assignment pa on poi.p_parent_id = pa.id WHERE poi.p_parent_id = #{pParentId} limit 1 + diff --git a/src/main/resources/static/js/evaluate/teamGroup/registerForm.js b/src/main/resources/static/js/evaluate/teamGroup/registerForm.js index e69cc17..3c3ca70 100644 --- a/src/main/resources/static/js/evaluate/teamGroup/registerForm.js +++ b/src/main/resources/static/js/evaluate/teamGroup/registerForm.js @@ -78,7 +78,6 @@ layui.use(["table", "form", "upload", "tree"], function () { fileExtension !== "docx" && fileExtension !== "png" && fileExtension !== "jpg" && - fileExtension !== "png" && fileExtension !== "pdf" ) { layer.msg("请选择word、pdf或图片文件", { icon: 2, time: 2000 });