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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/DictParamsConverter.java

@@ -11,7 +11,7 @@ import java.util.Map;
 
 public class DictParamsConverter implements Converter<String> {
 
-    private static final Map<String, String> dictMap = new HashMap<>();
+    public static final Map<String, String> dictMap = new HashMap<>();
 
     static {
         // 填充映射关系

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/EquCategoryConverter.java

@@ -45,7 +45,6 @@ public class EquCategoryConverter implements Converter<String> {
         equipmentMap.put("碰碰车类", "6A00");
         equipmentMap.put("滑道类", "6B00");
         equipmentMap.put("无动力游乐设施", "6E00");
-        equipmentMap.put("工业管道", "8300");
         equipmentMap.put("客运架空索道", "9100");
         equipmentMap.put("客运缆车", "9200");
         equipmentMap.put("客运拖牵索道", "9300");
@@ -54,6 +53,9 @@ public class EquCategoryConverter implements Converter<String> {
         equipmentMap.put("液压驱动电梯", "3200");
         equipmentMap.put("自动扶梯与自动人行道", "3300");
         equipmentMap.put("其它类型电梯", "3400");
+        equipmentMap.put("长输管道", "8100");
+        equipmentMap.put("公用管道", "8200");
+        equipmentMap.put("工业管道", "8300");
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/EquDefineConverter.java

@@ -63,9 +63,6 @@ public class EquDefineConverter implements Converter<String> {
         equipmentMap.put("滑索系列", "6E20");
         equipmentMap.put("空中飞人系列", "6E30");
         equipmentMap.put("系留式观光气球系列", "6E40");
-        equipmentMap.put("工艺管道", "8310");
-        equipmentMap.put("动力管道", "8320");
-        equipmentMap.put("制冷管道", "8330");
         equipmentMap.put("往复式客运架空索道", "9110");
         equipmentMap.put("循环式客运架空索道", "9120");
         equipmentMap.put("往复式客运缆车", "9210");
@@ -83,6 +80,13 @@ public class EquDefineConverter implements Converter<String> {
         equipmentMap.put("防爆电梯", "3410");
         equipmentMap.put("消防员电梯", "3420");
         equipmentMap.put("杂物电梯", "3430");
+        equipmentMap.put("输油管道", "8110");
+        equipmentMap.put("输气管道", "8120");
+        equipmentMap.put("燃气管道", "8210");
+        equipmentMap.put("热力管道", "8220");
+        equipmentMap.put("工艺管道", "8310");
+        equipmentMap.put("动力管道", "8320");
+        equipmentMap.put("制冷管道", "8330");
     }
 
     @Override

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class EquipRequestParamsDto {
+    private String companyCode;
+    private String companyName;
+    private String companyAddress;
+    private String execUserId;
+    private String execUserName;
+    private String equListCode;
+    private String equListName;
+    private String equCategoryCode;
+    private String equCategoryName;
+    private String equDefineCode;
+    private String equDefineName;
+    private String dataSource;
+    private String orgBranchCode;
+    private String orgBranchName;
+    private String useOrgCode;
+    private String vehicleApanage;
+    private String receiveOrgCode;
+    private String receiveOrgName;
+    private String projectContraptionSeq;
+    private String projectContraption;
+    private String projectContraptionNo;
+    private String productPhoto;
+    private String productQualificationCertificate;
+    private String otherAccessories;
+    private double pipelineLength;
+    private String equCode;
+    private String inspectUnitCreditCode;
+    private String inspectUnitName;
+}
\ No newline at end of file

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

@@ -11,7 +11,7 @@ import java.util.Map;
 
 public class InspectConclusionConverter implements Converter<String> {
 
-    private static final Map<String, String> dictMap = new HashMap<>();
+    public static final Map<String, String> dictMap = new HashMap<>();
 
     static {
         // 填充映射关系

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

@@ -11,7 +11,7 @@ import java.util.Map;
 
 public class InspectTypeConverter implements Converter<String> {
 
-    private static final Map<String, String> dictMap = new HashMap<>();
+    public static final Map<String, String> dictMap = new HashMap<>();
 
     static {
         // 填充映射关系

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

@@ -88,21 +88,21 @@ public class PipingExcelDto extends BaseDto {
 
     @ApiModelProperty(value = "安装单位统一社会信用代码")
     @ExcelProperty(value = "安装单位统一社会信用代码")
-    private String installUnitCode;
+    private String uscUnitCreditCode;
 
     @ApiModelProperty(value = "安装单位名称")
     @ExcelProperty(value = "安装单位名称")
-    private String installUnitName;
+    private String uscUnitName;
 
     //-----------------------------------------------------------------------检验检测信息
 
     @ApiModelProperty(value = "检验检测机构统一社会信用代码")
     @ExcelProperty(value = "检验检测机构统一社会信用代码")
-    private String inspectUnitCode;
+    private String inspectOrgCode;
 
     @ApiModelProperty(value = "检验检测机构名称")
     @ExcelProperty(value = "检验检测机构名称")
-    private String inspectUnitName;
+    private String inspectOrgName;
 
     @ApiModelProperty(value = "检验结论")
     @ExcelProperty(value = "检验结论")
@@ -118,7 +118,7 @@ public class PipingExcelDto extends BaseDto {
 
     @ApiModelProperty(value = "检验人员名称")
     @ExcelProperty(value = "检验人员名称")
-    private String inspectPersonName;
+    private String inspectStaff;
 
     @ApiModelProperty(value = "下次检验日期")
     @ExcelProperty(value = "下次检验日期")
@@ -126,7 +126,7 @@ public class PipingExcelDto extends BaseDto {
 
     @ApiModelProperty(value = "检验报告编号")
     @ExcelProperty(value = "检验报告编号")
-    private String inspectReportCode;
+    private String inspectReportNo;
 
     //-----------------------------------------------------------------------设计信息
 

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

@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 import java.util.Date;
 
@@ -19,6 +18,9 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tzs_jg_registration_history")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class JgRegistrationHistory extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -2077,7 +2077,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         createProjectConstruction2Db(jgInstallationNotice, projectContraption, deviceRegistrationCode, noticeRelationEquips);
     }
 
-    private String generateEquCode(String equListCode, String equCategoryCode, String equDefineCode, Date now, String receiveCompanyCode) {
+    public String generateEquCode(String equListCode, String equCategoryCode, String equDefineCode, Date now, String receiveCompanyCode) {
         CodeGenerateDto codeGenerateDto = new CodeGenerateDto();
         codeGenerateDto.setEquList(equListCode);
         codeGenerateDto.setEquCategory(equCategoryCode);