style: 调整外部标准库实体类字段

laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsDomesticStandard.java

@@ -26,8 +26,9 @@ import java.io.Serializable;
 @TableName("laws_domestic_standard")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="laws_domestic_standard对象", description="国内标准")
+@ApiModel(value="laws_domestic_standard对象", description="外来标准")
 public class LawsDomesticStandard implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
@@ -100,39 +101,31 @@ public class LawsDomesticStandard implements Serializable {
     @ApiModelProperty(value = "实施日期")
     private java.util.Date implementationDate;
 	/**在产车实施日期*/
-	@Excel(name = "在产车实施日期", width = 15)
-    @ApiModelProperty(value = "在产车实施日期")
-    private java.lang.String onTheProductionDate;
+	@Excel(name = "新认证车实施日期", width = 15)
+    @ApiModelProperty(value = "新认证车实施日期")
+    private java.lang.String newAuthImplDate;
 	/**新车型实施日期*/
-	@Excel(name = "新车型实施日期", width = 15)
-    @ApiModelProperty(value = "新车型实施日期")
-    private java.lang.String newModelImplementationDate;
-	/**废止日期*/
-	@Excel(name = "废止日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@Excel(name = "新生产车实施日期", width = 15)
+    @ApiModelProperty(value = "新生产车实施日期")
+    private java.lang.String newProductImplDate;
+    /**实施日期*/
+    @Excel(name = "注册日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "废止日期")
-    private java.util.Date annulmentDate;
+    @ApiModelProperty(value = "注册日期")
+    private java.util.Date registrationDate;
 	/**标准状态*/
 	@Excel(name = "标准状态", width = 15)
     @ApiModelProperty(value = "标准状态")
     private java.lang.String standardState;
-	/**归口管理部门*/
-	@Excel(name = "归口管理部门", width = 15)
-    @ApiModelProperty(value = "归口管理部门")
-    private java.lang.String centralizedManagementDepartments;
-	/**分标委*/
-	@Excel(name = "分标委", width = 15)
-    @ApiModelProperty(value = "分标委")
-    private java.lang.String biddingCommittee;
 	/**责任部门*/
-	@Excel(name = "责任部门", width = 15)
-    @ApiModelProperty(value = "责任部门")
-    private java.lang.String responsibleDepartment;
+	@Excel(name = "主控部门", width = 15)
+    @ApiModelProperty(value = "主控部门")
+    private java.lang.String mainDept;
     /**责任部门负责人*/
-    @Excel(name = "责任部门负责人", width = 15)
-    @ApiModelProperty(value = "责任部门负责人")
-    private java.lang.String responsibleDepartmentUser;
+    @Excel(name = "主控部门专业模块", width = 15)
+    @ApiModelProperty(value = "主控部门专业模块")
+    private java.lang.String mainDeptProfMode;
 	/**企业参与情况*/
 	@Excel(name = "企业参与情况", width = 15)
     @ApiModelProperty(value = "企业参与情况")
@@ -141,10 +134,6 @@ public class LawsDomesticStandard implements Serializable {
 	@Excel(name = "零部件名称", width = 15)
     @ApiModelProperty(value = "零部件名称")
     private java.lang.String partName;
-	/**适用认证*/
-	@Excel(name = "适用认证", width = 15)
-    @ApiModelProperty(value = "适用认证")
-    private java.lang.String applicableCertification;
 	/**适用车型*/
 	@Excel(name = "适用车型", width = 15)
     @ApiModelProperty(value = "适用车型")
@@ -176,15 +165,15 @@ public class LawsDomesticStandard implements Serializable {
 	/**采标程度*/
 	@Excel(name = "采标程度", width = 15)
     @ApiModelProperty(value = "采标程度")
-    private java.lang.String degreeOfBidAcquisition;
-	/**采用国际标准号*/
-	@Excel(name = "采用国际标准号", width = 15)
-    @ApiModelProperty(value = "采用国际标准号")
-    private java.lang.String adoptTheInternationalStandardNumber;
+    private java.lang.String acquisitionDegree;
 	/**关联国外标准*/
-	@Excel(name = "关联国外标准", width = 15)
-    @ApiModelProperty(value = "关联国外标准")
-    private java.lang.String associatedForeignStandards;
+	@Excel(name = "关联企业标准", width = 15)
+    @ApiModelProperty(value = "关联企业标准")
+    private java.lang.String associatedEnterpriseStandard;
+    /**关联国外标准*/
+    @Excel(name = "关联标准", width = 15)
+    @ApiModelProperty(value = "关联标准")
+    private java.lang.String associatedStandard;
 	/**发布搞（原文）*/
 	@Excel(name = "发布搞（原文）", width = 15)
     @ApiModelProperty(value = "发布搞（原文）")
@@ -209,9 +198,39 @@ public class LawsDomesticStandard implements Serializable {
 	@Excel(name = "草案", width = 15)
     @ApiModelProperty(value = "草案")
     private java.lang.String draft;
+    /**TBT通报文件*/
+    @Excel(name = "TBT通报文件", width = 15)
+    @ApiModelProperty(value = "TBT通报文件")
+    private java.lang.String tbtFile;
+    /**关联部门*/
+    @Excel(name = "关联部门", width = 15)
+    @ApiModelProperty(value = "关联部门")
+    private java.lang.String related_department;
+    /**关联部门专业模块*/
+    @Excel(name = "关联部门专业模块", width = 15)
+    @ApiModelProperty(value = "关联部门专业模块")
+    private java.lang.String associateDepartmentSpecializedModules;
+    /**专业领域*/
+    @Excel(name = "专业领域", width = 15)
+    @ApiModelProperty(value = "专业领域")
+    private java.lang.String professionalField;
+    /**排查阶段*/
+    @Excel(name = "排查阶段", width = 15)
+    @ApiModelProperty(value = "排查阶段")
+    private java.lang.String investigationStage;
+    /**P3证明符合性的交付物名称*/
+    @Excel(name = "P3证明符合性的交付物名称", width = 15)
+    @ApiModelProperty(value = "P3证明符合性的交付物名称")
+    private java.lang.String p3Name;
+    /**P5证明符合性的交付物名称*/
+    @Excel(name = "P5证明符合性的交付物名称", width = 15)
+    @ApiModelProperty(value = "P5证明符合性的交付物名称")
+    private java.lang.String p5Name;
+    /**是否执行状态自动更新（0不更新 1更新）*/
+    @Excel(name = "是否执行状态自动更新（0不更新 1更新）", width = 15)
+    @ApiModelProperty(value = "是否执行状态自动更新（0不更新 1更新）")
+    private java.lang.String autoUpdateStateFlag;
 
-    /**是否ASMS导入(1是)*/
-    private String isAsmsImport;
     /**标准号*/
     private String standardNumberTemp;
 }

laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java

@@ -68,8 +68,9 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
 				//查询国内标准数据，赋值给collection
 				LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId);
 				if (standard != null){
-					collection.setNewModelImplementationDate(standard.getNewModelImplementationDate());
-					collection.setOnTheProductionDate(standard.getOnTheProductionDate());
+					// TODO
+//					collection.setNewModelImplementationDate(standard.getNewModelImplementationDate());
+//					collection.setOnTheProductionDate(standard.getOnTheProductionDate());
 					collection.setReleaseDate(standard.getReleaseDate());
 					String standard_state = sysDictService.queryDictTextByKey("standard_state", standard.getStandardState());
 					collection.setStandardState(standard_state);

laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java

@@ -204,10 +204,11 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
 					assess.setStandardEnglishName(standard.getStandardEnglishName());
 					assess.setStandardState(standard.getStandardState());
 					assess.setApplicableVehicle(standard.getApplicableVehicle());
-					assess.setOnTheProductionDate(standard.getOnTheProductionDate());
-					assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
-					assess.setReleaseDate(standard.getReleaseDate());
-					assess.setResponsibleDepartment(standard.getResponsibleDepartment());
+					// TODO
+//					assess.setOnTheProductionDate(standard.getOnTheProductionDate());
+//					assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
+//					assess.setReleaseDate(standard.getReleaseDate());
+//					assess.setResponsibleDepartment(standard.getResponsibleDepartment());
 				}
 
 			}