修改一些bug

wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java

@@ -52,8 +52,8 @@ public enum BASE_RESP_CODE_ENUM {
     WORK_ORDER_END("630", "该项目的工单已经全部审批"),
     DEPT_IS_NULL("631","该部门不存在"),
     MANAGER_NOT_PROJECT("632","该管理没有可管理的项目"),
-    DEPT_NOT_FOUND("633", "部门信息未找到");
-
+    DEPT_NOT_FOUND("633", "部门信息未找到"),
+    DATE_IS_ERROR("634","时间不匹配");
     /**
      * 错误编码
      */

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

@@ -21,5 +21,5 @@ public interface WorkCollectMapper extends BaseMapper<WorkCollect> {
 
     int inserWorkCollect(WorkCollect workCollect);
 
-    int updateStatusOrTotaltime(Integer id, Integer status, Integer totalTime);
+    int updateStatusOrTotalTime(Integer id, Integer status, Integer totalTime);
 }

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

@@ -40,7 +40,7 @@
         <include refid="vals"/>
         )
     </insert>
-    <update id="updateStatusOrTotaltime">
+    <update id="updateStatusOrTotalTime">
         UPDATE
         <include refid="table"/>
         <set>

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

@@ -14,8 +14,8 @@ public interface WorkSubmitAdoptService {
 
     /**
      * 功能： 获取自动审批和默认填报限制
-     * @param id
-     * @return
+     * @param id 用户id
+     * @return WorkSubmitAdopt
      */
     WorkSubmitAdopt getById(Integer id);
 }

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

