diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/controller/EmployAddressController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/controller/EmployAddressController.java new file mode 100644 index 0000000..9a4e3b7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/controller/EmployAddressController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employAddress.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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.common.util.oConvertUtils; +import org.jeecg.modules.employAddress.entity.EmployAddress; +import org.jeecg.modules.employAddress.service.IEmployAddressService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 地址表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Api(tags="地址表") +@RestController +@RequestMapping("/employAddress/employAddress") +@Slf4j +public class EmployAddressController extends JeecgController { + @Autowired + private IEmployAddressService employAddressService; + + /** + * 分页列表查询 + * + * @param employAddress + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "地址表-分页列表查询") + @ApiOperation(value="地址表-分页列表查询", notes="地址表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployAddress employAddress, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employAddress, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employAddressService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employAddress + * @return + */ + @AutoLog(value = "地址表-添加") + @ApiOperation(value="地址表-添加", notes="地址表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployAddress employAddress) { + employAddressService.save(employAddress); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employAddress + * @return + */ + @AutoLog(value = "地址表-编辑") + @ApiOperation(value="地址表-编辑", notes="地址表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployAddress employAddress) { + employAddressService.updateById(employAddress); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "地址表-通过id删除") + @ApiOperation(value="地址表-通过id删除", notes="地址表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employAddressService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "地址表-批量删除") + @ApiOperation(value="地址表-批量删除", notes="地址表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employAddressService.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) { + EmployAddress employAddress = employAddressService.getById(id); + if(employAddress==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employAddress); + } + + /** + * 导出excel + * + * @param request + * @param employAddress + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployAddress employAddress) { + return super.exportXls(request, employAddress, EmployAddress.class, "地址表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployAddress.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/entity/EmployAddress.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/entity/EmployAddress.java new file mode 100644 index 0000000..3059d8f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/entity/EmployAddress.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.employAddress.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 地址表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Data +@TableName("employ_address") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_address对象", description="地址表") +public class EmployAddress 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; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**地址*/ + @Excel(name = "地址", width = 15) + @ApiModelProperty(value = "地址") + private java.lang.String adress; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/EmployAddressMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/EmployAddressMapper.java new file mode 100644 index 0000000..2e49750 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/EmployAddressMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employAddress.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employAddress.entity.EmployAddress; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 地址表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +public interface EmployAddressMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/xml/EmployAddressMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/xml/EmployAddressMapper.xml new file mode 100644 index 0000000..046a420 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/xml/EmployAddressMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/IEmployAddressService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/IEmployAddressService.java new file mode 100644 index 0000000..f2c9d11 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/IEmployAddressService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employAddress.service; + +import org.jeecg.modules.employAddress.entity.EmployAddress; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 地址表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +public interface IEmployAddressService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/impl/EmployAddressServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/impl/EmployAddressServiceImpl.java new file mode 100644 index 0000000..758b8c3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/impl/EmployAddressServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employAddress.service.impl; + +import org.jeecg.modules.employAddress.entity.EmployAddress; +import org.jeecg.modules.employAddress.mapper.EmployAddressMapper; +import org.jeecg.modules.employAddress.service.IEmployAddressService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 地址表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Service +public class EmployAddressServiceImpl extends ServiceImpl implements IEmployAddressService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/EmployAddressList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/EmployAddressList.vue new file mode 100644 index 0000000..5d6fb63 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/EmployAddressList.vue @@ -0,0 +1,171 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressForm.vue new file mode 100644 index 0000000..72f1599 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressModal.Style#Drawer.vue new file mode 100644 index 0000000..874980a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressModal.vue new file mode 100644 index 0000000..6a738bc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/modules/EmployAddressModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.api.ts new file mode 100644 index 0000000..2483024 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employAddress/employAddress/list', + save='/employAddress/employAddress/add', + edit='/employAddress/employAddress/edit', + deleteOne = '/employAddress/employAddress/delete', + deleteBatch = '/employAddress/employAddress/deleteBatch', + importExcel = '/employAddress/employAddress/importExcel', + exportXls = '/employAddress/employAddress/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}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.data.ts new file mode 100644 index 0000000..f6edbf7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.data.ts @@ -0,0 +1,23 @@ +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: '地址', + align:"center", + dataIndex: 'adress' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '地址', + field: 'adress', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddressList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddressList.vue new file mode 100644 index 0000000..2caacf9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddressList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/components/EmployAddressModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/components/EmployAddressModal.vue new file mode 100644 index 0000000..73bdee4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/components/EmployAddressModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/controller/EmployAhthenticationCompanyController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/controller/EmployAhthenticationCompanyController.java new file mode 100644 index 0000000..81f186d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/controller/EmployAhthenticationCompanyController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employAhthenticationCompany.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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.common.util.oConvertUtils; +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 企业信息实名认证表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Api(tags="企业信息实名认证表") +@RestController +@RequestMapping("/employAhthenticationCompany/employAhthenticationCompany") +@Slf4j +public class EmployAhthenticationCompanyController extends JeecgController { + @Autowired + private IEmployAhthenticationCompanyService employAhthenticationCompanyService; + + /** + * 分页列表查询 + * + * @param employAhthenticationCompany + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "企业信息实名认证表-分页列表查询") + @ApiOperation(value="企业信息实名认证表-分页列表查询", notes="企业信息实名认证表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployAhthenticationCompany employAhthenticationCompany, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employAhthenticationCompany, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employAhthenticationCompanyService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employAhthenticationCompany + * @return + */ + @AutoLog(value = "企业信息实名认证表-添加") + @ApiOperation(value="企业信息实名认证表-添加", notes="企业信息实名认证表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployAhthenticationCompany employAhthenticationCompany) { + employAhthenticationCompanyService.save(employAhthenticationCompany); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employAhthenticationCompany + * @return + */ + @AutoLog(value = "企业信息实名认证表-编辑") + @ApiOperation(value="企业信息实名认证表-编辑", notes="企业信息实名认证表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployAhthenticationCompany employAhthenticationCompany) { + employAhthenticationCompanyService.updateById(employAhthenticationCompany); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "企业信息实名认证表-通过id删除") + @ApiOperation(value="企业信息实名认证表-通过id删除", notes="企业信息实名认证表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employAhthenticationCompanyService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "企业信息实名认证表-批量删除") + @ApiOperation(value="企业信息实名认证表-批量删除", notes="企业信息实名认证表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employAhthenticationCompanyService.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) { + EmployAhthenticationCompany employAhthenticationCompany = employAhthenticationCompanyService.getById(id); + if(employAhthenticationCompany==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employAhthenticationCompany); + } + + /** + * 导出excel + * + * @param request + * @param employAhthenticationCompany + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployAhthenticationCompany employAhthenticationCompany) { + return super.exportXls(request, employAhthenticationCompany, EmployAhthenticationCompany.class, "企业信息实名认证表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployAhthenticationCompany.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/entity/EmployAhthenticationCompany.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/entity/EmployAhthenticationCompany.java new file mode 100644 index 0000000..0268418 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/entity/EmployAhthenticationCompany.java @@ -0,0 +1,75 @@ +package org.jeecg.modules.employAhthenticationCompany.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 企业信息实名认证表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Data +@TableName("employ_ahthentication_company") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_ahthentication_company对象", description="企业信息实名认证表") +public class EmployAhthenticationCompany 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; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**企业名称*/ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private java.lang.String companyName; + /**企业地址*/ + @Excel(name = "企业地址", width = 15) + @ApiModelProperty(value = "企业地址") + private java.lang.String companyAddress; + /**企业法人*/ + @Excel(name = "企业法人", width = 15) + @ApiModelProperty(value = "企业法人") + private java.lang.String legalPerson; + /**社会统一信用代码*/ + @Excel(name = "社会统一信用代码", width = 15) + @ApiModelProperty(value = "社会统一信用代码") + private java.lang.String socialCode; + /**工商营业执照*/ + @Excel(name = "工商营业执照", width = 15) + @ApiModelProperty(value = "工商营业执照") + private java.lang.String businessLicense; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/EmployAhthenticationCompanyMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/EmployAhthenticationCompanyMapper.java new file mode 100644 index 0000000..ab2676e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/EmployAhthenticationCompanyMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employAhthenticationCompany.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 企业信息实名认证表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +public interface EmployAhthenticationCompanyMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/xml/EmployAhthenticationCompanyMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/xml/EmployAhthenticationCompanyMapper.xml new file mode 100644 index 0000000..9119d9e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/mapper/xml/EmployAhthenticationCompanyMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/IEmployAhthenticationCompanyService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/IEmployAhthenticationCompanyService.java new file mode 100644 index 0000000..361ccc8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/IEmployAhthenticationCompanyService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employAhthenticationCompany.service; + +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 企业信息实名认证表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +public interface IEmployAhthenticationCompanyService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/impl/EmployAhthenticationCompanyServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/impl/EmployAhthenticationCompanyServiceImpl.java new file mode 100644 index 0000000..b907c2e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/service/impl/EmployAhthenticationCompanyServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employAhthenticationCompany.service.impl; + +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import org.jeecg.modules.employAhthenticationCompany.mapper.EmployAhthenticationCompanyMapper; +import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 企业信息实名认证表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Service +public class EmployAhthenticationCompanyServiceImpl extends ServiceImpl implements IEmployAhthenticationCompanyService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/EmployAhthenticationCompanyList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/EmployAhthenticationCompanyList.vue new file mode 100644 index 0000000..91a4462 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/EmployAhthenticationCompanyList.vue @@ -0,0 +1,203 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyForm.vue new file mode 100644 index 0000000..e02d1da --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyForm.vue @@ -0,0 +1,129 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyModal.Style#Drawer.vue new file mode 100644 index 0000000..52a4080 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyModal.vue new file mode 100644 index 0000000..ff20fd6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue/modules/EmployAhthenticationCompanyModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.api.ts new file mode 100644 index 0000000..10ed170 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employAhthenticationCompany/employAhthenticationCompany/list', + save='/employAhthenticationCompany/employAhthenticationCompany/add', + edit='/employAhthenticationCompany/employAhthenticationCompany/edit', + deleteOne = '/employAhthenticationCompany/employAhthenticationCompany/delete', + deleteBatch = '/employAhthenticationCompany/employAhthenticationCompany/deleteBatch', + importExcel = '/employAhthenticationCompany/employAhthenticationCompany/importExcel', + exportXls = '/employAhthenticationCompany/employAhthenticationCompany/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}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.data.ts new file mode 100644 index 0000000..4851c40 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompany.data.ts @@ -0,0 +1,79 @@ +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: '企业名称', + align:"center", + dataIndex: 'companyName' + }, + { + title: '企业地址', + align:"center", + dataIndex: 'companyAddress' + }, + { + title: '企业法人', + align:"center", + dataIndex: 'legalPerson' + }, + { + title: '社会统一信用代码', + align:"center", + dataIndex: 'socialCode' + }, + { + title: '工商营业执照', + align:"center", + dataIndex: 'businessLicense', + customRender:render.renderAvatar, + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '企业名称', + field: 'companyName', + component: 'Input', + }, + { + label: '企业地址', + field: 'companyAddress', + component: 'Input', + }, + { + label: '企业法人', + field: 'legalPerson', + component: 'Input', + }, + { + label: '社会统一信用代码', + field: 'socialCode', + component: 'Input', + }, + { + label: '工商营业执照', + field: 'businessLicense', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompanyList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompanyList.vue new file mode 100644 index 0000000..71a328d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/EmployAhthenticationCompanyList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/components/EmployAhthenticationCompanyModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/components/EmployAhthenticationCompanyModal.vue new file mode 100644 index 0000000..7770c20 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAhthenticationCompany/vue3/components/EmployAhthenticationCompanyModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/controller/EmployAuthenticationPersonController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/controller/EmployAuthenticationPersonController.java new file mode 100644 index 0000000..4cfedf6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/controller/EmployAuthenticationPersonController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employAuthenticationPerson.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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.common.util.oConvertUtils; +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; +import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 个人实名认证信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Api(tags="个人实名认证信息表") +@RestController +@RequestMapping("/employAuthenticationPerson/employAuthenticationPerson") +@Slf4j +public class EmployAuthenticationPersonController extends JeecgController { + @Autowired + private IEmployAuthenticationPersonService employAuthenticationPersonService; + + /** + * 分页列表查询 + * + * @param employAuthenticationPerson + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "个人实名认证信息表-分页列表查询") + @ApiOperation(value="个人实名认证信息表-分页列表查询", notes="个人实名认证信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployAuthenticationPerson employAuthenticationPerson, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employAuthenticationPerson, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employAuthenticationPersonService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employAuthenticationPerson + * @return + */ + @AutoLog(value = "个人实名认证信息表-添加") + @ApiOperation(value="个人实名认证信息表-添加", notes="个人实名认证信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployAuthenticationPerson employAuthenticationPerson) { + employAuthenticationPersonService.save(employAuthenticationPerson); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employAuthenticationPerson + * @return + */ + @AutoLog(value = "个人实名认证信息表-编辑") + @ApiOperation(value="个人实名认证信息表-编辑", notes="个人实名认证信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployAuthenticationPerson employAuthenticationPerson) { + employAuthenticationPersonService.updateById(employAuthenticationPerson); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "个人实名认证信息表-通过id删除") + @ApiOperation(value="个人实名认证信息表-通过id删除", notes="个人实名认证信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employAuthenticationPersonService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "个人实名认证信息表-批量删除") + @ApiOperation(value="个人实名认证信息表-批量删除", notes="个人实名认证信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employAuthenticationPersonService.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) { + EmployAuthenticationPerson employAuthenticationPerson = employAuthenticationPersonService.getById(id); + if(employAuthenticationPerson==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employAuthenticationPerson); + } + + /** + * 导出excel + * + * @param request + * @param employAuthenticationPerson + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployAuthenticationPerson employAuthenticationPerson) { + return super.exportXls(request, employAuthenticationPerson, EmployAuthenticationPerson.class, "个人实名认证信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployAuthenticationPerson.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/entity/EmployAuthenticationPerson.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/entity/EmployAuthenticationPerson.java new file mode 100644 index 0000000..f262420 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/entity/EmployAuthenticationPerson.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.employAuthenticationPerson.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 个人实名认证信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Data +@TableName("employ_authentication_person") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_authentication_person对象", description="个人实名认证信息表") +public class EmployAuthenticationPerson 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; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String name; + /**身份证号*/ + @Excel(name = "身份证号", width = 15) + @ApiModelProperty(value = "身份证号") + private java.lang.String cerNo; + /**联系方式*/ + @Excel(name = "联系方式", width = 15) + @ApiModelProperty(value = "联系方式") + private java.lang.String phone; + /**身份证人像面照片*/ + @Excel(name = "身份证人像面照片", width = 15) + @ApiModelProperty(value = "身份证人像面照片") + private java.lang.String image; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/EmployAuthenticationPersonMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/EmployAuthenticationPersonMapper.java new file mode 100644 index 0000000..ab523f9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/EmployAuthenticationPersonMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employAuthenticationPerson.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 个人实名认证信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +public interface EmployAuthenticationPersonMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/xml/EmployAuthenticationPersonMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/xml/EmployAuthenticationPersonMapper.xml new file mode 100644 index 0000000..543dce9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/mapper/xml/EmployAuthenticationPersonMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/IEmployAuthenticationPersonService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/IEmployAuthenticationPersonService.java new file mode 100644 index 0000000..33f6fed --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/IEmployAuthenticationPersonService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employAuthenticationPerson.service; + +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 个人实名认证信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +public interface IEmployAuthenticationPersonService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/impl/EmployAuthenticationPersonServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/impl/EmployAuthenticationPersonServiceImpl.java new file mode 100644 index 0000000..fe503e6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/service/impl/EmployAuthenticationPersonServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employAuthenticationPerson.service.impl; + +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; +import org.jeecg.modules.employAuthenticationPerson.mapper.EmployAuthenticationPersonMapper; +import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 个人实名认证信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Service +public class EmployAuthenticationPersonServiceImpl extends ServiceImpl implements IEmployAuthenticationPersonService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/EmployAuthenticationPersonList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/EmployAuthenticationPersonList.vue new file mode 100644 index 0000000..51ac3ed --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/EmployAuthenticationPersonList.vue @@ -0,0 +1,197 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonForm.vue new file mode 100644 index 0000000..ead016f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonForm.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonModal.Style#Drawer.vue new file mode 100644 index 0000000..4b426c4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonModal.vue new file mode 100644 index 0000000..86520e9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue/modules/EmployAuthenticationPersonModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.api.ts new file mode 100644 index 0000000..a91119e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employAuthenticationPerson/employAuthenticationPerson/list', + save='/employAuthenticationPerson/employAuthenticationPerson/add', + edit='/employAuthenticationPerson/employAuthenticationPerson/edit', + deleteOne = '/employAuthenticationPerson/employAuthenticationPerson/delete', + deleteBatch = '/employAuthenticationPerson/employAuthenticationPerson/deleteBatch', + importExcel = '/employAuthenticationPerson/employAuthenticationPerson/importExcel', + exportXls = '/employAuthenticationPerson/employAuthenticationPerson/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}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.data.ts new file mode 100644 index 0000000..68095c2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPerson.data.ts @@ -0,0 +1,69 @@ +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: '姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '身份证号', + align:"center", + dataIndex: 'cerNo' + }, + { + title: '联系方式', + align:"center", + dataIndex: 'phone' + }, + { + title: '身份证人像面照片', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '身份证号', + field: 'cerNo', + component: 'Input', + }, + { + label: '联系方式', + field: 'phone', + component: 'Input', + }, + { + label: '身份证人像面照片', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPersonList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPersonList.vue new file mode 100644 index 0000000..9620dee --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/EmployAuthenticationPersonList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/components/EmployAuthenticationPersonModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/components/EmployAuthenticationPersonModal.vue new file mode 100644 index 0000000..0ff170d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAuthenticationPerson/vue3/components/EmployAuthenticationPersonModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java index 13ef829..6472b9d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 电子合同表 * @Author: jeecg-boot - * @Date: 2024-10-17 + * @Date: 2024-10-21 * @Version: V1.0 */ @Api(tags="电子合同表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java index 769119e..7f2c37c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 电子合同表 * @Author: jeecg-boot - * @Date: 2024-10-17 + * @Date: 2024-10-21 * @Version: V1.0 */ @Data @@ -59,6 +59,14 @@ public class EmployContract implements Serializable { @Excel(name = "求职者签署(0-未签 1-已签)", width = 15) @ApiModelProperty(value = "求职者签署(0-未签 1-已签)") private java.lang.String signPerson; + /**合同甲方名称*/ + @Excel(name = "合同甲方名称", width = 15) + @ApiModelProperty(value = "合同甲方名称") + private java.lang.String nameA; + /**合同乙方名称*/ + @Excel(name = "合同乙方名称", width = 15) + @ApiModelProperty(value = "合同乙方名称") + private java.lang.String nameB; /**关联招聘者id*/ @Excel(name = "关联招聘者id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java index 5ebfd45..1becbef 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 电子合同表 * @Author: jeecg-boot - * @Date: 2024-10-17 + * @Date: 2024-10-21 * @Version: V1.0 */ public interface EmployContractMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java index 1ad7b75..124bdcd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 电子合同表 * @Author: jeecg-boot - * @Date: 2024-10-17 + * @Date: 2024-10-21 * @Version: V1.0 */ public interface IEmployContractService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java index 76b3167..03cbe6d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 电子合同表 * @Author: jeecg-boot - * @Date: 2024-10-17 + * @Date: 2024-10-21 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue index 9f80d40..0d6d191 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue @@ -138,6 +138,16 @@ align:"center", dataIndex: 'signPerson' }, + { + title:'合同甲方名称', + align:"center", + dataIndex: 'nameA' + }, + { + title:'合同乙方名称', + align:"center", + dataIndex: 'nameB' + }, { title:'关联招聘者id', align:"center", @@ -185,6 +195,8 @@ fieldList.push({type:'string',value:'fileContract',text:'合同文件',dictCode:''}) fieldList.push({type:'string',value:'signCompany',text:'公司签署(0-未签 1-已签)',dictCode:''}) fieldList.push({type:'string',value:'signPerson',text:'求职者签署(0-未签 1-已签)',dictCode:''}) + fieldList.push({type:'string',value:'nameA',text:'合同甲方名称',dictCode:''}) + fieldList.push({type:'string',value:'nameB',text:'合同乙方名称',dictCode:''}) fieldList.push({type:'string',value:'companyId',text:'关联招聘者id',dictCode:"han_hai_member,nick_name,id"}) fieldList.push({type:'string',value:'personId',text:'关联求职者id',dictCode:"han_hai_member,nick_name,id"}) this.superFieldList = fieldList diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue index 2a43b74..58f2efc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue @@ -18,6 +18,16 @@ + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts index 6ab9894..3b527fc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts @@ -20,6 +20,16 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'signPerson' }, + { + title: '合同甲方名称', + align:"center", + dataIndex: 'nameA' + }, + { + title: '合同乙方名称', + align:"center", + dataIndex: 'nameB' + }, { title: '关联招聘者id', align:"center", @@ -53,6 +63,16 @@ export const formSchema: FormSchema[] = [ field: 'signPerson', component: 'Input', }, + { + label: '合同甲方名称', + field: 'nameA', + component: 'Input', + }, + { + label: '合同乙方名称', + field: 'nameB', + component: 'Input', + }, { label: '关联招聘者id', field: 'companyId', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/controller/EmployNatureController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/controller/EmployNatureController.java new file mode 100644 index 0000000..692ed7b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/controller/EmployNatureController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employNature.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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.common.util.oConvertUtils; +import org.jeecg.modules.employNature.entity.EmployNature; +import org.jeecg.modules.employNature.service.IEmployNatureService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 工作性质表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Api(tags="工作性质表") +@RestController +@RequestMapping("/employNature/employNature") +@Slf4j +public class EmployNatureController extends JeecgController { + @Autowired + private IEmployNatureService employNatureService; + + /** + * 分页列表查询 + * + * @param employNature + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "工作性质表-分页列表查询") + @ApiOperation(value="工作性质表-分页列表查询", notes="工作性质表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployNature employNature, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employNature, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employNatureService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employNature + * @return + */ + @AutoLog(value = "工作性质表-添加") + @ApiOperation(value="工作性质表-添加", notes="工作性质表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployNature employNature) { + employNatureService.save(employNature); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employNature + * @return + */ + @AutoLog(value = "工作性质表-编辑") + @ApiOperation(value="工作性质表-编辑", notes="工作性质表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployNature employNature) { + employNatureService.updateById(employNature); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "工作性质表-通过id删除") + @ApiOperation(value="工作性质表-通过id删除", notes="工作性质表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employNatureService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "工作性质表-批量删除") + @ApiOperation(value="工作性质表-批量删除", notes="工作性质表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employNatureService.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) { + EmployNature employNature = employNatureService.getById(id); + if(employNature==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employNature); + } + + /** + * 导出excel + * + * @param request + * @param employNature + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployNature employNature) { + return super.exportXls(request, employNature, EmployNature.class, "工作性质表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployNature.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/entity/EmployNature.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/entity/EmployNature.java new file mode 100644 index 0000000..f13bd79 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/entity/EmployNature.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.employNature.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 工作性质表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Data +@TableName("employ_nature") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_nature对象", description="工作性质表") +public class EmployNature 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; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**工作性质名称*/ + @Excel(name = "工作性质名称", width = 15) + @ApiModelProperty(value = "工作性质名称") + private java.lang.String name; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/mapper/EmployNatureMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/mapper/EmployNatureMapper.java new file mode 100644 index 0000000..366d525 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/mapper/EmployNatureMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employNature.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employNature.entity.EmployNature; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 工作性质表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +public interface EmployNatureMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/mapper/xml/EmployNatureMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/mapper/xml/EmployNatureMapper.xml new file mode 100644 index 0000000..a38bf45 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/mapper/xml/EmployNatureMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/service/IEmployNatureService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/service/IEmployNatureService.java new file mode 100644 index 0000000..c986c33 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/service/IEmployNatureService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employNature.service; + +import org.jeecg.modules.employNature.entity.EmployNature; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 工作性质表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +public interface IEmployNatureService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/service/impl/EmployNatureServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/service/impl/EmployNatureServiceImpl.java new file mode 100644 index 0000000..48d1613 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/service/impl/EmployNatureServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employNature.service.impl; + +import org.jeecg.modules.employNature.entity.EmployNature; +import org.jeecg.modules.employNature.mapper.EmployNatureMapper; +import org.jeecg.modules.employNature.service.IEmployNatureService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 工作性质表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Service +public class EmployNatureServiceImpl extends ServiceImpl implements IEmployNatureService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/EmployNatureList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/EmployNatureList.vue new file mode 100644 index 0000000..8241e2e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/EmployNatureList.vue @@ -0,0 +1,171 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/modules/EmployNatureForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/modules/EmployNatureForm.vue new file mode 100644 index 0000000..7a8692f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/modules/EmployNatureForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/modules/EmployNatureModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/modules/EmployNatureModal.Style#Drawer.vue new file mode 100644 index 0000000..0eae566 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/modules/EmployNatureModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/modules/EmployNatureModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/modules/EmployNatureModal.vue new file mode 100644 index 0000000..05fd9d7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue/modules/EmployNatureModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/EmployNature.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/EmployNature.api.ts new file mode 100644 index 0000000..8484377 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/EmployNature.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employNature/employNature/list', + save='/employNature/employNature/add', + edit='/employNature/employNature/edit', + deleteOne = '/employNature/employNature/delete', + deleteBatch = '/employNature/employNature/deleteBatch', + importExcel = '/employNature/employNature/importExcel', + exportXls = '/employNature/employNature/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}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/EmployNature.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/EmployNature.data.ts new file mode 100644 index 0000000..64f25d7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/EmployNature.data.ts @@ -0,0 +1,23 @@ +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: '工作性质名称', + align:"center", + dataIndex: 'name' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '工作性质名称', + field: 'name', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/EmployNatureList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/EmployNatureList.vue new file mode 100644 index 0000000..03776b6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/EmployNatureList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/components/EmployNatureModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/components/EmployNatureModal.vue new file mode 100644 index 0000000..06c20bf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employNature/vue3/components/EmployNatureModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/controller/EmployScoreController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/controller/EmployScoreController.java new file mode 100644 index 0000000..8d07df3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/controller/EmployScoreController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employScore.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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.common.util.oConvertUtils; +import org.jeecg.modules.employScore.entity.EmployScore; +import org.jeecg.modules.employScore.service.IEmployScoreService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 积分表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Api(tags="积分表") +@RestController +@RequestMapping("/employScore/employScore") +@Slf4j +public class EmployScoreController extends JeecgController { + @Autowired + private IEmployScoreService employScoreService; + + /** + * 分页列表查询 + * + * @param employScore + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "积分表-分页列表查询") + @ApiOperation(value="积分表-分页列表查询", notes="积分表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployScore employScore, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employScore, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employScoreService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employScore + * @return + */ + @AutoLog(value = "积分表-添加") + @ApiOperation(value="积分表-添加", notes="积分表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployScore employScore) { + employScoreService.save(employScore); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employScore + * @return + */ + @AutoLog(value = "积分表-编辑") + @ApiOperation(value="积分表-编辑", notes="积分表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployScore employScore) { + employScoreService.updateById(employScore); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "积分表-通过id删除") + @ApiOperation(value="积分表-通过id删除", notes="积分表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employScoreService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "积分表-批量删除") + @ApiOperation(value="积分表-批量删除", notes="积分表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employScoreService.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) { + EmployScore employScore = employScoreService.getById(id); + if(employScore==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employScore); + } + + /** + * 导出excel + * + * @param request + * @param employScore + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployScore employScore) { + return super.exportXls(request, employScore, EmployScore.class, "积分表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployScore.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/entity/EmployScore.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/entity/EmployScore.java new file mode 100644 index 0000000..203d571 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/entity/EmployScore.java @@ -0,0 +1,63 @@ +package org.jeecg.modules.employScore.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 积分表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Data +@TableName("employ_score") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_score对象", description="积分表") +public class EmployScore 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; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**积分*/ + @Excel(name = "积分", width = 15) + @ApiModelProperty(value = "积分") + private java.lang.Double score; + /**积分类型(0-正式 1-临时)*/ + @Excel(name = "积分类型(0-正式 1-临时)", width = 15) + @ApiModelProperty(value = "积分类型(0-正式 1-临时)") + private java.lang.String type; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/EmployScoreMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/EmployScoreMapper.java new file mode 100644 index 0000000..eee2541 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/EmployScoreMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employScore.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employScore.entity.EmployScore; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 积分表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +public interface EmployScoreMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/xml/EmployScoreMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/xml/EmployScoreMapper.xml new file mode 100644 index 0000000..1b42e35 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/xml/EmployScoreMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/IEmployScoreService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/IEmployScoreService.java new file mode 100644 index 0000000..6a04e94 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/IEmployScoreService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employScore.service; + +import org.jeecg.modules.employScore.entity.EmployScore; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 积分表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +public interface IEmployScoreService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/impl/EmployScoreServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/impl/EmployScoreServiceImpl.java new file mode 100644 index 0000000..16c91d6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/impl/EmployScoreServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employScore.service.impl; + +import org.jeecg.modules.employScore.entity.EmployScore; +import org.jeecg.modules.employScore.mapper.EmployScoreMapper; +import org.jeecg.modules.employScore.service.IEmployScoreService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 积分表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Service +public class EmployScoreServiceImpl extends ServiceImpl implements IEmployScoreService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/EmployScoreList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/EmployScoreList.vue new file mode 100644 index 0000000..99e7ed7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/EmployScoreList.vue @@ -0,0 +1,184 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreForm.vue new file mode 100644 index 0000000..2d63c48 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreModal.Style#Drawer.vue new file mode 100644 index 0000000..d81fa97 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreModal.vue new file mode 100644 index 0000000..463a178 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.api.ts new file mode 100644 index 0000000..3c47203 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employScore/employScore/list', + save='/employScore/employScore/add', + edit='/employScore/employScore/edit', + deleteOne = '/employScore/employScore/delete', + deleteBatch = '/employScore/employScore/deleteBatch', + importExcel = '/employScore/employScore/importExcel', + exportXls = '/employScore/employScore/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}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.data.ts new file mode 100644 index 0000000..cc22411 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.data.ts @@ -0,0 +1,46 @@ +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: '积分', + align:"center", + dataIndex: 'score' + }, + { + title: '积分类型(0-正式 1-临时)', + align:"center", + dataIndex: 'type' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '积分', + field: 'score', + component: 'InputNumber', + }, + { + label: '积分类型(0-正式 1-临时)', + field: 'type', + component: 'Input', + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScoreList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScoreList.vue new file mode 100644 index 0000000..4a5d649 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScoreList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/components/EmployScoreModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/components/EmployScoreModal.vue new file mode 100644 index 0000000..b7df7b9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/components/EmployScoreModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/controller/EmployScoreRecordController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/controller/EmployScoreRecordController.java new file mode 100644 index 0000000..259d666 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/controller/EmployScoreRecordController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employScoreRecord.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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.common.util.oConvertUtils; +import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; +import org.jeecg.modules.employScoreRecord.service.IEmployScoreRecordService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Api(tags="积分记录表") +@RestController +@RequestMapping("/employScoreRecord/employScoreRecord") +@Slf4j +public class EmployScoreRecordController extends JeecgController { + @Autowired + private IEmployScoreRecordService employScoreRecordService; + + /** + * 分页列表查询 + * + * @param employScoreRecord + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "积分记录表-分页列表查询") + @ApiOperation(value="积分记录表-分页列表查询", notes="积分记录表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployScoreRecord employScoreRecord, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employScoreRecord, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employScoreRecordService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employScoreRecord + * @return + */ + @AutoLog(value = "积分记录表-添加") + @ApiOperation(value="积分记录表-添加", notes="积分记录表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployScoreRecord employScoreRecord) { + employScoreRecordService.save(employScoreRecord); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employScoreRecord + * @return + */ + @AutoLog(value = "积分记录表-编辑") + @ApiOperation(value="积分记录表-编辑", notes="积分记录表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployScoreRecord employScoreRecord) { + employScoreRecordService.updateById(employScoreRecord); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "积分记录表-通过id删除") + @ApiOperation(value="积分记录表-通过id删除", notes="积分记录表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employScoreRecordService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "积分记录表-批量删除") + @ApiOperation(value="积分记录表-批量删除", notes="积分记录表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employScoreRecordService.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) { + EmployScoreRecord employScoreRecord = employScoreRecordService.getById(id); + if(employScoreRecord==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employScoreRecord); + } + + /** + * 导出excel + * + * @param request + * @param employScoreRecord + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployScoreRecord employScoreRecord) { + return super.exportXls(request, employScoreRecord, EmployScoreRecord.class, "积分记录表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployScoreRecord.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/entity/EmployScoreRecord.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/entity/EmployScoreRecord.java new file mode 100644 index 0000000..cdc99c8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/entity/EmployScoreRecord.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.employScoreRecord.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Data +@TableName("employ_score_record") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_score_record对象", description="积分记录表") +public class EmployScoreRecord 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; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**积分标题*/ + @Excel(name = "积分标题", width = 15) + @ApiModelProperty(value = "积分标题") + private java.lang.String title; + /**积分*/ + @Excel(name = "积分", width = 15) + @ApiModelProperty(value = "积分") + private java.lang.String score; + /**积分类型(0-收入 1-消耗)*/ + @Excel(name = "积分类型(0-收入 1-消耗)", width = 15) + @ApiModelProperty(value = "积分类型(0-收入 1-消耗)") + private java.lang.String type; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/EmployScoreRecordMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/EmployScoreRecordMapper.java new file mode 100644 index 0000000..de3c5a2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/EmployScoreRecordMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employScoreRecord.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +public interface EmployScoreRecordMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/xml/EmployScoreRecordMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/xml/EmployScoreRecordMapper.xml new file mode 100644 index 0000000..92c4059 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/xml/EmployScoreRecordMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/IEmployScoreRecordService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/IEmployScoreRecordService.java new file mode 100644 index 0000000..110cd97 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/IEmployScoreRecordService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employScoreRecord.service; + +import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +public interface IEmployScoreRecordService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/impl/EmployScoreRecordServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/impl/EmployScoreRecordServiceImpl.java new file mode 100644 index 0000000..85b7b35 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/impl/EmployScoreRecordServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employScoreRecord.service.impl; + +import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; +import org.jeecg.modules.employScoreRecord.mapper.EmployScoreRecordMapper; +import org.jeecg.modules.employScoreRecord.service.IEmployScoreRecordService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 积分记录表 + * @Author: jeecg-boot + * @Date: 2024-10-21 + * @Version: V1.0 + */ +@Service +public class EmployScoreRecordServiceImpl extends ServiceImpl implements IEmployScoreRecordService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/EmployScoreRecordList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/EmployScoreRecordList.vue new file mode 100644 index 0000000..5b8f067 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/EmployScoreRecordList.vue @@ -0,0 +1,190 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordForm.vue new file mode 100644 index 0000000..0146640 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordForm.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordModal.Style#Drawer.vue new file mode 100644 index 0000000..363c9a6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordModal.vue new file mode 100644 index 0000000..aff9008 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.api.ts new file mode 100644 index 0000000..c932ce3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employScoreRecord/employScoreRecord/list', + save='/employScoreRecord/employScoreRecord/add', + edit='/employScoreRecord/employScoreRecord/edit', + deleteOne = '/employScoreRecord/employScoreRecord/delete', + deleteBatch = '/employScoreRecord/employScoreRecord/deleteBatch', + importExcel = '/employScoreRecord/employScoreRecord/importExcel', + exportXls = '/employScoreRecord/employScoreRecord/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}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.data.ts new file mode 100644 index 0000000..d1d2c1b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.data.ts @@ -0,0 +1,56 @@ +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: '积分标题', + align:"center", + dataIndex: 'title' + }, + { + title: '积分', + align:"center", + dataIndex: 'score' + }, + { + title: '积分类型(0-收入 1-消耗)', + align:"center", + dataIndex: 'type' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '积分标题', + field: 'title', + component: 'Input', + }, + { + label: '积分', + field: 'score', + component: 'Input', + }, + { + label: '积分类型(0-收入 1-消耗)', + field: 'type', + component: 'Input', + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecordList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecordList.vue new file mode 100644 index 0000000..01b5d2b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecordList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/components/EmployScoreRecordModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/components/EmployScoreRecordModal.vue new file mode 100644 index 0000000..d2b14ec --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/components/EmployScoreRecordModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java new file mode 100644 index 0000000..2f2bdea --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employVipType.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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.common.util.oConvertUtils; +import org.jeecg.modules.employVipType.entity.EmployVipType; +import org.jeecg.modules.employVipType.service.IEmployVipTypeService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 会员类型表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Api(tags="会员类型表") +@RestController +@RequestMapping("/employVipType/employVipType") +@Slf4j +public class EmployVipTypeController extends JeecgController { + @Autowired + private IEmployVipTypeService employVipTypeService; + + /** + * 分页列表查询 + * + * @param employVipType + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "会员类型表-分页列表查询") + @ApiOperation(value="会员类型表-分页列表查询", notes="会员类型表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployVipType employVipType, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employVipType, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employVipTypeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employVipType + * @return + */ + @AutoLog(value = "会员类型表-添加") + @ApiOperation(value="会员类型表-添加", notes="会员类型表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployVipType employVipType) { + employVipTypeService.save(employVipType); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employVipType + * @return + */ + @AutoLog(value = "会员类型表-编辑") + @ApiOperation(value="会员类型表-编辑", notes="会员类型表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployVipType employVipType) { + employVipTypeService.updateById(employVipType); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "会员类型表-通过id删除") + @ApiOperation(value="会员类型表-通过id删除", notes="会员类型表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employVipTypeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "会员类型表-批量删除") + @ApiOperation(value="会员类型表-批量删除", notes="会员类型表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employVipTypeService.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) { + EmployVipType employVipType = employVipTypeService.getById(id); + if(employVipType==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employVipType); + } + + /** + * 导出excel + * + * @param request + * @param employVipType + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployVipType employVipType) { + return super.exportXls(request, employVipType, EmployVipType.class, "会员类型表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployVipType.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java new file mode 100644 index 0000000..4bc2f44 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.employVipType.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 会员类型表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Data +@TableName("employ_vip_type") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_vip_type对象", description="会员类型表") +public class EmployVipType 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; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**会员名称*/ + @Excel(name = "会员名称", width = 15) + @ApiModelProperty(value = "会员名称") + private java.lang.String name; + /**会员开通金额*/ + @Excel(name = "会员开通金额", width = 15) + @ApiModelProperty(value = "会员开通金额") + private java.math.BigDecimal price; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; + /**专属特权*/ + @Excel(name = "专属特权", width = 15) + @ApiModelProperty(value = "专属特权") + private java.lang.String perquisite; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java new file mode 100644 index 0000000..f2f8738 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employVipType.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employVipType.entity.EmployVipType; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 会员类型表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +public interface EmployVipTypeMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/xml/EmployVipTypeMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/xml/EmployVipTypeMapper.xml new file mode 100644 index 0000000..16b6cb3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/xml/EmployVipTypeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java new file mode 100644 index 0000000..bdf756e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employVipType.service; + +import org.jeecg.modules.employVipType.entity.EmployVipType; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 会员类型表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +public interface IEmployVipTypeService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java new file mode 100644 index 0000000..7cbfefa --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employVipType.service.impl; + +import org.jeecg.modules.employVipType.entity.EmployVipType; +import org.jeecg.modules.employVipType.mapper.EmployVipTypeMapper; +import org.jeecg.modules.employVipType.service.IEmployVipTypeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 会员类型表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Service +public class EmployVipTypeServiceImpl extends ServiceImpl implements IEmployVipTypeService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue new file mode 100644 index 0000000..e49ce19 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue @@ -0,0 +1,189 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue new file mode 100644 index 0000000..bde6348 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeModal.Style#Drawer.vue new file mode 100644 index 0000000..f421e92 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeModal.vue new file mode 100644 index 0000000..bb1a384 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.api.ts new file mode 100644 index 0000000..9869851 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employVipType/employVipType/list', + save='/employVipType/employVipType/add', + edit='/employVipType/employVipType/edit', + deleteOne = '/employVipType/employVipType/delete', + deleteBatch = '/employVipType/employVipType/deleteBatch', + importExcel = '/employVipType/employVipType/importExcel', + exportXls = '/employVipType/employVipType/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}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts new file mode 100644 index 0000000..7d1dfad --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts @@ -0,0 +1,53 @@ +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: '会员名称', + align:"center", + dataIndex: 'name' + }, + { + title: '会员开通金额', + align:"center", + dataIndex: 'price' + }, + { + title: '备注', + align:"center", + dataIndex: 'remark' + }, + { + title: '专属特权', + align:"center", + dataIndex: 'perquisite' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '会员名称', + field: 'name', + component: 'Input', + }, + { + label: '会员开通金额', + field: 'price', + component: 'InputNumber', + }, + { + label: '备注', + field: 'remark', + component: 'Input', + }, + { + label: '专属特权', + field: 'perquisite', + component: 'InputTextArea',//TODO 注意string转换问题 + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipTypeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipTypeList.vue new file mode 100644 index 0000000..dfca079 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipTypeList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/components/EmployVipTypeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/components/EmployVipTypeModal.vue new file mode 100644 index 0000000..7a9cd99 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/components/EmployVipTypeModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/controller/EmployVipUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/controller/EmployVipUserController.java new file mode 100644 index 0000000..c022770 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/controller/EmployVipUserController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employVipUser.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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.common.util.oConvertUtils; +import org.jeecg.modules.employVipUser.entity.EmployVipUser; +import org.jeecg.modules.employVipUser.service.IEmployVipUserService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 会员信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Api(tags="会员信息表") +@RestController +@RequestMapping("/employVipUser/employVipUser") +@Slf4j +public class EmployVipUserController extends JeecgController { + @Autowired + private IEmployVipUserService employVipUserService; + + /** + * 分页列表查询 + * + * @param employVipUser + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "会员信息表-分页列表查询") + @ApiOperation(value="会员信息表-分页列表查询", notes="会员信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployVipUser employVipUser, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employVipUser, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employVipUserService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employVipUser + * @return + */ + @AutoLog(value = "会员信息表-添加") + @ApiOperation(value="会员信息表-添加", notes="会员信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployVipUser employVipUser) { + employVipUserService.save(employVipUser); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employVipUser + * @return + */ + @AutoLog(value = "会员信息表-编辑") + @ApiOperation(value="会员信息表-编辑", notes="会员信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployVipUser employVipUser) { + employVipUserService.updateById(employVipUser); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "会员信息表-通过id删除") + @ApiOperation(value="会员信息表-通过id删除", notes="会员信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employVipUserService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "会员信息表-批量删除") + @ApiOperation(value="会员信息表-批量删除", notes="会员信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employVipUserService.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) { + EmployVipUser employVipUser = employVipUserService.getById(id); + if(employVipUser==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employVipUser); + } + + /** + * 导出excel + * + * @param request + * @param employVipUser + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployVipUser employVipUser) { + return super.exportXls(request, employVipUser, EmployVipUser.class, "会员信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployVipUser.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/entity/EmployVipUser.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/entity/EmployVipUser.java new file mode 100644 index 0000000..ffcb57b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/entity/EmployVipUser.java @@ -0,0 +1,60 @@ +package org.jeecg.modules.employVipUser.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 会员信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Data +@TableName("employ_vip_user") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_vip_user对象", description="会员信息表") +public class EmployVipUser 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; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**会员类型*/ + @Excel(name = "会员类型", width = 15, dictTable = "employ_vip_type", dicText = "name", dicCode = "id") + @Dict(dictTable = "employ_vip_type", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "会员类型") + private java.lang.String typeId; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/mapper/EmployVipUserMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/mapper/EmployVipUserMapper.java new file mode 100644 index 0000000..5e0a148 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/mapper/EmployVipUserMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employVipUser.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employVipUser.entity.EmployVipUser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 会员信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +public interface EmployVipUserMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/mapper/xml/EmployVipUserMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/mapper/xml/EmployVipUserMapper.xml new file mode 100644 index 0000000..150c3d2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/mapper/xml/EmployVipUserMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/service/IEmployVipUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/service/IEmployVipUserService.java new file mode 100644 index 0000000..9fea68b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/service/IEmployVipUserService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employVipUser.service; + +import org.jeecg.modules.employVipUser.entity.EmployVipUser; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 会员信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +public interface IEmployVipUserService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/service/impl/EmployVipUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/service/impl/EmployVipUserServiceImpl.java new file mode 100644 index 0000000..4ac4d10 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/service/impl/EmployVipUserServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employVipUser.service.impl; + +import org.jeecg.modules.employVipUser.entity.EmployVipUser; +import org.jeecg.modules.employVipUser.mapper.EmployVipUserMapper; +import org.jeecg.modules.employVipUser.service.IEmployVipUserService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 会员信息表 + * @Author: jeecg-boot + * @Date: 2024-10-22 + * @Version: V1.0 + */ +@Service +public class EmployVipUserServiceImpl extends ServiceImpl implements IEmployVipUserService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/EmployVipUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/EmployVipUserList.vue new file mode 100644 index 0000000..3e43c18 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/EmployVipUserList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/modules/EmployVipUserForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/modules/EmployVipUserForm.vue new file mode 100644 index 0000000..d1655dd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/modules/EmployVipUserForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/modules/EmployVipUserModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/modules/EmployVipUserModal.Style#Drawer.vue new file mode 100644 index 0000000..8aa4f1d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/modules/EmployVipUserModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/modules/EmployVipUserModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/modules/EmployVipUserModal.vue new file mode 100644 index 0000000..a4c3e5b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue/modules/EmployVipUserModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/EmployVipUser.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/EmployVipUser.api.ts new file mode 100644 index 0000000..dc76a56 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/EmployVipUser.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employVipUser/employVipUser/list', + save='/employVipUser/employVipUser/add', + edit='/employVipUser/employVipUser/edit', + deleteOne = '/employVipUser/employVipUser/delete', + deleteBatch = '/employVipUser/employVipUser/deleteBatch', + importExcel = '/employVipUser/employVipUser/importExcel', + exportXls = '/employVipUser/employVipUser/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}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/EmployVipUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/EmployVipUser.data.ts new file mode 100644 index 0000000..d6815b7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/EmployVipUser.data.ts @@ -0,0 +1,39 @@ +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: '会员类型', + align:"center", + dataIndex: 'typeId_dictText' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '会员类型', + field: 'typeId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"employ_vip_type,name,id" + }, + }, + { + label: '关联用户id', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/EmployVipUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/EmployVipUserList.vue new file mode 100644 index 0000000..ca75964 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/EmployVipUserList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/components/EmployVipUserModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/components/EmployVipUserModal.vue new file mode 100644 index 0000000..be19f5d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipUser/vue3/components/EmployVipUserModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java index cafd4cd..c4aefe2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java @@ -22,9 +22,9 @@ import java.util.Map; @Service public class AppletLoginServiceImpl implements AppletLoginService { //微信小程序appid(特易招) - private static final String mpAppId = ""; + private static final String mpAppId = "wxe631bce44d54667e"; //微信小程序appSecret(特易招) - private static final String mpAppSecret = ""; + private static final String mpAppSecret = "2f19c405ea9bb523f350b5a9fd01b878"; @Resource private IHanHaiMemberService memberService; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java index 364a00e..00394a8 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java @@ -65,8 +65,8 @@ public class BossApiController { //首页-发布招工 @ApiOperation(value="首页-发布招工", notes="首页-发布招工") @RequestMapping(value = "/addJob", method = {RequestMethod.POST}) - public Result addJob(@RequestHeader("X-Access-Token") String token, EmployJob employJob){ - return bossApiService.addJob(token, employJob); + public Result addJob(EmployJob employJob){ + return bossApiService.addJob(employJob); } /***************会员中心***************/ @@ -78,17 +78,24 @@ public class BossApiController { } //会员中心-联系记录-我看过谁(我的招工) - @ApiOperation(value="会员中心-联系记录-我看过谁(我的招工)", notes="会员中心-联系记录-我看过谁(我的招工)") + @ApiOperation(value="会员中心-联系记录-我看过谁", notes="会员中心-联系记录-我看过谁") @RequestMapping(value = "/queryWatchWho", method = {RequestMethod.GET}) - public Result queryWatchWho(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ - return bossApiService.queryWatchWho(token, pageBean); + public Result queryWatchWho(PageBean pageBean){ + return bossApiService.queryWatchWho(pageBean); } //会员中心-联系记录-谁看过我(谁看过我的招工) @ApiOperation(value="会员中心-联系记录-谁看过我(谁看过我的招工)", notes="会员中心-联系记录-谁看过我(谁看过我的招工)") @RequestMapping(value = "/queryWatchMe", method = {RequestMethod.GET}) - public Result queryWatchMe(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ - return bossApiService.queryWatchMe(token, pageBean); + public Result queryWatchMe(PageBean pageBean){ + return bossApiService.queryWatchMe(pageBean); + } + + //会员中心-联系记录-我看过谁(我的招工) + @ApiOperation(value="会员中心-我的招工", notes="会员中心-我的招工") + @RequestMapping(value = "/queryJobListByUserId", method = {RequestMethod.GET}) + public Result queryJobListByUserId(String token, PageBean pageBean){ + return bossApiService.queryJobListByUserId(token, pageBean); } //我的服务-电子合同 @@ -101,8 +108,8 @@ public class BossApiController { //我的服务-电子合同 @ApiOperation(value="电子合同-根据id查询电子合同详情", notes="电子合同-根据id查询电子合同详情") @RequestMapping(value = "/queryContracById", method = {RequestMethod.GET}) - public Result queryContracById(@RequestHeader("X-Access-Token") String token, String contractId){ - return bossApiService.queryContracById(token, contractId); + public Result queryContracById(String contractId){ + return bossApiService.queryContracById(contractId); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java index 0f3e699..c03539b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java @@ -6,13 +6,17 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.CommonApiService; +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; import org.jeecg.modules.employBillInfo.entity.EmployBillInfo; import org.jeecg.modules.employFeedback.entity.EmployFeedback; import org.jeecg.modules.employNotebook.entity.EmployNotebook; +import org.jeecg.modules.employVipUser.entity.EmployVipUser; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import sun.security.krb5.internal.PAData; import javax.annotation.Resource; @@ -40,97 +44,124 @@ public class CommonApiController { return commonApiService.queryJobTypeList(pageBean); } + //获取工作性质列表 + @ApiOperation(value="首页-获取工作性质列表", notes="首页-获取工作性质列表") + @RequestMapping(value = "/queryJobNatureList", method = {RequestMethod.GET}) + public Result queryJobNatureList(PageBean pageBean){ + return commonApiService.queryJobNatureList(pageBean); + } + //获取地址列表 @ApiOperation(value="首页-获取地址列表", notes="首页-获取地址列表") @RequestMapping(value = "/queryAddressList", method = {RequestMethod.GET}) public Result queryAddressList(PageBean pageBean){ - return null; + return commonApiService.queryAddressList(pageBean); } /***************记工记账***************/ //个人记工-新建账本 - @ApiOperation(value="个人记工-新建账本", notes="个人记工-新建账本") + @ApiOperation(value="记工记账-新建账本", notes="Type：0-个人 1-班组") @RequestMapping(value = "/addBill", method = {RequestMethod.POST}) - public Result addBill(@RequestHeader("X-Access-Token") String token, EmployNotebook employNotebook){ - return commonApiService.addBill(token, employNotebook); + public Result addBill(EmployNotebook employNotebook){ + return commonApiService.addBill(employNotebook); } //个人记工-全年收支 - @ApiOperation(value="个人记工-全年收支", notes="个人记工-全年收支") + @ApiOperation(value="记工记账-全年收支", notes="记工记账-全年收支") @RequestMapping(value = "/queryBill", method = {RequestMethod.GET}) public Result queryBill(PageBean pageBean){ return commonApiService.queryBill(pageBean); } //个人记工-技工问题 - @ApiOperation(value="个人记工-技工问题", notes="个人记工-技工问题") + @ApiOperation(value="记工记账-技工问题", notes="记工记账-技工问题") @RequestMapping(value = "/addQuestion", method = {RequestMethod.POST}) - public Result addQuestion(@RequestHeader("X-Access-Token") String token, EmployFeedback employFeedback){ - return commonApiService.addQuestion(token, employFeedback); - } - - //个人记工-在建项目 - @ApiOperation(value="个人记工-在建项目", notes="个人记工-在建项目") - @RequestMapping(value = "/queryStrartJobList", method = {RequestMethod.GET}) - public Result queryStrartJobList(PageBean pageBean){ - return commonApiService.queryStrartJobList(pageBean); - } - - //个人记工-结束项目 - @ApiOperation(value="个人记工-结束项目", notes="个人记工-结束项目") - @RequestMapping(value = "/queryEndJobList", method = {RequestMethod.GET}) - public Result queryEndJobList(PageBean pageBean){ - return commonApiService.queryEndJobList(pageBean); - } - - //班组记工-新建账本 - @ApiOperation(value="班组记工-新建账本", notes="班组记工-新建账本") - @RequestMapping(value = "/addBills", method = {RequestMethod.POST}) - public Result addBills(@RequestHeader("X-Access-Token") String token, EmployNotebook employNotebook){ - return commonApiService.addBill(token, employNotebook); - } - - //班组记工-技工问题 - @ApiOperation(value="班组记工-技工问题", notes="班组记工-技工问题") - @RequestMapping(value = "/addQuestions", method = {RequestMethod.POST}) - public Result addQuestions(@RequestHeader("X-Access-Token") String token, EmployFeedback employFeedback){ - return commonApiService.addQuestion(token, employFeedback); - } + public Result addQuestion(EmployFeedback employFeedback){ + return commonApiService.addQuestion(employFeedback); + } + + @ApiOperation(value="记工记账-在建/结束项目", notes="Type：0-个人 1-班组， status: 0-在建项目 1-结束项目") + @RequestMapping(value = "/queryNotebookList", method = {RequestMethod.GET}) + public Result queryNotebookList(String type, String status, PageBean pageBean){ + return commonApiService.queryNotebookList(type, status, pageBean); + } + +// //个人记工-在建项目 +// @ApiOperation(value="记工记账-在建项目", notes="记工记账-在建项目") +// @RequestMapping(value = "/queryStrartJobList", method = {RequestMethod.GET}) +// public Result queryStrartJobList(PageBean pageBean){ +// return commonApiService.queryStrartJobList(pageBean); +// } +// +// //个人记工-结束项目 +// @ApiOperation(value="记工记账-结束项目", notes="记工记账-结束项目") +// @RequestMapping(value = "/queryEndJobList", method = {RequestMethod.GET}) +// public Result queryEndJobList(PageBean pageBean){ +// return commonApiService.queryEndJobList(pageBean); +// } +// +// //班组记工-新建账本 +// @ApiOperation(value="班组记工-新建账本", notes="班组记工-新建账本") +// @RequestMapping(value = "/addBills", method = {RequestMethod.POST}) +// public Result addBills(EmployNotebook employNotebook){ +// return commonApiService.addBill(employNotebook); +// } +// +// //班组记工-技工问题 +// @ApiOperation(value="班组记工-技工问题", notes="班组记工-技工问题") +// @RequestMapping(value = "/addQuestions", method = {RequestMethod.POST}) +// public Result addQuestions(EmployFeedback employFeedback){ +// return commonApiService.addQuestion(employFeedback); +// } +// +// //班组记工-在建项目 +// @ApiOperation(value="班组记工-在建项目", notes="班组记工-在建项目") +// @RequestMapping(value = "/queryStrartJobLists", method = {RequestMethod.GET}) +// public Result queryStrartJobLists(PageBean pageBean){ +// return commonApiService.queryStrartJobList(pageBean); +// } +// +// //班组记工-结束项目 +// @ApiOperation(value="班组记工-结束项目", notes="班组记工-结束项目") +// @RequestMapping(value = "/queryEndJobLists", method = {RequestMethod.GET}) +// public Result queryEndJobLists(PageBean pageBean){ +// return commonApiService.queryEndJobList(pageBean); +// } - //班组记工-在建项目 - @ApiOperation(value="班组记工-在建项目", notes="班组记工-在建项目") - @RequestMapping(value = "/queryStrartJobLists", method = {RequestMethod.GET}) - public Result queryStrartJobLists(PageBean pageBean){ - return commonApiService.queryStrartJobList(pageBean); + /***************会员中心***************/ + //会员中心-正式积分||临时积分 + @ApiOperation(value="会员中心-正式积分||临时积分", notes="type：0-正式积分 1-临时积分") + @RequestMapping(value = "/queryScore", method = {RequestMethod.GET}) + public Result queryScore(String token, String type){ + return commonApiService.queryScore(token, type); } - //班组记工-结束项目 - @ApiOperation(value="班组记工-结束项目", notes="班组记工-结束项目") - @RequestMapping(value = "/queryEndJobLists", method = {RequestMethod.GET}) - public Result queryEndJobLists(PageBean pageBean){ - return commonApiService.queryEndJobList(pageBean); + //会员中心-积分记录 + @ApiOperation(value="会员中心-积分记录", notes="type：0-收入 1-消耗") + @RequestMapping(value = "/queryScoreRecord", method = {RequestMethod.GET}) + public Result queryScoreRecord(String type, PageBean pageBean){ + return commonApiService.queryScoreRecord(type, pageBean); } - /***************会员中心***************/ - //会员中心-正式积分||临时积分||积分记录 - @ApiOperation(value="会员中心-正式积分||临时积分||积分记录", notes="会员中心-正式积分||临时积分||积分记录") - @RequestMapping(value = "/queryScore", method = {RequestMethod.GET}) - public Result queryScore(){ - return null; + //我的服务-获取VIP信息 + @ApiOperation(value="我的服务-获取VIP配置信息", notes="我的服务-获取VIP配置信息") + @RequestMapping(value = "/queryVipType", method = {RequestMethod.POST}) + public Result queryVipType(PageBean pageBean){ + return commonApiService.queryVipType(pageBean); } //我的服务-会员充值(开通VIP) @ApiOperation(value="我的服务-会员充值(开通VIP)", notes="我的服务-会员充值(开通VIP)") @RequestMapping(value = "/addRecharge", method = {RequestMethod.POST}) - public Result addRecharge(){ - return null; + public Result addVip(String token, EmployVipUser employVipUser){ + return commonApiService.addVip(token, employVipUser); } //我的服务-获取积分-充值积分 @ApiOperation(value="我的服务-获取积分-充值积分", notes="我的服务-获取积分-充值积分") @RequestMapping(value = "/addScoreByRecharge", method = {RequestMethod.POST}) - public Result addScoreByRecharge(){ - return null; + public Result addScoreByRecharge(String token, String score, String type){ + return commonApiService.addScoreByRecharge(token, score, type); } //我的服务-获取积分-邀请工友获取积分 @@ -142,74 +173,74 @@ public class CommonApiController { //我的服务-个人实名认证 @ApiOperation(value="我的服务-个人实名认证", notes="我的服务-个人实名认证") - @RequestMapping(value = "/validatePerson", method = {RequestMethod.POST}) - public Result validatePerson(){ - return null; + @RequestMapping(value = "/addAuthenticationPerson", method = {RequestMethod.POST}) + public Result addAuthenticationPerson(EmployAuthenticationPerson employAuthenticationPerson){ + return commonApiService.addAuthenticationPerson(employAuthenticationPerson); } //我的服务-企业实名认证 @ApiOperation(value="我的服务-企业实名认证", notes="我的服务-企业实名认证") - @RequestMapping(value = "/validateCompany", method = {RequestMethod.POST}) - public Result validateCompany(){ - return null; - } - - //我的服务-兑换码 - @ApiOperation(value="我的服务-兑换码", notes="我的服务-兑换码") - @RequestMapping(value = "/addExchange", method = {RequestMethod.POST}) - public Result addExchange(){ - return null; - } - - /***************设置与帮助***************/ - //系统设置-切换账号 - @ApiOperation(value="系统设置-切换账号", notes="系统设置-切换账号") - @RequestMapping(value = "/changeAccount", method = {RequestMethod.GET}) - public Result changeAccount(){ - return null; - } - - //系统设置-修改密码 - @ApiOperation(value="系统设置-修改密码", notes="系统设置-修改密码") - @RequestMapping(value = "/updatePassword", method = {RequestMethod.GET}) - public Result updatePassword(){ - return null; - } - - //系统设置-清理缓存 - @ApiOperation(value="系统设置-清理缓存", notes="系统设置-清理缓存") - @RequestMapping(value = "/clearCache", method = {RequestMethod.GET}) - public Result clearCache(){ - return null; - } - - //系统设置-版本更新 - @ApiOperation(value="系统设置-版本更新", notes="系统设置-版本更新") - @RequestMapping(value = "/updateVersion", method = {RequestMethod.GET}) - public Result updateVersion(){ - return null; - } - - //系统设置-退出登录 - @ApiOperation(value="系统设置-退出登录", notes="系统设置-退出登录") - @RequestMapping(value = "/loginOut", method = {RequestMethod.GET}) - public Result loginOut(){ - return null; - } - - //系统设置-切换身份 - @ApiOperation(value="系统设置-切换身份", notes="系统设置-切换身份") - @RequestMapping(value = "/changeRole", method = {RequestMethod.GET}) - public Result changeRole(){ - return null; - } - - //帮助与反馈 - @ApiOperation(value="帮助与反馈", notes="帮助与反馈") - @RequestMapping(value = "/help", method = {RequestMethod.GET}) - public Result help(){ - return null; - } + @RequestMapping(value = "/addAuthenticationCompany", method = {RequestMethod.POST}) + public Result addAuthenticationCompany(EmployAhthenticationCompany employAhthenticationCompany){ + return commonApiService.addAuthenticationCompany(employAhthenticationCompany); + } +// +// //我的服务-兑换码 +// @ApiOperation(value="我的服务-兑换码", notes="我的服务-兑换码") +// @RequestMapping(value = "/addExchange", method = {RequestMethod.POST}) +// public Result addExchange(){ +// return null; +// } +// +// /***************设置与帮助***************/ +// //系统设置-切换账号 +// @ApiOperation(value="系统设置-切换账号", notes="系统设置-切换账号") +// @RequestMapping(value = "/changeAccount", method = {RequestMethod.GET}) +// public Result changeAccount(){ +// return null; +// } +// +// //系统设置-修改密码 +// @ApiOperation(value="系统设置-修改密码", notes="系统设置-修改密码") +// @RequestMapping(value = "/updatePassword", method = {RequestMethod.GET}) +// public Result updatePassword(){ +// return null; +// } +// +// //系统设置-清理缓存 +// @ApiOperation(value="系统设置-清理缓存", notes="系统设置-清理缓存") +// @RequestMapping(value = "/clearCache", method = {RequestMethod.GET}) +// public Result clearCache(){ +// return null; +// } +// +// //系统设置-版本更新 +// @ApiOperation(value="系统设置-版本更新", notes="系统设置-版本更新") +// @RequestMapping(value = "/updateVersion", method = {RequestMethod.GET}) +// public Result updateVersion(){ +// return null; +// } +// +// //系统设置-退出登录 +// @ApiOperation(value="系统设置-退出登录", notes="系统设置-退出登录") +// @RequestMapping(value = "/loginOut", method = {RequestMethod.GET}) +// public Result loginOut(){ +// return null; +// } +// +// //系统设置-切换身份 +// @ApiOperation(value="系统设置-切换身份", notes="系统设置-切换身份") +// @RequestMapping(value = "/changeRole", method = {RequestMethod.GET}) +// public Result changeRole(){ +// return null; +// } +// +// //帮助与反馈 +// @ApiOperation(value="帮助与反馈", notes="帮助与反馈") +// @RequestMapping(value = "/help", method = {RequestMethod.GET}) +// public Result help(){ +// return null; +// } //关于本程序 @ApiOperation(value="关于本程序", notes="关于本程序") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java index 9832b65..2e325d6 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java @@ -93,51 +93,58 @@ public class EmployeeApiController { //考证咨询-提交报名材料 @ApiOperation(value="考证咨询-提交报名材料", notes="考证咨询-提交报名材料") @RequestMapping(value = "/addMaterial", method = {RequestMethod.POST}) - public Result addMaterial(@RequestHeader("X-Access-Token") String token, EmployRedister employRedister){ - return employeeApiService.addMaterial(token, employRedister); + public Result addMaterial(EmployRedister employRedister){ + return employeeApiService.addMaterial(employRedister); } //考证咨询-联系客服 @ApiOperation(value="考证咨询-联系客服", notes="考证咨询-联系客服") @RequestMapping(value = "/queryWorker", method = {RequestMethod.GET}) public Result queryWorker(){ - return Result.OK("接口内容暂未处理"); + return Result.OK("客服电话","17777777777"); } /***************会员中心***************/ //会员中心-我的收藏 @ApiOperation(value="会员中心-我的收藏", notes="会员中心-我的收藏") @RequestMapping(value = "/queryJobCollectionList", method = {RequestMethod.GET}) - public Result queryCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ - return employeeApiService.queryJobCollectionList(token, pageBean); + public Result queryCollectionList(PageBean pageBean){ + return employeeApiService.queryJobCollectionList(pageBean); } - //会员中心-联系记录-我看过谁(我的找活) - @ApiOperation(value="会员中心-联系记录-我看过谁(我的找活)", notes="会员中心-联系记录-我看过谁(我的找活)") + //会员中心-联系记录-我看过谁 + @ApiOperation(value="会员中心-联系记录-我看过谁", notes="会员中心-联系记录-我看过谁") @RequestMapping(value = "/queryWatchWho", method = {RequestMethod.GET}) - public Result queryWatchWho(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ - return employeeApiService.queryWatchWho(token, pageBean); + public Result queryWatchWho(PageBean pageBean){ + return employeeApiService.queryWatchWho(pageBean); } - //会员中心-联系记录-我看过谁(我的找活) + //会员中心-联系记录-我看过谁 @ApiOperation(value="会员中心-联系记录-谁看过我(谁看过我的简历)", notes="会员中心-联系记录-谁看过我(谁看过我的简历)") @RequestMapping(value = "/queryWatchMe", method = {RequestMethod.GET}) - public Result queryWatchMe(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ - return employeeApiService.queryWatchMe(token, pageBean); + public Result queryWatchMe(PageBean pageBean){ + return employeeApiService.queryWatchMe(pageBean); + } + + //会员中心-我的找活 + @ApiOperation(value="会员中心-我的找活", notes="会员中心-我的找活") + @RequestMapping(value = "/queryResumeByUserId", method = {RequestMethod.GET}) + public Result queryResumeByUserId(String token, PageBean pageBean){ + return employeeApiService.queryResumeByUserId(token, pageBean); } //我的服务-电子合同 @ApiOperation(value="电子合同-获取电子合同列表", notes="电子合同-获取电子合同列表") @RequestMapping(value = "/queryContractList", method = {RequestMethod.GET}) - public Result queryContractList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ - return employeeApiService.queryContractList(token, pageBean); + public Result queryContractList(PageBean pageBean){ + return employeeApiService.queryContractList(pageBean); } //我的服务-电子合同 @ApiOperation(value="电子合同-根据id查询电子合同详情", notes="电子合同-根据id查询电子合同详情") @RequestMapping(value = "/queryContracById", method = {RequestMethod.GET}) - public Result queryContracById(@RequestHeader("X-Access-Token") String token, String contractId){ - return employeeApiService.queryContracById(token, contractId); + public Result queryContracById(String contractId){ + return employeeApiService.queryContracById(contractId); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/JobCollectionBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/JobCollectionBean.java new file mode 100644 index 0000000..bfe46aa --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/JobCollectionBean.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.apiBean; + +import lombok.Data; +import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob; +import org.jeecg.modules.employJob.entity.EmployJob; + +@Data +public class JobCollectionBean { + EmployCollectionJob employCollectionJob; + EmployJob employJob; + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ResumeCollectionBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ResumeCollectionBean.java new file mode 100644 index 0000000..f187483 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ResumeCollectionBean.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.apiBean; + +import lombok.Data; +import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; +import org.jeecg.modules.employResume.entity.EmployResume; + +@Data +public class ResumeCollectionBean { + EmployCollectionResume employCollectionResume; + EmployResume employResume; + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java index 7d24e42..116f078 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java @@ -15,8 +15,6 @@ public interface BossApiService { // //首页-获取简历列表带分页 // public Result queryResumeList(PageBean pageBean); // - //首页-根据Id查看简历详情 - public Result queryResumeById(String resumeId); // // //首页-根据工种查询简历列表带分页 // public Result queryResumeListByName(String jobType, PageBean pageBean); @@ -27,23 +25,29 @@ public interface BossApiService { //首页-根据工作性质查询简历列表带分页 public Result queryResumeListByAll(EmployResume employResume, PageBean pageBean, HttpServletRequest req); + //首页-根据Id查看简历详情 + public Result queryResumeById(String resumeId); + //首页-发布招工 - public Result addJob(String token, EmployJob employJob); + public Result addJob(EmployJob employJob); /***************会员中心***************/ //会员中心-我的收藏 public Result queryJobCollectionList(PageBean pageBean); - //会员中心-联系记录-我看过谁(我的找活) - public Result queryWatchWho(String token, PageBean pageBean); + //会员中心-联系记录-我看过谁 + public Result queryWatchWho(PageBean pageBean); //会员中心-联系记录-我看过谁(我的找活) - public Result queryWatchMe(String token, PageBean pageBean); + public Result queryWatchMe(PageBean pageBean); + + //会员中心-联系记录-我的招工 + public Result queryJobListByUserId(String token, PageBean pageBean); //电子合同-获取电子合同列表 public Result queryContractList(EmployContract employContract, PageBean pageBean, HttpServletRequest req); //电子合同-获取电子合同详情 - public Result queryContracById(String token, String contractId); + public Result queryContracById(String contractId); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java index a1ec0b4..77d730e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java @@ -2,8 +2,11 @@ package org.jeecg.modules.apiService; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; import org.jeecg.modules.employFeedback.entity.EmployFeedback; import org.jeecg.modules.employNotebook.entity.EmployNotebook; +import org.jeecg.modules.employVipUser.entity.EmployVipUser; public interface CommonApiService { @@ -14,23 +17,53 @@ public interface CommonApiService { //获取工种列表带分页 public Result queryJobTypeList(PageBean pageBean); + //获取工作性质列表 + public Result queryJobNatureList(PageBean pageBean); + //获取地址列表带分页 public Result queryAddressList(PageBean pageBean); /***************记工记账***************/ //个人记工-新建账本 - public Result addBill(String token, EmployNotebook employNotebook); + public Result addBill(EmployNotebook employNotebook); //个人记工-全年收支 public Result queryBill(PageBean pageBean); //个人记工-技工问题 - public Result addQuestion(String token, EmployFeedback employFeedback); + public Result addQuestion(EmployFeedback employFeedback); //个人记工-在建项目 - public Result queryStrartJobList(PageBean pageBean); + public Result queryNotebookList(String type, String status, PageBean pageBean); + +// //个人记工-在建项目 +// public Result queryStrartJobList(PageBean pageBean); +// +// //个人记工-结束项目 +// public Result queryEndJobList(PageBean pageBean); + + /***************会员中心***************/ + //会员中心-正式积分||临时积分 + public Result queryScore(String token, String type); + + //会员中心-积分记录 + public Result queryScoreRecord(String type, PageBean pageBean); + + //会员中心-获取VIP配置信息 + public Result queryVipType(PageBean pageBean); + + //会员中心-开通VIP + public Result addVip(String token, EmployVipUser employVipUser); + + //会员中心-充值积分 + public Result addScoreByRecharge(String token, String score, String type); + + //会员中心-实名认证 + public Result addAuthenticationPerson(EmployAuthenticationPerson employAuthenticationPerson); + + //会员中心-企业 + public Result addAuthenticationCompany(EmployAhthenticationCompany employAhthenticationCompany); + - //个人记工-结束项目 - public Result queryEndJobList(PageBean pageBean); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java index 7a2ed41..c7572d2 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java @@ -30,25 +30,29 @@ public interface EmployeeApiService { public Result queryCertList(PageBean pageBean); //考证咨询-提交报名材料 - public Result addMaterial(String token, EmployRedister employRedister); + //考证咨询-提交报名材料 + public Result addMaterial(EmployRedister employRedister); //考证咨询-联系客服 /***************会员中心***************/ //会员中心-我的收藏 - public Result queryJobCollectionList(String token, PageBean pageBean); + public Result queryJobCollectionList(PageBean pageBean); + + //会员中心-联系记录-我看过谁 + public Result queryWatchWho(PageBean pageBean); - //会员中心-联系记录-我看过谁(我的找活) - public Result queryWatchWho(String token, PageBean pageBean); + //会员中心-联系记录-谁看过我(谁看过我的找活) + public Result queryWatchMe(PageBean pageBean); - //会员中心-联系记录-我看过谁(我的找活) - public Result queryWatchMe(String token, PageBean pageBean); + //会员中心-我的找活 + public Result queryResumeByUserId(String token, PageBean pageBean); //电子合同-获取电子合同列表 - public Result queryContractList(String token, PageBean pageBean); + public Result queryContractList(PageBean pageBean); //电子合同-获取电子合同详情 - public Result queryContracById(String token, String contractId); + public Result queryContracById(String contractId); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java index 4089918..9e12114 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java @@ -7,6 +7,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiBean.ResumeCollectionBean; import org.jeecg.modules.apiService.BossApiService; import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService; @@ -26,6 +27,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.List; @Service @@ -73,16 +75,6 @@ public class BossApiServiceImpl implements BossApiService { // return Result.OK("简历列表", pageList); // } // - //首页-根据Id查看简历详情 - @Override - public Result queryResumeById(String resumeId) { - EmployResume one = employResumeService - .lambdaQuery() - .eq(EmployResume::getId, resumeId) - .one(); - - return Result.OK("简历详情", one); - } // // //首页-根据岗工种查询简历列表 // @Override @@ -117,17 +109,28 @@ public class BossApiServiceImpl implements BossApiService { return Result.OK("简历列表", pageList); } + //首页-根据Id查看简历详情 + @Override + public Result queryResumeById(String resumeId) { + EmployResume one = employResumeService + .lambdaQuery() + .eq(EmployResume::getId, resumeId) + .one(); + + return Result.OK("简历详情", one); + } + //首页-发布招工 @Override - public Result addJob(String token, EmployJob employJob) { + public Result addJob(EmployJob employJob) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 String message; //添加招工信息 - employJob.setUserId(hanHaiMember.getId()); + //employJob.setUserId(hanHaiMember.getId()); boolean result = employJobService.save(employJob); //判断招工信息是否添加成功 @@ -144,23 +147,35 @@ public class BossApiServiceImpl implements BossApiService { @Override public Result queryJobCollectionList(PageBean pageBean) { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + //获取收藏列表 Page pageList = employCollectionResumeService .lambdaQuery() .page(page); + List list = new ArrayList<>(); + //根据收藏列表关联简历id获取简历信息 + for (EmployCollectionResume record : pageList.getRecords()) { + ResumeCollectionBean resumeCollectionBean = new ResumeCollectionBean(); + EmployResume one = employResumeService.getById(record.getResumeId()); - return Result.OK("简历收藏列表", pageList); + resumeCollectionBean.setEmployCollectionResume(record); + resumeCollectionBean.setEmployResume(one); + list.add(resumeCollectionBean); + + } + + return Result.OK("简历收藏列表", list); } - //会员中心-联系记录-我看过谁(我的招工) + //会员中心-联系记录-我看过谁 @Override - public Result queryWatchWho(String token, PageBean pageBean) { + public Result queryWatchWho(PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employCheckResumeService .lambdaQuery() - .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) + //.eq(EmployCheckResume::getUserId, hanHaiMember.getId()) .page(page); return Result.OK("我看过谁列表", pageList); @@ -168,27 +183,40 @@ public class BossApiServiceImpl implements BossApiService { //会员中心-联系记录-谁看过我(谁看过我的招工) @Override - public Result queryWatchMe(String token, PageBean pageBean) { + public Result queryWatchMe(PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //查询我发布的工作 - EmployJob job = employJobService +// EmployJob job = employJobService +// .lambdaQuery() +// //.eq(EmployJob::getUserId, hanHaiMember.getId()) +// .one(); + List jobList = employJobService .lambdaQuery() - .eq(EmployJob::getUserId, hanHaiMember.getId()) - .one(); + //.eq(EmployJob::getUserId, hanHaiMember.getId()) + .list(); //获取工作被查询的记录 - List checkJobList = employCheckJobService - .lambdaQuery() - .eq(EmployCheckJob::getJobId, job.getId()) - .list(); +// List checkJobList = employCheckJobService +// .lambdaQuery() +// .eq(EmployCheckJob::getJobId, job.getId()) +// .list(); + + List lists = new ArrayList<>(); + for (EmployJob job : jobList) { + List checkJobList1 = employCheckJobService + .lambdaQuery() + .eq(EmployCheckJob::getJobId, job.getId()) + .list(); + lists.addAll(checkJobList1); + } //获取查看我的工作的求职者id - int size = (int)checkJobList.size(); + int size = (int)lists.size(); Object[] objects = new Object[size]; int index = 0; - for (EmployCheckJob employCheckJob : checkJobList) { + for (EmployCheckJob employCheckJob : lists) { objects[index] = employCheckJob.getUserId(); index++; } @@ -200,7 +228,22 @@ public class BossApiServiceImpl implements BossApiService { .in(EmployResume::getUserId,objects) .page(page); - return Result.OK("谁看过我列表", pageList); + return Result.OK("谁看过我(谁看过我的招工)列表", pageList); + } + + //我的招工 + @Override + public Result queryJobListByUserId(String token, PageBean pageBean) { + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employJobService + .lambdaQuery() + //.eq(EmployCheckResume::getUserId, hanHaiMember.getId()) + .page(page); + + return Result.OK("我的招工", pageList); } //电子合同-获取电子合同列表 @@ -228,7 +271,7 @@ public class BossApiServiceImpl implements BossApiService { //电子合同-获取电子合同详情 @Override - public Result queryContracById(String token, String contractId) { + public Result queryContracById(String contractId) { //权限验证 //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java index 50276f7..e70d1bd 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java @@ -5,6 +5,12 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.CommonApiService; +import org.jeecg.modules.employAddress.entity.EmployAddress; +import org.jeecg.modules.employAddress.service.IEmployAddressService; +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; +import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService; import org.jeecg.modules.employBillInfo.entity.EmployBillInfo; import org.jeecg.modules.employBillInfo.service.IEmployBillInfoService; import org.jeecg.modules.employFeedback.entity.EmployFeedback; @@ -13,15 +19,27 @@ import org.jeecg.modules.employImage.entity.EmployImage; import org.jeecg.modules.employImage.service.IEmployImageService; import org.jeecg.modules.employJobType.entity.EmployJobType; import org.jeecg.modules.employJobType.service.IEmployJobTypeService; +import org.jeecg.modules.employNature.entity.EmployNature; +import org.jeecg.modules.employNature.service.IEmployNatureService; import org.jeecg.modules.employNotebook.entity.EmployNotebook; import org.jeecg.modules.employNotebook.service.IEmployNotebookService; import org.jeecg.modules.employResume.entity.EmployResume; import org.jeecg.modules.employResume.service.IEmployResumeService; +import org.jeecg.modules.employScore.entity.EmployScore; +import org.jeecg.modules.employScore.service.IEmployScoreService; +import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; +import org.jeecg.modules.employScoreRecord.service.IEmployScoreRecordService; +import org.jeecg.modules.employVipType.entity.EmployVipType; +import org.jeecg.modules.employVipType.service.IEmployVipTypeService; +import org.jeecg.modules.employVipUser.entity.EmployVipUser; +import org.jeecg.modules.employVipUser.service.IEmployVipUserService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class CommonApiServiceImpl implements CommonApiService { @@ -39,6 +57,14 @@ public class CommonApiServiceImpl implements CommonApiService { @Resource private IEmployJobTypeService employJobTypeService; + //工作性质表 + @Resource + private IEmployNatureService employNatureService; + + //简历信息表 + @Resource + private IEmployResumeService employResumeService; + //图片信息表表 @Resource private IEmployImageService employImageService; @@ -55,6 +81,35 @@ public class CommonApiServiceImpl implements CommonApiService { @Resource private IEmployFeedbackService employFeedbackService; + //积分表 + @Resource + private IEmployScoreService employScoreService; + + //积分记录表 + @Resource + private IEmployScoreRecordService employScoreRecordService; + + //地址表 + @Resource + private IEmployAddressService employAddressService; + + //个人实名认证表 + @Resource + private IEmployAuthenticationPersonService employAuthenticationPersonService; + + //企业实名认证表 + @Resource + private IEmployAhthenticationCompanyService employAhthenticationCompanyService; + + //VIP配置表 + @Resource + private IEmployVipTypeService employVipTypeService; + + //VIP用户表 + @Resource + private IEmployVipUserService employVipUserService; + + /****************************************************************************************/ /****************************************************************************************/ @@ -83,21 +138,39 @@ public class CommonApiServiceImpl implements CommonApiService { return Result.OK("工种列表", pageList); } + //获取工作性质带分页 + @Override + public Result queryJobNatureList(PageBean pageBean) { + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employNatureService + .lambdaQuery() + .page(page); + + return Result.OK("工作性质列表", pageList); + } + + //获取地址列表带分页 @Override public Result queryAddressList(PageBean pageBean) { - return null; + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employAddressService + .lambdaQuery() + .page(page); + + return Result.OK("地址列表", pageList); } /***************记工记账***************/ - //个人记工-新建账本 + //记工记账-新建账本 @Override - public Result addBill(String token, EmployNotebook employNotebook) { + public Result addBill(EmployNotebook employNotebook) { String message = ""; //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); employNotebook.setStatus("0"); - employNotebook.setUserId(hanHaiMember.getId()); + //employNotebook.setUserId(hanHaiMember.getId()); boolean result = employNotebookService.save(employNotebook); if(result){ @@ -109,7 +182,7 @@ public class CommonApiServiceImpl implements CommonApiService { return Result.OK(message); } - //个人记工-全年收支 + //记工记账-全年收支 @Override public Result queryBill(PageBean pageBean) { @@ -121,14 +194,14 @@ public class CommonApiServiceImpl implements CommonApiService { return Result.OK("记账列表", pageList); } - //个人记工-技工问题 + //记工记账-技工问题 @Override - public Result addQuestion(String token, EmployFeedback employFeedback) { + public Result addQuestion(EmployFeedback employFeedback) { String message = ""; //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - employFeedback.setUserId(hanHaiMember.getId()); + //employFeedback.setUserId(hanHaiMember.getId()); boolean result = employFeedbackService.save(employFeedback); if(result){ @@ -140,27 +213,194 @@ public class CommonApiServiceImpl implements CommonApiService { return Result.OK(message); } - //个人记工-在建项目 + //记工记账-在建结束项目 @Override - public Result queryStrartJobList(PageBean pageBean) { + public Result queryNotebookList(String type, String status, PageBean pageBean) { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employNotebookService - .lambdaQuery() - .eq(EmployNotebook::getStatus, 0) - .page(page); + Page pageList = null; + if(null != type && null != status){ + pageList = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getType, type) + .eq(EmployNotebook::getStatus, status) + .page(page); + }else if(null != type){ + pageList = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getType, type) + .page(page); + }else if(null != status){ + pageList = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getStatus, status) + .page(page); + }else { + pageList = employNotebookService + .lambdaQuery() + .page(page); + } - return Result.OK("在建项目", pageList); + return Result.OK("在建/结束项目", pageList); } - //个人记工-结束项目 + /***************会员中心***************/ + //会员中心-正式积分||临时积分 @Override - public Result queryEndJobList(PageBean pageBean) { - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employNotebookService + public Result queryScore(String token, String type) { + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + String message = "获取积分失败"; + EmployScore one = null; + switch (type){ + case "0": + message = "正式积分"; + one = employScoreService + .lambdaQuery() + //.eq(EmployScoreRecord::getUserId, hanHaiMember.getId()) + .eq(EmployScore::getUserId, "1830614749375053826") + .eq(EmployScore::getType, type) + .one(); + break; + case "1": + message = "临时积分"; + one = employScoreService + .lambdaQuery() + //.eq(EmployScoreRecord::getUserId, hanHaiMember.getId()) + .eq(EmployScore::getUserId, "1830614749375053826") + .eq(EmployScore::getType, type) + .one(); + break; + default: + message = "积分类型输入错误，请重新输入：type：0-正式积分 1-临时积分"; + break; + } + + return Result.OK(message, one); + } + + //会员中心-积分记录 + @Override + public Result queryScoreRecord(String type, PageBean pageBean) { + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList =null; + + if(null != type){ + pageList = employScoreRecordService + .lambdaQuery() + .eq(EmployScoreRecord::getType, type) + .page(page); + }else { + pageList = employScoreRecordService + .lambdaQuery() + .page(page); + } + + return Result.OK("积分记录", pageList); + } + + //会员中心-获取VIP配置信息 + @Override + public Result queryVipType(PageBean pageBean) { + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employVipTypeService .lambdaQuery() - .eq(EmployNotebook::getStatus, 1) .page(page); - return Result.OK("结束项目", pageList); + return Result.OK("VIP配置信息列表", pageList); + } + + //会员中心-开通VIP + @Override + public Result addVip(String token, EmployVipUser employVipUser) { + String message = ""; + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //employVipUser.setUserId(hanHaiMember.getId()); + //employVipUser.setTypeId(vipTypeId); + boolean result = employVipUserService.save(employVipUser); + + if(result){ + message = "开通VIP成功！"; + }else { + message = "开通VIP失败！"; + } + + return Result.OK(message); + } + + //会员中心-充值积分 + @Override + public Result addScoreByRecharge(String token, String score, String type ) { + //积分表 + //根据userId查询出用户正式积分 + //修改正式积分 + + //积分记录表 + return Result.OK("该接口暂未完成"); + } + + //会员中心-个人实名认证 + @Override + public Result addAuthenticationPerson(EmployAuthenticationPerson employAuthenticationPerson) { + String message = ""; + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //employFeedback.setUserId(hanHaiMember.getId()); + boolean result = employAuthenticationPersonService.save(employAuthenticationPerson); + + if(result){ + message = "个人实名添加成功！"; + }else { + message = "个人实名添加失败！"; + } + + return Result.OK(message); + } + + //会员中心-企业实名认证 + @Override + public Result addAuthenticationCompany(EmployAhthenticationCompany employAhthenticationCompany) { + String message = ""; + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //employFeedback.setUserId(hanHaiMember.getId()); + boolean result = employAhthenticationCompanyService.save(employAhthenticationCompany); + + if(result){ + message = "企业实名添加成功！"; + }else { + message = "企业实名添加失败！"; + } + + return Result.OK(message); } + +// //个人记工-在建项目 +// @Override +// public Result queryStrartJobList(PageBean pageBean) { +// Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); +// Page pageList = employNotebookService +// .lambdaQuery() +// .eq(EmployNotebook::getStatus, 0) +// .page(page); +// +// return Result.OK("在建项目", pageList); +// } +// +// //个人记工-结束项目 +// @Override +// public Result queryEndJobList(PageBean pageBean) { +// Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); +// Page pageList = employNotebookService +// .lambdaQuery() +// .eq(EmployNotebook::getStatus, 1) +// .page(page); +// +// return Result.OK("结束项目", pageList); +// } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java index 413eebf..00070e2 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.apiService.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.JobCollectionBean; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.EmployeeApiService; import org.jeecg.modules.employCert.entity.EmployCert; @@ -179,15 +180,15 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { //考证咨询-提交报名材料 @Override - public Result addMaterial(String token, EmployRedister employRedister) { + public Result addMaterial(EmployRedister employRedister) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 String message; //提交报名材料 - employRedister.setUserId(hanHaiMember.getId()); + //employRedister.setUserId(hanHaiMember.getId()); boolean result = employRedisterService.save(employRedister); //判断招工信息是否添加成功 @@ -202,29 +203,42 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { /***************会员中心***************/ //会员中心-我的收藏 @Override - public Result queryJobCollectionList(String token, PageBean pageBean) { + public Result queryJobCollectionList(PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //获取工作收藏列表 Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employCollectionJobService .lambdaQuery() - .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + //.eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) .page(page); - return Result.OK("工作收藏列表", pageList); + //根据收藏列表工作id查询工作信息 + List list = new ArrayList<>(); + for (EmployCollectionJob record : pageList.getRecords()) { + JobCollectionBean jobCollectionBean = new JobCollectionBean(); + EmployJob one = employJobService.getById(record.getJobId()); + + jobCollectionBean.setEmployCollectionJob(record); + jobCollectionBean.setEmployJob(one); + list.add(jobCollectionBean); + + } + + return Result.OK("工作收藏列表", list); } //会员中心-联系记录-我看过谁(我的找活) @Override - public Result queryWatchWho(String token, PageBean pageBean) { + public Result queryWatchWho(PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employCheckJobService .lambdaQuery() - .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) + //.eq(EmployCheckJob::getUserId, hanHaiMember.getId()) .page(page); return Result.OK("工作查看列表", pageList); @@ -232,27 +246,40 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { //会员中心-联系记录-谁看过我(谁看过我的简历) @Override - public Result queryWatchMe(String token, PageBean pageBean) { + public Result queryWatchMe(PageBean pageBean) { //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //查询我的简历 - EmployResume one = employResumeService +// EmployResume one = employResumeService +// .lambdaQuery() +// //.eq(EmployResume::getUserId, hanHaiMember.getId()) +// .one(); + List list = employResumeService .lambdaQuery() - .eq(EmployResume::getUserId, hanHaiMember.getId()) - .one(); + //.eq(EmployResume::getUserId, hanHaiMember.getId()) + .list(); //查询我的简历被查看的记录 - List list = employCheckResumeService +// List list = employCheckResumeService +// .lambdaQuery() +// .eq(EmployCheckResume::getResumeId, one.getId()) +// .list(); + List list1 = new ArrayList<>(); + for (EmployResume employResume : list) { + List list2 = employCheckResumeService .lambdaQuery() - .eq(EmployCheckResume::getResumeId, one.getId()) + .eq(EmployCheckResume::getResumeId, employResume.getId()) .list(); + list1.addAll(list2); + } + //获取查看我的简历的招聘人员id - int size = (int)list.size(); + int size = (int)list1.size(); Object[] objects = new Object[size]; int index = 0; - for (EmployCheckResume employCheckResume : list) { + for (EmployCheckResume employCheckResume : list1) { objects[index] = employCheckResume.getUserId(); index++; } @@ -267,9 +294,25 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { return Result.OK("谁看过我的简历列表", pageList); } + //会员中心-我的找活 + @Override + public Result queryResumeByUserId(String token, PageBean pageBean) { + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employResumeService + .lambdaQuery() + //.eq(EmployResume::getUserId, hanHaiMember.getId()) + .eq(EmployResume::getUserId, "1846405293308338177") + .page(page); + + return Result.OK("我的找活", pageList); + } + //电子合同-获取电子合同列表 @Override - public Result queryContractList(String token, PageBean pageBean) { + public Result queryContractList(PageBean pageBean) { //权限验证 //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); @@ -284,7 +327,7 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { //电子合同-获取电子合同详情 @Override - public Result queryContracById(String token, String contractId) { + public Result queryContracById(String contractId) { //权限验证 //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);