法规清单导出

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java

@@ -67,7 +67,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String projectLibraryId;
 
 	/**编号*/
-	@Excel(name = "编号", width = 20)
+	@Excel(name = "*编号", width = 20)
     @ApiModelProperty(value = "编号")
     private String serialNumber;
 
@@ -150,7 +150,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 	private String attestationType_dictText;
 
 	/**认证级别*/
-	@Excel(name = "认证级别", width = 20,dicCode ="attestation_rank")
+	@Excel(name = "*认证级别", width = 20,dicCode ="attestation_rank")
     @ApiModelProperty(value = "认证级别")
     //@Dict(dicCode ="attestation_rank")
     private String attestationRank;
@@ -167,7 +167,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String wvtaId;
 
 	/**责任领域*/
-	@Excel(name = "责任领域", width = 20,dicCode ="duty_territory")
+	@Excel(name = "*责任领域", width = 20,dicCode ="duty_territory")
     @ApiModelProperty(value = "责任领域")
     //@Dict(dicCode ="duty_territory")
     private String dutyTerritory;
@@ -207,7 +207,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String remark;
 
 	/**设计符合性确认-交付物类型*/
-	@Excel(name = "设计符合性确认-交付物类型", width = 20,dicCode ="deliverable_template")
+	@Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "设计符合性确认")
     @ApiModelProperty(value = "设计符合性确认-交付物类型")
     //@Dict(dicCode ="deliverable_template")
     private String designDeliverableType;
@@ -222,7 +222,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 
     /**设计符合性确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "设计符合性确认-交付物模板", width = 20)
+    @Excel(name = "交付物模板", width = 20,groupName = "设计符合性确认")
     private String designDeliverableTemplateName;
 
 	/**设计符合性确认-发起人角色*/
@@ -238,7 +238,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String designInitiatorId;
 
     /**设计符合性确认-发起人名称*/
-    @Excel(name = "设计符合性确认-发起人", width = 20)
+    @Excel(name = "发起人", width = 20,groupName = "设计符合性确认")
     @TableField(exist = false)
     private String designInitiatorName;
 
@@ -255,12 +255,12 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String designDutyId;
 
     /**设计符合性确认-责任人名称*/
-    @Excel(name = "设计符合性确认-责任人", width = 20)
+    @Excel(name = "责任人", width = 20,groupName = "设计符合性确认")
     @TableField(exist = false)
     private String designDutyName;
 
 	/**设计符合性确认-截止时间*/
-	@Excel(name = "设计符合性确认-截止时间", width = 20, format = "yyyy-MM-dd")
+	@Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "设计符合性确认")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "设计符合性确认-截止时间")
@@ -270,11 +270,11 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String designDueDateString;
 
     //交付物说明
-    @Excel(name = "设计符合性确认-交付物说明", width = 20)
+    @Excel(name = "交付物说明", width = 20,groupName = "设计符合性确认")
     private String designRemark;
 
 	/**prehomo确认-交付物类型*/
-	@Excel(name = "prehomo确认-交付物类型", width = 20,dicCode ="deliverable_template")
+	@Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认")
     @ApiModelProperty(value = "prehomo确认-1")
     ////@Dict(dicCode ="deliverable_template")
     private String prehomoDeliverableType;
@@ -289,7 +289,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 
     /**prehomo确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "prehomo确认-交付物模板", width = 20)
+    @Excel(name = "交付物模板", width = 20,groupName = "Pre-homo确认")
     private String prehomoDeliverableTemplateName;
 
 	/**prehomo确认-发起人角色*/
@@ -305,7 +305,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoInitiatorId;
 
     /**prehomo确认-发起人名称*/
-    @Excel(name = "prehomo确认-发起人", width = 20)
+    @Excel(name = "发起人", width = 20,groupName = "Pre-homo确认")
     @TableField(exist = false)
     private String prehomoInitiatorName;
 
@@ -322,12 +322,12 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoDutyId;
 
     /**prehomo确认-责任人名称*/
-    @Excel(name = "prehomo确认-责任人", width = 20)
+    @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认")
     @TableField(exist = false)
     private String prehomoDutyName;
 
 	/**prehomo确认-截止时间*/
