diff --git a/src/main/java/com/bonus/gs/sub/evaluate/GsSubEvaluateApplication.java b/src/main/java/com/bonus/gs/sub/evaluate/GsSubEvaluateApplication.java index 6e3797f..99a18b0 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/GsSubEvaluateApplication.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/GsSubEvaluateApplication.java @@ -15,5 +15,6 @@ public class GsSubEvaluateApplication { public static void main(String[] args) { SpringApplication.run(GsSubEvaluateApplication.class, args); + System.err.println("甘肃考试分包商评价系统启动成功"); } } 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 7e714b8..ebe1319 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 @@ -32,6 +32,7 @@ public class EvaluateDataBean { private String subName; private String isApprove; private String isTwoApprove; + private String isThreeApprove; private String name; private String evaluateType; private String leaderName; diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OrganizationalBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OrganizationalBean.java index cb4fd30..b2aee3d 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OrganizationalBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OrganizationalBean.java @@ -39,6 +39,8 @@ public class OrganizationalBean { private String keyWorld; + private String parentUserName; + private List children; /** * 是否是新增 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 a2f9e30..ad239a2 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 @@ -92,6 +92,25 @@ public class EvalSummaryController extends BaseController { } return ar; } + + /** + * 专员汇总列表 + * @param bean 查询条件 + * @return AjaxRes + */ + @RequestMapping(path = "dedicatedEvalSummaryList", method = RequestMethod.GET) + @ResponseBody + public AjaxRes dedicatedEvalSummaryList(EvalSummaryBean bean) { + AjaxRes ar = getAjaxRes(); + try { + List list = service.dedicatedEvalSummaryList(bean); + ar.setListSucceed(list); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } /** * 线下评价汇总列表 * @param bean 查询条件 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 ab4b5d3..137be93 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 @@ -331,6 +331,12 @@ public class OutsourcerEvaluateController extends BaseController stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7","专责"); + if(StringUtils.isBlank(o.getEvaluateId())){ + ar.setFailMsg("评价ID不能为空"); + return ar; + } + + if(stringList==null || stringList.size() == 0){ + ar.setFailMsg("请先配置专责审批人"); + return ar; + } + try { + o.setUserId(String.valueOf(UserUtil.getLoginUser().getId())); + if (StringUtils.isBlank(o.getRejectReason())) { + o.setRejectReason(""); + } else { + o.setIsApprove("2"); + //修改pj_evaluate_details状态 + outsourcerEvaluateDao.updatepjEvaluateDetailsStatus(o); + } + int code = outsourcerEvaluateDao.audit(o); + if (code > 0) { + ar.setSucceedMsg("审核成功"); + } else { + ar.setFailMsg("审核失败"); + } + //查询当前的审核状态 + int count = outsourcerEvaluateDao.getCurrentIsApprove(o); + if (count == 0) { + //修改pj_evaluate状态 + o.setIsApprove("1"); + outsourcerEvaluateDao.updatepjEvaluateDetailsStatus(o); + } + } catch (Exception e) { + ar.setFailMsg("审核失败"); + } + return ar; + } + + @RequestMapping("dedicatedAllAudit") + @ResponseBody + public synchronized AjaxRes dedicatedAllAudit(EvaluateDataBean o) { + AjaxRes ar = new AjaxRes(); + List stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7","专责"); + if(StringUtils.isBlank(o.getEvaluateId())){ + ar.setFailMsg("评价ID不能为空"); + return ar; + } + + if(stringList==null || stringList.size() == 0){ + ar.setFailMsg("请先配置专责审批人"); + return ar; + + } + + o.setUserId(String.valueOf(UserUtil.getLoginUser().getId())); + if (StringUtils.isBlank(o.getRejectReason())) { + o.setRejectReason(""); + } else { + o.setIsApprove("2"); + } + //修改pj_evaluate_details状态 + outsourcerEvaluateDao.updatePjEvaluateDetailsStatusByThreeParams(o); + + int code = outsourcerEvaluateDao.auditByThreeParams(o); + if (code > 0) { + ar.setSucceedMsg("审核成功"); + } else { + ar.setFailMsg("审核失败"); + } + //修改pj_evaluate状态 + outsourcerEvaluateDao.updatePjEvaluateDetailsStatusByThreeParams(o); + + int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o); + String evaluateType = o.getEvaluateType(); + System.err.println("startId:"+startId+" ,evaluateType="+evaluateType); + if(startId == 0 && ("1".equals(evaluateType) || "2".equals(evaluateType))){ + + int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(),"1"); + if(examineNum == 0){ + //新增二级审核 + ExamineBean childBean = new ExamineBean(); + childBean.setEvaluateId(o.getEvaluateId()); + //添加汇总审核人id + childBean.setUserList(String.valueOf(String.join(",",stringList))); + //添加汇总审核人姓名 + childBean.setPostId("7"); + childBean.setEvaluateType("0"); + childBean.setEvaluateNode("1"); + outsourcerEvaluateDao.addExaminePerson(childBean); + } + + } else if (startId == 0 && "3".equals(evaluateType)) { + //汇总审核结束 更新状态 + outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2",o.getEvaluateId()); + }else{ + //过程中 暂不做处理 + + } + + + return ar; + } + @RequestMapping("updateJsonData") @ResponseBody public AjaxRes updateJsonData(EvaluateDataBean o) { 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 f92f6af..e2a3c58 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 @@ -33,4 +33,6 @@ public interface EvalSummaryDao { List getOfflineSummaryList(EvalSummaryBean bean); int deleteOffEvaluateById(String id); + + List dedicatedEvalSummaryList(EvalSummaryBean bean); } 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 ad505fb..a485ab6 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 @@ -139,4 +139,6 @@ public interface OutsourcerEvaluateDao { List getEvaluateSubInfo(EvaluateDataBean o); int addMonthRank(@Param("bean") EvaluateDataBean bean,@Param("list") List list); + + int isCheckTwoIsAudit(EvaluateDataBean o); } 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 8e0b8a8..52819fa 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 @@ -33,4 +33,6 @@ public interface EvalSummaryService { List getOfflineSummaryList(EvalSummaryBean bean); int deleteOffEvaluateById(String id); + + List dedicatedEvalSummaryList(EvalSummaryBean bean); } 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 05b3b72..0273a0d 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 @@ -60,4 +60,9 @@ public class EvalSummaryServiceImpl implements EvalSummaryService { public int deleteOffEvaluateById(String id) { return dao.deleteOffEvaluateById(id); } + + @Override + public List dedicatedEvalSummaryList(EvalSummaryBean bean) { + return dao.dedicatedEvalSummaryList(bean); + } } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java index 12a42f4..5c67767 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java @@ -330,6 +330,9 @@ public class OrganizationalServiceImpl implements OrganizationalService { .collect(Collectors.toList()); if (!children.isEmpty()) { + for (OrganizationalBean vo:children){ + vo.setParentUserName(parent.getUserName()); + } parent.setChildren(children); for (OrganizationalBean child : children) { buildChildren(child, nodes); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateService.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateService.java index 04f3e3f..20a1427 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateService.java @@ -71,4 +71,6 @@ public interface OutsourcerEvaluateService { AjaxRes getSummaryCompareList(EvaluateSubBean o); AjaxRes isCheckOneIsAudit(EvaluateDataBean o); + + AjaxRes isCheckTwoIsAudit(EvaluateDataBean o); } 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 cd4bcde..1770f0a 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 @@ -864,6 +864,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService map.put("id", bean.getId()); map.put("isApprove", bean.getIsApprove()); map.put("isTwoApprove", bean.getIsTwoApprove()); + map.put("isThreeApprove", bean.getIsThreeApprove()); map.put("detailsId", bean.getParentId()); childList.add(map); } @@ -1244,4 +1245,16 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService } return ar; } + + @Override + public AjaxRes isCheckTwoIsAudit(EvaluateDataBean o) { + AjaxRes ar = new AjaxRes(); + int count = outsourcerEvaluateDao.isCheckTwoIsAudit(o); + if (count > 0) { + ar.setSucceed("1"); + } else { + ar.setFailMsg("0"); + } + return ar; + } } diff --git a/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml b/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml index 81217b3..14334f2 100644 --- a/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml +++ b/src/main/resources/mappers/evaluate/EvalSummaryMapper.xml @@ -39,7 +39,7 @@ left join pj_evaluate_details ped on ped.evaluate_id = per.evaluate_id left join ( select - count(if(check_two > 0,1,null)) as num, + count(if(check_three > 0,1,null)) as num, count(1) as total, evaluate_id from pj_evaluate_details @@ -47,9 +47,9 @@ ) m on m.evaluate_id = per.evaluate_id left join( SELECT - count(IF(check_two is null or check_two = 0 or check_two = '',1,null)) as num, - GROUP_CONCAT(DISTINCT IF(reject_two is null or reject_two = '',null,reject_two)) as rejectReason, - count(if(check_two = 2,1,null)) as failNum, + count(IF(check_three is null or check_three = 0 or check_three = '',1,null)) as num, + GROUP_CONCAT(DISTINCT IF(reject_three is null or reject_three = '',null,reject_three)) as rejectReason, + count(if(check_three = 2,1,null)) as failNum, evaluate_id from pj_evaluate_result GROUP BY evaluate_id @@ -94,4 +94,69 @@ + diff --git a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml index ec183ed..f21903a 100644 --- a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml +++ b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml @@ -41,6 +41,11 @@ check_one = #{type} where id = #{id} + + update pj_evaluate_result set check_three = #{type},reject_three = #{rejectReason},check_person_three = #{userId}, + check_one = #{type},check_two = #{type} + where id = #{id} + @@ -54,7 +59,11 @@ check_one = #{type} where evaluate_id = #{evaluateId} and sub_evaluate_id = #{templateId} and dept_id = #{deptId} - + + update pj_evaluate_result set check_three = #{type},reject_three = #{rejectReason},check_person_three = #{userId}, + check_two = #{type},check_one = #{type} + where evaluate_id = #{evaluateId} and sub_evaluate_id = #{templateId} and dept_id = #{deptId} + @@ -70,9 +79,12 @@ update pj_evaluate_details set check_one = #{isApprove} where details_id = #{detailsId} - + update pj_evaluate_details set check_two = #{isApprove},check_one = #{isApprove} where details_id = #{detailsId} + + update pj_evaluate_details set check_three = #{isApprove}, check_two = #{isApprove},check_one = #{isApprove} where details_id = #{detailsId} + @@ -83,6 +95,9 @@ update pj_evaluate_details set check_two = #{isApprove},check_one = #{isApprove} where evaluate_id = #{evaluateId} and post_id = #{deptId} and sub_evaluate_id = #{templateId} + + update pj_evaluate_details set check_three = #{isApprove},check_two = #{isApprove},check_one = #{isApprove} where evaluate_id = #{evaluateId} and post_id = #{deptId} and sub_evaluate_id = #{templateId} + @@ -537,7 +552,8 @@ su.username as userName, per.person_id as userId, ifnull(per.check_one,'0') as isApprove, - ifnull(per.check_two,'0') as isTwoApprove + ifnull(per.check_two,'0') as isTwoApprove, + ifnull(per.check_three,'0') as isThreeApprove from pj_evaluate_result per left join sys_user su on per.person_id = su.id where @@ -561,10 +577,12 @@ and check_one != '1' - and check_two != '1' + + and check_three != '1' + + update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId} diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js index 42dfc78..5fc5874 100644 --- a/src/main/resources/static/js/common.js +++ b/src/main/resources/static/js/common.js @@ -1,16 +1,15 @@ //form序列化为json -$.fn.serializeObject = function() -{ +$.fn.serializeObject = function () { var o = {}; var a = this.serializeArray(); - $.each(a, function() { + $.each(a, function () { if (o[this.name] !== undefined) { if (!o[this.name].push) { o[this.name] = [o[this.name]]; } - o[this.name].push(this.value || ''); + o[this.name].push(this.value || ""); } else { - o[this.name] = this.value || ''; + o[this.name] = this.value || ""; } }); return o; @@ -18,17 +17,24 @@ $.fn.serializeObject = function() //获取url后的参数值 function getUrlParam(key) { - var href = window.location.href; - var url = href.split("?"); - if(url.length <= 1){ - return ""; - } - var params = url[1].split("&"); - - for(var i=0; i { let html = ""; + if ([1, 2, 3, 4].includes(d.level)) { if(user.roleId == 6 || user.roleId == 5){ html += '新增'; } - if(user.roleId == 7 && d.level == 4 && d.userName == user.nickname){ + if(user.roleId == 7 && d.level == 4 &&(d.userName == user.nickname || d.parentUserName==user.nickname) ){ html += '新增'; } if(user.roleId == 7 && d.level == 3 && d.userName == user.nickname){ html += '新增'; } + + + + } if (d.level === 5) { if(user.roleId == 6 || user.roleId == 5){ diff --git a/src/main/resources/static/js/evaluate/summaryAudit/responsibleForApproval.js b/src/main/resources/static/js/evaluate/summaryAudit/responsibleForApproval.js index 44729ee..93ae365 100644 --- a/src/main/resources/static/js/evaluate/summaryAudit/responsibleForApproval.js +++ b/src/main/resources/static/js/evaluate/summaryAudit/responsibleForApproval.js @@ -1,3 +1,4 @@ +// 专责审批 js文件 let layer, laydate, table, form; $(function () { layui.use(["layer", "laydate", "table", "form"], function () { @@ -27,7 +28,7 @@ function search(type) { form.render("select"); } table.reload("baseTable", { - url: ctxPath + "/backstage/evaluate/evalSummaryList", + url: ctxPath + "/backstage/evaluate/dedicatedEvalSummaryList", page: { curr: 1, }, @@ -47,7 +48,7 @@ function initTable() { //渲染表格 table.render({ elem: "#baseTable", - url: ctxPath + "/backstage/evaluate/evalSummaryList", //数据接口 + url: ctxPath + "/backstage/evaluate/dedicatedEvalSummaryList", //数据接口 method: "get", //方式默认是get toolbar: "default", //开启工具栏，此处显示默认图标，可以自定义模板，详见文档 where: { diff --git a/src/main/resources/static/pages/evaluate/responsibleApproval/responsibleForApproval.html b/src/main/resources/static/pages/evaluate/responsibleApproval/responsibleForApproval.html index 18fe5a0..c7e2752 100644 --- a/src/main/resources/static/pages/evaluate/responsibleApproval/responsibleForApproval.html +++ b/src/main/resources/static/pages/evaluate/responsibleApproval/responsibleForApproval.html @@ -2,6 +2,7 @@ + 汇总审核 diff --git a/src/main/resources/static/pages/evaluate/responsibleApproval/reviewPage.html b/src/main/resources/static/pages/evaluate/responsibleApproval/reviewPage.html index 49b7ca8..b0beed0 100644 --- a/src/main/resources/static/pages/evaluate/responsibleApproval/reviewPage.html +++ b/src/main/resources/static/pages/evaluate/responsibleApproval/reviewPage.html @@ -8,6 +8,7 @@ +
diff --git a/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html b/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html index dc99d8c..98f60c8 100644 --- a/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html +++ b/src/main/resources/static/pages/evaluate/summaryAudit/proEvaluateAuditForm.html @@ -127,17 +127,17 @@ console.log("ddddd:", d) //如果d.isApprove == 1 去除当前行的编辑功能 let text = ""; - if (d.isTwoApprove == 1 && d.isApprove == 1) { + if (d.isTwoApprove == 1 && d.isApprove == 1 && d.isThreeApprove == 0) { text += '通过'; text += '驳回'; } else { - if (d.isTwoApprove == 1 && d.isApprove == 1) { + if (d.isTwoApprove == 1 && d.isApprove == 1 && d.isThreeApprove == 1) { text += '已通过'; - } else if (d.isTwoApprove == 2 && d.isApprove == 1) { + } else if (d.isThreeApprove == 2 && d.isTwoApprove == 1) { text += '已驳回'; } else { @@ -160,11 +160,11 @@ cellData.templet = function (d) { //如果d.isApprove == 1 去除当前行的编辑功能 let text = ""; - if (d.isTwoApprove == 1) { + if (d.isThreeApprove == 1) { text += '已通过'; } - if (d.isTwoApprove == 2) { + if (d.isThreeApprove == 2) { text += '已驳回'; } @@ -173,6 +173,8 @@ // text += // '驳回'; + + return text; } } diff --git a/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html b/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html index f0bf0b8..5c29b66 100644 --- a/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html +++ b/src/main/resources/static/pages/evaluate/summaryAudit/summaryAuditView.html @@ -1,152 +1,158 @@ + 汇总审核查看审批 - + + -
-
+
+
+
+
-
-
- - - - - - - - + + + + + + + + + + function bindToolbarEvents() { + table.on('toolbar(test)', function (obj) { + var id = obj.config.id; + switch (obj.event) { + case 'getCheckData': + //获取带按钮的名称 + const title = $(this).text(); + const layerIndex = layer.open({ + type: 2, + title: title, + shade: 0.3, + area: ['80%', '90%'], + scrollbar: true, + move: true, + anim: 2, + shadeClose: false, + content: './reviewPage.html', + }); + break; + case 'getData': + var getData = table.getData(id); + layer.alert(layui.util.escape(JSON.stringify(getData))); + break; + } + }); + } + + function openPage(id, name, type) { + let url = './otherEvaluateAuditForm.html?deptId=' + id + '&evaluateId=' + getUrlParam('evaluateId') + + '&templateId=' + getUrlParam('templateId') + '&type=' + type; + if (id == '0') { + url = './proEvaluateAuditForm.html?deptId=' + id + '&evaluateId=' + getUrlParam('evaluateId') + + '&templateId=' + getUrlParam('templateId') + '&type=' + type; + } + const layerIndex = layer.open({ + type: 2, + title: name + "评价审批", + shade: 0.3, + area: ['98%', '98%'], + scrollbar: true, + move: true, + anim: 2, + shadeClose: false, + content: url, + }); + } + - + + \ No newline at end of file