优化代码结构

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

@@ -22,5 +22,5 @@ public interface WorkCollectMapper extends BaseMapper<WorkCollect> {
 
     int insertWorkCollect(WorkCollect workCollect);
 
-    int updateStatusOrTotalTime(@Param("userId") Integer id,@Param("status") Integer status,@Param("totalTime") Integer totalTime);
+    int updateStatusOrTotalTime(@Param("id") Integer id,@Param("status") Integer status,@Param("totalTime") Integer totalTime);
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ProjectDto.java

@@ -27,6 +27,9 @@ public class ProjectDto {
     @ApiModelProperty(name = "type",value = "1:项目，2：商机")
     private Integer type;
 
+    @ApiModelProperty(name = "managerId", value = "项目经理id")
+    private Integer managerId;
+
     @ApiModelProperty(name = "managerName", value = "项目经理")
     private String managerName;
 

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

 package cn.wisenergy.service;
 
 import cn.wisenergy.model.app.WorkCollect;
+import cn.wisenergy.model.app.WorkTimeOrder;
 import cn.wisenergy.model.dto.CalendarDto;
 import cn.wisenergy.model.dto.SubtotalDto;
 
@@ -59,4 +60,6 @@ public interface WorkCollectService {
      */
     Boolean update(WorkCollect workCollect);
 
+    Boolean updateByWorkTimeOrder(List<WorkTimeOrder> workTimeOrders);
+
 }

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

@@ -3,7 +3,9 @@ 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.WorkCollectMapper;
+import cn.wisenergy.mapper.WorkTimeOrderMapper;
 import cn.wisenergy.model.app.WorkCollect;
+import cn.wisenergy.model.app.WorkTimeOrder;
 import cn.wisenergy.model.dto.CalendarDto;
 import cn.wisenergy.model.dto.SubtotalDto;
 import cn.wisenergy.service.WorkCollectService;
@@ -42,6 +44,12 @@ public class WorkCollectServiceImpl implements WorkCollectService {
     @Autowired
     private WorkTimeOrderService workTimeOrderService;
 
+    @Autowired
+    private WorkCollectService workCollectService;
+
+    @Autowired
+    private WorkTimeOrderMapper workTimeOrderMapper;
+
 
     /**
      * 功能： 查询某年月的填报情况
@@ -107,7 +115,7 @@ public class WorkCollectServiceImpl implements WorkCollectService {
     /**
      * 功能：判断当日是否已经填报
      *
-     * @param userId 用户名
+     * @param userId  用户名
      * @param workDay 某日
      * @return 当日填报情况
      */
@@ -128,8 +136,8 @@ public class WorkCollectServiceImpl implements WorkCollectService {
     }
 
     /**
-     *
      * 功能：修改某日的审批工时情况
+     *
      * @param workCollect 实体类
      * @return 是否成功
      */
@@ -140,10 +148,38 @@ public class WorkCollectServiceImpl implements WorkCollectService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
         Integer id = getByUserIdAndWorkDay(workCollect.getUserId(), workCollect.getWorkDay()).getId();
+        System.out.println("我是collect的id:" + id);
         int updateRow = workCollectMapper.updateStatusOrTotalTime(id, workCollect.getStatus(), workCollect.getTotalTime());
         if (updateRow == 0) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.UPDATE_DATA_FAIL);
         }
         return true;
     }
+
+    @Override
+    public Boolean updateByWorkTimeOrder(List<WorkTimeOrder> workTimeOrders) {
+        Integer userId;
+        Date workDay;
+        for (WorkTimeOrder workTimeOrder : workTimeOrders) {
+            userId = workTimeOrder.getUserId();
+            workDay = workTimeOrder.getWorkDay();
+
+            WorkCollect workCollect = workCollectService.getByUserIdAndWorkDay(userId, workDay);
+            if (null == workCollect) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL);
+            }
+            int status = 2;
+            // 查看userId workDay 的数据status是否全部为2
+            List<WorkTimeOrder> timeOrders = workTimeOrderMapper.getByDay(userId, workDay);
+            for (WorkTimeOrder timeOrder : timeOrders) {
+                if (1 == timeOrder.getStatus() || 3 == timeOrder.getStatus() || 4 == timeOrder.getStatus()) {
+                    status = 1;
+                }
+            }
+            workCollect.setStatus(status);
+            workCollect.setTotalTime(0);
+            workCollectService.update(workCollect);
+        }
+        return true;
+    }
 }

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

@@ -48,6 +48,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
     @Autowired
     private WorkDeptService workDeptService;
 
+    @Autowired
+    private WorkTimeOrderService workTimeOrderService;
+
     @Autowired
     private WorkSubmitAdoptService workSbumitAdoptService;
 
@@ -189,6 +192,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         }
         timeNotEight(count, workTimeOrders);
 
+
         // 更新数据
         reSubmit(workTimeOrders);
         return dto.getWorkTimeOrders();
@@ -205,7 +209,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
      * @return 自定义dto
      */
     @Override
-    public  PageInfo<WorkTimeOrder> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
+    public PageInfo<WorkTimeOrder> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
         log.info("WorkOrderServiceImpl[]getExamine[]input.param.userId:{},projectId:{},type:{},page:{},size:{},status:{}" + userId, projectId, type, page, size, status);
         // 判断当前用户是否是管理员
         isManager(userId);
@@ -315,20 +319,10 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         }
 
         List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.selectBatchIds(ids);
-        Integer userId;
-        Date workDay;
-        for (WorkTimeOrder workTimeOrder : workTimeOrders) {
-            userId = workTimeOrder.getUserId();
-            workDay = workTimeOrder.getWorkDay();
 
-            WorkCollect workCollect = workCollectService.getByUserIdAndWorkDay(userId, workDay);
-            if (null == workCollect) {
-                throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL);
-            }
-            workCollect.setStatus(2);
-            workCollect.setTotalTime(0);
-            workCollectService.update(workCollect);
-        }
+        // 更新collect表
+        workCollectService.updateByWorkTimeOrder(workTimeOrders);
+
         return true;
     }
 
@@ -404,6 +398,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         }
         List<Integer> ids = workUserProjectService.getProjectIdByUserId(userId);
         List<ProjectDto> list = workProjectService.getNameById(ids);
+        for (ProjectDto projectDto : list) {
+            projectDto.setManagerName(workUserService.getById(projectDto.getManagerId()).getName());
+        }
         Integer deptId = workUserDeptService.getDeptIdByUserId(userId);
         List<Integer> idsByDeptId = workUserDeptService.getUserIdsByDeptId(deptId);
         WorkUser workUser = workUserService.getDeptManagerByIds(idsByDeptId);
@@ -615,7 +612,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         }
         // 部门经理
         if (2 == level) {
-            types = type == null ? Arrays.asList(3, 4, 5, 6) : new ArrayList<>(type);
+            types = type == null ? Arrays.asList(3, 4, 5, 6, 7) : new ArrayList<>(type);
             workTimeOrders = workTimeOrderMapper.queryByPage(status, null, types);
         }
         PageInfo<WorkTimeOrder> pageInfo = new PageInfo<>(workTimeOrders);
@@ -626,7 +623,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
     // 根据工单获取管理员
     private String getManagerNameByOrder(WorkTimeOrder wto) {
-        if (1 == wto.getType() || 2 == wto.getType() ) {
+        if (1 == wto.getType() || 2 == wto.getType()) {
             WorkProject workProject = workProjectService.getById(wto.getProjectId());
             return workProject != null ? workUserService.getById(workProject.getManagerId()).getName() : "";
         }