yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2024年5月25日 修复问题

This commit is contained in:
bai 2024-05-25 18:47:27 +08:00
parent e1f5207804
commit eccafa4eee
6 changed files with 161 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/controller/KcDetectionMainController.java
View File

@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
import com.beust.jcommander.internal.Sets; import com.beust.jcommander.internal.Sets;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
@ -27,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
@ -78,6 +80,14 @@ public class KcDetectionMainController extends JeecgController<KcDetectionMain,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<KcDetectionMain> queryWrapper = QueryGenerator.initQueryWrapper(kcDetectionMain, req.getParameterMap()); QueryWrapper<KcDetectionMain> queryWrapper = QueryGenerator.initQueryWrapper(kcDetectionMain, req.getParameterMap());
//补充搜索
if(StringUtils.isNotBlank(kcDetectionMain.getSearchSkrq())){
queryWrapper.eq("JSON_VALUE(ketangbiao_info,'$.skrq')", kcDetectionMain.getSearchSkrq());
}
if(StringUtils.isNotBlank(kcDetectionMain.getSearchHh())){
queryWrapper.eq("ketangbiao_info -> '$.hh'", kcDetectionMain.getSearchHh());
}
Page<KcDetectionMain> page = new Page<>(pageNo, pageSize); Page<KcDetectionMain> page = new Page<>(pageNo, pageSize);
IPage<KcDetectionMain> pageList = kcDetectionMainService.page(page, queryWrapper); IPage<KcDetectionMain> pageList = kcDetectionMainService.page(page, queryWrapper);
//补充查询子列表 //补充查询子列表
@ -88,11 +98,15 @@ public class KcDetectionMainController extends JeecgController<KcDetectionMain,
pidSet.add(x.getId()); pidSet.add(x.getId());
detectionMainMap.put(x.getId(),x); detectionMainMap.put(x.getId(),x);
x.setDetectionDetailedList(Lists.newArrayList()); x.setDetectionDetailedList(Lists.newArrayList());
if(x.getKetangbiaoInfo() == null){
x.setKetangbiaoInfo(new KcKetangbiao());
}
} ); } );
if(!pidSet.isEmpty()){ if(!pidSet.isEmpty()){
QueryWrapper<KcDetectionDetailed> qw = new QueryWrapper<>(); QueryWrapper<KcDetectionDetailed> qw = new QueryWrapper<>();
qw.lambda().in(KcDetectionDetailed::getPid,pidSet); qw.lambda().in(KcDetectionDetailed::getPid,pidSet);
qw.orderByAsc("detection_num", "create_time"); // qw.orderByAsc("detection_num");
qw.orderByDesc("create_time");
List<KcDetectionDetailed> detailedList = kcDetectionDetailedService.list(qw); List<KcDetectionDetailed> detailedList = kcDetectionDetailedService.list(qw);
detailedList.forEach(x -> { detailedList.forEach(x -> {
if(detectionMainMap.containsKey(x.getPid())){ if(detectionMainMap.containsKey(x.getPid())){
@ -100,7 +114,6 @@ public class KcDetectionMainController extends JeecgController<KcDetectionMain,
pData.getDetectionDetailedList().add(x); pData.getDetectionDetailedList().add(x);
} }
}); });
} }
} }

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/entity/KcDetectionDetailed.java
View File

@ -37,12 +37,12 @@ public class KcDetectionDetailed implements Serializable {
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private java.lang.String id; private java.lang.String id;
/**创建时间*/ /**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private java.util.Date createTime; private java.util.Date createTime;
/**更新时间*/ /**更新时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private java.util.Date updateTime; private java.util.Date updateTime;

10
jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/entity/KcDetectionMain.java
View File

@ -89,11 +89,19 @@ public class KcDetectionMain implements Serializable {
@ApiModelProperty(value = "课堂信息") @ApiModelProperty(value = "课堂信息")
private KcKetangbiao ketangbiaoInfo; private KcKetangbiao ketangbiaoInfo;
/***/ /**详细数据子列表*/
@TableField(exist = false) @TableField(exist = false)
private List<KcDetectionDetailed> detectionDetailedList; private List<KcDetectionDetailed> detectionDetailedList;
/***/ /***/
@TableField(exist = false) @TableField(exist = false)
private Boolean isSelectKcDetailed; private Boolean isSelectKcDetailed;
/**搜索上课日期*/
@TableField(exist = false)
private String searchSkrq;
/**搜索节次*/
@TableField(exist = false)
private String searchHh;
} }

