67169 法规清单导出问题修改。

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

@@ -86,7 +86,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String inventoryAffirmStatus;
 
     @TableField(exist = false)
-    @Excel(name = "清单确认状态", width = 20)
+    // @Excel(name = "清单确认状态", width = 20)
     @ApiModelProperty(value = "清单确认状态名称")
     private String inventoryAffirmStatusName;//清单确认状态名称
 
@@ -96,7 +96,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "任务发布状态名称")
-    @Excel(name = "任务确认状态", width = 20)
+    // @Excel(name = "任务确认状态", width = 20)
     private String taskAffirmStatusName;//任务发布状态名称
 
     /**适用地区*/
@@ -274,7 +274,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String designRemark;
 
 	/**prehomo确认-交付物类型*/
-	@Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认")
+//	@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 = "交付物模板", width = 20,groupName = "Pre-homo确认")
+//    @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 = "发起人", width = 20,groupName = "Pre-homo确认")
+//    @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 = "责任人", width = 20,groupName = "Pre-homo确认")
+//    @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认")
     @TableField(exist = false)
     private String prehomoDutyName;
 
 	/**prehomo确认-截止时间*/
-	@Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认")
+//	@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,7 +337,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoDueDateString;
 
     //prehomo确认-交付物说明
-    @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认")
+//    @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认")
     private String prehomoRemark;
 
 	/**验证符合性确认-交付物类型*/
@@ -488,12 +488,14 @@ public class ProjectLawsInventoryEO implements Serializable {
     @ApiModelProperty(value = "设计符合性确认-流程状态")
     private String designFlowStatus;
     @TableField(exist = false)
+    @Excel(name = "流程状态", width = 20,groupName = "设计符合性确认")
     private String designFlowStatusName;
 
     /**验证符合性确认-流程状态*/
     @ApiModelProperty(value = "验证符合性确认-流程状态")
     private String verifyFlowStatus;
     @TableField(exist = false)
+    @Excel(name = "流程状态", width = 20,groupName = "验证符合性确认")
     private String verifyFlowStatusName;
 
     /**验证符合性确认-流程实例id*/

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

@@ -85,7 +85,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String inventoryAffirmStatus;
 
     @TableField(exist = false)
-    @Excel(name = "List Confirmation Status", width = 30)
+//    @Excel(name = "List Confirmation Status", width = 30)
     @ApiModelProperty(value = "清单确认状态名称")
     private String inventoryAffirmStatusName;//清单确认状态名称
 
@@ -95,7 +95,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "任务发布状态名称")
-    @Excel(name = "Task Confirmation Status", width = 30)
+//    @Excel(name = "Task Confirmation Status", width = 30)
     private String taskAffirmStatusName;//任务发布状态名称
 
     /**适用地区*/
@@ -245,7 +245,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String designRemark;
 
 	/**prehomo确认-交付物类型*/
-	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check")
+//	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check")
     @ApiModelProperty(value = "prehomo确认-1")
     @Dict(dicCode ="deliverable_template")
     private String prehomoDeliverableType;
@@ -256,7 +256,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
 
     /**prehomo确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check")
+//    @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check")
     private String prehomoDeliverableTemplateName;
 
 	/**prehomo确认-发起人角色*/
@@ -269,7 +269,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoInitiatorId;
 
     /**prehomo确认-发起人名称*/
-    @Excel(name = "Reviewer", width = 25,groupName = "Pre-homo Check")
+//    @Excel(name = "Reviewer", width = 25,groupName = "Pre-homo Check")
     @TableField(exist = false)
     private String prehomoInitiatorName;
 
@@ -283,12 +283,12 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoDutyId;
 
     /**prehomo确认-责任人名称*/
-    @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check")
+//    @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check")
     @TableField(exist = false)
     private String prehomoDutyName;
 
 	/**prehomo确认-截止时间*/
-	@Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check")
+//	@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确认-截止时间")
@@ -297,7 +297,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoDueDateString;
 
     //prehomo确认-交付物说明
-    @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check")
+//    @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check")
     private String prehomoRemark;
 
 	/**验证符合性确认-交付物类型*/
@@ -411,5 +411,14 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     @ApiModelProperty(value = "调取虚拟清单,虚拟清单中维护数据为空时,进行二次确认")
     private String flag;
 
+    /**设计符合性确认-流程状态*/
+    @TableField(exist = false)
+    @Excel(name = "Process Status", width = 25,groupName = "Design Compliance Check")
+    private String designFlowStatusName;
+
+    /**验证符合性确认-流程状态*/
+    @TableField(exist = false)
+    @Excel(name = "Process Status", width = 25,groupName = "Validation Compliance Check")
+    private String verifyFlowStatusName;
 
 }

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

@@ -5146,6 +5146,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		//数据转换(文件名称,对应标准)
 		dataTransition(dataList, fileInfos,sysUserList,projectLawsInventoryEO);
 
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		this.dataDispose(dataList,currentUser,Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()),projectLawsInventoryEO.getCut());
 		OutputStream os = null;
 		try {
 			response.setContentType("application/force-download");