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

jero-boot/db/蔚来标准sql/first_bug_fix_record.sql

@@ -26,3 +26,6 @@ ALTER TABLE `project_laws_inventory`
     ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `file_id`;
 ALTER TABLE `project_task_inventory`
     ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `process_end_time`;
+
+ALTER TABLE `dummy_inventory_info`
+ADD COLUMN `buss_document_library_id` varchar(32) NULL COMMENT '文档库id' AFTER `design_remark`;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java

@@ -284,6 +284,9 @@ public class DummyInventoryInfoEO implements Serializable {
     @TableField(exist = false)
     private Integer pageSize;
 
+    //文档库id
+    private String bussDocumentLibraryId;
+
 
 
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml

@@ -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>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java

@@ -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);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -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);
 						}
 					}