81
jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentOneController.java
View File

@ -143,50 +143,67 @@ public class KcTeachingUnitContentOneController extends JeecgController<KcTeachi
return Result.OK(list); return Result.OK(list);
} }
// /**
// * 添加
// *
// * @param teachingUnitContentSave
// * @return
// */
// @AutoLog(value = "教学单元内容-第一层-添加")
// @ApiOperation(value="教学单元内容-第一层-添加", notes="教学单元内容-第一层-添加")
//// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_one:add")
// @PostMapping(value = "/add")
// public Result<String> add(@RequestBody KcTeachingUnitContentSave teachingUnitContentSave) {
// kcTeachingUnitContentOneService.saveAll(teachingUnitContentSave);
// return Result.OK("添加成功！");
// }
/** /**
* 编辑 * 编辑
* *
* @param teachingUnitContentSave * @param teachingUnitContentSave
* @return * @return
*/ */
@AutoLog(value = "教学单元内容-第一层-编辑") @AutoLog(value = "教学单元内容-全部-编辑")
@ApiOperation(value="教学单元内容-第一层-编辑", notes="教学单元内容-第一层-编辑") @ApiOperation(value="教学单元内容-全部-编辑", notes="教学单元内容-全部-编辑")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_one:edit") // @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_one:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/editAll", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcTeachingUnitContentSave teachingUnitContentSave) { public Result<String> editAll(@RequestBody KcTeachingUnitContentSave teachingUnitContentSave) {
kcTeachingUnitContentOneService.updateAllById(teachingUnitContentSave); kcTeachingUnitContentOneService.updateAllById(teachingUnitContentSave);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
// /** /**
// * 通过id删除 * 添加
// * *
// * @param id * @param kcTeachingUnitContentOne
// * @return * @return
// */ */
// @AutoLog(value = "教学单元内容-第一层-通过id删除") @AutoLog(value = "教学单元内容-第一层-添加")
// @ApiOperation(value="教学单元内容-第一层-通过id删除", notes="教学单元内容-第一层-通过id删除") @ApiOperation(value="教学单元内容-第一层-添加", notes="教学单元内容-第一层-添加")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_one:add")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody KcTeachingUnitContentOne kcTeachingUnitContentOne) {
kcTeachingUnitContentOneService.save(kcTeachingUnitContentOne);
Result<KcTeachingUnitContentOne> r = Result.OK("添加成功！");
r.setResult(kcTeachingUnitContentOne);
return r;
}
/**
* 编辑
*
* @param kcTeachingUnitContentOne
* @return
*/
@AutoLog(value = "教学单元内容-第一层-编辑")
@ApiOperation(value="教学单元内容-第一层-编辑", notes="教学单元内容-第一层-编辑")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_one:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcTeachingUnitContentOne kcTeachingUnitContentOne) {
kcTeachingUnitContentOneService.updateById(kcTeachingUnitContentOne);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "教学单元内容-第一层-通过id删除")
@ApiOperation(value="教学单元内容-第一层-通过id删除", notes="教学单元内容-第一层-通过id删除")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_one:delete") // @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_one:delete")
// @DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
// public Result<String> delete(@RequestParam(name="id",required=true) String id) { public Result<String> delete(@RequestParam(name="id",required=true) String id) {
// kcTeachingUnitContentOneService.removeById(id); kcTeachingUnitContentOneService.removeById(id);
// return Result.OK("删除成功!"); return Result.OK("删除成功!");
// } }
// //
// /** // /**
// * 批量删除 // * 批量删除