-	@Excel(name = "prehomo确认-截止时间", width = 20, format = "yyyy-MM-dd")
+	@Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "prehomo确认-截止时间")
@@ -337,11 +337,11 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoDueDateString;
 
     //prehomo确认-交付物说明
-    @Excel(name = "prehomo确认-交付物说明", width = 20)
+    @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认")
     private String prehomoRemark;
 
 	/**验证符合性确认-交付物类型*/
-	@Excel(name = "验证符合性确认-交付物类型", width = 20,dicCode ="deliverable_template")
+	@Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "验证符合性确认")
     @ApiModelProperty(value = "验证符合性确认-交付物类型")
     //@Dict(dicCode ="deliverable_template")
     private String verifyDeliverableType;
@@ -355,7 +355,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String verifyDeliverableTemplate;
 
     /**验证符合性确认-交付物模板名称*/
-    @Excel(name = "验证符合性确认-交付物模板", width = 20)
+    @Excel(name = "交付物模板", width = 20,groupName = "验证符合性确认")
     @TableField(exist = false)
     private String verifyDeliverableTemplateName;
 
@@ -372,7 +372,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String verifyInitiatorId;
 
     /**验证符合性确认-发起人名称*/
-    @Excel(name = "验证符合性确认-发起人", width = 20)
+    @Excel(name = "发起人", width = 20,groupName = "验证符合性确认")
     @TableField(exist = false)
     private String verifyInitiatorName;
 
@@ -389,12 +389,12 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String verifyDutyId;
 
     /**验证符合性确认-责任人名称*/
-    @Excel(name = "验证符合性确认-责任人", width = 20)
+    @Excel(name = "责任人", width = 20,groupName = "验证符合性确认")
     @TableField(exist = false)
     private String verifyDutyName;
 
 	/**验证符合性确认-截止时间*/
-	@Excel(name = "验证符合性确认-截止时间", width = 20, format = "yyyy-MM-dd")
+	@Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "验证符合性确认")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "验证符合性确认-截止时间")
@@ -404,7 +404,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String verifyDueDateString;
 
     //验证备注
-    @Excel(name = "验证符合性确认-交付物说明", width = 20)
+    @Excel(name = "交付物说明", width = 20,groupName = "验证符合性确认")
     private String verifyRemark;
 
     @TableField(exist = false)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java

@@ -188,7 +188,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String remark;
 
 	/**设计符合性确认-交付物类型*/
-	@Excel(name = "Design Compliance Check Deliverable Type", width = 50,dicCode ="deliverable_template")
+	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Design Compliance Check")
     @ApiModelProperty(value = "设计符合性确认-交付物类型")
     @Dict(dicCode ="deliverable_template")
     private String designDeliverableType;
@@ -199,7 +199,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
 
     /**设计符合性确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "Design Compliance Check Deliverable Template", width = 50)
+    @Excel(name = "Deliverable Template", width = 25,groupName = "Design Compliance Check")
     private String designDeliverableTemplateName;
 
 	/**设计符合性确认-发起人角色*/
@@ -212,7 +212,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String designInitiatorId;
 
     /**设计符合性确认-发起人名称*/
-    @Excel(name = "Design Compliance Check Initiator", width = 50)
+    @Excel(name = "Initiator", width = 25,groupName = "Design Compliance Check")
     @TableField(exist = false)
     private String designInitiatorName;
 
@@ -226,12 +226,12 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String designDutyId;
 
     /**设计符合性确认-责任人名称*/
-    @Excel(name = "Design Compliance Check Assignee", width = 50)
+    @Excel(name = "Assignee", width = 25,groupName = "Design Compliance Check")
     @TableField(exist = false)
     private String designDutyName;
 
 	/**设计符合性确认-截止时间*/
-	@Excel(name = "Design Compliance Check Due Date", width = 50, format = "yyyy-MM-dd")
+	@Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Design Compliance Check")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "设计符合性确认-截止时间")
@@ -240,11 +240,11 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String designDueDateString;
 
     //交付物说明
