优化代码结构

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

@@ -74,10 +74,5 @@ public interface WorkTimeOrderMapper extends BaseMapper<WorkTimeOrder> {
      */
     List<Date> getDaysByDateAndStatus(@Param("firstDayOfMonth") Date firstDayOfMonth,@Param("userId") Integer userId);
 
-    /**
-     * 清空某条数据
-     * @param workId
-     * @return
-     */
-    int updateToNull(Integer workId);
+
 }

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

@@ -71,6 +71,7 @@
         )
     </insert>
 
+
     <update id="updateByIds">
         UPDATE
         <include refid="table"/>
@@ -87,13 +88,6 @@
         SET status = 3,reason = #{reason},reviewer_id = #{reviewerId},modify_time=now()
         WHERE work_id = #{id}
     </update>
-    <update id="updateToNull">
-        UPDATE
-        <include refid="table"/>
-        SET project_id=null,dept_id=null,des=null,reason=null,reviewer_id=null,modify_time=now()
-        WHERE work_id = #{workId}
-
-    </update>
 
 
     <select id="getByDay" resultType="cn.wisenergy.model.app.WorkTimeOrder">

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

@@ -61,5 +61,7 @@ public class WorkTimeOrderDto {
     @ApiModelProperty(name = "isOvertime",value = "0:正常工时，1：加班")
     private Integer isOvertime;
 
-
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
+    @ApiModelProperty(name = "modifyTime", value = "工单修改时间")
+    private Date modifyTime;
 }

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

@@ -231,11 +231,17 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             // 3.判断工单是否合法
             isEmpty(dto);
             // 4、默认设置超过系统默认3天（包括驳回3天）未填报的工时将不能填报
-            System.out.println("判断是否超过三天");
-            if (date.getTime() - dto.getWorkDay().getTime() > submitTime * 24 * 60 * 60 * 1000) {
-                throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE);
+            if (!REJECTED.equals(dto.getStatus()) && !RE_SUBMIT.equals(dto.getStatus())) {
+                if (date.getTime() - dto.getWorkDay().getTime() > submitTime * 24 * 60 * 60 * 1000) {
+                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE);
+                }
             }
 
+            if (REJECTED.equals(dto.getStatus()) || RE_SUBMIT.equals(dto.getStatus())) {
+                if (date.getTime() - dto.getModifyTime().getTime() > submitTime * 24 * 60 * 60 * 1000) {
+                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE);
+                }
+            }
             // 获取某些数据
             Integer type = dto.getType();
             dto.setUserName(workUserService.getById(dto.getUserId()).getName());
@@ -287,7 +293,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         wrapper.notIn("status", 2, 5);
         workTimeOrderMapper.delete(wrapper);
         for (WorkTimeOrder workTimeOrder : addList) {
-            workTimeOrderMapper.insert(workTimeOrder);
+            workTimeOrderMapper.save(workTimeOrder);
         }
 
 
@@ -733,6 +739,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
     private void isEmpty(WorkTimeOrderDto dto) {
         int size = 0;
+
         if (null == dto.getType()) {
             size++;
         }
@@ -761,6 +768,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (thanDate(dto.getWorkDay())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY);
         }
+        if (1 == dto.getType() || 2 == dto.getType() && null == dto.getProjectId()) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION);
+        }
         for (ProjectTypeEnum value : ProjectTypeEnum.values()) {
             if (value.getReviewer() == 2) {
                 if (dto.getType().equals(value.getType())) {