代码提交

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;

src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OrganizationalController.java

@@ -178,6 +178,7 @@ public class OrganizationalController extends BaseController<EvaluateBean> {
         }
         return ar;
     }
+
     @RequestMapping(value = "getProjectSelect", method = RequestMethod.POST)
     @ResponseBody
     public AjaxRes getProjectSelect(OrganizationalBean bean) {
@@ -193,7 +194,6 @@ public class OrganizationalController extends BaseController<EvaluateBean> {
     }
 
 
-
     /**
      * 获取班组类型下拉框
      *
@@ -259,6 +259,7 @@ public class OrganizationalController extends BaseController<EvaluateBean> {
     /**
      * 新增数据接口
      * 修改 不传
+     *
      * @param bean
      * @return
      */
@@ -276,7 +277,6 @@ public class OrganizationalController extends BaseController<EvaluateBean> {
     }
 
     /**
-     *
      * @param bean
      * @return
      */
@@ -340,6 +340,62 @@ public class OrganizationalController extends BaseController<EvaluateBean> {
         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) {

src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java

@@ -59,7 +59,7 @@ public class TeamGroupController extends BaseController<TeamGroupBean> {
     public AjaxRes getRegisterList(TeamGroupBean teamGroupBean) {
         AjaxRes ar = new AjaxRes();
         try {
-            List<TeamGroupBean> teamGroupList = teamGroupService.getTeamGroupList(teamGroupBean);
+            List<TeamGroupBean> teamGroupList = teamGroupService.getRegisterList(teamGroupBean);
             ar.setListSucceed(teamGroupList);
         } catch (Exception e) {
             ar.setFailMsg(GlobalConst.DATA_FAIL);

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<TeamGroupBean> getRegisterList(TeamGroupBean teamGroupBean);
 }

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<TeamGroupBean> getTeamGroupPersons(TeamGroupBean teamGroupBean);
+
+    List<TeamGroupBean> getRegisterList(TeamGroupBean teamGroupBean);
 }

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<TeamGroupBean> getRegisterList(TeamGroupBean teamGroupBean) {
+        List<TeamGroupBean> registerList = teamGroupDao.getRegisterList(teamGroupBean);
+//        for (TeamGroupBean groupBean : registerList) {
+//
+//        }
+        return registerList;
+    }
+
     // 处理单行数据
     private Map<String, String> processRow(String teamId, Row row, Map<String, Boolean> existIdCards, Map<String, Boolean> existPhones) {
         Map<String, String> rowData = new HashMap<>();

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
     </select>
+    <select id="getRegisterList" resultType="com.bonus.gs.sub.evaluate.evaluate.beans.TeamGroupBean">
+        SELECT
+            poi.name teamGroupName,
+            poi.apply_man applyMan,
+            poi.create_time createTime
+        FROM
+            pm_org_info poi
+        WHERE
+            poi.audit_status IS NOT NULL
+          AND poi.LEVEL = 5
+    </select>
 </mapper>

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 });