优化代码结构

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

@@ -3,11 +3,9 @@ package cn.wisenergy.mapper;
 import cn.wisenergy.model.app.WorkTypeManager;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import java.util.List;
-
 
 public interface WorkTypeManagerMapper extends BaseMapper<WorkTypeManager> {
 
-    List<Integer> getTypeByGroup();
+
 
 }

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

@@ -30,7 +30,7 @@
         SELECT <include refid="Base_Column_List"/>
         FROM <include refid="table"/>
         WHERE year(day_start) = year(#{date}) AND day_type = #{type}
-
+        ORDER BY day_start
     </select>
 
 </mapper>

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

@@ -3,9 +3,5 @@
 <mapper namespace="cn.wisenergy.mapper.WorkTypeManagerMapper">
 
 
-    <select id="getTypeByGroup" resultType="java.lang.Integer">
-        SELECT `type`
-        FROM work_type_manager
-        GROUP BY `type`
-    </select>
+
 </mapper>
\ No newline at end of file

wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkTypeManager.java

 package cn.wisenergy.model.app;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,9 +19,6 @@ public class WorkTypeManager {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(name = "name",value = "类型名")
-    private String name;
-
     @ApiModelProperty(name = "deptId",value = "部门id")
     private Integer deptId;
 
@@ -30,4 +28,8 @@ public class WorkTypeManager {
     @ApiModelProperty(name = "type",value = "5：外部商务、技术交流  6：内部培训、技术准备、管理   7：其他非项目/商机工作")
     private Integer type;
 
+    // 附加字段
+    @TableField(exist = false)
+    @ApiModelProperty(name = "name",value = "类型名")
+    private String name;
 }

wisenergy-model/src/main/java/cn/wisenergy/model/enums/ChangeTypeEnum.java

@@ -10,7 +10,6 @@ public enum ChangeTypeEnum {
     STARTINGTIME(3, "预计开始时间"),
     ENDTIME(4, "预计结束时间"),
 
-
     ;
 
 

wisenergy-model/src/main/java/cn/wisenergy/model/vo/ManagerOrderVo.java

+package cn.wisenergy.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @Authotr:陈奇
+ * @QQ1799796883
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ManagerOrderVo", description="工单管理分页条件类")
+public class ManagerOrderVo {
+
+    @ApiModelProperty(name = "userId",value = "管理员id")
+    private Integer userId;
+
+    @ApiModelProperty(name = "projectId",value = "项目id")
+    private Integer projectId;
+
+    @ApiModelProperty(name = "startTime",value = "开始时间")
+    private Date startTime;
+
+    @ApiModelProperty(name = "endTime",value = "结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(name = "page",value = "当前页码")
+    private Integer page;
+
+    @ApiModelProperty(name = "pageSize",value = "每页记录数")
+    private Integer pageSize;
+}

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

@@ -2,6 +2,7 @@ package cn.wisenergy.service;
 
 import cn.wisenergy.model.app.WorkTimeOrder;
 import cn.wisenergy.model.dto.*;
+import cn.wisenergy.model.vo.ManagerOrderVo;
 import com.github.pagehelper.PageInfo;
 
 import java.util.Date;
@@ -118,4 +119,11 @@ public interface WorkTimeOrderService {
      * @return
      */
     int statusYes(Integer userId, Date workDay);
+
+    /**
+     * 功能：获取工单变更分页
+     * @param managerOrderVo 分页套件
+     * @return PageInfo
+     */
+    PageInfo getOrderPageInfo(ManagerOrderVo managerOrderVo);
 }

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

@@ -37,5 +37,5 @@ public interface WorkTypeManagerService {
      */
     List<WorkTypeManager> getType();
 
-    List<Integer> getTypeByGroup();
+
 }

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

@@ -12,6 +12,7 @@ import cn.wisenergy.model.enums.LevelEnum;
 import cn.wisenergy.model.enums.LevelRankEnum;
 import cn.wisenergy.model.enums.ManagerEnum;
 import cn.wisenergy.model.enums.StatusEnum;
+import cn.wisenergy.model.vo.ManagerOrderVo;
 import cn.wisenergy.service.*;
 import cn.wisenergy.service.utils.UserRoleLevelUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -331,7 +332,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                                 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);
                     }
                 }
@@ -803,7 +804,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             if (typeIds.contains(wto.getType())) {
                 WorkProject workProject = workProjectService.getById(wto.getProjectId());
                 return workProject != null ? workUserService.getById(workProject.getManagerId()).getName() : "";
-            }else{
+            } else {
                 return workUserService.getById(
                         workDeptService.getById(wto.getDeptId()).getDeptManagerId())
                         .getName();
@@ -858,4 +859,27 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         return status;
     }
 
+    /**
+     * 功能：获取工单变更分页
+     *
+     * @param managerOrderVo 分页套件
+     * @return PageInfo
+     */
+    @Override
+    public PageInfo getOrderPageInfo(ManagerOrderVo managerOrderVo) {
+        log.info("WorkOrderServiceImpl[]getOrderPageInfo[]input.param.managerOrderVo:{}" + managerOrderVo);
+        if (null == managerOrderVo || null == managerOrderVo.getUserId()) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
+        }
+        // 1.判断管理员是否有权限 TODO
+
+        int page = null == managerOrderVo.getPage() ? 1 : managerOrderVo.getPage();
+        int pageSize = null == managerOrderVo.getPageSize() ? 10 : managerOrderVo.getPageSize();
+        PageHelper.startPage(page, pageSize);
+
+
+
+        return null;
+    }
+
 }

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

