qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/QHSELoginServiceImpl.java

@@ -244,9 +244,9 @@ public class QHSELoginServiceImpl implements QHSELoginService {
         }
         setModuleHelp(sysUserVo);
         // 设置最后一次登录的路由
-        List<SysLastvisitRouteDo> lastvisitRouteDos = sysLastvisitRouteService.list(new LambdaQueryWrapper<SysLastvisitRouteDo>()
-                .eq(SysLastvisitRouteDo::getUserid, sysUserVo.getId()).orderByAsc(SysLastvisitRouteDo::getRoutesort));
-        sysUserVo.setSysLastvisitRouteDos(lastvisitRouteDos);
+        // List<SysLastvisitRouteDo> lastvisitRouteDos = sysLastvisitRouteService.list(new LambdaQueryWrapper<SysLastvisitRouteDo>()
+        //         .eq(SysLastvisitRouteDo::getUserid, sysUserVo.getId()).orderByAsc(SysLastvisitRouteDo::getRoutesort));
+        // sysUserVo.setSysLastvisitRouteDos(lastvisitRouteDos);
         // 菜单
         Map<String, Object> map = new HashMap<>();
         map.put("token", token);

qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/RohhServiceImpl.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwei.bscommon.system.service.RohhService;
 import com.rongwei.bscommon.system.utils.QHSEUtils;
 import com.rongwei.bsentity.domain.*;
@@ -78,7 +79,7 @@ public class RohhServiceImpl implements RohhService {
         qhseRohhValidateDo.setVerifier(qhseRohhDo.getVerifier());
         qhseRohhValidateDo.setVerifierid(qhseRohhDo.getVerifierid());
         qhseRohhValidateDo.setHdtype(qhseRohhDo.getHdtype());
-        qhseRohhValidateDo.setVerifierdesc(qhseRohhDo.getVerifierdesc());
+        qhseRohhValidateDo.setVerifierdesc(qhseRohhDo.getCurrentdescribe());
         qhseRohhValidateDo.setVerifierphoto(qhseRohhDo.getVerifierphoto());
         qhseRohhValidateDo.setVerifierresult(qhseRohhDo.getVerifierresult());
         qhseRohhValidateService.save(qhseRohhValidateDo);
@@ -89,7 +90,9 @@ public class RohhServiceImpl implements RohhService {
         rohhEventVo.setRohhid(id);
         rohhEventVo.setEventname("复证");
         rohhEventVo.setEventtype(verifierResult.equals("1") ? "复证通过" :"复证不通过");
-        rohhEventVo.setDescribe(verifierResult.equals("1") ? "任务已整改登记完成" : qhseRohhDo.getVerifierdesc());
+        rohhEventVo.setDescribe(verifierResult.equals("1") ? "任务已整改复证通过" : qhseRohhDo.getCurrentdescribe());
+        // 情况当前的描述信息
+        qhseRohhService.update(new LambdaUpdateWrapper<QhseRohhDo>().eq(QhseRohhDo::getId,id).set(QhseRohhDo::getCurrentdescribe,""));
         createRPEvent(rohhEventVo);
     }
 

qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhDo.java

@@ -222,9 +222,9 @@ public class QhseRohhDo extends BaseDo {
     private String hdtype;
 
     /**
-     * 验证说明
+     * 当前的说明
      */
-    private String verifierdesc;
+    private String currentdescribe;
 
     /**
      * 验证图片