liux
/
gs_sub_evaluate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
liang.chao 2025-05-29 13:46:39 +08:00
parent 935b22c059
commit 8cf04475f9
5 changed files with 283 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/EvalSummaryController.java
View File

@ -8,6 +8,7 @@ import com.bonus.gs.sub.evaluate.manager.controller.BaseController;
import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; 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.GlobalConst;
import com.bonus.gs.sub.evaluate.manager.utils.UserUtil; import com.bonus.gs.sub.evaluate.manager.utils.UserUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -84,6 +85,9 @@ public class EvalSummaryController extends BaseController<EvaluateBean> {
public AjaxRes evalSummaryList(EvalSummaryBean bean) { public AjaxRes evalSummaryList(EvalSummaryBean bean) {
AjaxRes ar = getAjaxRes(); AjaxRes ar = getAjaxRes();
try { try {
if (StringUtils.isNotBlank(bean.getSearchDate())){
bean.setStartDate(bean.getSearchDate());
}
List<OutSourceBean> list = service.getEvalSummaryList(bean); List<OutSourceBean> list = service.getEvalSummaryList(bean);
ar.setListSucceed(list); ar.setListSucceed(list);
} catch (Exception e) { } catch (Exception e) {

243
src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java
View File

@ -24,6 +24,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.*; import java.util.*;
@Controller @Controller
@ -58,6 +62,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
AjaxRes ar = outsourcerEvaluateService.getCollectData(o); AjaxRes ar = outsourcerEvaluateService.getCollectData(o);
return ar; return ar;
} }
@RequestMapping(value = "/getTotalTitle", method = RequestMethod.GET) @RequestMapping(value = "/getTotalTitle", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public AjaxRes getTotalTitle(EvaluateSubBean o) { public AjaxRes getTotalTitle(EvaluateSubBean o) {
@ -65,6 +70,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
AjaxRes ar = outsourcerEvaluateService.getTotalTitle(o); AjaxRes ar = outsourcerEvaluateService.getTotalTitle(o);
return ar; return ar;
} }
@RequestMapping(value = "/getCollectTitle", method = RequestMethod.GET) @RequestMapping(value = "/getCollectTitle", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public AjaxRes getCollectTitle(EvaluateSubBean o) { public AjaxRes getCollectTitle(EvaluateSubBean o) {
@ -97,6 +103,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
/** /**
* 外包商评价 * 外包商评价
*
* @param o * @param o
* @return * @return
*/ */
@ -140,7 +147,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
String isBusinessDivision = outsourcerEvaluateDao.getIsBusinessDivision(o.getDeptId()); String isBusinessDivision = outsourcerEvaluateDao.getIsBusinessDivision(o.getDeptId());
if (!StringUtils.isBlank(isBusinessDivision) && "1".equals(isBusinessDivision)) { if (!StringUtils.isBlank(isBusinessDivision) && "1".equals(isBusinessDivision)) {
o.setIsBusinessDivision("1"); o.setIsBusinessDivision("1");
}else{ } else {
o.setIsBusinessDivision("0"); o.setIsBusinessDivision("0");
} }
List<OutSourceBean> list = outsourcerEvaluateService.getEvaluateAuditList(o); List<OutSourceBean> list = outsourcerEvaluateService.getEvaluateAuditList(o);
@ -152,6 +159,122 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
return ar; return ar;
} }
@RequestMapping("exportExcelData")
public void exportability(HttpServletRequest request, HttpServletResponse response, OutSourceBean o) {
String filename = "退场班组评价";
// 导出所有人员基本信息
try {
o.setDeptId(UserUtil.getLoginUser().getDeptId());
String isBusinessDivision = outsourcerEvaluateDao.getIsBusinessDivision(o.getDeptId());
if (!StringUtils.isBlank(isBusinessDivision) && "1".equals(isBusinessDivision)) {
o.setIsBusinessDivision("1");
} else {
o.setIsBusinessDivision("0");
}
List<OutSourceBean> list = outsourcerEvaluateService.getEvaluateAuditList(o);
excelOut(response, list, filename, "退场班组评价");
} catch (Exception e) {
e.printStackTrace();
}
}
private void excelOut(HttpServletResponse response, List<OutSourceBean> registlist, String filename, String sheetname)
throws Exception {
if (registlist != null) {
List<Map<String, Object>> results = new ArrayList<Map<String, Object>>();
int size = registlist.size();
for (int i = 0; i < size; i++) {
OutSourceBean bean = registlist.get(i);
Map<String, Object> maps = outVehicleOilBeanMap(i, bean, sheetname);
results.add(maps);
}
List<String> headers = outVehicleOilHeaders(sheetname);
HSSFWorkbook workbook = POIOutputHelperNumBer.excel(results, headers, filename);
OutputStream out = null;
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
response.addHeader("Content-Disposition",
"attachment;filename=" + URLEncoder.encode(filename, "UTF-8") + ".xls");
response.setHeader("Pragma", "No-cache");
out = response.getOutputStream();
workbook.write(out);
out.flush();
out.close();
}
}
private List<String> outVehicleOilHeaders(String sheetname) {
ArrayList<String> list = new ArrayList<String>();
list.add("序号");
switch (sheetname) {
case "退场班组评价":
list.add("评价事业部");
list.add("评价标题");
list.add("评价年月");
list.add("项目数量");
list.add("外包商数量");
list.add("评价状态");
list.add("审核状态");
list.add("驳回原因");
break;
default:
break;
}
return list;
}
private Map<String, Object> outVehicleOilBeanMap(int i, OutSourceBean bean, String sheetname) {
Map<String, Object> maps = new LinkedHashMap<String, Object>();
maps.put("id", i + 1);
switch (sheetname) {
case "退场班组评价":
maps.put("evaluateDept", bean.getEvaluateDept());
maps.put("evaluateTitle", bean.getEvaluateTitle());
maps.put("evaluateMonth", bean.getEvaluateMonth());
maps.put("projectNum", bean.getProjectNum());
maps.put("outsourcerNum", bean.getOutsourcerNum());
if (bean.getIsApprove() == null) {
bean.setIsApprove("0");
}
if (bean.getEvaluateNum() == null) {
bean.setEvaluateNum("0");
}
if (bean.getIsAuditTask() == null) {
bean.setIsAuditTask("0");
}
if (Integer.parseInt(bean.getEvaluateNum()) > 0 && StringUtils.isNotBlank(bean.getRejectReason())) {
maps.put("evaluateStatus", "评价驳回");
} else if (Integer.parseInt(bean.getEvaluateNum()) > 0 && Integer.parseInt(bean.getIsAuditTask()) > 0) {
maps.put("evaluateStatus", "已评价");
} else if (Integer.parseInt(bean.getEvaluateNum()) > 0 && Integer.parseInt(bean.getIsAuditTask()) == 0) {
maps.put("evaluateStatus", "评价中");
} else {
maps.put("evaluateStatus", "未评价");
}
if (bean.getRejectReason() != null && !bean.getRejectReason().trim().isEmpty()) {
maps.put("auditStatus", "已驳回");
} else {
if (Integer.parseInt(bean.getIsApprove()) > 0 && StringUtils.isNotBlank(bean.getRejectReason())) {
maps.put("auditStatus", "已驳回");
} else if (Integer.parseInt(bean.getIsApprove()) == 1) {
maps.put("auditStatus", "已通过");
} else if (Integer.parseInt(bean.getEvaluateNum()) > 0 && Integer.parseInt(bean.getIsApprove()) == 0) {
maps.put("auditStatus", "待审批");
} else {
maps.put("auditStatus", "待评价");
}
}
maps.put("rejectReason", bean.getRejectReason());
break;
default:
break;
}
return maps;
}
@RequestMapping(value = "/getAuditTitleData", method = RequestMethod.GET) @RequestMapping(value = "/getAuditTitleData", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public AjaxRes getAuditTitleData(EvaluateSubBean o) { public AjaxRes getAuditTitleData(EvaluateSubBean o) {
@ -166,13 +289,13 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
@ResponseBody @ResponseBody
public synchronized AjaxRes allAudit(EvaluateDataBean o) { public synchronized AjaxRes allAudit(EvaluateDataBean o) {
AjaxRes ar = new AjaxRes(); AjaxRes ar = new AjaxRes();
List<String> stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7","汇总审批人"); List<String> stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7", "汇总审批人");
if(StringUtils.isBlank(o.getEvaluateId())){ if (StringUtils.isBlank(o.getEvaluateId())) {
ar.setFailMsg("评价ID不能为空"); ar.setFailMsg("评价ID不能为空");
return ar; return ar;
} }
if(stringList==null || stringList.size() == 0){ if (stringList == null || stringList.size() == 0) {
ar.setFailMsg("请先配置汇总审批人"); ar.setFailMsg("请先配置汇总审批人");
return ar; return ar;
@ -203,19 +326,19 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
Collections.sort(deptIdList); Collections.sort(deptIdList);
Collections.sort(postIdList); Collections.sort(postIdList);
//对两次查询的结果判断是否完全相同 //对两次查询的结果判断是否完全相同
if (deptIdList.equals(postIdList)){ if (deptIdList.equals(postIdList)) {
int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o); int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
String evaluateType = o.getEvaluateType(); String evaluateType = o.getEvaluateType();
System.err.println("startId:"+startId+" ,evaluateType="+evaluateType); System.err.println("startId:" + startId + " ,evaluateType=" + evaluateType);
if(startId == 0 && "1".equals(evaluateType)){ if (startId == 0 && "1".equals(evaluateType)) {
int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(),"1"); int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(), "1");
if(examineNum == 0){ if (examineNum == 0) {
//新增二级审核 //新增二级审核
ExamineBean childBean = new ExamineBean(); ExamineBean childBean = new ExamineBean();
childBean.setEvaluateId(o.getEvaluateId()); childBean.setEvaluateId(o.getEvaluateId());
//添加汇总审核人id //添加汇总审核人id
childBean.setUserList(String.valueOf(String.join(",",stringList))); childBean.setUserList(String.valueOf(String.join(",", stringList)));
//添加汇总审核人姓名 //添加汇总审核人姓名
childBean.setPostId("7"); childBean.setPostId("7");
childBean.setEvaluateType("0"); childBean.setEvaluateType("0");
@ -225,25 +348,27 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
} else if (startId == 0 && "3".equals(evaluateType)) { } else if (startId == 0 && "3".equals(evaluateType)) {
//汇总审核结束 更新状态 //汇总审核结束 更新状态
outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2",o.getEvaluateId()); outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2", o.getEvaluateId());
//添加到月度排名表 //添加到月度排名表
addMonthRank(o); addMonthRank(o);
}else{ } else {
//过程中 暂不做处理 //过程中 暂不做处理
} }
} }
if("1".equals(o.getType())){ if ("1".equals(o.getType())) {
outsourcerEvaluateDao.updateEvalStatus("3",o.getEvaluateId()); outsourcerEvaluateDao.updateEvalStatus("3", o.getEvaluateId());
}else { } else {
outsourcerEvaluateDao.updateEvalStatus("4",o.getEvaluateId()); outsourcerEvaluateDao.updateEvalStatus("4", o.getEvaluateId());
} }
return ar; return ar;
} }
/** /**
* 添加到月度排名表 * 添加到月度排名表
*
* @param o * @param o
*/ */
private void addMonthRank(EvaluateDataBean o) { private void addMonthRank(EvaluateDataBean o) {
@ -258,8 +383,8 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
List<EvaluateDataBean> dataBeanList = outsourcerEvaluateDao.getEvaluateSubInfo(o); List<EvaluateDataBean> dataBeanList = outsourcerEvaluateDao.getEvaluateSubInfo(o);
o.setUserName(UserUtil.getLoginUser().getNickname()); o.setUserName(UserUtil.getLoginUser().getNickname());
dataBeanList.forEach(dataBean -> { dataBeanList.forEach(dataBean -> {
childDataList.forEach(item ->{ childDataList.forEach(item -> {
if ( dataBean.getSubId().equals(((JSONObject) item).getString("subId"))) { if (dataBean.getSubId().equals(((JSONObject) item).getString("subId"))) {
//取出item中的所有包含total的数据 //取出item中的所有包含total的数据
dataBean.setTotalScore(String.format("%.2f", ((JSONObject) item).getDouble("totalScore"))); dataBean.setTotalScore(String.format("%.2f", ((JSONObject) item).getDouble("totalScore")));
dataBean.setTitleName(dataBean.getEvaluateDate() + "对标得分"); dataBean.setTitleName(dataBean.getEvaluateDate() + "对标得分");
@ -268,20 +393,20 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
}); });
String deptId = outsourcerEvaluateDao.getOrgIddByEvaluateId(o.getEvaluateId()); String deptId = outsourcerEvaluateDao.getOrgIddByEvaluateId(o.getEvaluateId());
o.setDeptId(deptId); o.setDeptId(deptId);
outsourcerEvaluateDao.addMonthRank(o,dataBeanList); outsourcerEvaluateDao.addMonthRank(o, dataBeanList);
} }
@RequestMapping("audit") @RequestMapping("audit")
@ResponseBody @ResponseBody
public synchronized AjaxRes audit(EvaluateDataBean o) { public synchronized AjaxRes audit(EvaluateDataBean o) {
AjaxRes ar = new AjaxRes(); AjaxRes ar = new AjaxRes();
List<String> stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7","汇总审批人"); List<String> stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7", "汇总审批人");
if(StringUtils.isBlank(o.getEvaluateId())){ if (StringUtils.isBlank(o.getEvaluateId())) {
ar.setFailMsg("评价ID不能为空"); ar.setFailMsg("评价ID不能为空");
return ar; return ar;
} }
if(stringList==null || stringList.size() == 0){ if (stringList == null || stringList.size() == 0) {
ar.setFailMsg("请先配置汇总审批人"); ar.setFailMsg("请先配置汇总审批人");
return ar; return ar;
@ -317,19 +442,19 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
Collections.sort(deptIdList); Collections.sort(deptIdList);
Collections.sort(postIdList); Collections.sort(postIdList);
//对两次查询的结果判断是否完全相同 //对两次查询的结果判断是否完全相同
if (deptIdList.equals(postIdList)){ if (deptIdList.equals(postIdList)) {
int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o); int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
String evaluateType = o.getEvaluateType(); String evaluateType = o.getEvaluateType();
System.err.println("startId:"+startId+" ,evaluateType="+evaluateType); System.err.println("startId:" + startId + " ,evaluateType=" + evaluateType);
if(startId == 0 && "1".equals(evaluateType)){ if (startId == 0 && "1".equals(evaluateType)) {
int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(),"1"); int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(), "1");
if(examineNum == 0){ if (examineNum == 0) {
//新增二级审核 //新增二级审核
ExamineBean childBean = new ExamineBean(); ExamineBean childBean = new ExamineBean();
childBean.setEvaluateId(o.getEvaluateId()); childBean.setEvaluateId(o.getEvaluateId());
//添加汇总审核人id //添加汇总审核人id
childBean.setUserList(String.valueOf(String.join(",",stringList))); childBean.setUserList(String.valueOf(String.join(",", stringList)));
//添加汇总审核人姓名 //添加汇总审核人姓名
childBean.setPostId("7"); childBean.setPostId("7");
childBean.setEvaluateType("0"); childBean.setEvaluateType("0");
@ -339,19 +464,19 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
} else if (startId == 0 && "3".equals(evaluateType)) { } else if (startId == 0 && "3".equals(evaluateType)) {
//汇总审核结束 更新状态 //汇总审核结束 更新状态
outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2",o.getEvaluateId()); outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2", o.getEvaluateId());
//添加到月度排名表 //添加到月度排名表
addMonthRank(o); addMonthRank(o);
}else{ } else {
//过程中 暂不做处理 //过程中 暂不做处理
} }
} }
if("1".equals(o.getType())){ if ("1".equals(o.getType())) {
outsourcerEvaluateDao.updateEvalStatus("2",o.getEvaluateId()); outsourcerEvaluateDao.updateEvalStatus("2", o.getEvaluateId());
}else { } else {
outsourcerEvaluateDao.updateEvalStatus("4",o.getEvaluateId()); outsourcerEvaluateDao.updateEvalStatus("4", o.getEvaluateId());
} }
} catch (Exception e) { } catch (Exception e) {
ar.setFailMsg("审核失败"); ar.setFailMsg("审核失败");
@ -374,6 +499,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
/** /**
* 查看第一级是否审核 * 查看第一级是否审核
*
* @param o * @param o
* @return * @return
*/ */
@ -391,6 +517,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
/** /**
* 查看第二级是否审核 * 查看第二级是否审核
*
* @param o * @param o
* @return * @return
*/ */
@ -417,8 +544,10 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
} }
return ar; return ar;
} }
/** /**
* 专员审核 * 专员审核
*
* @param o * @param o
* @return * @return
*/ */
@ -426,13 +555,13 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
@ResponseBody @ResponseBody
public synchronized AjaxRes dedicatedAudit(EvaluateDataBean o) { public synchronized AjaxRes dedicatedAudit(EvaluateDataBean o) {
AjaxRes ar = new AjaxRes(); AjaxRes ar = new AjaxRes();
List<String> stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7","专责"); List<String> stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7", "专责");
if(StringUtils.isBlank(o.getEvaluateId())){ if (StringUtils.isBlank(o.getEvaluateId())) {
ar.setFailMsg("评价ID不能为空"); ar.setFailMsg("评价ID不能为空");
return ar; return ar;
} }
if(stringList==null || stringList.size() == 0){ if (stringList == null || stringList.size() == 0) {
ar.setFailMsg("请先配置专责审批人"); ar.setFailMsg("请先配置专责审批人");
return ar; return ar;
} }
@ -468,13 +597,13 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
@ResponseBody @ResponseBody
public synchronized AjaxRes dedicatedAllAudit(EvaluateDataBean o) { public synchronized AjaxRes dedicatedAllAudit(EvaluateDataBean o) {
AjaxRes ar = new AjaxRes(); AjaxRes ar = new AjaxRes();
List<String> stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7","专责"); List<String> stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7", "专责");
if(StringUtils.isBlank(o.getEvaluateId())){ if (StringUtils.isBlank(o.getEvaluateId())) {
ar.setFailMsg("评价ID不能为空"); ar.setFailMsg("评价ID不能为空");
return ar; return ar;
} }
if(stringList==null || stringList.size() == 0){ if (stringList == null || stringList.size() == 0) {
ar.setFailMsg("请先配置专责审批人"); ar.setFailMsg("请先配置专责审批人");
return ar; return ar;
@ -498,18 +627,18 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
//修改pj_evaluate状态 //修改pj_evaluate状态
outsourcerEvaluateDao.updatePjEvaluateDetailsStatusByThreeParams(o); outsourcerEvaluateDao.updatePjEvaluateDetailsStatusByThreeParams(o);
int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o); int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
String evaluateType = o.getEvaluateType(); String evaluateType = o.getEvaluateType();
System.err.println("startId:"+startId+" ,evaluateType="+evaluateType); System.err.println("startId:" + startId + " ,evaluateType=" + evaluateType);
if(startId == 0 && ("1".equals(evaluateType) || "2".equals(evaluateType))){ if (startId == 0 && ("1".equals(evaluateType) || "2".equals(evaluateType))) {
int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(),"1"); int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(), "1");
if(examineNum == 0){ if (examineNum == 0) {
//新增二级审核 //新增二级审核
ExamineBean childBean = new ExamineBean(); ExamineBean childBean = new ExamineBean();
childBean.setEvaluateId(o.getEvaluateId()); childBean.setEvaluateId(o.getEvaluateId());
//添加汇总审核人id //添加汇总审核人id
childBean.setUserList(String.valueOf(String.join(",",stringList))); childBean.setUserList(String.valueOf(String.join(",", stringList)));
//添加汇总审核人姓名 //添加汇总审核人姓名
childBean.setPostId("7"); childBean.setPostId("7");
childBean.setEvaluateType("0"); childBean.setEvaluateType("0");
@ -519,18 +648,18 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
} else if (startId == 0 && "3".equals(evaluateType)) { } else if (startId == 0 && "3".equals(evaluateType)) {
//汇总审核结束 更新状态 //汇总审核结束 更新状态
outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2",o.getEvaluateId()); outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2", o.getEvaluateId());
}else{ } else {
//过程中 暂不做处理 //过程中 暂不做处理
} }
if("1".equals(o.getType())){ if ("1".equals(o.getType())) {
outsourcerEvaluateDao.updateEvalStatus("2",o.getEvaluateId()); outsourcerEvaluateDao.updateEvalStatus("2", o.getEvaluateId());
}else { } else {
outsourcerEvaluateDao.updateEvalStatus("4",o.getEvaluateId()); outsourcerEvaluateDao.updateEvalStatus("4", o.getEvaluateId());
} }
return ar; return ar;
} }
@RequestMapping("updateJsonData") @RequestMapping("updateJsonData")

9
src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamEvaluateServiceImpl.java
View File

@ -111,6 +111,15 @@ public class TeamEvaluateServiceImpl implements TeamEvaluateService {
List<TeamEvaluateBean> list = null; List<TeamEvaluateBean> list = null;
try { try {
bean.setEvUserId(Integer.parseInt(String.valueOf(UserUtil.getLoginUser().getId()))); bean.setEvUserId(Integer.parseInt(String.valueOf(UserUtil.getLoginUser().getId())));
if ("5".equals(UserUtil.getLoginUser().getRoleId()) || Arrays.asList(UserUtil.getLoginUser().getRoleId().split(",")).contains("5")) {
bean.setRoleId("5");
} else if ("6".equals(UserUtil.getLoginUser().getRoleId()) || Arrays.asList(UserUtil.getLoginUser().getRoleId().split(",")).contains("6")) {
bean.setRoleId("6");
}else if ("1".equals(UserUtil.getLoginUser().getRoleId()) || Arrays.asList(UserUtil.getLoginUser().getRoleId().split(",")).contains("1")) {
bean.setRoleId("1");
}else{
bean.setRoleId("0");
}
list = dao.getTeamEvaluateList(bean); list = dao.getTeamEvaluateList(bean);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

8
src/main/resources/mappers/evaluate/EvalSummaryMapper.xml
View File

@ -58,8 +58,8 @@
<if test="evaluateDeptId != null and evaluateDeptId != ''"> <if test="evaluateDeptId != null and evaluateDeptId != ''">
and per.dept_id = #{evaluateDeptId} and per.dept_id = #{evaluateDeptId}
</if> </if>
<if test="searchDate != null and searchDate != ''"> <if test="startDate != null and startDate != ''">
and per.year_and_month = #{searchDate} and per.year_and_month = #{startDate}
</if> </if>
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and per.evaluate_name like concat('%', #{keyWord}, '%' ) and per.evaluate_name like concat('%', #{keyWord}, '%' )
@ -143,8 +143,8 @@
<if test="evaluateDeptId != null and evaluateDeptId != ''"> <if test="evaluateDeptId != null and evaluateDeptId != ''">
and per.dept_id = #{evaluateDeptId} and per.dept_id = #{evaluateDeptId}
</if> </if>
<if test="searchDate != null and searchDate != ''"> <if test="startDate != null and startDate != ''">
and per.year_and_month = #{searchDate} and per.year_and_month = #{startDate}
</if> </if>
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and per.evaluate_name like concat('%', #{keyWord}, '%' ) and per.evaluate_name like concat('%', #{keyWord}, '%' )

147
src/main/resources/static/pages/evaluate/outsourceAudit/outsourceAuditList.html
View File

@ -4,7 +4,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>外包商评价</title> <title>外包商评价</title>
<link rel="stylesheet" href="../../../layui/css/layui.css" /> <link rel="stylesheet" href="../../../layui/css/layui.css"/>
</head> </head>
<style> <style>
a { a {
@ -24,63 +24,64 @@
</style> </style>
<body> <body>
<div class="layui-container" style="width: 100%;height: 100%;padding: 10px"> <div class="layui-container" style="width: 100%;height: 100%;padding: 10px">
<form id="baseForm" class="layui-form" method="POST" onsubmit="return false;"> <form id="baseForm" class="layui-form" method="POST" onsubmit="return false;">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyWord" id="keyWord" placeholder="这里输入评价标题" class="layui-input" <input type="text" name="keyWord" id="keyWord" placeholder="这里输入评价标题" class="layui-input"
maxlength="30"> maxlength="30">
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<select id="evaluateDeptId" class="layui-select" name="evaluateDeptId"> <select id="evaluateDeptId" class="layui-select" name="evaluateDeptId">
</select> </select>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<select class="layui-select" id="evStatus" name="evStatus"> <select class="layui-select" id="evStatus" name="evStatus">
<option value="">请选择评价状态</option> <option value="">请选择评价状态</option>
<option value="1">待评价</option> <option value="1">待评价</option>
<option value="2">已评价</option> <option value="2">已评价</option>
<option value="3">评价驳回</option> <option value="3">评价驳回</option>
</select> </select>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<select class="layui-select" id="auditStatus" name="auditStatus"> <select class="layui-select" id="auditStatus" name="auditStatus">
<option value="">请选择审核状态</option> <option value="">请选择审核状态</option>
<option value="1">待评价</option> <option value="1">待评价</option>
<option value="2">待审批</option> <option value="2">待审批</option>
<option value="3">已通过</option> <option value="3">已通过</option>
<option value="4">已驳回</option> <option value="4">已驳回</option>
</select> </select>
</div> </div>
<div class="layui-inline" id="timeRange"> <div class="layui-inline" id="timeRange">
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" autocomplete="off" id="startDate" class="layui-input" placeholder="请选择评价年月"> <input type="text" autocomplete="off" id="startDate" class="layui-input"
</div> placeholder="请选择评价年月">
</div>
<input type="text" name="operType" id="operType" value="1" hidden>
<div class="layui-inline">
<button id='searchBtn' class="layui-btn layui-btn-warm" title="过滤" type="button"
onclick="search(1)">
搜索
</button>
<button class="layui-btn" title="重置" type="button" onclick="search(2)">重置</button>
<button class="layui-btn layui-bg-blue" title="导出" type="button" onclick="exportData()">
导出
</button>
</div> </div>
</div> </div>
</form> <input type="text" name="operType" id="operType" value="1" hidden>
<div id="tree-table-box"> <div class="layui-inline">
<table id="baseTable" class="layui-table" lay-filter="test"></table> <button id='searchBtn' class="layui-btn layui-btn-warm" title="过滤" type="button"
onclick="search(1)">
搜索
</button>
<button class="layui-btn" title="重置" type="button" onclick="search(2)">重置</button>
<button class="layui-btn layui-bg-blue" title="导出" type="button" onclick="exportData()">
导出
</button>
</div>
</div> </div>
</form>
<div id="tree-table-box">
<table id="baseTable" class="layui-table" lay-filter="test"></table>
</div> </div>
<script src="../../../js/publicJs.js"></script> </div>
<script type="text/javascript" src="../../../js/libs/jquery-2.1.1.min.js"></script> <script src="../../../js/publicJs.js"></script>
<script type="text/javascript" src="../../../js/jq.js"></script> <script type="text/javascript" src="../../../js/libs/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="../../../js/my/permission.js"></script> <script type="text/javascript" src="../../../js/jq.js"></script>
<script src="../../../layui/layui.js"></script> <script type="text/javascript" src="../../../js/my/permission.js"></script>
<script type="text/javascript" src="../../../js/common_methon.js"></script> <script src="../../../layui/layui.js"></script>
<script type="text/javascript" src="../../../js/select.js"></script> <script type="text/javascript" src="../../../js/common_methon.js"></script>
<script type="text/javascript" src="../../../js/select.js"></script>
</body> </body>
</html> </html>
@ -121,12 +122,24 @@
keyWord: $("#keyWord").val(), keyWord: $("#keyWord").val(),
evaluateDeptId: $("#evaluateDeptId").val(), evaluateDeptId: $("#evaluateDeptId").val(),
evStatus: $("#evStatus").val(), evStatus: $("#evStatus").val(),
auditStatus: $("#auditStatus").val(),
startDate: $("#startDate").val(), startDate: $("#startDate").val(),
endDate: $("#endDate").val(), endDate: $("#endDate").val(),
} }
}); });
} }
function exportData() {
let keyWord = $("#keyWord").val();
let evaluateDeptId = $("#evaluateDeptId").val();
let evStatus = $("#evStatus").val();
let auditStatus = $("#auditStatus").val();
let token = localStorage.getItem("token")
let startDate = $("#startDate").val();
let params = "?keyWord=" + keyWord + "&evStatus=" + evStatus + "&auditStatus=" + auditStatus + "&evaluateDeptId=" + evaluateDeptId + "&startDate=" + startDate + '&token=' + token;
$(location).attr("href", ctxPath + '/outsourcer/exportExcelData' + params);
}
function initTable() { function initTable() {
let loginUser = localStorage.getItem("loginUser"); let loginUser = localStorage.getItem("loginUser");
let user = JSON.parse(loginUser); let user = JSON.parse(loginUser);
@ -136,18 +149,17 @@
, url: ctxPath + '/outsourcer/getEvaluateAuditList' //数据接口 , url: ctxPath + '/outsourcer/getEvaluateAuditList' //数据接口
, method: 'get' //方式默认是get , method: 'get' //方式默认是get
, toolbar: 'default' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档 , toolbar: 'default' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
, where: { , where: {} //post请求必须加where ，post请求需要的参数
} //post请求必须加where ，post请求需要的参数
, cellMinWidth: 80 , cellMinWidth: 80
, cols: [[ //表头 , cols: [[ //表头
{ {
field: 'number', width: 80, title: '序号', align: 'center', type: 'numbers' field: 'number', width: 80, title: '序号', align: 'center', type: 'numbers'
} }
, { field: 'evaluateDept', align: 'center', title: '评价事业部' } , {field: 'evaluateDept', align: 'center', title: '评价事业部'}
, { field: 'evaluateTitle', align: 'center', title: '评价标题' } , {field: 'evaluateTitle', align: 'center', title: '评价标题'}
, { field: 'evaluateMonth', align: 'center', title: '评价年月' } , {field: 'evaluateMonth', align: 'center', title: '评价年月'}
, { field: 'projectNum', align: 'center', title: '项目数量' } , {field: 'projectNum', align: 'center', title: '项目数量'}
, { field: 'outsourcerNum', align: 'center', title: '外包商数量' } , {field: 'outsourcerNum', align: 'center', title: '外包商数量'}
, { , {
field: 'evaluateStatus', align: 'center', title: '评价状态', templet: d => { field: 'evaluateStatus', align: 'center', title: '评价状态', templet: d => {
if (Number(d.evaluateNum) > 0 && d.rejectReason) { if (Number(d.evaluateNum) > 0 && d.rejectReason) {
@ -163,15 +175,15 @@
// Number(d.evaluateNum) > 0 && d.rejectReason ? '评价驳回' : (Number(d.evaluateNum) > 0 ? '已评价' : '未评价') // Number(d.evaluateNum) > 0 && d.rejectReason ? '评价驳回' : (Number(d.evaluateNum) > 0 ? '已评价' : '未评价')
} }
, { , {
field: 'auditStatus', align: 'center', title: '审核状态', templet:function(d){ field: 'auditStatus', align: 'center', title: '审核状态', templet: function (d) {
if(d.rejectReason){ if (d.rejectReason) {
return '已驳回' return '已驳回'
}else{ } else {
return Number(d.isApprove) > 0 && d.rejectReason ? '已驳回' : (Number(d.isApprove) === 1 ? '已通过' : (Number(d.evaluateNum) > 0 && d.isApprove == 0 ? '待审批' : '待评价')) return Number(d.isApprove) > 0 && d.rejectReason ? '已驳回' : (Number(d.isApprove) === 1 ? '已通过' : (Number(d.evaluateNum) > 0 && d.isApprove == 0 ? '待审批' : '待评价'))
} }
} }
} }
, { field: 'rejectReason', align: 'center', title: '驳回原因' } , {field: 'rejectReason', align: 'center', title: '驳回原因'}
, { , {
fixed: 'right', width: 180, title: '操作', align: 'center', templet: d => { fixed: 'right', width: 180, title: '操作', align: 'center', templet: d => {
let text = ""; let text = "";
@ -251,7 +263,8 @@
content: url, content: url,
maxmin: false, maxmin: false,
area: ['90%', '95%'], area: ['90%', '95%'],
success: function (layero, index) { }, success: function (layero, index) {
},
end: function () { end: function () {
table.reload('baseTable', { table.reload('baseTable', {
url: ctxPath + '/outsourcer/getEvaluateAuditList', url: ctxPath + '/outsourcer/getEvaluateAuditList',