@@ -3,6 +3,8 @@ package cn.wisenergy.service.impl;
 import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
 import cn.wisenergy.common.utils.exception.BaseCustomException;
 import cn.wisenergy.mapper.WorkTypeManagerMapper;
+import cn.wisenergy.mapper.WorkTypeMapper;
+import cn.wisenergy.model.app.WorkType;
 import cn.wisenergy.model.app.WorkTypeManager;
 import cn.wisenergy.service.WorkTypeManagerService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +21,10 @@ public class WorkTypeManagerServiceImpl implements WorkTypeManagerService {
 
     @Autowired
     private WorkTypeManagerMapper workTypeManagerMapper;
+
+    @Autowired
+    private WorkTypeMapper workTypeMapper;
+
     /**
      * 功能：根据审核人id获取
      *
@@ -67,18 +73,12 @@ public class WorkTypeManagerServiceImpl implements WorkTypeManagerService {
         QueryWrapper<WorkTypeManager> wrapper = new QueryWrapper<>();
         wrapper.groupBy("type");
         wrapper.orderByAsc("type");
-        return workTypeManagerMapper.selectList(wrapper);
+        List<WorkTypeManager> workTypeManagers = workTypeManagerMapper.selectList(wrapper);
+        return addName(workTypeManagers);
     }
 
-    @Override
-    public List<Integer> getTypeByGroup() {
-        log.info("WorkTypeManagerServiceImpl[]getTypeByGroup[]");
-        List<Integer> typeByGroup = workTypeManagerMapper.getTypeByGroup();
-        if (CollectionUtils.isEmpty(typeByGroup)) {
-            return null;
-        }
-        return typeByGroup;
-    }
+
+
 
     private List<WorkTypeManager> getWorkTypes(Integer userId, String column) {
         if (null == userId) {
@@ -87,7 +87,24 @@ public class WorkTypeManagerServiceImpl implements WorkTypeManagerService {
         QueryWrapper<WorkTypeManager> wrapper = new QueryWrapper<>();
         wrapper.eq(column, userId);
         List<WorkTypeManager> workTypeManagers = workTypeManagerMapper.selectList(wrapper);
-        return workTypeManagers;
+
+        return addName(workTypeManagers);
     }
 
+    public List<WorkTypeManager> addName(List<WorkTypeManager> workTypeManagers) {
+        if (!CollectionUtils.isEmpty(workTypeManagers)) {
+            List<WorkType> types = workTypeMapper.getAll();
+            if (!CollectionUtils.isEmpty(types)) {
+                for (WorkType type : types) {
+                    for (WorkTypeManager workTypeManager : workTypeManagers) {
+                        if (type.getId().equals(workTypeManager.getType())) {
+                            workTypeManager.setName(type.getName());
+                        }
+                    }
+                }
+            }
+            return workTypeManagers;
+        }
+        return null;
+    }
 }

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

@@ -23,6 +23,8 @@ public class WorkTypeServiceImpl implements WorkTypeService {
 
     @Autowired
     private WorkTypeMapper workTypeMapper;
+
+
     @Override
     public List<WorkType> getAll() {
         log.info("WorkTypeServiceImpl[]getAll[]");
@@ -60,6 +62,10 @@ public class WorkTypeServiceImpl implements WorkTypeService {
             return insert > 0;
         }else{
             int i = workTypeMapper.updateById(workType);
+            if (i == 0) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.UPDATE_DATA_FAIL);
+            }
+
             return i>0;
         }
     }

wisenergy-service/src/main/java/cn/wisenergy/service/utils/UserRoleLevelUtils.java

@@ -9,7 +9,7 @@ import cn.wisenergy.mapper.WorkUserRoleMapper;
 import cn.wisenergy.model.app.WorkLevel;
 import cn.wisenergy.model.app.WorkRole;
 import cn.wisenergy.model.dto.UserRoleLevelDto;
-import cn.wisenergy.model.enums.LevelEnum;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -9,6 +9,7 @@ import cn.wisenergy.model.dto.AppletsPendApprovalDto;
 import cn.wisenergy.model.dto.CreateWorkOrderDto;
 import cn.wisenergy.model.dto.ProjectsDto;
 import cn.wisenergy.model.dto.WorkTimeOrderDto;
+import cn.wisenergy.model.vo.ManagerOrderVo;
 import cn.wisenergy.service.WorkTimeOrderService;
 import cn.wisenergy.web.admin.controller.common.BaseController;
 import com.github.pagehelper.PageInfo;
@@ -157,4 +158,13 @@ public class WorkTimeOrderController extends BaseController {
         return getResult(workTimeOrderDtos);
     }
 
+    @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);
+
+        return getResult(null);
+    }
+
 }