Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage

This commit is contained in:
wangzhijiang
2022-07-08 11:08:51 +08:00
5 changed files with 10 additions and 0 deletions
@@ -284,6 +284,9 @@ public class DummyInventoryInfoEO implements Serializable {
@TableField(exist = false)
private Integer pageSize;
//文档库id
private String bussDocumentLibraryId;
@@ -40,5 +40,6 @@
<result column="verify_remark" property="verifyRemark" />
<result column="prehomo_remark" property="prehomoRemark" />
<result column="design_remark" property="designRemark" />
<result column="buss_document_library_id" property="bussDocumentLibraryId" />
</resultMap>
</mapper>
@@ -156,6 +156,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
dummyInventoryInfoEOTemp.setDummyInventoryBaseId(dummyInventoryInfoEO.getDummyInventoryBaseId());
dummyInventoryInfoEOTemp.setCreateTime(new Date());
dummyInventoryInfoEOTemp.setUpdateTime(new Date());
dummyInventoryInfoEOTemp.setBussDocumentLibraryId(bussDocumentLibraryEO.getId());
list.add(dummyInventoryInfoEOTemp);
}
this.saveBatch(list);
@@ -245,6 +245,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
}
}else{
@@ -266,6 +267,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
}
}