ndt修改记录

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZchxNdtProjectNdtCheckOperLogServiceImpl.java

@@ -36,6 +36,6 @@ public class ZchxNdtProjectNdtCheckOperLogServiceImpl extends ServiceImpl<ZchxNd
         entity.setModifydate(operDto.getOperTime());
         entity.setModifyuserid(operDto.getOperUser().getId());
         entity.setModifyusername(operDto.getOperUser().getName());
-        return null;
+        return entity;
     }
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZchxNdtProjectNdtCheckServiceImpl.java

@@ -14,6 +14,7 @@ import com.rongwei.bsentity.dto.ndt.EditWeldResultBO;
 import com.rongwei.bsentity.dto.ndt.EnrollNdtExecuteRequest;
 import com.rongwei.rwcommon.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -36,6 +37,7 @@ public class ZchxNdtProjectNdtCheckServiceImpl extends ServiceImpl<ZchxNdtProjec
     private ZchxNdtProjectNdtLibService zchxNdtProjectNdtLibService;
     @Autowired
     private ZchxNdtProjectNdtWeldSeamService zchxNdtProjectNdtWeldSeamService;
+    @Lazy
     @Autowired
     private ZhcxCommon zhcxCommon;
     @Autowired
@@ -72,6 +74,7 @@ public class ZchxNdtProjectNdtCheckServiceImpl extends ServiceImpl<ZchxNdtProjec
         //添加修改记录
         if(ObjectUtil.isNotEmpty(weldResultBO.getEditWeldDescList())) {
             final ZchxNdtProjectNdtCheckOperLogDo operLog = zchxNdtProjectNdtCheckOperLogService.getNew(operDto);
+            operLog.setCheckid(req.getCheckId());
             operLog.setOperdescription("合格编号修改：".concat(StringUtils.join(weldResultBO.getEditWeldDescList(), ",")));
             zchxNdtProjectNdtCheckOperLogService.save(operLog);
         }

business-entity/src/main/java/com/rongwei/bsentity/domain/ZchxNdtProjectNdtCheckOperLogDo.java

@@ -40,10 +40,10 @@ public class ZchxNdtProjectNdtCheckOperLogDo extends BaseDo {
     @TableField("ROPTION")
     private String roption;
     /**
-     * NDT库id
+     * 单据id
      */
-    @TableField("LIBID")
-    private String libid;
+    @TableField("CHECKID")
+    private String checkid;
     /**
      * 操作描述
      */