shudonghui 1 년 전
부모
커밋
a63da706ee

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDelayWarnDetailServiceImpl.java

@@ -49,7 +49,7 @@ public class TBDelayWarnDetailServiceImpl extends ServiceImpl<TBDelayWarnDetailM
 					tBDelayWarnDetail.setCreateId(sysUser.getId());
 					tBDelayWarnDetail.setCreateTime(System.currentTimeMillis());
 					TBDelayWarn tbDelayWarn = tBDelayWarnService.getById(tBDelayWarnDetail.getDelayWarnId());
-					if(tbDelayWarn.getStatus()==DelayWarnStatusEnum.NOT_START) {
+					if(tbDelayWarn.getStatus()!=DelayWarnStatusEnum.FOLLOW) {
 						tbDelayWarn.setStatus(DelayWarnStatusEnum.FOLLOW);
 						tBDelayWarnService.saveTBDelayWarn(tbDelayWarn);
 					}

+ 14 - 1
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBViolationDetailServiceImpl.java

@@ -3,17 +3,23 @@ package com.qmth.sop.business.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.sop.business.entity.SysUser;
+import com.qmth.sop.business.entity.TBViolation;
 import com.qmth.sop.business.entity.TBViolationDetail;
 import com.qmth.sop.business.mapper.TBViolationDetailMapper;
 import com.qmth.sop.business.service.TBViolationDetailService;
+import com.qmth.sop.business.service.TBViolationService;
 import com.qmth.sop.common.enums.ExceptionResultEnum;
 import com.qmth.sop.common.enums.FieldUniqueEnum;
+import com.qmth.sop.common.enums.ViolationStatusEnum;
+import com.qmth.sop.common.enums.ViolationTypeEnum;
 import com.qmth.sop.common.util.ResultUtil;
 import com.qmth.sop.common.util.ServletUtil;
+import io.swagger.annotations.Authorization;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
 
@@ -29,7 +35,8 @@ import java.util.Objects;
 @Service
 public class TBViolationDetailServiceImpl extends ServiceImpl<TBViolationDetailMapper, TBViolationDetail> implements TBViolationDetailService {
 
-
+    @Resource
+    TBViolationService tbViolationService;
     /**
      * 新增修改违规明细表
      *
@@ -43,6 +50,12 @@ public class TBViolationDetailServiceImpl extends ServiceImpl<TBViolationDetailM
             if (Objects.isNull(tBViolationDetail.getId())) {// 新增
                 tBViolationDetail.setCreateId(sysUser.getId());
                 tBViolationDetail.setCreateTime(System.currentTimeMillis());
+                TBViolation tbViolation = tbViolationService.getById(tBViolationDetail.getViolationId());
+                if(tbViolation.getStatus()!= ViolationStatusEnum.FOLLOW) {
+                    tbViolation.setStatus(ViolationStatusEnum.FOLLOW);
+                    tbViolationService.saveTBViolation(tbViolation);
+                }
+
             } else { // 修改
 //					tBViolationDetail.updateInfo(sysUser.getId());
             }