85
jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentThreeController.java
View File

@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.teachingunitcontent.entity.KcTeachingUnitContentOne;
import org.jeecg.modules.kc.teachingunitcontent.entity.KcTeachingUnitContentThree; import org.jeecg.modules.kc.teachingunitcontent.entity.KcTeachingUnitContentThree;
import org.jeecg.modules.kc.teachingunitcontent.service.IKcTeachingUnitContentThreeService; import org.jeecg.modules.kc.teachingunitcontent.service.IKcTeachingUnitContentThreeService;
@ -73,50 +74,52 @@ public class KcTeachingUnitContentThreeController extends JeecgController<KcTeac
return Result.OK(pageList); return Result.OK(pageList);
} }
// /** /**
// * 添加 * 添加
// * *
// * @param kcTeachingUnitContentThree * @param kcTeachingUnitContentThree
// * @return * @return
// */ */
// @AutoLog(value = "教学单元内容-第三层-添加") @AutoLog(value = "教学单元内容-第三层-添加")
// @ApiOperation(value="教学单元内容-第三层-添加", notes="教学单元内容-第三层-添加") @ApiOperation(value="教学单元内容-第三层-添加", notes="教学单元内容-第三层-添加")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_three:add") // @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_three:add")
// @PostMapping(value = "/add") @PostMapping(value = "/add")
// public Result<String> add(@RequestBody KcTeachingUnitContentThree kcTeachingUnitContentThree) { public Result<?> add(@RequestBody KcTeachingUnitContentThree kcTeachingUnitContentThree) {
// kcTeachingUnitContentThreeService.save(kcTeachingUnitContentThree); kcTeachingUnitContentThreeService.save(kcTeachingUnitContentThree);
// return Result.OK("添加成功！"); Result<KcTeachingUnitContentThree> r = Result.OK("添加成功！");
// } r.setResult(kcTeachingUnitContentThree);
// return r;
// /** }
// * 编辑
// * /**
// * @param kcTeachingUnitContentThree * 编辑
// * @return *
// */ * @param kcTeachingUnitContentThree
// @AutoLog(value = "教学单元内容-第三层-编辑") * @return
// @ApiOperation(value="教学单元内容-第三层-编辑", notes="教学单元内容-第三层-编辑") */
@AutoLog(value = "教学单元内容-第三层-编辑")
@ApiOperation(value="教学单元内容-第三层-编辑", notes="教学单元内容-第三层-编辑")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_three:edit") // @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_three:edit")
// @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
// public Result<String> edit(@RequestBody KcTeachingUnitContentThree kcTeachingUnitContentThree) { public Result<String> edit(@RequestBody KcTeachingUnitContentThree kcTeachingUnitContentThree) {
// kcTeachingUnitContentThreeService.updateById(kcTeachingUnitContentThree); kcTeachingUnitContentThreeService.updateById(kcTeachingUnitContentThree);
// return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
// } }
//
// /** /**
// * 通过id删除 * 通过id删除
// * *
// * @param id * @param id
// * @return * @return
// */ */
// @AutoLog(value = "教学单元内容-第三层-通过id删除") @AutoLog(value = "教学单元内容-第三层-通过id删除")
// @ApiOperation(value="教学单元内容-第三层-通过id删除", notes="教学单元内容-第三层-通过id删除") @ApiOperation(value="教学单元内容-第三层-通过id删除", notes="教学单元内容-第三层-通过id删除")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_three:delete") // @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_three:delete")
// @DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
// public Result<String> delete(@RequestParam(name="id",required=true) String id) { public Result<String> delete(@RequestParam(name="id",required=true) String id) {
// kcTeachingUnitContentThreeService.removeById(id); kcTeachingUnitContentThreeService.removeById(id);
// return Result.OK("删除成功!"); return Result.OK("删除成功!");
// } }
// //
// /** // /**
// * 批量删除 // * 批量删除

85
jeecg-module-main/src/main/java/org/jeecg/modules/kc/teachingunitcontent/controller/KcTeachingUnitContentTwoController.java
View File

