第二次

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkSbumitAdoptMapper.java → wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkSubmitAdoptMapper.java

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author chenqi
  * @since 2021-01-19
  */
-public interface WorkSbumitAdoptMapper extends BaseMapper<WorkSubmitAdopt> {
+public interface WorkSubmitAdoptMapper extends BaseMapper<WorkSubmitAdopt> {
 
 }

wisenergy-mapper/src/main/resources/mapper/WorkSbumitAdoptMapper.xml → wisenergy-mapper/src/main/resources/mapper/WorkSubmitAdoptMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wisenergy.mapper.WorkSbumitAdoptMapper">
+<mapper namespace="cn.wisenergy.mapper.WorkSubmitAdoptMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkSubmitAdopt">

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

@@ -30,8 +30,8 @@ public class WorkProject implements Serializable {
       @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(name = "peojectNum",value = "项目编号")
-    private String peojectNum;
+    @ApiModelProperty(name = "oaProjectNumber",value = "项目编号")
+    private String oaProjectNumber;
 
     @ApiModelProperty(name = "projectName",value = "项目名称")
     private String projectName;

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

@@ -10,7 +10,7 @@ import cn.wisenergy.model.app.WorkSubmitAdopt;
  * @author chenqi
  * @since 2021-01-19
  */
-public interface WorkSbumitAdoptService {
+public interface WorkSubmitAdoptService {
 
     /**
      * 功能： 获取自动审批和默认填报限制

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkSbumitAdoptServiceImpl.java → wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkSubmitAdoptServiceImpl.java

@@ -2,9 +2,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.WorkSbumitAdoptMapper;
+import cn.wisenergy.mapper.WorkSubmitAdoptMapper;
 import cn.wisenergy.model.app.WorkSubmitAdopt;
-import cn.wisenergy.service.WorkSbumitAdoptService;
+import cn.wisenergy.service.WorkSubmitAdoptService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,10 +19,10 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @Slf4j
-public class WorkSbumitAdoptServiceImpl implements WorkSbumitAdoptService {
+public class WorkSubmitAdoptServiceImpl implements WorkSubmitAdoptService {
 
     @Autowired
-    private WorkSbumitAdoptMapper workSbumitAdoptMapper;
+    private WorkSubmitAdoptMapper workSubmitAdoptMapper;
     /**
      * 功能： 获取自动审批和默认填报限制
      *
@@ -31,14 +31,14 @@ public class WorkSbumitAdoptServiceImpl implements WorkSbumitAdoptService {
      */
     @Override
     public WorkSubmitAdopt getById(Integer id) {
-        log.info("WorkSbumitAdoptServiceImpl[]getById[]input.param.id:" + id);
+        log.info("WorkSubmitAdoptServiceImpl[]getById[]input.param.id:" + id);
         if (null == id) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
-        WorkSubmitAdopt workSbumitAdopt = workSbumitAdoptMapper.selectById(id);
-        if (null == workSbumitAdopt) {
+        WorkSubmitAdopt workSubmitAdopt = workSubmitAdoptMapper.selectById(id);
+        if (null == workSubmitAdopt) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.RESOURCE_NOT_FOUND);
         }
-        return workSbumitAdopt;
+        return workSubmitAdopt;
     }
 }

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

@@ -49,7 +49,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
     private WorkDeptService workDeptService;
 
     @Autowired
-    private WorkSbumitAdoptService workSbumitAdoptService;
+    private WorkSubmitAdoptService workSbumitAdoptService;
 
     @Autowired
     private WorkHolidayService workHolidayService;

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -40,7 +41,6 @@ public class StatisticsController extends BaseController {
     @GetMapping("/getMonthlyCollect")
     public PageInfo getMonthlyCollect(GetMonthlyCollectParam param) {
         log.info("StatisticsController[]getMonthlyCollect[]input.param" + param);
-
         PageInfo monthlyCollect = statisticsService.getMonthlyCollect(param);
         return monthlyCollect;
     }

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

@@ -7,7 +7,7 @@ package cn.wisenergy.web.config.auto;
 
 import cn.wisenergy.common.utils.DateUtil;
 import cn.wisenergy.mapper.WorkCollectMapper;
-import cn.wisenergy.mapper.WorkSbumitAdoptMapper;
+import cn.wisenergy.mapper.WorkSubmitAdoptMapper;
 import cn.wisenergy.mapper.WorkTimeOrderMapper;
 import cn.wisenergy.model.app.WorkCollect;
 import cn.wisenergy.model.app.WorkSubmitAdopt;
@@ -38,7 +38,7 @@ public class Examin {
     private WorkCollectMapper workCollectMapper;
 
     @Autowired
-    private WorkSbumitAdoptMapper workSbumitAdoptMapper;
+    private WorkSubmitAdoptMapper workSbumitAdoptMapper;
 
     @Scheduled(cron = "0 0 0 * * ?")
     public void autoExamin() {