优化代码结构

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java

@@ -40,7 +40,7 @@ public interface WorkTimeOrderMapper extends BaseMapper<WorkTimeOrder> {
 
     int updateStatusById(@Param("reviewerId") Integer reviewerId, @Param("id") Integer id, @Param("reason") String reason);
 
-    List<WorkTimeOrder> queryByPage(@Param("status") Integer status, @Param("projectId") Integer projectId, @Param("type") Integer type, @Param("deptId") Integer deptId);
+    List<WorkTimeOrder> queryByPage(@Param("status")List<Integer>  status, @Param("projectId") Integer projectId, @Param("type") Integer type, @Param("deptId") Integer deptId);
 
     /**
      * 根据填报项目类型获取次数和工时汇总

wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml

@@ -164,7 +164,10 @@
                 AND project_id = #{projectId}
             </if>
             <if test="null != status">
-                AND status = #{status}
+                AND status in
+                <foreach collection="status" item="sta" open="(" close=")" separator=",">
+                    #{sta}
+                </foreach>
             </if>
             <if test="null != type">
                 AND type = #{type}

wisenergy-service/src/main/java/cn/wisenergy/service/WorkTimeOrderService.java

@@ -56,7 +56,7 @@ public interface WorkTimeOrderService {
      * @param status    状态
      * @return 自定义dto
      */
-    PageInfo<WorkTimeOrderDto> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer pageSize, Integer status);
+    PageInfo<WorkTimeOrderDto> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer pageSize, List<Integer> status);
 
     /**
      *  功能：获取小程序待审批

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkCollectServiceImpl.java

@@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -96,7 +95,7 @@ public class WorkCollectServiceImpl implements WorkCollectService {
      * @param workDay 某日
      * @return List<CalendarDto>
      */
