Commit 17c813a7 authored by cq990612's avatar cq990612

Merge branch 'master' into chenqi

# Conflicts:
#	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
parents 4ee1c009 3e08e172
...@@ -65,7 +65,8 @@ public enum BASE_RESP_CODE_ENUM { ...@@ -65,7 +65,8 @@ public enum BASE_RESP_CODE_ENUM {
HAVE_ORDER_DELETE("643", "有工单被用户删除,审批失败,请重新审批"), HAVE_ORDER_DELETE("643", "有工单被用户删除,审批失败,请重新审批"),
ORDER_EXAMINE("644","该工单已经被审批,请刷新查看"), ORDER_EXAMINE("644","该工单已经被审批,请刷新查看"),
NO_WORK_ORDERS_HAVE_BEEN_REJECTED("645", "暂无驳回未提交工单"), NO_WORK_ORDERS_HAVE_BEEN_REJECTED("645", "暂无驳回未提交工单"),
LEAVE_JOB_USER("646","账号状态异常,请联系管理员") LEAVE_JOB_USER("646","账号状态异常,请联系管理员"),
ItemType_Does_NotMatch("647","工时类型和项目名称不匹配"),
; ;
......
...@@ -2,6 +2,7 @@ package cn.wisenergy.mapper; ...@@ -2,6 +2,7 @@ package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkProject; import cn.wisenergy.model.app.WorkProject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -22,4 +23,7 @@ public interface WorkProjectMapper extends BaseMapper<WorkProject> { ...@@ -22,4 +23,7 @@ public interface WorkProjectMapper extends BaseMapper<WorkProject> {
* @return * @return
*/ */
List<WorkProject> getProjectsByCriteria(Map<String, Object> map); List<WorkProject> getProjectsByCriteria(Map<String, Object> map);
List<WorkProject> getProjectsByIds(@Param("ids") List<Integer> ids, @Param("isConclusion") Integer isConclusion);
} }
...@@ -57,5 +57,23 @@ ...@@ -57,5 +57,23 @@
</if> </if>
</where> </where>
</select> </select>
<select id="getProjectsByIds" resultType="cn.wisenergy.model.app.WorkProject">
select <include refid="Base_Column_List"/>
from <include refid="table"/>
<where>
<if test="ids != null">
AND id IN
<foreach collection="ids" item="id" separator="," open="(" close=")">
#{id}
</foreach>
</if>
<if test="null !=isConclusion">
AND is_conclusion = #{isConclusion}
</if>
</where>
</select>
</mapper> </mapper>
...@@ -23,7 +23,7 @@ public interface WorkProjectService { ...@@ -23,7 +23,7 @@ public interface WorkProjectService {
WorkProject getById(Integer id); WorkProject getById(Integer id);
List<WorkProject> getNameById(List<Integer> ids); List<WorkProject> getNameByIds(List<Integer> ids,Integer isConclusion);
/** /**
...@@ -31,7 +31,7 @@ public interface WorkProjectService { ...@@ -31,7 +31,7 @@ public interface WorkProjectService {
* @param id * @param id
* @return * @return
*/ */
List<ProjectDto> getByManagerId(Integer id); List<ProjectDto> getByManagerId(Integer id,Integer isConclusion);
/** /**
......
...@@ -258,9 +258,9 @@ public class StatisticsServiceImpl implements StatisticsService { ...@@ -258,9 +258,9 @@ public class StatisticsServiceImpl implements StatisticsService {
// 创建一行 // 创建一行
HSSFRow row1 = sheet.createRow(0); HSSFRow row1 = sheet.createRow(0);
// 给第一行赋值 // 给第一行赋值
row1.createCell(0).setCellValue("序号"); row1.createCell(0).setCellValue("序号");
row1.createCell(1).setCellValue("部门名称"); row1.createCell(1).setCellValue("部门名称");
row1.createCell(2).setCellValue("姓名"); row1.createCell(2).setCellValue("姓名");
for (int i = 1; i <= dayCount; i++) { for (int i = 1; i <= dayCount; i++) {
HSSFCell cell = row1.createCell(2 + i); HSSFCell cell = row1.createCell(2 + i);
cell.setCellValue(i + "日"); cell.setCellValue(i + "日");
......
...@@ -69,12 +69,12 @@ public class WorkProjectServiceImpl implements WorkProjectService { ...@@ -69,12 +69,12 @@ public class WorkProjectServiceImpl implements WorkProjectService {
} }
@Override @Override
public List<WorkProject> getNameById(List<Integer> ids) { public List<WorkProject> getNameByIds(List<Integer> ids,Integer isConclusion) {
log.info("WorkProjectServiceImpl[]getNameById[]input.param.ids:" + ids); log.info("WorkProjectServiceImpl[]getNameById[]input.param.ids:" + ids);
if (CollectionUtils.isEmpty(ids)) { if (CollectionUtils.isEmpty(ids)) {
return null; return null;
} }
List<WorkProject> workProjects = workProjectMapper.selectBatchIds(ids); List<WorkProject> workProjects = workProjectMapper.getProjectsByIds(ids, isConclusion);
if (CollectionUtils.isEmpty(workProjects)) { if (CollectionUtils.isEmpty(workProjects)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.MANAGER_NOT_PROJECT); throw new BaseCustomException(BASE_RESP_CODE_ENUM.MANAGER_NOT_PROJECT);
} }
...@@ -88,13 +88,14 @@ public class WorkProjectServiceImpl implements WorkProjectService { ...@@ -88,13 +88,14 @@ public class WorkProjectServiceImpl implements WorkProjectService {
* @return dto * @return dto
*/ */
@Override @Override
public List<ProjectDto> getByManagerId(Integer id) { public List<ProjectDto> getByManagerId(Integer id,Integer isConclusion) {
log.info("WorkProjectServiceImpl[]getByManagerId[]input.param.id:" + id); log.info("WorkProjectServiceImpl[]getByManagerId[]input.param.id:" + id);
if (null == id) { if (null == id) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
} }
QueryWrapper<WorkProject> wrapper = new QueryWrapper<>(); QueryWrapper<WorkProject> wrapper = new QueryWrapper<>();
wrapper.eq("manager_id", id); wrapper.eq("manager_id", id);
wrapper.eq("is_conclusion", isConclusion);
List<WorkProject> workProjects = workProjectMapper.selectList(wrapper); List<WorkProject> workProjects = workProjectMapper.selectList(wrapper);
if (!CollectionUtils.isEmpty(workProjects)) { if (!CollectionUtils.isEmpty(workProjects)) {
return workProjectToDto(workProjects); return workProjectToDto(workProjects);
......
...@@ -316,11 +316,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -316,11 +316,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
for (int j = i + 1; j < size; j++) { for (int j = i + 1; j < size; j++) {
if (PROJECT.equals(list.get(i).getType()) || BUSINESS_OPPORTUNITY.equals(list.get(i).getType())) { if (PROJECT.equals(list.get(i).getType()) || BUSINESS_OPPORTUNITY.equals(list.get(i).getType())) {
if (null == list.get(i).getProjectId() || null == list.get(j).getProjectId()) { if (list.get(j).getType().equals(list.get(i).getType())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION); if (null == list.get(i).getProjectId() || null == list.get(j).getProjectId()) {
}else if(list.get(i).getProjectId().equals(list.get(j).getProjectId())){ throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION);
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT); }else if(list.get(i).getProjectId().equals(list.get(j).getProjectId())){
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
}
} }
} else if (list.get(i).getType().equals(list.get(j).getProjectId())) { } else if (list.get(i).getType().equals(list.get(j).getProjectId())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT); throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
} }
...@@ -536,7 +539,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -536,7 +539,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
// 2.获取可审批的项目 // 2.获取可审批的项目
if (0 != user.getLevel()) { if (0 != user.getLevel()) {
List<ProjectManagerDto> projectManagerDtos = new ArrayList<>(); List<ProjectManagerDto> projectManagerDtos = new ArrayList<>();
List<ProjectDto> projectDtos = workProjectService.getByManagerId(userId); List<ProjectDto> projectDtos = workProjectService.getByManagerId(userId,1);
if (!CollectionUtils.isEmpty(projectDtos)) { if (!CollectionUtils.isEmpty(projectDtos)) {
QueryWrapper<WorkTimeOrder> wrapper = new QueryWrapper<>(); QueryWrapper<WorkTimeOrder> wrapper = new QueryWrapper<>();
List<Integer> projectIds = new ArrayList<>(); List<Integer> projectIds = new ArrayList<>();
...@@ -597,8 +600,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -597,8 +600,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
String deptManagerName = workUserService.getById(workDeptService.getById(deptId).getDeptManagerId()).getName(); String deptManagerName = workUserService.getById(workDeptService.getById(deptId).getDeptManagerId()).getName();
// 2.获取可填报的类型 // 2.获取可填报的类型
List<ProjectInfoDto> projectList = new ArrayList<>(); List<ProjectInfoDto> projectList = new ArrayList<>();
// 3.获取正在进行中的项目/商机
List<WorkProject> projects = workProjectService.getNameById(projectIds); List<WorkProject> projects = workProjectService.getNameByIds(projectIds,1);
ProjectInfoDto projectInfoDto; ProjectInfoDto projectInfoDto;
for (ProjectTypeEnum value : ProjectTypeEnum.values()) { for (ProjectTypeEnum value : ProjectTypeEnum.values()) {
projectInfoDto = new ProjectInfoDto().setType(value.getType()).setTypeName(value.getTypeName()).setDeptManagerName(deptManagerName); projectInfoDto = new ProjectInfoDto().setType(value.getType()).setTypeName(value.getTypeName()).setDeptManagerName(deptManagerName);
...@@ -678,6 +681,13 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService { ...@@ -678,6 +681,13 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY); throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY);
} }
if (1 == dto.getType() || 2 == dto.getType()) { if (1 == dto.getType() || 2 == dto.getType()) {
QueryWrapper<WorkProject> wrapper = new QueryWrapper<>();
wrapper.eq("id", dto.getProjectId());
wrapper.eq("type", dto.getType());
List<WorkProject> workProjects = workProjectMapper.selectList(wrapper);
if (CollectionUtils.isEmpty(workProjects)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.ItemType_Does_NotMatch);
}
if (null == dto.getProjectId()) if (null == dto.getProjectId())
throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION); throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment