Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanController.java

@@ -239,8 +239,8 @@ public class LabRiskPlanController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_PLAN + PerFun.QUERY)
     @Log(title = "写入用户进入预案数据", businessType = BusinessType.OTHER)
     @GetMapping("/writerEnterRiskPlan")
-    public ResultData writerEnterRiskPlan(Long groupId,Integer ifcheck) {
-        labRiskPlanService.writerEnterRiskPlan(groupId,ifcheck);
+    public ResultData writerEnterRiskPlan(Long groupId,Integer ifCheck) {
+        labRiskPlanService.writerEnterRiskPlan(groupId,ifCheck);
         return ResultData.success();
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabRiskPlanService.java

@@ -163,5 +163,5 @@ public interface ILabRiskPlanService  extends IService<LabRiskPlan> {
 
     Integer checkEnterRiskPlan(Long riskPlanId);
 
-    void writerEnterRiskPlan(Long groupId,Integer ifcheck);
+    void writerEnterRiskPlan(Long groupId,Integer ifCheck);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -1069,7 +1069,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             });
             //有效预案延长一分钟
 //            if(redisService.getCacheObject("subjectByYa"+subFunction.getSubId())==null){
-//            redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 2L, TimeUnit.MINUTES);
+//            redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 10L, TimeUnit.SECONDS);
             redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 2L, TimeUnit.MINUTES);
             log.info("@@@@@@@@@@@@@@@@@@@@预案延长3分钟@@@@@@@@@@@@@@@@@@@@");
 //            }
@@ -2238,10 +2238,11 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     }
 
     @Override
-    public void writerEnterRiskPlan(Long groupId,Integer ifcheck) {
+    public void writerEnterRiskPlan(Long groupId,Integer ifCheck) {
         LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup = new LabRiskPlanAbnormalGroup();
         labRiskPlanAbnormalGroup.setId(groupId);
-        labRiskPlanAbnormalGroup.setIfCheck(ifcheck);
+        labRiskPlanAbnormalGroup.setIfCheck(ifCheck);
+        log.error("入参数据：{}，{}",groupId,ifCheck);
         labRiskPlanAbnormalGroupMapper.updateLabRiskPlanAbnormalGroup(labRiskPlanAbnormalGroup);
     }