diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java index bc02e0c..2b18d21 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java @@ -99,9 +99,9 @@ public class ImprovementDeptScore implements Serializable { /**所属部门*/ @Schema(description = "所属部门") private String sysOrgCode; - /**删除状态:0正常,1已删除*/ + /**逻辑删除标识,新增记录默认为正常状态*/ @Excel(name = "删除状态:0正常,1已删除", width = 15) @Schema(description = "删除状态:0正常,1已删除") @TableLogic - private String delFlag; + private String delFlag = "0"; } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java index b74dae0..c1a671a 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java @@ -83,9 +83,9 @@ public class ImprovementInstituteVote implements Serializable { /**所属部门*/ @Schema(description = "所属部门") private String sysOrgCode; - /**删除状态:0正常,1已删除*/ + /**逻辑删除标识,新增记录默认为正常状态*/ @Excel(name = "删除状态:0正常,1已删除", width = 15) @Schema(description = "删除状态:0正常,1已删除") @TableLogic - private String delFlag; + private String delFlag = "0"; } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java index 3a54fa4..ba3569d 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java @@ -172,9 +172,9 @@ public class ImprovementProposal implements Serializable { /**所属部门*/ @Schema(description = "所属部门") private String sysOrgCode; - /**删除状态:0正常,1已删除*/ + /**逻辑删除标识,新增记录默认为正常状态*/ @Excel(name = "删除状态:0正常,1已删除", width = 15) @Schema(description = "删除状态:0正常,1已删除") @TableLogic - private String delFlag; + private String delFlag = "0"; } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java index 1105988..7e41be7 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java @@ -23,6 +23,7 @@ import java.util.Collection; */ @Service public class ImprovementProposalServiceImpl extends ServiceImpl implements IImprovementProposalService { + private static final String NORMAL_DEL_FLAG = "0"; @Autowired private ImprovementProposalMapper improvementProposalMapper; @@ -34,11 +35,18 @@ public class ImprovementProposalServiceImpl extends ServiceImpl improvementDeptScoreList,List improvementInstituteVoteList) { + // 页面 VO 的空值可能覆盖实体默认值,入库前统一补齐逻辑删除正常状态。 + if (improvementProposal.getDelFlag() == null) { + improvementProposal.setDelFlag(NORMAL_DEL_FLAG); + } improvementProposalMapper.insert(improvementProposal); if(improvementDeptScoreList!=null && improvementDeptScoreList.size()>0) { for(ImprovementDeptScore entity:improvementDeptScoreList) { //外键设置 entity.setMainId(improvementProposal.getId()); + if (entity.getDelFlag() == null) { + entity.setDelFlag(NORMAL_DEL_FLAG); + } improvementDeptScoreMapper.insert(entity); } } @@ -46,6 +54,9 @@ public class ImprovementProposalServiceImpl extends ServiceImpl