From 25f09f395bf7de11f7786c06c70a92417f75070e Mon Sep 17 00:00:00 2001 From: zhangtq <2452618307@qq.com> Date: Tue, 21 Jan 2025 19:15:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluate/beans/EvaluateDataBean.java | 7 +++ .../evaluate/beans/OutSourceBean.java | 5 +++ .../controller/EvalSummaryController.java | 40 ++++++++++++++++- .../OutsourcerEvaluateController.java | 33 ++++++++++++++ .../evaluate/evaluate/dao/EvalSummaryDao.java | 4 ++ .../evaluate/dao/OutsourcerEvaluateDao.java | 5 +++ .../evaluate/service/EvalSummaryService.java | 6 ++- .../service/EvalSummaryServiceImpl.java | 14 +++++- .../OutsourcerEvaluateServiceImpl.java | 21 +++++++++ src/main/resources/application.properties | 6 +-- .../mappers/evaluate/EvalSummaryMapper.xml | 23 ++++++++++ .../evaluate/OutsourcerEvaluateMapper.xml | 31 +++++++++++++ .../js/evaluate/evalSummary/evalSummary.js | 44 +++++++++++++++---- .../static/js/evaluate/org/orgList.js | 1 - src/main/resources/static/js/filePreview.js | 2 +- .../evaluate/evalSummary/addEvalSummary.html | 13 ++++++ .../resources/static/pages/role/addRole.html | 9 +++- .../resources/static/pages/user/userList.html | 12 ++--- 18 files changed, 251 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvaluateDataBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvaluateDataBean.java index 7651979..7e714b8 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvaluateDataBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvaluateDataBean.java @@ -34,4 +34,11 @@ public class EvaluateDataBean { private String isTwoApprove; private String name; private String evaluateType; + private String leaderName; + private String totalScore; + private String evaluateMonth; + private String evaluateDate; + private String year; + private String month; + private String titleName; } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OutSourceBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OutSourceBean.java index dc88c30..9c6d3e9 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OutSourceBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OutSourceBean.java @@ -72,4 +72,9 @@ public class OutSourceBean { private String isReject; private String isBusinessDivision; private String status; + + private String filePath; + private String fileName; + private String type; + private String createTime; } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/EvalSummaryController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/EvalSummaryController.java index 8a104f7..a2f9e30 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/EvalSummaryController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/EvalSummaryController.java @@ -41,6 +41,7 @@ public class EvalSummaryController extends BaseController { @ResponseBody public AjaxRes addEvalSummary(@RequestParam("evaluateTitle") String evaluateTitle, @RequestParam("date") String date, + @RequestParam("evaluateDept") String evaluateDept, @RequestParam("file") MultipartFile file) { AjaxRes ar = getAjaxRes(); if (file != null && !file.isEmpty()) { @@ -64,7 +65,7 @@ public class EvalSummaryController extends BaseController { // 返回文件路径 String pathname = targetFile.getAbsolutePath(); ar.setSucceedMsg("文件上传成功"); - int result = service.addEvalSummary(pathname, date, evaluateTitle); + int result = service.addEvalSummary(pathname, date, evaluateTitle,evaluateDept); ar.setSucceed(result); } catch (Exception e) { logger.error(e.toString(), e); @@ -91,6 +92,43 @@ public class EvalSummaryController extends BaseController { } return ar; } + /** + * 线下评价汇总列表 + * @param bean 查询条件 + * @return AjaxRes + */ + @RequestMapping(path = "offlineSummaryList", method = RequestMethod.GET) + @ResponseBody + public AjaxRes offlineSummaryList(EvalSummaryBean bean) { + AjaxRes ar = getAjaxRes(); + try { + List list = service.getOfflineSummaryList(bean); + ar.setListSucceed(list); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } + @RequestMapping("deleteOffEvaluateById") + @ResponseBody + public AjaxRes deleteOffEvaluateById(String id) { + AjaxRes ar = new AjaxRes(); + try { + int result = service.deleteOffEvaluateById(id); + if(result > 0) { + ar.setRes(GlobalConst.SUCCEED); + ar.setResMsg("删除成功"); + }else { + ar.setFailMsg(GlobalConst.DATA_FAIL); + ar.setResMsg("删除失败,请联系系统管理员"); + } + + }catch(Exception e) { + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java index 937f539..2dd06b0 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java @@ -1,5 +1,7 @@ package com.bonus.gs.sub.evaluate.evaluate.controller; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.bonus.gs.sub.evaluate.evaluate.beans.*; import com.bonus.gs.sub.evaluate.evaluate.dao.OutsourcerEvaluateDao; import com.bonus.gs.sub.evaluate.evaluate.service.OutsourcerEvaluateService; @@ -9,6 +11,7 @@ import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; import com.bonus.gs.sub.evaluate.manager.utils.GlobalConst; import com.bonus.gs.sub.evaluate.manager.utils.UserUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -199,6 +203,35 @@ public class OutsourcerEvaluateController extends BaseController dataBeanList = outsourcerEvaluateDao.getEvaluateSubInfo(o); + o.setUserName(UserUtil.getLoginUser().getNickname()); + System.out.println("childDataList==" + childDataList); + System.out.println("o==" + o); + System.out.println("dataBeanList==" + dataBeanList); + JSONArray finalChildDataList = childDataList; + dataBeanList.forEach(dataBean -> { + finalChildDataList.forEach(item ->{ + if ( dataBean.getSubId().equals(((JSONObject) item).getString("subId"))) { + //取出item中的所有包含total的数据 + dataBean.setTotalScore(String.format("%.2f", ((JSONObject) item).getDouble("totalScore"))); + dataBean.setTitleName(dataBean.getEvaluateDate() + "对标得分"); + } + }); + }); + String deptId = outsourcerEvaluateDao.getOrgIddByEvaluateId(o.getEvaluateId()); + o.setDeptId(deptId); + int code1 = outsourcerEvaluateDao.addMonthRank(o,dataBeanList); + System.out.println("dataBean==" + dataBeanList); + System.out.println("o==" + o); }else{ //过程中 暂不做处理 diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/EvalSummaryDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/EvalSummaryDao.java index fe56f0c..f92f6af 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/EvalSummaryDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/EvalSummaryDao.java @@ -29,4 +29,8 @@ public interface EvalSummaryDao { * @return AjaxRes */ List getEvalSummaryList(EvalSummaryBean bean); + + List getOfflineSummaryList(EvalSummaryBean bean); + + int deleteOffEvaluateById(String id); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java index 0195cc1..ad505fb 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java @@ -1,6 +1,7 @@ package com.bonus.gs.sub.evaluate.evaluate.dao; +import com.alibaba.fastjson.JSONArray; import com.bonus.gs.sub.evaluate.evaluate.beans.*; import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; import org.apache.ibatis.annotations.Mapper; @@ -134,4 +135,8 @@ public interface OutsourcerEvaluateDao { int getIsRejectionByDeptId(@Param("bean") EvaluateDataBean o,@Param("dataBean") EvaluateDataBean dataBean); int isCheckOneIsAudit(EvaluateDataBean o); + + List getEvaluateSubInfo(EvaluateDataBean o); + + int addMonthRank(@Param("bean") EvaluateDataBean bean,@Param("list") List list); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/EvalSummaryService.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/EvalSummaryService.java index 4f311aa..8e0b8a8 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/EvalSummaryService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/EvalSummaryService.java @@ -21,7 +21,7 @@ public interface EvalSummaryService { * @param pathname 文件路径 * @return AjaxRes */ - int addEvalSummary(String pathname, String date, String evaluateTitle); + int addEvalSummary(String pathname, String date, String evaluateTitle, String evaluateDept); /** * 线下评价汇总列表 @@ -29,4 +29,8 @@ public interface EvalSummaryService { * @return AjaxRes */ List getEvalSummaryList(EvalSummaryBean bean); + + List getOfflineSummaryList(EvalSummaryBean bean); + + int deleteOffEvaluateById(String id); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/EvalSummaryServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/EvalSummaryServiceImpl.java index 0515ee5..05b3b72 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/EvalSummaryServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/EvalSummaryServiceImpl.java @@ -31,11 +31,11 @@ public class EvalSummaryServiceImpl implements EvalSummaryService { * @return AjaxRes */ @Override - public int addEvalSummary(String pathname, String date, String evaluateTitle) { + public int addEvalSummary(String pathname, String date, String evaluateTitle, String evaluateDept) { EvalSummaryBean bean = new EvalSummaryBean(); bean.setEvaluateMonth(date); bean.setEvaluateTitle(evaluateTitle); - bean.setEvaluateDept(UserUtil.getLoginUser().getDeptId()); + bean.setEvaluateDept(evaluateDept); bean.setPathName(pathname); return dao.addEvalSummary(bean); } @@ -50,4 +50,14 @@ public class EvalSummaryServiceImpl implements EvalSummaryService { public List getEvalSummaryList(EvalSummaryBean bean) { return dao.getEvalSummaryList(bean); } + + @Override + public List getOfflineSummaryList(EvalSummaryBean bean) { + return dao.getOfflineSummaryList(bean); + } + + @Override + public int deleteOffEvaluateById(String id) { + return dao.deleteOffEvaluateById(id); + } } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java index 3f6e645..247fb2f 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java @@ -6,6 +6,7 @@ import com.bonus.gs.sub.evaluate.evaluate.beans.*; import com.bonus.gs.sub.evaluate.evaluate.dao.OutsourcerEvaluateDao; import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; import com.bonus.gs.sub.evaluate.manager.utils.UserUtil; +import lombok.val; import org.apache.commons.lang3.StringUtils; import org.aspectj.weaver.loadtime.Aj; import org.springframework.beans.BeanUtils; @@ -494,7 +495,9 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService for (Map map : list){ Map childMap = new LinkedHashMap<>(); childMap.put("subName", map.get("subName")); + childMap.put("subId", map.get("subId")); childMap.put("proName", map.get("proName")); + childMap.put("proId", map.get("proId")); Float score = 0.0F; for (String title : sortList) { childMap.put(title, map.get(title)); @@ -546,6 +549,8 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService for (Map map : list){ Map childMap = new LinkedHashMap<>(); childMap.put("subName", map.get("subName")); + childMap.put("subId", map.get("subId")); + childMap.put("proId", map.get("proId")); Float score = 0.0F; for (String title : sortList) { childMap.put(title, map.get(title)); @@ -565,6 +570,18 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService for (String subName : subNameSet) { Map childMap = new LinkedHashMap<>(); childMap.put("subName", subName); + //从childDataList中获取subId 和 proId 根据subName + String subId = ""; + String proId = ""; + for (Map map : childDataList) { + if (subName.equals(map.get("subName").toString())) { + subId = map.get("subId").toString(); + proId = map.get("proId").toString(); + } + } + + childMap.put("subId",subId); + childMap.put("proId", proId); Float score = 0.0F; for (String title : sortList) { //从oneList中获取title的countType 和 standardScore @@ -705,6 +722,10 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService childMap.put("subName", dataBean.getSubName()); //添加工程名称 childMap.put("proName", dataBean.getProName()); + //添加分包商 + childMap.put("subId", dataBean.getSubId()); + //添加工程名称 + childMap.put("proId", dataBean.getProId()); //对部门下的数据进行循环赋值 for (String title : titleSet) { System.out.println(title); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8572690..a9dedc6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,11 +1,11 @@ -server.port=18081 +server.port=1803 server.servlet.context-path=/GsSubEvaluate #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/gs_sub_evaluate?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 #spring.datasource.username=root #spring.datasource.password=bonus@admin123!% -spring.datasource.url=jdbc:mysql://192.168.0.14:1115/gs_sub_evaluate?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false +spring.datasource.url=jdbc:mysql://192.168.0.14:4419/gs_sub_evaluate?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false spring.datasource.username=root -spring.datasource.password=xbzadmin@szedu14! +spring.datasource.password=Bonus@admin123! spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.max-idle=10 spring.datasource.max-wait=60000 diff --git a/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml b/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml index b3e43bf..218ec48 100644 --- a/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml +++ b/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml @@ -6,6 +6,9 @@ insert into pj_offline(type, file_path, evaluate_title, year_and_month, upload_time, update_time) values (#{evaluateDept}, #{pathName}, #{evaluateTitle}, #{evaluateMonth}, now(),now()) + + update pj_offline set is_active = 0 where offline_id = #{id} + + diff --git a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml index 8c3c5c0..9a60a25 100644 --- a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml +++ b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml @@ -626,6 +626,15 @@ insert into pj_task_examine(evaluat_task_id,evaluate_id,post_id,user_list,evaluate_type,evaluate_node) values (#{evaluatTaskId},#{evaluateId},#{postId},#{userList},#{evaluateType},#{evaluateNode}) + + insert into + pj_summary_compare(business_id,evaluate_id,sub_id,sub_name,leader_name,evaluate_date,year,month,title_name,score,user_id,user_name) values + + (#{bean.deptId}, #{bean.evaluateId}, #{item.subId}, #{item.subName}, #{item.leaderName}, + #{item.evaluateDate}, #{item.year}, #{item.month}, + #{item.titleName}, #{item.totalScore}, #{bean.userId}, #{bean.userName}) + + + update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId} diff --git a/src/main/resources/static/js/evaluate/evalSummary/evalSummary.js b/src/main/resources/static/js/evaluate/evalSummary/evalSummary.js index 1853622..81c54eb 100644 --- a/src/main/resources/static/js/evaluate/evalSummary/evalSummary.js +++ b/src/main/resources/static/js/evaluate/evalSummary/evalSummary.js @@ -19,7 +19,7 @@ function search(type) { form.render('select'); } table.reload('baseTable', { - url: ctxPath + '/backstage/evaluate/evalSummaryList', + url: ctxPath + '/backstage/evaluate/offlineSummaryList', page: { curr: 1 }, @@ -34,7 +34,7 @@ function initTable() { //渲染表格 table.render({ elem: '#baseTable' - , url: ctxPath + '/backstage/evaluate/evalSummaryList' //数据接口 + , url: ctxPath + '/backstage/evaluate/offlineSummaryList' //数据接口 , method: 'get' //方式默认是get , toolbar: 'default' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档 , where: {} //post请求必须加where ，post请求需要的参数 @@ -50,9 +50,12 @@ function initTable() { fixed: 'right', width: 180, title: '操作', align: 'center', templet: d => { let text = ""; text += '查看'; + ' id="evaluation">查看'; text += '下载'; + text += '删除'; return text; } }, @@ -94,16 +97,39 @@ function initTable() { case 'viewReviews': downloadFile(data); break; + case 'del': + del(data); + break; default: console.warn(`未知事件: ${layEvent}`); } }); + function del(data) { + layer.confirm('确认删除吗？', function (index) { + $.ajax({ + type: "POST", + url: ctxPath + '/backstage/evaluate/deleteOffEvaluateById', + data: {id: data.id}, + success: function (data) { + layer.close(index); + if (data.res === 1) { + layer.msg(data.resMsg, {icon: 1, time: 2000}); + search(1); + } else { + layer.msg(data.resMsg, {icon: 2, time: 2000}); + } + } + }); + }); + } + //查看子页面 function ViewReviews(data) { try { - // let fileUrl = data.pathName; - const fileUrl = '/2024/12/26/外包商对标打分统计表9月_20241226104522A025.xlsx'; + let fileUrl = data.filePath; + console.log('fileUrl:', data); + // const fileUrl = '/2024/12/26/外包商对标打分统计表9月_20241226104522A025.xlsx'; // 避免将敏感信息存储在 localStorage 中 sessionStorage.setItem("fileUrl", fileUrl); @@ -123,8 +149,8 @@ function initTable() { } function downloadFile(data) { - // let fileUrl = data.pathName; - let fileUrl = '/2024/12/26/外包商对标打分统计表9月_20241226104522A025.xlsx'; + let fileUrl = data.pathName; + // let fileUrl = '/2024/12/26/外包商对标打分统计表9月_20241226104522A025.xlsx'; //解析fileUrl获取文件名 let fileName = fileUrl.substring(fileUrl.lastIndexOf("/") + 1); let truePath; @@ -142,11 +168,11 @@ function initTable() { function add() { layer.open({ type: 2, - title: "新增企业", + title: "新增", content: './addEvalSummary.html?id=0', btn: ["确定"], maxmin: false, - area: ['30%', '50%'], + area: ['40%', '60%'], success: function (layero, index) { }, yes: function (index, layero) { diff --git a/src/main/resources/static/js/evaluate/org/orgList.js b/src/main/resources/static/js/evaluate/org/orgList.js index 046154d..c4f9bd6 100644 --- a/src/main/resources/static/js/evaluate/org/orgList.js +++ b/src/main/resources/static/js/evaluate/org/orgList.js @@ -170,7 +170,6 @@ let titleArr = ['新增项目', '新增外包商', "新增班组", '更换班长 function addForm(type, obj) { let area = ['50%', '70%']; if (type === 0) { - obj = {type: type}; area = ['70%', '80%']; } else if (type === 1) { area = ['50%', '50%']; diff --git a/src/main/resources/static/js/filePreview.js b/src/main/resources/static/js/filePreview.js index a398eff..15a2891 100644 --- a/src/main/resources/static/js/filePreview.js +++ b/src/main/resources/static/js/filePreview.js @@ -89,7 +89,7 @@ var Base64 = { } } -var filePreviewPath = "http://192.168.0.14:21626/file/statics"; +var filePreviewPath = "http://36.33.26.201:21624/GsSubEvaluate/statics"; var filePreviewPathAll = "http://192.168.0.14:8012/onlinePreview?url="; diff --git a/src/main/resources/static/pages/evaluate/evalSummary/addEvalSummary.html b/src/main/resources/static/pages/evaluate/evalSummary/addEvalSummary.html index 56b47ce..c9d81e7 100644 --- a/src/main/resources/static/pages/evaluate/evalSummary/addEvalSummary.html +++ b/src/main/resources/static/pages/evaluate/evalSummary/addEvalSummary.html @@ -9,6 +9,15 @@
+
+
+ +
+ +
+
+
@@ -52,6 +61,7 @@ + @@ -67,6 +77,8 @@ laydate.render({ elem: '#date', }); + // 获取事业部下拉框数据 + businessDivisionPullDown(form, null); // 让点击上传按钮触发文件输入框的点击事件 $('#uploadBtn').on('click', function() { $('#fileInput').click(); @@ -106,6 +118,7 @@ return false; } const formData = data.field; // 获取表单数据 + formData.evaluateDept = formData.evaluateDeptId; const formDataWithFile = new FormData(); for (const key in formData) { formDataWithFile.append(key, formData[key]); diff --git a/src/main/resources/static/pages/role/addRole.html b/src/main/resources/static/pages/role/addRole.html index b2c7417..accaf7f 100644 --- a/src/main/resources/static/pages/role/addRole.html +++ b/src/main/resources/static/pages/role/addRole.html @@ -13,7 +13,7 @@
- +