Merge branch 'develop_unit_register' into 'developer'

amos-boot-data/amos-boot-data-openapi/src/main/resources/application.properties

@@ -11,4 +11,4 @@ redis.cache.failure.time=10800
 # mybatis-plus
 mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml
 mybatis-plus.type-aliases-super-type=org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity
-mybatis-plus.global-config.db-config.id-type=id_worker
+mybatis-plus.global-config.db-config.id-type=ID_WORKER

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgBasicInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
+import java.util.List;
+
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgConstructionInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgDesignInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgInspectionInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgMaintenanceInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgOtherInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgProduceInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgRegistrationInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgSuperviseInfo;
-import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgUseInfo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -83,16 +76,29 @@ public class TzsJgBasicInfoDto extends BaseDto {
 	@ApiModelProperty(value = "施工信息-最新一次")
 	private TzsJgConstructionInfoDto constructionInfo;
 
+	@ApiModelProperty(value = "施工信息列表")
+	private List<TzsJgConstructionInfoDto> constructionInfoList;
+
 	@ApiModelProperty(value = "维保信息")
 	private TzsJgMaintenanceInfoDto maintenanceInfo;
 
+	@ApiModelProperty(value = "维保信息列表")
+	private List<TzsJgMaintenanceInfoDto> maintenanceInfoList;
+
 	@ApiModelProperty(value = "技术信息")
 	private TzsJgElevatorTechInfoDto elevatorTechInfo;
 
 	@ApiModelProperty(value = "检验信息")
 	private TzsJgInspectionInfoDto inspectionInfo;
 
-	
+	@ApiModelProperty(value = "检验信息列表")
+	private List<TzsJgInspectionInfoDto> inspectionInfoList;
+
 	@ApiModelProperty(value = "其他信息")
 	private TzsJgOtherInfoDto otherInfo;
+
+	@ApiModelProperty(value = "附件信息")
+	private List<TzsJgEnclosureInfoDto> enclousureInfo;
+	
+	private String superviseKey;
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgFile.java

@@ -51,4 +51,5 @@ public class TzsJgFile extends BaseEntity {
 	@ApiModelProperty(value = "对接公司编码")
 	private String appId;
 
+	private Long squNbr;
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/JgFileObjectEnum.java

@@ -10,7 +10,7 @@ package com.yeejoin.amos.boot.module.tzs.api.enums;
 
 public enum JgFileObjectEnum {
 
-    DESIGN_INFO("designInf"),
+    DESIGN_INFO("designInfo"),
     PRODUCE_INFO("produceInfo"),
     REGISTRATION_INFO("registrationInfo"),
     MAINTENANCE_INFO("maintenanceInfo"),

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TzsJgMapper.xml

@@ -39,6 +39,11 @@
 		supervise.sequence_code
 		<where>
 			<if
+				test="tzsJgBasicInfoDto.orgBranchCode!=null and tzsJgBasicInfoDto.orgBranchCode!='' ">
+				AND supervise.org_branch_code LIKE
+				CONCAT('%',#{tzsJgBasicInfoDto.orgBranchCode},'%')
+			</if>
+			<if
 				test="tzsJgBasicInfoDto.orgBranchName!=null and tzsJgBasicInfoDto.orgBranchName!='' ">
 				AND supervise.org_branch_name LIKE
 				CONCAT('%',#{tzsJgBasicInfoDto.orgBranchName},'%')
@@ -70,7 +75,7 @@
 			</if>
 			<if
 				test="tzsJgBasicInfoDto.equDefine!=null and tzsJgBasicInfoDto.equDefine!='' ">
-				AND supervise.equ_define LIKE
+				AND registration.equ_define LIKE
 				CONCAT('%',#{tzsJgBasicInfoDto.equDefine},'%')
 			</if>
 			<if