ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 年度制修订导入翻译Bug

Browse Source
This commit is contained in:
mzaxd
2023-10-23 15:51:12 +08:00
parent 37d9730b8a
commit 11e8b2c594
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
-3
View File
@@ -15,7 +15,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecgframework.poi.excel.annotation.ExcelVerify;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
@@ -228,7 +227,6 @@ public class ProcessEsAnnualInit implements Serializable {
*/
@Excel(name = "主起草人", width = 15, orderNum = "9")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@NotNull
@ApiModelProperty(value = "主起草人")
private String mainDraftingUser;
@@ -237,7 +235,6 @@ public class ProcessEsAnnualInit implements Serializable {
*/
@Excel(name = "主起草单位", width = 15, orderNum = "10")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@NotNull
@ApiModelProperty(value = "主起草单位")
private String mainDraftingUnit;
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
+13 -12
View File
@@ -114,14 +114,14 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 原企标名称
*/
@Excel(name = "原企标名称", width = 15, orderNum = "4")
@Excel(name = "原企标名称", width = 15, orderNum = "3")
@ApiModelProperty(value = "原企标名称")
private String originEnStandardName;
/**
* 新企标名称
*/
@Excel(name = "新企标名称", width = 15, orderNum = "5")
@Excel(name = "新企标名称", width = 15, orderNum = "4")
@ApiModelProperty(value = "新企标名称")
private String newEnStandardName;
@@ -140,7 +140,7 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 企业标准代号
*/
@Excel(name = "企业标准代号", width = 15, orderNum = "7")
@Excel(name = "企业标准代号", width = 15, orderNum = "6")
@Dict(dicCode = "enterprise_standard_code")
@ApiModelProperty(value = "企业标准代号")
private String enStandardCode;
@@ -178,7 +178,7 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 草稿计划完成日期
*/
@Excel(name = "草稿计划完成日期", width = 20, orderNum = "13")
@Excel(name = "草稿计划完成日期", width = 20, orderNum = "12")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "草稿计划完成日期")
@@ -187,7 +187,7 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 征求意见稿计划完成日期
*/
@Excel(name = "征求意见稿计划完成日期", width = 24, orderNum = "14")
@Excel(name = "征求意见稿计划完成日期", width = 24, orderNum = "13")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "征求意见稿计划完成日期")
@@ -196,7 +196,7 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 计划报批日期
*/
@Excel(name = "计划报批日期", width = 15, orderNum = "15")
@Excel(name = "计划报批日期", width = 15, orderNum = "14")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "计划报批日期")
@@ -229,14 +229,15 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 主起草单位
*/
@Excel(name = "主起草单位", width = 15, orderNum = "9")
@Excel(name = "主起草单位", width = 15, orderNum = "8")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "主起草单位")
private String mainDraftingUnit;
/**
* 主起草单位责任人
*/
@Excel(name = "主起草单位责任人", width = 20, orderNum = "10")
@Excel(name = "主起草单位责任人", width = 20, orderNum = "9")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson;
@@ -244,7 +245,7 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 标准推进人
*/
@Excel(name = "标准推进人", width = 15, orderNum = "12")
@Excel(name = "标准推进人", width = 15, orderNum = "11")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@ApiModelProperty(value = "标准推进人")
private String standardPromoter;
@@ -301,7 +302,7 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 授权部门
*/
@Excel(name = "授权部门", width = 15, orderNum = "6")
@Excel(name = "授权部门", width = 15, orderNum = "5")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "授权部门")
private String authDept;
@@ -309,7 +310,7 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 配合单位
*/
@Excel(name = "配合单位", width = 15, orderNum = "8")
@Excel(name = "配合单位", width = 15, orderNum = "7")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "配合单位")
private String cooperationUnit;
@@ -317,7 +318,7 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 隶属工作组
*/
@Excel(name = "隶属工作组", width = 15, orderNum = "11")
@Excel(name = "隶属工作组", width = 15, orderNum = "10")
@Dict(dictTable = "laws_working_group", dicCode = "id", dicText = "name")
@ApiModelProperty(value = "隶属工作组")
private String workGroup;
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+3 -5
View File
@@ -117,12 +117,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
if (ESPProjectType.ENACT.getValue().equals(item.getProjectType())) {
item.setOriginEnStandardName(null);
item.setOriginEnStandardNo(null);
}
// 设置变更状态 制定是新增 修订是变更
if (item.getProjectType().equals("制定")) {
item.setChangeStatus("新增");
// 设置变更状态 制定是新增 修订是变更
item.setChangeStatus("1");
} else {
item.setChangeStatus("变更");
item.setChangeStatus("2");
}
});
}