diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java new file mode 100644 index 00000000..a78f0d47 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/controller/KcKetangSuibiController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.kc.kcKetangSuibi.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.kc.kcKetangSuibi.entity.KcKetangSuibi; +import org.jeecg.modules.kc.kcKetangSuibi.service.IKcKetangSuibiService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 课堂随笔 + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +@Api(tags="课堂随笔") +@RestController +@RequestMapping("/kc/kcKetangSuibi") +@Slf4j +public class KcKetangSuibiController extends JeecgController { + @Autowired + private IKcKetangSuibiService kcKetangSuibiService; + + /** + * 分页列表查询 + * + * @param kcKetangSuibi + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "课堂随笔-分页列表查询") + @ApiOperation(value="课堂随笔-分页列表查询", notes="课堂随笔-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(KcKetangSuibi kcKetangSuibi, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcKetangSuibi, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcKetangSuibiService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param kcKetangSuibi + * @return + */ + @AutoLog(value = "课堂随笔-添加") + @ApiOperation(value="课堂随笔-添加", notes="课堂随笔-添加") +// @RequiresPermissions("kc:kc_ketang_suibi:add") + @PostMapping(value = "/add") + public Result add(@RequestBody KcKetangSuibi kcKetangSuibi) { + kcKetangSuibiService.save(kcKetangSuibi); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param kcKetangSuibi + * @return + */ + @AutoLog(value = "课堂随笔-编辑") + @ApiOperation(value="课堂随笔-编辑", notes="课堂随笔-编辑") +// @RequiresPermissions("kc:kc_ketang_suibi:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody KcKetangSuibi kcKetangSuibi) { + kcKetangSuibiService.updateById(kcKetangSuibi); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "课堂随笔-通过id删除") + @ApiOperation(value="课堂随笔-通过id删除", notes="课堂随笔-通过id删除") + @RequiresPermissions("kc:kc_ketang_suibi:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + kcKetangSuibiService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "课堂随笔-批量删除") + @ApiOperation(value="课堂随笔-批量删除", notes="课堂随笔-批量删除") + @RequiresPermissions("kc:kc_ketang_suibi:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.kcKetangSuibiService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "课堂随笔-通过id查询") + @ApiOperation(value="课堂随笔-通过id查询", notes="课堂随笔-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + KcKetangSuibi kcKetangSuibi = kcKetangSuibiService.getById(id); + if(kcKetangSuibi==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(kcKetangSuibi); + } + + /** + * 导出excel + * + * @param request + * @param kcKetangSuibi + */ + @RequiresPermissions("kc:kc_ketang_suibi:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, KcKetangSuibi kcKetangSuibi) { + return super.exportXls(request, kcKetangSuibi, KcKetangSuibi.class, "课堂随笔"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("kc:kc_ketang_suibi:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, KcKetangSuibi.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java new file mode 100644 index 00000000..b950023d --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/entity/KcKetangSuibi.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.kc.kcKetangSuibi.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 课堂随笔 + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +@Data +@TableName("kc_ketang_suibi") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="kc_ketang_suibi对象", description="课堂随笔") +public class KcKetangSuibi implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**用户ID*/ + @Excel(name = "用户ID", width = 15) + @ApiModelProperty(value = "用户ID") + private java.lang.String userId; + /**课堂表ID*/ + @Excel(name = "课堂表ID", width = 15) + @ApiModelProperty(value = "课堂表ID") + private java.lang.String ketangbiaoId; + /**笔记内容*/ + @Excel(name = "笔记内容", width = 15) + @ApiModelProperty(value = "笔记内容") + private java.lang.String notes; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/KcKetangSuibiMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/KcKetangSuibiMapper.java new file mode 100644 index 00000000..8a01630f --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/KcKetangSuibiMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.kcKetangSuibi.mapper; + +import org.jeecg.modules.kc.kcKetangSuibi.entity.KcKetangSuibi; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 课堂随笔 + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +public interface KcKetangSuibiMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/xml/KcKetangSuibiMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/xml/KcKetangSuibiMapper.xml new file mode 100644 index 00000000..c051a008 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/mapper/xml/KcKetangSuibiMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/service/IKcKetangSuibiService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/service/IKcKetangSuibiService.java new file mode 100644 index 00000000..3463347a --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/service/IKcKetangSuibiService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.kcKetangSuibi.service; + +import org.jeecg.modules.kc.kcKetangSuibi.entity.KcKetangSuibi; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 课堂随笔 + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +public interface IKcKetangSuibiService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/service/impl/KcKetangSuibiServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/service/impl/KcKetangSuibiServiceImpl.java new file mode 100644 index 00000000..37832695 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/service/impl/KcKetangSuibiServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.kc.kcKetangSuibi.service.impl; + +import org.jeecg.modules.kc.kcKetangSuibi.entity.KcKetangSuibi; +import org.jeecg.modules.kc.kcKetangSuibi.mapper.KcKetangSuibiMapper; +import org.jeecg.modules.kc.kcKetangSuibi.service.IKcKetangSuibiService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 课堂随笔 + * @Author: jeecg-boot + * @Date: 2023-05-04 + * @Version: V1.0 + */ +@Service +public class KcKetangSuibiServiceImpl extends ServiceImpl implements IKcKetangSuibiService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibi.api.ts b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibi.api.ts new file mode 100644 index 00000000..ec6f4105 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibi.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/kc/kcKetangSuibi/list', + save='/kc/kcKetangSuibi/add', + edit='/kc/kcKetangSuibi/edit', + deleteOne = '/kc/kcKetangSuibi/delete', + deleteBatch = '/kc/kcKetangSuibi/deleteBatch', + importExcel = '/kc/kcKetangSuibi/importExcel', + exportXls = '/kc/kcKetangSuibi/exportXls', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibi.data.ts b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibi.data.ts new file mode 100644 index 00000000..d1184193 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibi.data.ts @@ -0,0 +1,52 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '用户ID', + align: "center", + dataIndex: 'userId' + }, + { + title: '课堂表ID', + align: "center", + dataIndex: 'ketangbiaoId' + }, + { + title: '笔记内容', + align: "center", + dataIndex: 'notes' + }, +]; + +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户ID', + field: 'userId', + component: 'Input', + }, + { + label: '课堂表ID', + field: 'ketangbiaoId', + component: 'Input', + }, + { + label: '笔记内容', + field: 'notes', + component: 'Input', + }, + // TODO 主键隐藏字段,目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibiList.vue b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibiList.vue new file mode 100644 index 00000000..3e525d0d --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibiList.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibi_menu_insert.sql b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibi_menu_insert.sql new file mode 100644 index 00000000..7e1e9a52 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/KcKetangSuibi_menu_insert.sql @@ -0,0 +1,26 @@ +-- 注意:该页面对应的前台目录为views/kc文件夹下 +-- 如果你想更改到其他目录,请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('2023050409036750280', NULL, '课堂随笔', '/kc/kcKetangSuibiList', 'kc/KcKetangSuibiList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-04 21:03:28', NULL, NULL, 0); + +-- 权限控制sql +-- 新增 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2023050409036750281', '2023050409036750280', '添加课堂随笔', NULL, NULL, 0, NULL, NULL, 2, 'kc:kc_ketang_suibi:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-04 21:03:28', NULL, NULL, 0, 0, '1', 0); +-- 编辑 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2023050409036750282', '2023050409036750280', '编辑课堂随笔', NULL, NULL, 0, NULL, NULL, 2, 'kc:kc_ketang_suibi:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-04 21:03:28', NULL, NULL, 0, 0, '1', 0); +-- 删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2023050409036750283', '2023050409036750280', '删除课堂随笔', NULL, NULL, 0, NULL, NULL, 2, 'kc:kc_ketang_suibi:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-04 21:03:28', NULL, NULL, 0, 0, '1', 0); +-- 批量删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2023050409036750284', '2023050409036750280', '批量删除课堂随笔', NULL, NULL, 0, NULL, NULL, 2, 'kc:kc_ketang_suibi:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-04 21:03:28', NULL, NULL, 0, 0, '1', 0); +-- 导出excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2023050409036750285', '2023050409036750280', '导出excel_课堂随笔', NULL, NULL, 0, NULL, NULL, 2, 'kc:kc_ketang_suibi:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-04 21:03:28', NULL, NULL, 0, 0, '1', 0); +-- 导入excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2023050409036750286', '2023050409036750280', '导入excel_课堂随笔', NULL, NULL, 0, NULL, NULL, 2, 'kc:kc_ketang_suibi:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-04 21:03:28', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/components/KcKetangSuibiForm.vue b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/components/KcKetangSuibiForm.vue new file mode 100644 index 00000000..eea39199 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/components/KcKetangSuibiForm.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/components/KcKetangSuibiModal.vue b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/components/KcKetangSuibiModal.vue new file mode 100644 index 00000000..2f3d4f53 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangSuibi/vue3Native/components/KcKetangSuibiModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index bd7bd3a4..d5555bbb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java @@ -268,4 +268,7 @@ public class KcKetangbiao implements Serializable { @TableField(exist = false) private String ts; + @TableField(exist = false) + private String zhjsId; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml index 6f556138..73b5fc7b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml @@ -409,7 +409,7 @@ SELECT tingketime, tkrq, shijian, hq, mq, tk.kcmc, tk.ketangbiaoid, tk.skjs, tk.kkdw, tk.userid, tk.hh, tk.WEEK, - ev.evaluationid, ev.evaluationver, ev.score + ev.evaluationid, ev.evaluationver, ev.score, suibi.id as suibiId ,suibi.notes as suibiNotes FROM ( SELECT @@ -457,6 +457,17 @@ AND evs.upuserid = #{userid} ) ev ON tk.ketangbiaoid = ev.ketangbiaoid + left join ( + SELECT + id, user_id, ketangbiao_id, notes + FROM ( SELECT distinct id, user_id, ketangbiao_id, notes FROM kc_ketang_suibi WHERE + + user_id = #{userid} + + ORDER BY create_time DESC ) a + GROUP BY user_id, ketangbiao_id + ) suibi on suibi.ketangbiao_id = tk.ketangbiaoid +