-    @Transactional
+
     @Override
     public SubtotalDto calendarDay(Integer userId, Date workDay) {
         log.info("WorkCollectServiceImpl[]calendarDay[]input.param.userId:{},workDay:{}", userId, workDay);

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java

@@ -265,13 +265,13 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                 Date rejectTime1 = byUserIdAndWorkDay.getRejectTime();
                 dto.setStatus(RE_SUBMIT);
                 Date rejectTime = DateUtil.convertStrToDate(DateUtil.convertDateToStr(rejectTime1, "yyyy-MM-dd"), "yyyy-MM-dd");
-                if (DateUtil.isThanDay(rejectTime,date,submitTime)) {
+                if (DateUtil.isThanDay(rejectTime, date, submitTime)) {
                     throw new BaseCustomException("627", "超过" + submitTime + "天的不能填报");
                 }
             }
             // 4、默认设置超过系统默认3天（包括驳回3天）未填报的工时将不能填报
             if (!REJECTED.equals(dto.getStatus()) && !RE_SUBMIT.equals(dto.getStatus())) {
-                if (DateUtil.isThanDay(dto.getWorkDay(),date,submitTime) ) {
+                if (DateUtil.isThanDay(dto.getWorkDay(), date, submitTime)) {
                     throw new BaseCustomException("627", "超过" + submitTime + "天的不能填报");
                 }
             }
@@ -345,7 +345,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
      * @return 自定义dto
      */
     @Override
-    public PageInfo<WorkTimeOrderDto> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer pageSize, Integer status) {
+    public PageInfo<WorkTimeOrderDto> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer pageSize, List<Integer> status) {
         log.info("WorkOrderServiceImpl[]getExamine[]input.param.userId:{},projectId:{},type:{},page:{},size:{},status:{}" + userId, projectId, type, page, pageSize, status);
         // 判断当前用户是否是管理员
         isManager(userId);
@@ -758,7 +758,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
 
     // 审批分页
-    private PageInfo<WorkTimeOrderDto> pageExamine(WorkUser user, Integer projectId, Integer type, Integer page, Integer pageSize, Integer status) {
+    private PageInfo<WorkTimeOrderDto> pageExamine(WorkUser user, Integer projectId, Integer type, Integer page, Integer pageSize, List<Integer> status) {
         log.info("WorkOrderServiceImpl[]pageExamine[]input.param.user:{},projectId:{},type:{},page:{},pageSize:{},status:{}" + user, projectId, type, page, pageSize, status);
         page = page == null ? 1 : page;
         pageSize = pageSize == null ? 10 : pageSize;
@@ -881,7 +881,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         PageHelper.startPage(page, pageSize);
 
 
-
         return null;
     }
 

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java

@@ -189,6 +189,7 @@ public class WorkUserServiceImpl implements WorkUserService {
     @Override
     public Boolean modifyRole(Integer userId, List<Integer> roleIds) {
         log.info("WorkUserServiceImpl[]modifyRole[].input.param.userId:{},roleIds:{}" + userId, roleIds);
+        PageHelper.clearPage();
         WorkUser workUser = workUserMapper.selectById(userId);
         if (null == workUser) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_DATA_IS_NULL);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkTimeOrderController.java

@@ -53,7 +53,6 @@ public class WorkTimeOrderController extends BaseController {
     }
 
 
-
     @ApiOperation(value = "查询待审批(小程序)", notes = "查询待审批(小程序)", httpMethod = "GET")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int", required = true),
@@ -77,15 +76,21 @@ public class WorkTimeOrderController extends BaseController {
             @ApiImplicitParam(name = "type", value = "部门经理：工单类型type(5,6,7)", dataType = "int"),
             @ApiImplicitParam(name = "page", value = "PC端当前页", dataType = "int"),
             @ApiImplicitParam(name = "pageSize", value = "PC端一页多少条记录", dataType = "int"),
-            @ApiImplicitParam(name = "status", value = "PC端审批状态", dataType = "int"),
+            @ApiImplicitParam(name = "status", value = "PC端审批状态", dataType = "string"),
     })
     @GetMapping(value = "/getExamine")
-    public Result<PageInfo<WorkTimeOrderDto>> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer pageSize, Integer status) {
+    public Result<PageInfo<WorkTimeOrderDto>> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer pageSize, String status) {
         log.info("WorkTimeOrderController[]getExamine[]input.param.userId:{},projectId:{},type:{},page:{},pageSize:{},status:{}" + userId, projectId, type, page, pageSize, status);
         if (null == userId) {
             throw new CustomException(RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
-        PageInfo<WorkTimeOrderDto> examine = workTimeOrderService.getExamine(userId, projectId, type, page, pageSize, status);
+        List<Integer> lists = null;
+        if (!StringUtils.isEmpty(status)) {
+            String[] split = status.split("\\,");
+            Integer[] newIds = (Integer[]) ConvertUtils.convert(split, Integer.class);
+            lists = new ArrayList<>(Arrays.asList(newIds));
+        }
+        PageInfo<WorkTimeOrderDto> examine = workTimeOrderService.getExamine(userId, projectId, type, page, pageSize, lists);
         return getResult(examine);
     }
 
@@ -115,7 +120,6 @@ public class WorkTimeOrderController extends BaseController {
         String[] split = ids.split("\\,");
         Integer[] newIds = (Integer[]) ConvertUtils.convert(split, Integer.class);
         List<Integer> lists = new ArrayList<>(Arrays.asList(newIds));
-        System.out.println(lists);
         Boolean aBoolean = workTimeOrderService.examineByIds(reviewerId, lists);
         return getResult(aBoolean);
 
@@ -158,8 +162,8 @@ public class WorkTimeOrderController extends BaseController {
         return getResult(workTimeOrderDtos);
     }
 
-    @ApiOperation(value = "工单管理分页",notes = "工单管理分页",httpMethod = "POST")
-    @ApiImplicitParam(name = "managerOrderVo",value = "工单管理分页条件类",dataType = "ManagerOrderVo",required = true)
+    @ApiOperation(value = "工单管理分页", notes = "工单管理分页", httpMethod = "POST")
+    @ApiImplicitParam(name = "managerOrderVo", value = "工单管理分页条件类", dataType = "ManagerOrderVo", required = true)
     @PostMapping(value = "/managerOrderPageInfo")
     public Result<PageInfo> managerOrderPageInfo(@RequestBody ManagerOrderVo managerOrderVo) {
         log.info("WorkTimeOrderController[]managerOrderPageInfo[]input.param.ManagerOrderVo" + managerOrderVo);