fix

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

@@ -806,12 +806,12 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                 } else if (tfFlowApprove.getSetup().intValue() == 3) {//内审
                     processLimitedTime = tfFlowApprove.getUpdateTime();
                     execField = ProcessLimitedEnum.APPROVE_RADIO.getKey();
-                } else if (tfFlowApprove.getSetup().intValue() == 4) {//环境部署时间
+                } else if (tfFlowApprove.getSetup().intValue() == 5) {//现场环境测试/环境部署时间
+                    tbSopInfoService.sopDeviceInOutSave(map, 4);
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getKey());
                     execField = ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 6) {//扫描准备
-                    tbSopInfoService.sopDeviceInOutSave(map, 5);
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.SCAN_START_TIME.getKey());
                     execField = ProcessLimitedEnum.SCAN_START_TIME.getKey();

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

@@ -4,8 +4,8 @@
 
     <select id="getFlowTaskRemindSmsInfo" resultType="com.qmth.sop.business.bean.result.FlowTaskSmsResult">
         select
-            tbc.id as serviceId,
-            tbc.name as serviceName,
+            tbs.id as serviceId,
+            tbs.name as serviceName,
             sc.name as customName,
             su.real_name as realName,
             su.mobile_number as mobileNumber,
@@ -17,6 +17,7 @@
                 left join t_f_custom_flow_entity tfcfe on tfcfe.code = tsjr.code
                 left join t_f_custom_flow tfcf on tfcf.id = tfcfe.t_f_custom_flow_id
                 left join t_b_crm tbc on tbc.crm_no = tfcfe.crm_no
+                left join t_b_service tbs on tbs.id = tbc.service_id
                 left join sys_custom sc on sc.id = tbc.custom_id
                 left join sys_user su on su.id = tsjr.receive_user_id
         where