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 635a852..19d504a 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 @@ -69,4 +69,5 @@ public class OrganizationalBean { private String orgType; private Integer pParentId; + private Integer isCompletion; } 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 46246a7..678b500 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 @@ -84,4 +84,7 @@ public class OutSourceBean { private String isAuditTask; private String checkOne; + private Integer allCheckOne; + private Integer allCheckTwo; + private Integer allCheckThree; } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java index 4680c30..c7d6978 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/ProjectBean.java @@ -23,5 +23,7 @@ public class ProjectBean { private Integer personInChargeId; // 所属事业部Id private Integer departmentId; + // 项目是否完工 0 否 1是 + private Integer isCompletion; private String keyWord; } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/ProjectController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/ProjectController.java index 97fea8f..0e1b8c8 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/ProjectController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/ProjectController.java @@ -41,6 +41,21 @@ public class ProjectController { return ar; } + /** + * 项目完工 + */ + @PostMapping("projectCompletion") + public AjaxRes projectCompletion(@RequestBody ProjectBean projectBean) { + AjaxRes ar = new AjaxRes(); + Integer i = service.updateprojectCompletion(projectBean); + if (i > 0) { + ar.setSucceedMsg("成功"); + } else { + ar.setFailMsg("失败"); + } + return ar; + } + @PostMapping("updateName") public AjaxRes updateName(@RequestBody ProjectBean projectBean) { AjaxRes ar = new AjaxRes(); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java index 8b9f471..ce921c4 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java @@ -1,7 +1,5 @@ package com.bonus.gs.sub.evaluate.evaluate.controller; -import com.bonus.gs.sub.evaluate.evaluate.beans.OrganizationalBean; -import com.bonus.gs.sub.evaluate.evaluate.beans.ProjectBean; import com.bonus.gs.sub.evaluate.evaluate.beans.TeamGroupBean; import com.bonus.gs.sub.evaluate.evaluate.service.TeamGroupService; import com.bonus.gs.sub.evaluate.manager.controller.BaseController; @@ -9,26 +7,14 @@ import com.bonus.gs.sub.evaluate.manager.utils.AesCbcUtils; 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 com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ImportUserDataVo; -import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ViolationBean; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.poifs.filesystem.POIFSFileSystem; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @Author：liang.chao @@ -79,8 +65,9 @@ public class TeamGroupController extends BaseController { } return ar; } + /** - * 各事业部审核人、专责、汇总审批 + * 各事业部审核人、专责、汇总审批列表 * * @param teamGroupBean * @return @@ -97,6 +84,24 @@ public class TeamGroupController extends BaseController { return ar; } + /** + * 各事业部审核人、专责、汇总审批 + * 0草稿 1事业部负责人审核中 2专责审核中 3汇总审核中 4已通过 5已驳回 + * @param teamGroupBean + * @return + */ + @PostMapping("auditRegister") + public AjaxRes auditRegister(@RequestBody TeamGroupBean teamGroupBean) { + AjaxRes ar = new AjaxRes(); + Integer i = teamGroupService.auditRegister(teamGroupBean); + if (i > 0) { + ar.setSucceedMsg("审核成功"); + } else { + ar.setFailMsg("审核失败"); + } + return ar; + } + @PostMapping("delTeamGroup") public AjaxRes delTeamGroup(@RequestBody TeamGroupBean teamGroupBean) { AjaxRes ar = new AjaxRes(); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java index 66e1047..26c043c 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java @@ -35,4 +35,6 @@ public interface ProjectDao { Integer getTeamGroup(ProjectBean bean); int getProIsExistByDepartmentId(OrganizationalBean bean); + + Integer updateprojectCompletion(ProjectBean projectBean); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/TeamGroupDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/TeamGroupDao.java index c09d515..4d7dd5e 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/TeamGroupDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/TeamGroupDao.java @@ -64,4 +64,6 @@ public interface TeamGroupDao { TeamGroupBean getTeamLeader(TeamGroupBean groupBean); String getDepartmentName(String applyMan); + + Integer auditRegister(TeamGroupBean teamGroupBean); } 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 2dabf3c..4be727c 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 @@ -139,6 +139,8 @@ public class OrganizationalServiceImpl implements OrganizationalService { return ar; } } else if (bean.getLevel() == 3) { + // 默认未完工 + bean.setIsCompletion(0); int count = projectDao.getProIsExistByDepartmentId(bean); if (count > 0) { ar.setFailMsg("该项目在此事业部下已存在"); 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 d137696..a62e803 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 @@ -290,9 +290,9 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService childMap.put("title", deptName); childMap.put("mergeType", "colspan"); childMap.put("num", num); - if (!StringUtils.isBlank(type) && "evaluate".equals(type)) { - childMap.put("edit", "text"); - } +// if (!StringUtils.isBlank(type) && "evaluate".equals(type)) { +// childMap.put("edit", "text"); +// } childMap.put("field", setTemplateBean.getParentId() + "-" + setTemplateBean.getId() + "-" + deptId); list.add(childMap); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectService.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectService.java index 915af1a..80983e8 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectService.java @@ -25,4 +25,6 @@ public interface ProjectService { Integer delProjectSubcontractor(ViolationBean bean); List getNoBindSubcontractorSelect(ViolationBean bean); + + Integer updateprojectCompletion(ProjectBean projectBean); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java index 9eb11fc..54f2e26 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/ProjectServiceImpl.java @@ -66,4 +66,9 @@ public class ProjectServiceImpl implements ProjectService { public List getNoBindSubcontractorSelect(ViolationBean bean) { return projectDao.getNoBindSubcontractorSelect(bean); } + + @Override + public Integer updateprojectCompletion(ProjectBean projectBean) { + return projectDao.updateprojectCompletion(projectBean); + } } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupService.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupService.java index fb83387..bae99e0 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupService.java @@ -33,4 +33,6 @@ public interface TeamGroupService { List getRegisterList(TeamGroupBean teamGroupBean); List auditRegisterList(TeamGroupBean teamGroupBean); + + Integer auditRegister(TeamGroupBean teamGroupBean); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java index 74be119..bef27f1 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java @@ -280,6 +280,11 @@ public class TeamGroupServiceImpl implements TeamGroupService { return getTeamLeaderInfo(registerList); } + @Override + public Integer auditRegister(TeamGroupBean teamGroupBean) { + return teamGroupDao.auditRegister(teamGroupBean); + } + private List getTeamLeaderInfo(List list) { for (TeamGroupBean groupBean : list) { TeamGroupBean teamLeader = teamGroupDao.getTeamLeader(groupBean); diff --git a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml index 230aa54..b34d3df 100644 --- a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml +++ b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml @@ -15,6 +15,7 @@ org_type, lk_id, table_source, + is_completion, status @@ -29,6 +30,7 @@ #{orgType}, #{lkId}, #{tableSource}, + #{isCompletion}, 1 diff --git a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml index 46c9132..d3bffd2 100644 --- a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml +++ b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml @@ -383,6 +383,9 @@ per.create_time AS createTime, r.proNum AS projectNum, r.subNum AS outsourcerNum, + c.allCheckOne, + c.allCheckTwo, + c.allCheckThree, ifnull( GROUP_CONCAT( ped.post_id ), '' ) AS deptId, IF(ped.check_one is null, 0,IF( ped.check_one > 0, '0', '1' )) as isApprove, ped.isReject as isReject, @@ -431,6 +434,9 @@ SELECT evaluate_id AS evaluateId, COUNT( id ) AS evaluateNum, + MIN(CASE WHEN check_one = 0 THEN 0 ELSE 1 END) AS allCheckOne, + MIN(CASE WHEN check_two = 0 THEN 0 ELSE 1 END) AS allCheckTwo, + MIN(CASE WHEN check_three = 0 THEN 0 ELSE 1 END) AS allCheckThree, GROUP_CONCAT(DISTINCT IF(reject_one is null or reject_one = '',null,reject_one)) as rejectReason, GROUP_CONCAT(DISTINCT IF(reject_two is null or reject_two = '',null,reject_two)) as rejectReasonTwo FROM diff --git a/src/main/resources/mappers/evaluate/ProjectMapper.xml b/src/main/resources/mappers/evaluate/ProjectMapper.xml index 5a5fde9..984d904 100644 --- a/src/main/resources/mappers/evaluate/ProjectMapper.xml +++ b/src/main/resources/mappers/evaluate/ProjectMapper.xml @@ -8,6 +8,7 @@ level, status, table_source, + is_completion, user_id, user_name) VALUES( @@ -15,7 +16,8 @@ #{parentId}, 3, 1, - 'pm_dept' + 'pm_dept', + 0, #{userId}, #{userName} ) @@ -27,6 +29,13 @@ WHERE id = #{id} + + UPDATE pm_org_info + SET + is_completion = 1 + WHERE + id = #{id} + DELETE FROM pm_org_info WHERE @@ -42,6 +51,7 @@ SELECT poi1.id, poi1.name as projectName, + poi1.is_completion as isCompletion, poi2.id as departmentId, poi2.name as department, su.username as projectManager diff --git a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml index 5efc3f5..aaefc5e 100644 --- a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml +++ b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml @@ -37,6 +37,9 @@ update team_person set name = #{name},id_card = #{idCard},phone = #{phone},sex = #{sex},work_type = #{workType},face_url = #{faceUrl} where id = #{id} + + update pm_org_info set audit_status = #{auditStatus} where id = #{id} + delete from pm_org_info where id = #{id} diff --git a/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml b/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml index 53e9849..78c316a 100644 --- a/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml +++ b/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml @@ -114,15 +114,19 @@ where is_active = 1 and is_enable = 0