第二次提交

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

@@ -13,6 +13,10 @@
         <result column="modify_time" property="modifyTime" />
     </resultMap>
 
+    <sql id="vals">
+        #{userId},#{workDay},#{totalTime},#{status},now(),now()
+    </sql>
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, user_id, work_day, total_time, status, create_time, modify_time

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

@@ -29,8 +29,6 @@ public class WorkUser implements Serializable {
       @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-
-
     @ApiModelProperty(name = "oaUserId",value = "oa中的用户编号")
     private String oaUserId;
 

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

@@ -358,6 +358,12 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (CollectionUtils.isEmpty(ids)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
+
+        Integer level = workUserService.getById(reviewerId).getLevel();
+        if (level == 0) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
+        }
+
         int i = workTimeOrderMapper.updateByIds(reviewerId, ids);
         if (i == 0) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.UPDATE_DATA_FAIL);
@@ -395,6 +401,11 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (null == reviewerId || null == id || StringUtils.isEmpty(reason)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
+        Integer level = workUserService.getById(reviewerId).getLevel();
+        if (level == 0) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
+        }
+
         int i = workTimeOrderMapper.updateStatusById(reviewerId, id, reason);
         if (i == 0) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.UPDATE_DATA_FAIL);

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

@@ -38,12 +38,13 @@ public class Examin {
     private WorkCollectMapper workCollectMapper;
 
     @Autowired
-    private WorkSubmitAdoptMapper workSbumitAdoptMapper;
+    private WorkSubmitAdoptMapper workSubmitAdoptMapper;
+
 
     @Scheduled(cron = "0 0 0 * * ?")
     public void autoExamin() {
         log.info("admin[]config[]auto[]Examin[]autoExamin");
-        WorkSubmitAdopt workSbumitAdopt = workSbumitAdoptMapper.selectById(1);
+        WorkSubmitAdopt workSbumitAdopt = workSubmitAdoptMapper.selectById(1);
         Integer autoAdopt = workSbumitAdopt.getAutoAdopt();
         Date yesterdayDate = getAutoExaminDay(autoAdopt);
         Date now = DateUtil.getToday();