-    @Excel(name = "Design Compliance Check Deliverable Description", width = 50)
+    @Excel(name = "Deliverable Description", width = 25,groupName = "Design Compliance Check")
     private String designRemark;
 
 	/**prehomo确认-交付物类型*/
-	@Excel(name = "Pre-homo Check Deliverable Type", width = 50,dicCode ="deliverable_template")
+	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check")
     @ApiModelProperty(value = "prehomo确认-1")
     @Dict(dicCode ="deliverable_template")
     private String prehomoDeliverableType;
@@ -255,7 +255,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
 
     /**prehomo确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "Pre-homo Check Deliverable Template", width = 50)
+    @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check")
     private String prehomoDeliverableTemplateName;
 
 	/**prehomo确认-发起人角色*/
@@ -268,7 +268,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoInitiatorId;
 
     /**prehomo确认-发起人名称*/
-    @Excel(name = "Pre-homo Check Initiator", width = 50)
+    @Excel(name = "Initiator", width = 25,groupName = "Pre-homo Check")
     @TableField(exist = false)
     private String prehomoInitiatorName;
 
@@ -282,12 +282,12 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoDutyId;
 
     /**prehomo确认-责任人名称*/
-    @Excel(name = "Pre-homo Check Assignee", width = 50)
+    @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check")
     @TableField(exist = false)
     private String prehomoDutyName;
 
 	/**prehomo确认-截止时间*/
-	@Excel(name = "Pre-homo Check Due Date", width = 50, format = "yyyy-MM-dd")
+	@Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "prehomo确认-截止时间")
@@ -296,11 +296,11 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoDueDateString;
 
     //prehomo确认-交付物说明
-    @Excel(name = "Pre-homo Check Deliverable Description", width = 50)
+    @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check")
     private String prehomoRemark;
 
 	/**验证符合性确认-交付物类型*/
-	@Excel(name = "Validation Compliance Check Deliverable Type", width = 50,dicCode ="deliverable_template")
+	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Validation Compliance Check")
     @ApiModelProperty(value = "验证符合性确认-交付物类型")
     @Dict(dicCode ="deliverable_template")
     private String verifyDeliverableType;
@@ -310,7 +310,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String verifyDeliverableTemplate;
 
     /**验证符合性确认-交付物模板名称*/
-    @Excel(name = "Validation Compliance Check Deliverable Template", width = 50)
+    @Excel(name = "Deliverable Template", width = 25,groupName = "Validation Compliance Check")
     @TableField(exist = false)
     private String verifyDeliverableTemplateName;
 
@@ -324,7 +324,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String verifyInitiatorId;
 
     /**验证符合性确认-发起人名称*/
-    @Excel(name = "Validation Compliance Check Initiator", width = 50)
+    @Excel(name = "Initiator", width = 25,groupName = "Validation Compliance Check")
     @TableField(exist = false)
     private String verifyInitiatorName;
 
@@ -338,12 +338,12 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String verifyDutyId;
 
     /**验证符合性确认-责任人名称*/
-    @Excel(name = "Validation Compliance Check Assignee", width = 50)
+    @Excel(name = "Assignee", width = 25,groupName = "Validation Compliance Check")
     @TableField(exist = false)
     private String verifyDutyName;
 
 	/**验证符合性确认-截止时间*/
-	@Excel(name = "Validation Compliance Check Due Date", width = 50, format = "yyyy-MM-dd")
+	@Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Validation Compliance Check")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "验证符合性确认-截止时间")
@@ -352,7 +352,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String verifyDueDateString;
 
     //验证备注
-    @Excel(name = "Validation Compliance Check Deliverable Description", width = 60)
+    @Excel(name = "Deliverable Description", width = 25,groupName = "Validation Compliance Check")
     private String verifyRemark;
 
     @TableField(exist = false)

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

@@ -3990,7 +3990,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		if(StringUtils.isNotBlank(projectLawsInventoryEO.getIds())){
 			queryWrapper.in("id",Arrays.asList(projectLawsInventoryEO.getIds().split(",")));
 		}
-		queryWrapper.orderByDesc("create_time");
+		queryWrapper.orderByDesc("create_time","serial_number");
 
 		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
 		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())