diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java index 6888db58..b57c10e5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java @@ -35,6 +35,7 @@ import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; import org.jeecg.modules.quartz.entity.QuartzJob; import org.jeecg.modules.quartz.service.IQuartzJobService; +import org.jeecg.modules.tools.DictUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -75,6 +76,9 @@ public class KcZhihuijiaoshiController extends JeecgController add(@RequestBody KcZhihuijiaoshi kcZhihuijiaoshi) { + //补充教学楼名称和教室名称 + if(StringUtils.isNotBlank(kcZhihuijiaoshi.getJxlId())){ + kcZhihuijiaoshi.setJxlName(dictUtils.translateDictValue("id","jxlh_name","kc_jiaoxuelou_info",kcZhihuijiaoshi.getJxlId())); + } + if(StringUtils.isNotBlank(kcZhihuijiaoshi.getJsbh())){ + kcZhihuijiaoshi.setJsmc(dictUtils.translateDictValue("jsh","jsmc","xxhbjsjbxx",kcZhihuijiaoshi.getJsbh())); + } kcZhihuijiaoshiService.save(kcZhihuijiaoshi); return Result.OK("添加成功!"); } @@ -227,9 +238,15 @@ public class KcZhihuijiaoshiController extends JeecgController edit(@RequestBody KcZhihuijiaoshi kcZhihuijiaoshi) { + if(StringUtils.isNotBlank(kcZhihuijiaoshi.getJxlId())){ + kcZhihuijiaoshi.setJxlName(dictUtils.translateDictValue("id","jxlh_name","kc_jiaoxuelou_info",kcZhihuijiaoshi.getJxlId())); + } + if(StringUtils.isNotBlank(kcZhihuijiaoshi.getJsbh())){ + kcZhihuijiaoshi.setJsmc(dictUtils.translateDictValue("jsh","jsmc","xxhbjsjbxx",kcZhihuijiaoshi.getJsbh())); + } kcZhihuijiaoshiService.updateById(kcZhihuijiaoshi); return Result.OK("编辑成功!"); } @@ -242,7 +259,7 @@ public class KcZhihuijiaoshiController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { kcZhihuijiaoshiService.removeById(id); @@ -257,7 +274,7 @@ public class KcZhihuijiaoshiController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.kcZhihuijiaoshiService.removeByIds(Arrays.asList(ids.split(",")));