Commit 91ead397 authored by cq990612's avatar cq990612

优化代码结构

parent 695400e5
...@@ -64,8 +64,9 @@ ...@@ -64,8 +64,9 @@
work_time = #{workTime}, work_time = #{workTime},
</if> </if>
<if test="null != costBudget"> <if test="null != costBudget">
cost_budget =#{costBudget} cost_budget =#{costBudget},
</if> </if>
modify_time = now()
</set> </set>
<where> <where>
<if test="null != projectId"> <if test="null != projectId">
...@@ -118,10 +119,12 @@ ...@@ -118,10 +119,12 @@
<select id="getManagerProjectsDto" resultType="cn.wisenergy.model.dto.ManagerProjectsDto"> <select id="getManagerProjectsDto" resultType="cn.wisenergy.model.dto.ManagerProjectsDto">
select p.id,p.oa_project_id,p.project_name,p.type,p.create_time,p.is_conclusion, select p.id,p.oa_project_id,p.project_name,p.type,p.create_time,p.is_conclusion,
GROUP_CONCAT(DISTINCT(u.name)) as 'participants',p.cost_budget,p.work_time,p.start_time,p.end_time, GROUP_CONCAT(DISTINCT(u.name)) as 'participants',p.cost_budget,p.work_time,p.start_time,p.end_time,
ROUND(SUM(o.work_time)/8,2) as 'currentLaborCost',ROUND(SUM(o.work_time),2) as 'totalCurrentWorkingHours', cost as 'currentLaborCost',total_time as 'totalCurrentWorkingHours',
if(now() BETWEEN p.start_time and p.end_time,'否','是') as 'isItOverdue', if(now() BETWEEN p.start_time and p.end_time,'否','是') as 'isItOverdue',
if(p.create_time = p.modify_time,'否','是') as 'isThereABudgetChange' if(p.create_time = p.modify_time,'否','是') as 'isThereABudgetChange'
from work_project p LEFT JOIN work_time_order o on p.id = o.project_id from work_project p LEFT JOIN (select project_id,SUM(total_time) as 'total_time',SUM(cost)as 'cost'
FROM work_project_time_cost
GROUP BY project_id) o on p.id = o.project_id
LEFT JOIN work_user_project up ON p.id = up.project_id LEFT JOIN work_user_project up ON p.id = up.project_id
LEFT JOIN work_user u on u.id = up.user_id LEFT JOIN work_user u on u.id = up.user_id
<where> <where>
......
...@@ -49,9 +49,11 @@ public class ManagerProjectsDto implements Serializable { ...@@ -49,9 +49,11 @@ public class ManagerProjectsDto implements Serializable {
@ApiModelProperty(name = "isConclusion",value = "是否结项 :0:项目已结束、1:项目未结束") @ApiModelProperty(name = "isConclusion",value = "是否结项 :0:项目已结束、1:项目未结束")
private Integer isConclusion; private Integer isConclusion;
@JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
@ApiModelProperty(name = "startTime",value = "项目开始时间") @ApiModelProperty(name = "startTime",value = "项目开始时间")
private Date startTime; private Date startTime;
@JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
@ApiModelProperty(name = "endTime",value = "项目结束时间") @ApiModelProperty(name = "endTime",value = "项目结束时间")
private Date endTime; private Date endTime;
......
...@@ -16,9 +16,8 @@ import java.util.Date; ...@@ -16,9 +16,8 @@ import java.util.Date;
public interface WorkHolidayService { public interface WorkHolidayService {
Boolean isHoliday(Date date); Boolean isHoliday(Date date);
Boolean addHoliday(WorkHoliday workHoliday);
Boolean modifyHoliday(WorkHoliday workHoliday); Boolean addAndModifyHoliday(WorkHoliday workHoliday);
Boolean deleteHoliday(Integer id); Boolean deleteHoliday(Integer id);
......
...@@ -66,8 +66,8 @@ public class WorkHolidayServiceImpl implements WorkHolidayService { ...@@ -66,8 +66,8 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
} }
@Override
public Boolean addHoliday(WorkHoliday workHoliday) { private Boolean addHoliday(WorkHoliday workHoliday) {
log.info("WorkHolidayServiceImpl[]addHoliday[]input.param.workHoliday:{}" + workHoliday); log.info("WorkHolidayServiceImpl[]addHoliday[]input.param.workHoliday:{}" + workHoliday);
verificationDate(workHoliday); verificationDate(workHoliday);
List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate(1, new Date()); List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate(1, new Date());
...@@ -88,33 +88,40 @@ public class WorkHolidayServiceImpl implements WorkHolidayService { ...@@ -88,33 +88,40 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
@Transactional @Transactional
@Override @Override
public Boolean modifyHoliday(WorkHoliday workHoliday) { public Boolean addAndModifyHoliday(WorkHoliday workHoliday) {
log.info("WorkHolidayServiceImpl[]modifyHoliday[]input.param.workHoliday:{}" + workHoliday); log.info("WorkHolidayServiceImpl[]modifyHoliday[]input.param.workHoliday:{}" + workHoliday);
workHoliday.setDayType(1); if (null == workHoliday) {
verificationDate(workHoliday);
if (null == workHoliday.getId()) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
} }
List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate(1, new Date()); if (null == workHoliday.getId()) {
if (!CollectionUtils.isEmpty(holidays)) { return addHoliday(workHoliday);
for (WorkHoliday holiday : holidays) { } else {
if (holiday.getId().equals(workHoliday.getId())) { workHoliday.setDayType(1);
continue; verificationDate(workHoliday);
} if (null == workHoliday.getId()) {
if (workHoliday.getDes().equals(holiday.getDes())) { throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATE_HOLIDAY_NAME); }
List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate(1, new Date());
if (!CollectionUtils.isEmpty(holidays)) {
for (WorkHoliday holiday : holidays) {
if (holiday.getId().equals(workHoliday.getId())) {
continue;
}
if (workHoliday.getDes().equals(holiday.getDes())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATE_HOLIDAY_NAME);
}
} }
} }
WorkHoliday workHolidayById = workHolidayMapper.selectById(workHoliday);
if (null == workHolidayById) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.HOLIDAY_NOT_IS_NULL);
}
if (isItRedundant(workHoliday, workHolidayById.getId())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.REPEAT_WITH_OLDTIME);
}
int i = workHolidayMapper.updateById(workHoliday);
return i > 0;
} }
WorkHoliday workHolidayById = workHolidayMapper.selectById(workHoliday);
if (null == workHolidayById) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.HOLIDAY_NOT_IS_NULL);
}
if (isItRedundant(workHoliday, workHolidayById.getId())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.REPEAT_WITH_OLDTIME);
}
int i = workHolidayMapper.updateById(workHoliday);
return i > 0;
} }
@Transactional @Transactional
...@@ -155,9 +162,9 @@ public class WorkHolidayServiceImpl implements WorkHolidayService { ...@@ -155,9 +162,9 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
if (null == workHoliday.getDayEnd()) { if (null == workHoliday.getDayEnd()) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
} }
if (null == workHoliday.getDayType()) { /*if (null == workHoliday.getDayType()) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
} }*/
if (null == workHoliday.getDes()) { if (null == workHoliday.getDes()) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
} }
...@@ -219,7 +226,7 @@ public class WorkHolidayServiceImpl implements WorkHolidayService { ...@@ -219,7 +226,7 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
} }
start = workHoliday1.getDayStart().getTime(); start = workHoliday1.getDayStart().getTime();
end = workHoliday1.getDayEnd().getTime(); end = workHoliday1.getDayEnd().getTime();
if ((d1-start>=0 && d2-end<=0) ||(d1-start<=0&&d2-end>=0) ||(d1-start<=0 && d2-start>=0)|| (d1-start>=0 &&d1-end<=0)) { if ((d1 - start >= 0 && d2 - end <= 0) || (d1 - start <= 0 && d2 - end >= 0) || (d1 - start <= 0 && d2 - start >= 0) || (d1 - start >= 0 && d1 - end <= 0)) {
return true; return true;
} }
} }
......
...@@ -416,6 +416,7 @@ public class WorkProjectServiceImpl implements WorkProjectService { ...@@ -416,6 +416,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
} }
private PageInfo returnPageInfo(List<ManagerProjectsDto> managerProjectsDto) { private PageInfo returnPageInfo(List<ManagerProjectsDto> managerProjectsDto) {
if (CollectionUtils.isEmpty(managerProjectsDto)) { if (CollectionUtils.isEmpty(managerProjectsDto)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
} }
......
...@@ -43,20 +43,13 @@ public class SystemController extends BaseController { ...@@ -43,20 +43,13 @@ public class SystemController extends BaseController {
@Autowired @Autowired
private WorkUserService workUserService; private WorkUserService workUserService;
@ApiOperation(value = "添加工作日历", notes = "添加工作日历", httpMethod = "POST")
@ApiImplicitParam(name = "workHoliday", value = "节假日实体类",dataType = "WorkHoliday",required = true) @ApiOperation(value = "添加和编辑工作日历", notes = "添加和编辑工作日历", httpMethod = "PUT")
@PostMapping("/addHoliday")
public Result<Boolean> addHoliday(@RequestBody WorkHoliday workHoliday) {
log.info("SystemController[]addHoliday[]input.param.workHoliday:{}" + workHoliday);
Boolean aBoolean = workHolidayService.addHoliday(workHoliday);
return getResult(aBoolean);
}
@ApiOperation(value = "编辑工作日历", notes = "编辑工作日历", httpMethod = "PUT")
@ApiImplicitParam(name = "workHoliday", value = "节假日实体类",dataType = "WorkHoliday",required = true) @ApiImplicitParam(name = "workHoliday", value = "节假日实体类",dataType = "WorkHoliday",required = true)
@PutMapping("/modifyHoliday") @PutMapping("/addAndModifyHoliday")
public Result<Boolean> modifyHoliday(@RequestBody WorkHoliday workHoliday) { public Result<Boolean> addAndModifyHoliday(@RequestBody WorkHoliday workHoliday) {
log.info("SystemController[]modifyHoliday[]input.param.workHoliday:{}" + workHoliday); log.info("SystemController[]modifyHoliday[]input.param.workHoliday:{}" + workHoliday);
Boolean aBoolean = workHolidayService.modifyHoliday(workHoliday); Boolean aBoolean = workHolidayService.addAndModifyHoliday(workHoliday);
return getResult(aBoolean); return getResult(aBoolean);
} }
......
...@@ -3,9 +3,7 @@ package cn.wisenergy.web.admin.controller.app; ...@@ -3,9 +3,7 @@ package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.exception.*; import cn.wisenergy.common.utils.exception.*;
import cn.wisenergy.model.dto.OrganizationStructureDto; import cn.wisenergy.model.dto.OrganizationStructureDto;
import cn.wisenergy.model.dto.ResultUser; import cn.wisenergy.model.dto.ResultUser;
import cn.wisenergy.model.dto.UserRoleLevelDto;
import cn.wisenergy.service.WorkUserService; import cn.wisenergy.service.WorkUserService;
import cn.wisenergy.service.utils.UserRoleLevelUtils;
import cn.wisenergy.web.admin.controller.common.BaseController; import cn.wisenergy.web.admin.controller.common.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -54,7 +52,7 @@ public class WorkUserController extends BaseController { ...@@ -54,7 +52,7 @@ public class WorkUserController extends BaseController {
@GetMapping(value = "/login") @GetMapping(value = "/login")
public Result<ResultUser> login(String loginName, String password, String source) { public Result<ResultUser> login(String loginName, String password, String source) {
log.info("WorkUserController[]login[]input.param" + loginName + password + source); log.info("WorkUserController[]login[]input.param" + loginName + password + source);
if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password) || StringUtils.isEmpty(loginName)) { if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password) || StringUtils.isEmpty(source)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
} }
ResultUser resultUser = workUserService.login(loginName, password, source); ResultUser resultUser = workUserService.login(loginName, password, source);
...@@ -85,12 +83,4 @@ public class WorkUserController extends BaseController { ...@@ -85,12 +83,4 @@ public class WorkUserController extends BaseController {
return getResult(organizationStructure); return getResult(organizationStructure);
} }
@ApiOperation(value = "权限", notes = "权限", httpMethod = "GET")
@ApiImplicitParam(name = "userId", value = "用户id", dataType = "int")
@GetMapping(value = "/getLevel")
public Result<UserRoleLevelDto> getLevel(Integer userId) {
List<UserRoleLevelDto> roleUserLevel = UserRoleLevelUtils.getRoleUserLevel(userId);
return getResult(roleUserLevel);
}
} }
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