Commit 7f3846ab authored by cq990612's avatar cq990612

优化代码结构

parent a12787df
......@@ -7,11 +7,12 @@
<id column="id" property="id" />
<result column="submit_time" property="submitTime" />
<result column="auto_adopt" property="autoAdopt" />
<result column="order_change" property="orderChange"></result>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, submit_time, auto_adopt
id, submit_time, auto_adopt,order_change
</sql>
</mapper>
......@@ -36,5 +36,8 @@ public class WorkSubmitAdopt implements Serializable {
@ApiModelProperty(name = "autoExamine",value = "自动审批")
private Integer autoExamine;
@ApiModelProperty(name = "orderChange", value = "工单修正时限")
private Integer orderChange;
}
......@@ -229,7 +229,6 @@ public class WorkProjectServiceImpl implements WorkProjectService {
int page = gmpv.getPage() == null ? 1 : gmpv.getPage();
int pageSize = gmpv.getPageSize() == null ? 10 : gmpv.getPageSize();
Integer isConclusion = gmpv.getIsConclusion();
Integer type = gmpv.getType() == null ? 1 : gmpv.getType();
PageHelper.startPage(page, pageSize);
List<ManagerProjectsDto> managerProjectsDto;
......@@ -241,19 +240,19 @@ public class WorkProjectServiceImpl implements WorkProjectService {
map.put("centre_id", workCentre.getId());
List<WorkDept> workDeptList = workDeptMapper.getDeptByCondition(map);
workDeptList.forEach(workDept -> deptIds.add(workDept.getId()));
managerProjectsDto = workProjectMapper.getManagerProjectsDto(gmpv.getUserId(), type, isConclusion, deptIds);
managerProjectsDto = workProjectMapper.getManagerProjectsDto(gmpv.getUserId(), gmpv.getType(), isConclusion, deptIds);
return returnPageInfo(managerProjectsDto);
}
// 部门经理
if (rank.equals(LevelRankEnum.DEPARTMENT_LEVEL.getRank())) {
List<Integer> deptIds = new ArrayList<>();
deptIds.add(user.getDeptId());
managerProjectsDto = workProjectMapper.getManagerProjectsDto(gmpv.getUserId(), type, isConclusion, deptIds);
managerProjectsDto = workProjectMapper.getManagerProjectsDto(gmpv.getUserId(), gmpv.getType(), isConclusion, deptIds);
return returnPageInfo(managerProjectsDto);
}
// 项目经理
if (rank.equals(LevelRankEnum.PROJECT_LEVEL.getRank())) {
managerProjectsDto = workProjectMapper.getManagerProjectsDto(gmpv.getUserId(), type, isConclusion, null);
managerProjectsDto = workProjectMapper.getManagerProjectsDto(gmpv.getUserId(), gmpv.getType(), isConclusion, null);
return returnPageInfo(managerProjectsDto);
}
throw new BaseCustomException(BASE_RESP_CODE_ENUM.LEAVE_JOB_USER);
......@@ -418,7 +417,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
private PageInfo returnPageInfo(List<ManagerProjectsDto> managerProjectsDto) {
if (CollectionUtils.isEmpty(managerProjectsDto)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
return null;
}
PageInfo pageInfo = new PageInfo<>(managerProjectsDto);
pageInfo.setList(managerProjectsDto);
......
......@@ -48,7 +48,7 @@ public class WorkSubmitAdoptServiceImpl implements WorkSubmitAdoptService {
@Override
public Boolean modifyAuto(WorkSubmitAdopt workSubmitAdopt) {
log.info("WorkSubmitAdoptServiceImpl[]getById[]input.param.workSubmitAdopt:" + workSubmitAdopt);
if (null == workSubmitAdopt || (null == workSubmitAdopt.getSubmitTime() && null == workSubmitAdopt.getAutoExamine() )) {
if (null == workSubmitAdopt || (null == workSubmitAdopt.getSubmitTime() && null == workSubmitAdopt.getAutoExamine() && null == workSubmitAdopt.getOrderChange())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
if (null != workSubmitAdopt.getAutoExamine() && workSubmitAdopt.getAutoExamine() < 1) {
......@@ -57,6 +57,9 @@ public class WorkSubmitAdoptServiceImpl implements WorkSubmitAdoptService {
if (null !=workSubmitAdopt.getSubmitTime() && workSubmitAdopt.getSubmitTime() <1) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.THEPERIOD_CANNOT_BELESS_THANONEDAY);
}
if (null !=workSubmitAdopt.getOrderChange() && workSubmitAdopt.getOrderChange() <1) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.THEPERIOD_CANNOT_BELESS_THANONEDAY);
}
workSubmitAdopt.setAutoAdopt(1);
workSubmitAdopt.setId(1);
int i = workSubmitAdoptMapper.updateById(workSubmitAdopt);
......
......@@ -612,7 +612,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
private List<ProjectInfoDto> getProjectInfoDto(Integer userId) {
// 获取该用户参与的项目
List<Integer> projectIds = workUserProjectService.getProjectIdByUserId(userId);
// 1.获取当前用户的部门管理
Integer deptId = workUserService.getById(userId).getDeptId();
......@@ -707,13 +706,13 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY);
}
if (1 == dto.getType() || 2 == dto.getType()) {
QueryWrapper<WorkProject> wrapper = new QueryWrapper<>();
/* 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()) {
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