@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.teachingunitcontent.entity.KcTeachingUnitContentOne;
import org.jeecg.modules.kc.teachingunitcontent.entity.KcTeachingUnitContentTwo; import org.jeecg.modules.kc.teachingunitcontent.entity.KcTeachingUnitContentTwo;
import org.jeecg.modules.kc.teachingunitcontent.service.IKcTeachingUnitContentTwoService; import org.jeecg.modules.kc.teachingunitcontent.service.IKcTeachingUnitContentTwoService;
@ -73,50 +74,52 @@ public class KcTeachingUnitContentTwoController extends JeecgController<KcTeachi
return Result.OK(pageList); return Result.OK(pageList);
} }
// /** /**
// * 添加 * 添加
// * *
// * @param kcTeachingUnitContentTwo * @param kcTeachingUnitContentTwo
// * @return * @return
// */ */
// @AutoLog(value = "教学单元内容-第二层-添加") @AutoLog(value = "教学单元内容-第二层-添加")
// @ApiOperation(value="教学单元内容-第二层-添加", notes="教学单元内容-第二层-添加") @ApiOperation(value="教学单元内容-第二层-添加", notes="教学单元内容-第二层-添加")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_two:add") // @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_two:add")
// @PostMapping(value = "/add") @PostMapping(value = "/add")
// public Result<String> add(@RequestBody KcTeachingUnitContentTwo kcTeachingUnitContentTwo) { public Result<?> add(@RequestBody KcTeachingUnitContentTwo kcTeachingUnitContentTwo) {
// kcTeachingUnitContentTwoService.save(kcTeachingUnitContentTwo); kcTeachingUnitContentTwoService.save(kcTeachingUnitContentTwo);
// return Result.OK("添加成功！"); Result<KcTeachingUnitContentTwo> r = Result.OK("添加成功！");
// } r.setResult(kcTeachingUnitContentTwo);
// return r;
// /** }
// * 编辑
// * /**
// * @param kcTeachingUnitContentTwo * 编辑
// * @return *
// */ * @param kcTeachingUnitContentTwo
// @AutoLog(value = "教学单元内容-第二层-编辑") * @return
// @ApiOperation(value="教学单元内容-第二层-编辑", notes="教学单元内容-第二层-编辑") */
@AutoLog(value = "教学单元内容-第二层-编辑")
@ApiOperation(value="教学单元内容-第二层-编辑", notes="教学单元内容-第二层-编辑")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_two:edit") // @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_two:edit")
// @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
// public Result<String> edit(@RequestBody KcTeachingUnitContentTwo kcTeachingUnitContentTwo) { public Result<String> edit(@RequestBody KcTeachingUnitContentTwo kcTeachingUnitContentTwo) {
// kcTeachingUnitContentTwoService.updateById(kcTeachingUnitContentTwo); kcTeachingUnitContentTwoService.updateById(kcTeachingUnitContentTwo);
// return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
// } }
//
// /** /**
// * 通过id删除 * 通过id删除
// * *
// * @param id * @param id
// * @return * @return
// */ */
// @AutoLog(value = "教学单元内容-第二层-通过id删除") @AutoLog(value = "教学单元内容-第二层-通过id删除")
// @ApiOperation(value="教学单元内容-第二层-通过id删除", notes="教学单元内容-第二层-通过id删除") @ApiOperation(value="教学单元内容-第二层-通过id删除", notes="教学单元内容-第二层-通过id删除")
// @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_two:delete") // @RequiresPermissions("teachingunitcontent:kc_teaching_unit_content_two:delete")
// @DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
// public Result<String> delete(@RequestParam(name="id",required=true) String id) { public Result<String> delete(@RequestParam(name="id",required=true) String id) {
// kcTeachingUnitContentTwoService.removeById(id); kcTeachingUnitContentTwoService.removeById(id);
// return Result.OK("删除成功!"); return Result.OK("删除成功!");
// } }
// //
// /** // /**
// * 批量删除 // * 批量删除