Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

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);
 					}

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingServiceImpl.java

@@ -217,14 +217,14 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
         SopCrmInfo sopCrmInfo = tbCrmService.findSopCrmInfoBySop(sopNo);
         Long serviceUnitId = sopCrmInfo.getServiceUnitId();
         DingElementResult dingElementResult = this.baseMapper.findDingResultByUserId(userId, serviceUnitId);
-        Integer reissueCardCount = dingElementResult.getReissueCardCount();
+        Integer reissueCardCount = dingElementResult!=null?dingElementResult.getReissueCardCount():0;
         int applyCount = this.baseMapper.findDingExceptionApplyCount(userId, sopNo);
 
         DingStatisticResult dingStatisticResult = new DingStatisticResult();
         dingStatisticResult.setDingFormList(formList);
         dingStatisticResult.setWorkDays(workCount);
         dingStatisticResult.setExceptionCount(exceptionCount);
-        dingStatisticResult.setRemainCount(reissueCardCount - applyCount);
+        dingStatisticResult.setRemainCount(reissueCardCount!=0?reissueCardCount - applyCount:0);
         return dingStatisticResult;
     }
 

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());
             }

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -197,14 +197,14 @@
         left join t_b_sop_info_detail tbsid on tbsid.sop_info_id = tbsi.id
         left join t_b_crm tbc on tbc.crm_no = tbsi.crm_no
         left join sys_custom sc on sc.id = tbsi.custom_id
-        <where> 1 = 1
+        <where>
             <if test="userId != null and userId != ''">
                 and (tbsid.engineer_user_id is not null and tbsid.engineer_user_id = #{userId})
             </if>
             <if test="serviceId != null and serviceId != ''">
                 and tbsi.service_id = #{serviceId}
             </if>
-                and tbsi.status = 'START'
+<!--                and tbsi.status = 'START'-->
         </where>
     </select>