diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/InitiateEvaluateBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/InitiateEvaluateBean.java index 4c5c8cf..ee04a18 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/InitiateEvaluateBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/InitiateEvaluateBean.java @@ -73,4 +73,5 @@ public class InitiateEvaluateBean { private List subList; private String subInfo; -} \ No newline at end of file + private Integer isActive; +} diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/InitiateEvaluateController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/InitiateEvaluateController.java index 8acc14d..dc89b87 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/InitiateEvaluateController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/InitiateEvaluateController.java @@ -163,6 +163,18 @@ public class InitiateEvaluateController { } return ar; } + @RequestMapping(value = "audit", method = RequestMethod.POST) + @ResponseBody + public AjaxRes audit(InitiateEvaluateBean o) { + AjaxRes ar = new AjaxRes(); + try { + ar = service.audit(o); + }catch(Exception e) { + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } + @RequestMapping(value = "getInitiateEvaluateDetails", method = RequestMethod.GET) @ResponseBody diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/InitiateEvaluateDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/InitiateEvaluateDao.java index b813cab..7273ed1 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/InitiateEvaluateDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/InitiateEvaluateDao.java @@ -109,4 +109,6 @@ public interface InitiateEvaluateDao { int insertPjTaskEvaluate(String id, String ids, String deptId, String isWait); List getBusinessDivisionUserIdByDeptId(String orgId); + + Integer audit(InitiateEvaluateBean o); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateService.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateService.java index b4ca986..277ea13 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateService.java @@ -23,6 +23,7 @@ public interface InitiateEvaluateService { * @return */ AjaxRes submitInitiateEvaluate(InitiateEvaluateBean o); + AjaxRes audit(InitiateEvaluateBean o); /** * 获取外包商发起评价详情 * @param bean diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java index 69f7233..51c98ff 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java @@ -171,6 +171,16 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService { return ar; } + @Override + public AjaxRes audit(InitiateEvaluateBean o) { + Integer res = dao.audit(o); + if (res > 0){ + return AjaxRes.success("审核成功"); + } else { + return AjaxRes.error("审核失败"); + } + } + @Override public AjaxRes getInitiateEvaluateDetails(InitiateEvaluateBean bean) { AjaxRes ar = new AjaxRes(); diff --git a/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml b/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml index 3703871..a43e6e3 100644 --- a/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml +++ b/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml @@ -4,7 +4,7 @@ insert into pj_evaluate_record (dept_id, evaluate_name, template_id, version, year_and_month, task_status, is_active,pro_id) - values (#{orgId}, #{templateTitle}, #{templateId}, #{version}, #{evaluateDate}, 0, 1, #{proIdStr}) + values (#{orgId}, #{templateTitle}, #{templateId}, #{version}, #{evaluateDate}, 0, 3, #{proIdStr}) insert into pj_evaluate_sub @@ -29,6 +29,11 @@ version = #{version} where evaluate_id = #{id} + + update pj_evaluate_record + set is_active = 1 + where evaluate_id = #{id} + update pj_evaluate_record set is_active = 0 @@ -58,6 +63,7 @@ pt.config_name as templateName, per.year_and_month as evaluateDate, per.create_time as createTime, + per.is_active as isActive, r.proNum as proNum, r.subNum as subNum, CASE @@ -79,7 +85,7 @@ left join pj_template_config pt on pt.config_id = per.template_id and pt.is_active = 1 left join pm_org_info poi on per.dept_id = poi.id and poi.status = 1 left join pm_org_info poi1 on poi1.id = r.pro_id - where per.is_active = 1 + where per.is_active in (1,3) @@ -168,8 +174,7 @@ on pt.config_id = per.template_id and pt.is_active = 1 left join pm_org_info poi on per.dept_id = poi.id and poi.status = 1 - where per.is_active = 1 - and per.evaluate_id = #{id} + where per.evaluate_id = #{id}