From 5a3d202599fe69a2e180afdba0bb4549f6e64d93 Mon Sep 17 00:00:00 2001 From: liweijie Date: Fri, 18 Sep 2026 19:00:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jwgl/service/impl/KCBMBServiceImpl.java | 32 ++++++++ .../impl/TeachingStockDetailServiceImpl.java | 3 + .../impl/TeachingStockServiceImpl.java | 3 + .../views/student/warningCondition/index.vue | 6 ++ .../src/views/subjectMajor/major/index.vue | 5 +- .../src/views/teachBusiness/venue/index.vue | 8 +- frontend/src/views/textbook/index.vue | 74 +++++++++++-------- 7 files changed, 97 insertions(+), 34 deletions(-) diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/KCBMBServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/KCBMBServiceImpl.java index 17d4260d5..9b44e1f6f 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/KCBMBServiceImpl.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/KCBMBServiceImpl.java @@ -48,9 +48,41 @@ public class KCBMBServiceImpl implements KCBMBService { tpl.setMBKY(true); } tpl.setMBCZ(tpl.getMB() != null && !tpl.getMB().isEmpty()); + applyLayoutDefaults(tpl); kcbmbbMapper.insert(tpl); } + /** + * 布局位置列为 NOT NULL 但当前版本不参与渲染计算， + * 未填写时给占位值，上传者取当前登录账号。 + */ + private void applyLayoutDefaults(KCBMBB tpl) { + if (tpl.getBTWZ() == null || tpl.getBTWZ().isEmpty()) tpl.setBTWZ("0"); + if (tpl.getZYXXWZ() == null || tpl.getZYXXWZ().isEmpty()) tpl.setZYXXWZ("0"); + if (tpl.getKBSJHH() == null || tpl.getKBSJHH().isEmpty()) tpl.setKBSJHH("0"); + if (tpl.getMWLWZ() == null || tpl.getMWLWZ().isEmpty()) tpl.setMWLWZ("0"); + if (tpl.getKCHWZ() == null || tpl.getKCHWZ().isEmpty()) tpl.setKCHWZ("0"); + if (tpl.getKCXHLWZ() == null || tpl.getKCXHLWZ().isEmpty()) tpl.setKCXHLWZ("0"); + if (tpl.getKCMCLWZ() == null || tpl.getKCMCLWZ().isEmpty()) tpl.setKCMCLWZ("0"); + if (tpl.getKCJCLWZ() == null || tpl.getKCJCLWZ().isEmpty()) tpl.setKCJCLWZ("0"); + if (tpl.getKCXSLWZ() == null || tpl.getKCXSLWZ().isEmpty()) tpl.setKCXSLWZ("0"); + if (tpl.getKCLXLWZ() == null || tpl.getKCLXLWZ().isEmpty()) tpl.setKCLXLWZ("0"); + if (tpl.getKCZRJYSLWZ() == null || tpl.getKCZRJYSLWZ().isEmpty()) tpl.setKCZRJYSLWZ("0"); + if (tpl.getKCZRJYLWZ() == null || tpl.getKCZRJYLWZ().isEmpty()) tpl.setKCZRJYLWZ("0"); + if (tpl.getKCSKJYLWZ() == null || tpl.getKCSKJYLWZ().isEmpty()) tpl.setKCSKJYLWZ("0"); + if (tpl.getKCRSLWZ() == null || tpl.getKCRSLWZ().isEmpty()) tpl.setKCRSLWZ("0"); + if (tpl.getKCCDLWZ() == null || tpl.getKCCDLWZ().isEmpty()) tpl.setKCCDLWZ("0"); + if (tpl.getQJBZWZ() == null || tpl.getQJBZWZ().isEmpty()) tpl.setQJBZWZ("0"); + if (tpl.getSCZ() == null || tpl.getSCZ().isEmpty()) { + try { + tpl.setSCZ(com.roomroot.common.utils.SecurityUtils.getUsername()); + } catch (Exception e) { + tpl.setSCZ("system"); + } + } + if (tpl.getXSYJ() == null) tpl.setXSYJ(false); + } + @Override public void update(KCBMBB tpl) { if (tpl.getBH() == null || tpl.getBH().isEmpty()) { diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/TeachingStockDetailServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/TeachingStockDetailServiceImpl.java index 75dd0f124..51377649b 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/TeachingStockDetailServiceImpl.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/TeachingStockDetailServiceImpl.java @@ -29,6 +29,9 @@ public class TeachingStockDetailServiceImpl implements TeachingStockDetailServic jckcmxx.setDelFlag(0); // 生成编号（四位补零） jckcmxx.setBh(getNextNumber()); + if (jckcmxx.getJsonzd() == null || jckcmxx.getJsonzd().isEmpty()) { + jckcmxx.setJsonzd("{}"); + } teachingStockDetailMapper.insert(jckcmxx); } diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/TeachingStockServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/TeachingStockServiceImpl.java index a72f127ee..5de108610 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/TeachingStockServiceImpl.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/TeachingStockServiceImpl.java @@ -32,6 +32,9 @@ public class TeachingStockServiceImpl implements TeachingStockService { jckcd.setXgsj(LocalDateTime.now()); // 生成编号（四位补零） jckcd.setBh(getNextNumber()); + if (jckcd.getJsonzd() == null || jckcd.getJsonzd().isEmpty()) { + jckcd.setJsonzd("{}"); + } teachingStockMapper.insert(jckcd); } diff --git a/frontend/src/views/student/warningCondition/index.vue b/frontend/src/views/student/warningCondition/index.vue index 29992204d..6562539d2 100644 --- a/frontend/src/views/student/warningCondition/index.vue +++ b/frontend/src/views/student/warningCondition/index.vue @@ -108,6 +108,11 @@ 基本信息 + + + + + @@ -302,6 +307,7 @@ export default { formSaving: false, form: this.createEmptyForm(), formRules: { + bh: [{ required: true, message: "编号不能为空", trigger: "blur" }], mc: [{ required: true, message: "名称不能为空", trigger: "blur" }], ty: [{ required: true, message: "停用不能为空", trigger: "change" }], bb: [{ required: true, message: "版本不能为空", trigger: "blur" }] diff --git a/frontend/src/views/subjectMajor/major/index.vue b/frontend/src/views/subjectMajor/major/index.vue index 9752528b6..23e670d50 100644 --- a/frontend/src/views/subjectMajor/major/index.vue +++ b/frontend/src/views/subjectMajor/major/index.vue @@ -193,7 +193,7 @@ - + @@ -512,7 +512,8 @@ export default { zdyfl: [{ required: true, message: "自定义分类不能为空", trigger: "blur" }], zgzy: [{ required: true, message: "主干专业不能为空", trigger: "change" }], jclb: [{ required: true, message: "请选择节次类别", trigger: "change" }], - xtms: [{ required: true, message: "请选择系统模式", trigger: "change" }] + xtms: [{ required: true, message: "请选择系统模式", trigger: "change" }], + gfmc: [{ required: true, message: "规范名称不能为空", trigger: "blur" }] }, // ==================== 详情 ==================== diff --git a/frontend/src/views/teachBusiness/venue/index.vue b/frontend/src/views/teachBusiness/venue/index.vue index eddeda04a..3ebf1f726 100644 --- a/frontend/src/views/teachBusiness/venue/index.vue +++ b/frontend/src/views/teachBusiness/venue/index.vue @@ -113,7 +113,7 @@ - + - + @@ -299,7 +299,9 @@ export default { scheduleQuery: { rq: '', jc: undefined }, scheduleList: [], rules: { - jsmc: [{ required: true, message: '请输入教室名称', trigger: 'blur' }] + jsmc: [{ required: true, message: '请输入教室名称', trigger: 'blur' }], + jxldh: [{ required: true, message: '请选择教学楼', trigger: 'change' }], + rnrs: [{ required: true, message: '请输入容纳人数', trigger: 'blur' }] } } }, diff --git a/frontend/src/views/textbook/index.vue b/frontend/src/views/textbook/index.vue index 8a99b43cb..5a72430f8 100644 --- a/frontend/src/views/textbook/index.vue +++ b/frontend/src/views/textbook/index.vue @@ -293,7 +293,7 @@ - + @@ -304,21 +304,21 @@ - + - + - + @@ -327,14 +327,14 @@ - + - + @@ -343,14 +343,14 @@ - + - + @@ -362,15 +362,15 @@ - + - + - + @@ -442,7 +442,7 @@ - + @@ -455,12 +455,12 @@ - + - + @@ -469,14 +469,14 @@ - + - + @@ -485,14 +485,14 @@ - + - + @@ -501,7 +501,7 @@ - + @@ -513,15 +513,15 @@ - + - + - + @@ -587,15 +587,15 @@ - + - + - + @@ -611,10 +611,10 @@ - + - + @@ -821,7 +821,18 @@ export default { // ==================== 表单校验 ==================== formRules: { mc: [{ required: true, message: '请输入教材名称', trigger: 'blur' }], - jcbxlx: [{ required: true, message: '请选择编写类型', trigger: 'change' }] + jcbxlx: [{ required: true, message: '请选择编写类型', trigger: 'change' }], + zz: [{ required: true, message: '请输入作者', trigger: 'blur' }], + cbrq: [{ required: true, message: '请选择出版日期', trigger: 'change' }], + jcfl: [{ required: true, message: '请选择教材分类', trigger: 'change' }], + jclx: [{ required: true, message: '请选择教材类型', trigger: 'change' }], + jczdlx: [{ required: true, message: '请选择重点类型', trigger: 'change' }], + jcly: [{ required: true, message: '请选择教材来源', trigger: 'change' }], + jccc: [{ required: true, message: '请选择教材层次', trigger: 'change' }], + cbfs: [{ required: true, message: '请选择出版方式', trigger: 'change' }], + kb: [{ required: true, message: '请输入开本', trigger: 'blur' }], + dj: [{ required: true, message: '请输入单价', trigger: 'blur' }], + jldw: [{ required: true, message: '请选择计量单位', trigger: 'change' }] }, // ==================== 导入 ==================== @@ -840,7 +851,12 @@ export default { isStockAdd: true, stockForm: this.createEmptyStockForm(), stockFormRules: { - mc: [{ required: true, message: '请输入名称', trigger: 'blur' }] + mc: [{ required: true, message: '请输入名称', trigger: 'blur' }], + qksm: [{ required: true, message: '请输入情况说明', trigger: 'blur' }], + lb: [{ required: true, message: '请输入类别', trigger: 'blur' }], + zb: [{ required: true, message: '请输入字别', trigger: 'blur' }], + cbbmbh: [{ required: true, message: '请输入承办部门编号', trigger: 'blur' }], + zt: [{ required: true, message: '请输入状态', trigger: 'blur' }] }, stockDetailDialogVisible: false, stockDetailData: {},