外部报验功能-构件跟踪

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

@@ -82,8 +82,8 @@ public class ZhcxOutsideInspectionComponentTrackServiceImpl extends ServiceImpl<
         entity.setStructurename(itpDo.getStructurename());
 
         //报验点
-        entity.setInspectioncontentid(itpDo.getInspectioncontentid());
-        entity.setInspectioncontent(itpDo.getInspectioncontent());
+//        entity.setInspectioncontentid(itpDo.getInspectioncontentid());
+//        entity.setInspectioncontent(itpDo.getInspectioncontent());
 
         //总装机号
         entity.setProjectmachineid(itpDo.getProjectmachineid());
@@ -106,15 +106,17 @@ public class ZhcxOutsideInspectionComponentTrackServiceImpl extends ServiceImpl<
             return false;
         }
 
-        //构件或者报验点为空，不保存跟踪
-        if(ObjectUtil.isNull(itpDo.getStructurename()) || ObjectUtil.isNull(itpDo.getInspectioncontent())) {
+        //构件或为空，不保存跟踪
+        if(ObjectUtil.isNull(itpDo.getStructurename())) {
             return false;
         }
 
         //已保存的构件和报验点，不再重新保存
         LambdaQueryWrapper<ZhcxOutsideInspectionComponentTrackDo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ZhcxOutsideInspectionComponentTrackDo::getStructurename, itpDo.getStructurename())
-                .eq(ZhcxOutsideInspectionComponentTrackDo::getInspectioncontent, itpDo.getInspectioncontent());
+                .eq(ZhcxOutsideInspectionComponentTrackDo::getMachineno, itpDo.getMachineno())
+                .eq(ZhcxOutsideInspectionComponentTrackDo::getStructuremachineno, itpDo.getStructuremachineno())
+                .eq(ZhcxOutsideInspectionComponentTrackDo::getProjectid, itpDo.getProjectid());
         int count = count(queryWrapper);
         if(count > 0) {
             return false;