sz-team/supervision-test-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!85 feat(excel): Excel导入校验和翻译支持逗号分隔多值

Browse Source 
* feat(excel): Excel导入校验和翻译支持逗号分隔多值
* fix(xispeak): 移除完成状态Excel导入导出注解，避免导入时覆盖系统自动维护的状态
* fix(xispeak): 修复密级Excel列名typo 非秘→非密
* fix(xispeak,partymatter,dq): 移除实体类 bpmStatus 字段默认值，改为 service 层设置，避免 Q…
* fix(xispeak,partymatter,dq): 实体类 bpmStatus 默认值设为"未开始"
This commit is contained in:
wsm
2026-07-22 07:13:07 +00:00
parent 111c0e2c8d
commit 28d10391a7
5 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java
+4 -4
View File
@@ -89,8 +89,8 @@ public class BgXiSpeak implements Serializable {
@Schema(description = "学习传达研究部署情况")
private java.lang.String status;
/**密级*/
@Excel(name = "密级(请填入非秘/秘密/机密)-必填", width = 15, dicCode = "secret_level")
@ExcelColumn(name = "密级(请填入非秘/秘密/机密)-必填", width = 15, dicCode = "secret_level")
@Excel(name = "密级(请填入非密/秘密/机密)-必填", width = 15, dicCode = "secret_level")
@ExcelColumn(name = "密级(请填入非密/秘密/机密)-必填", width = 15, dicCode = "secret_level")
@Dict(dicCode = "secret_level")
@Schema(description = "密级")
@NotBlank(message = "不能为空")
@@ -154,8 +154,8 @@ public class BgXiSpeak implements Serializable {
@Schema(description = "拖期风险应对措施")
private java.lang.String delayRiskMitigation;
/**完成状态(0推进中，1已完成)*/
@Excel(name = "完成状态(请填入推进中/已完成)-必填", width = 15, dicCode = "db_status")
@ExcelColumn(name = "完成状态(请填入推进中/已完成)-必填", width = 15, dicCode = "db_status")
// @Excel(name = "完成状态(请填入推进中/已完成)-必填", width = 15, dicCode = "db_status")
// @ExcelColumn(name = "完成状态(请填入推进中/已完成)-必填", width = 15, dicCode = "db_status")
@Schema(description = "完成状态(0推进中，1已完成)")
@Dict( dicCode = "db_status")
private java.lang.Integer completionStatus;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java
+3
View File
@@ -52,6 +52,9 @@ public class BgXiSpeakServiceImpl extends ServiceImpl<BgXiSpeakMapper, BgXiSpeak
public void addBgXiSpeak(BgXiSpeak bgXiSpeak) {
//新增时设置hasChild为0
bgXiSpeak.setHasChild(IBgXiSpeakService.NOCHILD);
if (bgXiSpeak.getBpmStatus() == null) {
bgXiSpeak.setBpmStatus(1);
}
if(oConvertUtils.isEmpty(bgXiSpeak.getPid())){
bgXiSpeak.setPid(IBgXiSpeakService.ROOT_PID_VALUE);
}else{
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java
+3
View File
@@ -150,6 +150,9 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
if (oConvertUtils.isEmpty(bgPartymatter.getDelFlag())) {
bgPartymatter.setDelFlag(BgPartymatterConstant.DelFlag.NORMAL);
}
if (bgPartymatter.getBpmStatus() == null) {
bgPartymatter.setBpmStatus("1");
}
fillDefaultMeetingTypeForCreate(bgPartymatter);
fillGeneratedNumber(bgPartymatter);
bgPartymatterService.save(bgPartymatter);
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java
+3
View File
@@ -39,6 +39,9 @@ public class DqInspectTaskServiceImpl extends ServiceImpl<DqInspectTaskMapper, D
@Override
@Transactional(rollbackFor = Exception.class)
public void saveMain(DqInspectTask dqInspectTask, List<DqInspectProgress> dqInspectProgressList) {
if (dqInspectTask.getBpmStatus() == null) {
dqInspectTask.setBpmStatus("1");
}
validateProblemId(dqInspectTask);
dqInspectTaskMapper.insert(dqInspectTask);
if(dqInspectProgressList!=null && dqInspectProgressList.size()>0) {