@@ -20,55 +20,58 @@ public interface WorkTimeOrderService {
 
 
     /**
-     * 功能; 获取某日填报信息
+     * 功能; 获取某日被驳回说明
      *
-     * @param userId
-     * @param workDay
-     * @return
+     * @param userId  用户id
+     * @param workDay 某日
+     * @return 工单集合
      */
     List<WorkTimeOrder> getByDay(Integer userId, Date workDay);
 
     /**
      * 功能：获取某日填报小计
      *
-     * @param userId
-     * @param workDay
-     * @return
+     * @param userId  用户id
+     * @param workDay 某日
+     * @return 填报小计
      */
     SubtotalDto getSubtotalReport(Integer userId, Date workDay);
 
     /**
      * 功能; 获取某日填报信息
      *
-     * @param userId
-     * @param workDay
-     * @return DTO
+     * @param userId  用户id
+     * @param workDay 工作日
+     * @return dto
      */
     List<WorkTimeOrderDto> getByDayToDto(Integer userId, Date workDay);
 
     /**
      * 功能：工时填报
      *
-     * @param createWorkOrderDto
-     * @return
+     * @param dto 自定义填报类
+     * @return dto
      */
-    List<WorkTimeOrderDto> add(CreateWorkOrderDto createWorkOrderDto);
+    List<WorkTimeOrderDto> add(CreateWorkOrderDto dto);
 
 
     /**
      * 功能： 驳回重新填报
      *
-     * @param createWorkOrderDto
-     * @return
+     * @param dto 自定义DTO
+     * @return 填报信息
      */
-    List<WorkTimeOrderDto> update(CreateWorkOrderDto createWorkOrderDto);
+    List<WorkTimeOrderDto> update(CreateWorkOrderDto dto);
 
 
     /**
      * 功能：获取待审批数据
      *
-     * @param userId
-     * @return
+     * @param userId    用户id
+     * @param projectId 项目id
+     * @param type      项目类型
+     * @param status    状态
+     * @return 自定义dto
      */
     List<ExamineGroupbyProjectDto> getExamine(Integer userId, Integer projectId, Integer type,Integer page,Integer size,Integer status);
 
@@ -76,25 +79,27 @@ public interface WorkTimeOrderService {
     /**
      * 功能：批量审批
      *
-     * @param ids
-     * @return
+     * @param reviewerId 审批人
+     * @param ids        工单
+     * @return 是否成功
      */
     Boolean examinsByIds(Integer reviewerId, List<Integer> ids);
 
     /**
      * 功能： 驳回
      *
-     * @param id
-     * @param reason
-     * @return
+     * @param reviewerId 审核人id
+     * @param id         工单id
+     * @param reason     驳回理由
+     * @return 是否成功
      */
     Boolean rejectById(Integer reviewerId, Integer id, String reason);
 
     /**
      * 功能：查询驳回未提交的
      *
-     * @param userId
-     * @return
+     * @param userId 用户id
+     * @return dto
      */
     List<WorkTimeOrderDto> rejectNotSubmit(Integer userId);
 }

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

@@ -35,6 +35,7 @@ import java.util.List;
 @Service
 @Slf4j
 public class WorkCollectServiceImpl implements WorkCollectService {
+
     @Autowired
     private WorkCollectMapper workCollectMapper;
 
@@ -99,9 +100,9 @@ public class WorkCollectServiceImpl implements WorkCollectService {
     /**
      * 功能：判断当日是否已经填报
      *
-     * @param userId
-     * @param workDay
-     * @return
+     * @param userId 用户名
+     * @param workDay 某日
+     * @return 当日填报情况
      */
     @Override
     public WorkCollect getByUserIdAndWorkDay(Integer userId, Date workDay) {
@@ -126,7 +127,7 @@ public class WorkCollectServiceImpl implements WorkCollectService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
         Integer id = getByUserIdAndWorkDay(workCollect.getUserId(), workCollect.getWorkDay()).getId();
-        int updateRow = workCollectMapper.updateStatusOrTotaltime(id, workCollect.getStatus(), workCollect.getTotalTime());
+        int updateRow = workCollectMapper.updateStatusOrTotalTime(id, workCollect.getStatus(), workCollect.getTotalTime());
         if (updateRow == 0) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.UPDATE_DATA_FAIL);
         }

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

@@ -118,15 +118,15 @@ public class WorkTimeOrderController extends BaseController {
         Integer deptId = workUserDeptService.getDeptIdByUserId(userId);
         List<Integer> idsByDeptId = workUserDeptService.getUserIdsByDeptId(deptId);
         WorkUser workUser = workUserService.getDeptManagerByIds(idsByDeptId);
-        list.stream().forEach(index -> index.setDeptManagerName(workUser.getName()));
+        list.forEach(index -> index.setDeptManagerName(workUser.getName()));
         return getResult(list);
     }
 
     @ApiOperation(value = "单个或批量审批", notes = "单个或批量审批", httpMethod = "GET")
-    // @ApiImplicitParam(name = "ids", value = "工单id", dataType = "list", required = true)
-    @ApiImplicitParam(name = "reviewerId", value = "审核人id", dataType = "int", required = true)
+    @ApiImplicitParams({//@ApiImplicitParam(name = "ids", value = "工单id", dataType = "list", required = true),
+            @ApiImplicitParam(name = "reviewerId", value = "审核人id", dataType = "int", required = true)})
     @GetMapping(value = "/examins")
-    public Result<Boolean> examinsByIds(Integer reviewerId, @RequestParam List<Integer> ids) {
+    public Result<Boolean> examinsByIds(Integer reviewerId,@RequestParam  List<Integer> ids) {
         log.info("WorkTimeOrderController[]examinsByIds[]input.param.reviewerId:{},ids:{}" + reviewerId, ids);
         if (null == reviewerId || CollectionUtils.isEmpty(ids)) {
             throw new CustomException(RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/auto/Examin.java

-package cn.wisenergy.web.config.auto;
-
-/**
- * @Authotr:陈奇
- * @QQ1799796883
- */
-
-import cn.wisenergy.common.utils.DateUtil;
-import cn.wisenergy.mapper.WorkCollectMapper;
-import cn.wisenergy.mapper.WorkSubmitAdoptMapper;
-import cn.wisenergy.mapper.WorkTimeOrderMapper;
-import cn.wisenergy.model.app.WorkCollect;
-import cn.wisenergy.model.app.WorkSubmitAdopt;
-import cn.wisenergy.model.app.WorkTimeOrder;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * 自动审批定时器
- */
-@Slf4j
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-public class Examin {
-
-    @Autowired
-    private WorkTimeOrderMapper workTimeOrderMapper;
-
-    @Autowired
-    private WorkCollectMapper workCollectMapper;
-
-    @Autowired
-    private WorkSubmitAdoptMapper workSubmitAdoptMapper;
-
-
-    @Scheduled(cron = "0 0 0 * * ?")
-    public void autoExamin() {
-        log.info("admin[]config[]auto[]Examin[]autoExamin");
-        WorkSubmitAdopt workSbumitAdopt = workSubmitAdoptMapper.selectById(1);
-        Integer autoAdopt = workSbumitAdopt.getAutoAdopt();
-        Date yesterdayDate = getAutoExaminDay(autoAdopt);
-        Date now = DateUtil.getToday();
-        UpdateWrapper<WorkTimeOrder> WTOwrapper = new UpdateWrapper<>();
-        WTOwrapper.eq("status", 1);
-        WTOwrapper.le("work_day", yesterdayDate);
-        WorkTimeOrder workTimeOrder = new WorkTimeOrder();
-        workTimeOrder.setStatus(5);
-        workTimeOrder.setModifyTime(now);
-        int wtoRow = workTimeOrderMapper.update(workTimeOrder, WTOwrapper);
-        System.out.println("一共审核：" + wtoRow + "条工单");
-        WorkCollect workCollect = new WorkCollect();
-        UpdateWrapper<WorkCollect> wcw = new UpdateWrapper<>();
-        wcw.eq("status", 1);
-        wcw.le("work_day", yesterdayDate);
-        workCollect.setStatus(2);
-        workCollect.setModifyTime(now);
-        int wcRow = workCollectMapper.update(workCollect, wcw);
-        System.out.println("一共审核：" + wcRow + "条工单");
-    }
-
-
-    public static Date getAutoExaminDay(Integer day) {
-        day = -(day + 1);
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar c = Calendar.getInstance();
-        c.setTime(new Date());
-        c.add(Calendar.DATE, -2);
-        Date start = c.getTime();
-        String qyt= format.format(start);
-        System.out.println(qyt);
-        Date date = DateUtil.convertStrToDate(qyt, "yyyy-MM-dd");
-        return date;
-    }
-}

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -3,9 +3,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/working_hours?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+      url: jdbc:mysql://localhost:3306/work_hours?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
       username: root
-      password: admin
+      password: 123456
       initial-size: 10
       max-active: 100
       min-idle: 10