From baddb39a2dda5a901b17ddfabe3d44eb23afdf2f Mon Sep 17 00:00:00 2001 From: lzx_mac <2602107437@qq.com> Date: Thu, 26 Sep 2024 13:01:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HanHaiBannerController.java | 2 +- .../modules/hanHaiBanner/entity/HanHaiBanner.java | 21 +- .../hanHaiBanner/mapper/HanHaiBannerMapper.java | 2 +- .../hanHaiBanner/service/IHanHaiBannerService.java | 2 +- .../service/impl/HanHaiBannerServiceImpl.java | 2 +- .../modules/hanHaiBanner/vue/HanHaiBannerList.vue | 25 ++ .../hanHaiBanner/vue/modules/HanHaiBannerForm.vue | 20 + .../modules/hanHaiBanner/vue3/HanHaiBanner.data.ts | 49 +++ .../controller/HanHaiRealEnterpriseController.java | 342 ++++++++--------- .../entity/HanHaiRealEnterprise.java | 171 +++++---- .../mapper/HanHaiRealEnterpriseMapper.java | 34 +- .../mapper/xml/HanHaiRealEnterpriseMapper.xml | 8 +- .../service/IHanHaiRealEnterpriseService.java | 28 +- .../impl/HanHaiRealEnterpriseServiceImpl.java | 38 +- .../vue/HanHaiRealEnterpriseList.vue | 427 +++++++++++---------- .../vue/modules/HanHaiRealEnterpriseForm.vue | 271 ++++++------- .../HanHaiRealEnterpriseModal.Style#Drawer.vue | 166 ++++---- .../vue/modules/HanHaiRealEnterpriseModal.vue | 118 +++--- .../vue3/HanHaiRealEnterprise.api.ts | 122 +++--- .../vue3/HanHaiRealEnterprise.data.ts | 203 +++++----- .../vue3/HanHaiRealEnterpriseList.vue | 322 ++++++++-------- .../vue3/components/HanHaiRealEnterpriseModal.vue | 114 +++--- .../controller/HanHaiRealNameController.java | 342 ++++++++--------- .../hanHaiRealName/entity/HanHaiRealName.java | 148 +++---- .../mapper/HanHaiRealNameMapper.java | 34 +- .../mapper/xml/HanHaiRealNameMapper.xml | 8 +- .../service/IHanHaiRealNameService.java | 28 +- .../service/impl/HanHaiRealNameServiceImpl.java | 38 +- .../hanHaiRealName/vue/HanHaiRealNameList.vue | 398 +++++++++---------- .../vue/modules/HanHaiRealNameForm.vue | 251 ++++++------ .../modules/HanHaiRealNameModal.Style#Drawer.vue | 166 ++++---- .../vue/modules/HanHaiRealNameModal.vue | 118 +++--- .../hanHaiRealName/vue3/HanHaiRealName.api.ts | 122 +++--- .../hanHaiRealName/vue3/HanHaiRealName.data.ts | 148 +++---- .../hanHaiRealName/vue3/HanHaiRealNameList.vue | 322 ++++++++-------- .../vue3/components/HanHaiRealNameModal.vue | 114 +++--- .../api/noticeapicontroller/InfoApiController.java | 4 +- .../jeecg/modules/apiBean/ActorSetPageBean.java | 4 + .../jeecg/modules/apiBean/PromotionPageBean.java | 4 +- .../apiservice/impl/IndexApiServiceImpl.java | 12 + .../apiservice/impl/InfoApiServiceImpl.java | 39 +- 41 files changed, 2506 insertions(+), 2281 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/controller/HanHaiBannerController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/controller/HanHaiBannerController.java index 2101af9..d807e23 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/controller/HanHaiBannerController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/controller/HanHaiBannerController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="轮播广告") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/entity/HanHaiBanner.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/entity/HanHaiBanner.java index c42f7bc..57bc152 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/entity/HanHaiBanner.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/entity/HanHaiBanner.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data @@ -63,4 +63,23 @@ public class HanHaiBanner implements Serializable { @Excel(name = "跳转地址", width = 15) @ApiModelProperty(value = "跳转地址") private java.lang.String toUrl; + /**0帖子1名片2作品*/ + @Excel(name = "0帖子1名片2作品", width = 15) + @ApiModelProperty(value = "0帖子1名片2作品") + private java.lang.Integer type; + /**帖子*/ + @Excel(name = "帖子", width = 15, dictTable = "at_trends", dicText = "title", dicCode = "id") + @Dict(dictTable = "at_trends", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "帖子") + private java.lang.String trendsId; + /**名片*/ + @Excel(name = "名片", width = 15, dictTable = "at_actor_collection", dicText = "name", dicCode = "id") + @Dict(dictTable = "at_actor_collection", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "名片") + private java.lang.String collectionId; + /**作品*/ + @Excel(name = "作品", width = 15, dictTable = "at_masterpiece", dicText = "title", dicCode = "id") + @Dict(dictTable = "at_masterpiece", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "作品") + private java.lang.String masterpieceId; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/mapper/HanHaiBannerMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/mapper/HanHaiBannerMapper.java index 170dee0..4df082e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/mapper/HanHaiBannerMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/mapper/HanHaiBannerMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface HanHaiBannerMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/IHanHaiBannerService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/IHanHaiBannerService.java index 1e50ae5..5915845 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/IHanHaiBannerService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/IHanHaiBannerService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface IHanHaiBannerService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/impl/HanHaiBannerServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/impl/HanHaiBannerServiceImpl.java index 6dfff49..40f05d3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/impl/HanHaiBannerServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/impl/HanHaiBannerServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/HanHaiBannerList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/HanHaiBannerList.vue index 0ca6478..b164355 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/HanHaiBannerList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/HanHaiBannerList.vue @@ -99,6 +99,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import HanHaiBannerModal from './modules/HanHaiBannerModal' + import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'HanHaiBannerList', @@ -137,6 +138,26 @@ align:"center", dataIndex: 'toUrl' }, + { + title:'0帖子1名片2作品', + align:"center", + dataIndex: 'type' + }, + { + title:'帖子', + align:"center", + dataIndex: 'trendsId_dictText' + }, + { + title:'名片', + align:"center", + dataIndex: 'collectionId_dictText' + }, + { + title:'作品', + align:"center", + dataIndex: 'masterpieceId_dictText' + }, { title: '操作', dataIndex: 'action', @@ -174,6 +195,10 @@ fieldList.push({type:'string',value:'name',text:'备注名称',dictCode:''}) fieldList.push({type:'string',value:'image',text:'图片',dictCode:''}) fieldList.push({type:'string',value:'toUrl',text:'跳转地址',dictCode:''}) + fieldList.push({type:'int',value:'type',text:'0帖子1名片2作品',dictCode:''}) + fieldList.push({type:'sel_search',value:'trendsId',text:'帖子',dictTable:"at_trends", dictText:'title', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'collectionId',text:'名片',dictTable:"at_actor_collection", dictText:'name', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'masterpieceId',text:'作品',dictTable:"at_masterpiece", dictText:'title', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/modules/HanHaiBannerForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/modules/HanHaiBannerForm.vue index ec6e9b8..5391ee6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/modules/HanHaiBannerForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/modules/HanHaiBannerForm.vue @@ -18,6 +18,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue3/HanHaiBanner.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue3/HanHaiBanner.data.ts index 4d0bf02..785a083 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue3/HanHaiBanner.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue3/HanHaiBanner.data.ts @@ -20,6 +20,26 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'toUrl' }, + { + title: '0帖子1名片2作品', + align:"center", + dataIndex: 'type' + }, + { + title: '帖子', + align:"center", + dataIndex: 'trendsId_dictText' + }, + { + title: '名片', + align:"center", + dataIndex: 'collectionId_dictText' + }, + { + title: '作品', + align:"center", + dataIndex: 'masterpieceId_dictText' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -43,4 +63,33 @@ export const formSchema: FormSchema[] = [ field: 'toUrl', component: 'Input', }, + { + label: '0帖子1名片2作品', + field: 'type', + component: 'InputNumber', + }, + { + label: '帖子', + field: 'trendsId', + component: 'JSearchSelect', + componentProps:{ + dict:"at_trends,title,id" + }, + }, + { + label: '名片', + field: 'collectionId', + component: 'JSearchSelect', + componentProps:{ + dict:"at_actor_collection,name,id" + }, + }, + { + label: '作品', + field: 'masterpieceId', + component: 'JSearchSelect', + componentProps:{ + dict:"at_masterpiece,title,id" + }, + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java index babbe73..b8baea8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java @@ -1,171 +1,171 @@ -package org.jeecg.modules.hanHaiRealEnterprise.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.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; -import org.jeecg.modules.hanHaiRealEnterprise.service.IHanHaiRealEnterpriseService; - -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-08-27 - * @Version: V1.0 - */ -@Api(tags="企业认证表") -@RestController -@RequestMapping("/hanHaiRealEnterprise/hanHaiRealEnterprise") -@Slf4j -public class HanHaiRealEnterpriseController extends JeecgController { - @Autowired - private IHanHaiRealEnterpriseService hanHaiRealEnterpriseService; - - /** - * 分页列表查询 - * - * @param hanHaiRealEnterprise - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "企业认证表-分页列表查询") - @ApiOperation(value="企业认证表-分页列表查询", notes="企业认证表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(HanHaiRealEnterprise hanHaiRealEnterprise, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(hanHaiRealEnterprise, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = hanHaiRealEnterpriseService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param hanHaiRealEnterprise - * @return - */ - @AutoLog(value = "企业认证表-添加") - @ApiOperation(value="企业认证表-添加", notes="企业认证表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody HanHaiRealEnterprise hanHaiRealEnterprise) { - hanHaiRealEnterpriseService.save(hanHaiRealEnterprise); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param hanHaiRealEnterprise - * @return - */ - @AutoLog(value = "企业认证表-编辑") - @ApiOperation(value="企业认证表-编辑", notes="企业认证表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody HanHaiRealEnterprise hanHaiRealEnterprise) { - hanHaiRealEnterpriseService.updateById(hanHaiRealEnterprise); - 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) { - hanHaiRealEnterpriseService.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.hanHaiRealEnterpriseService.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) { - HanHaiRealEnterprise hanHaiRealEnterprise = hanHaiRealEnterpriseService.getById(id); - if(hanHaiRealEnterprise==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(hanHaiRealEnterprise); - } - - /** - * 导出excel - * - * @param request - * @param hanHaiRealEnterprise - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HanHaiRealEnterprise hanHaiRealEnterprise) { - return super.exportXls(request, hanHaiRealEnterprise, HanHaiRealEnterprise.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, HanHaiRealEnterprise.class); - } - -} +package org.jeecg.modules.hanHaiRealEnterprise.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.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; +import org.jeecg.modules.hanHaiRealEnterprise.service.IHanHaiRealEnterpriseService; + +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-09-25 + * @Version: V1.0 + */ +@Api(tags="企业实名认证") +@RestController +@RequestMapping("/hanHaiRealEnterprise/hanHaiRealEnterprise") +@Slf4j +public class HanHaiRealEnterpriseController extends JeecgController { + @Autowired + private IHanHaiRealEnterpriseService hanHaiRealEnterpriseService; + + /** + * 分页列表查询 + * + * @param hanHaiRealEnterprise + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "企业实名认证-分页列表查询") + @ApiOperation(value="企业实名认证-分页列表查询", notes="企业实名认证-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(HanHaiRealEnterprise hanHaiRealEnterprise, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(hanHaiRealEnterprise, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = hanHaiRealEnterpriseService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param hanHaiRealEnterprise + * @return + */ + @AutoLog(value = "企业实名认证-添加") + @ApiOperation(value="企业实名认证-添加", notes="企业实名认证-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody HanHaiRealEnterprise hanHaiRealEnterprise) { + hanHaiRealEnterpriseService.save(hanHaiRealEnterprise); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param hanHaiRealEnterprise + * @return + */ + @AutoLog(value = "企业实名认证-编辑") + @ApiOperation(value="企业实名认证-编辑", notes="企业实名认证-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody HanHaiRealEnterprise hanHaiRealEnterprise) { + hanHaiRealEnterpriseService.updateById(hanHaiRealEnterprise); + 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) { + hanHaiRealEnterpriseService.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.hanHaiRealEnterpriseService.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) { + HanHaiRealEnterprise hanHaiRealEnterprise = hanHaiRealEnterpriseService.getById(id); + if(hanHaiRealEnterprise==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(hanHaiRealEnterprise); + } + + /** + * 导出excel + * + * @param request + * @param hanHaiRealEnterprise + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HanHaiRealEnterprise hanHaiRealEnterprise) { + return super.exportXls(request, hanHaiRealEnterprise, HanHaiRealEnterprise.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, HanHaiRealEnterprise.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java index da8b03f..8b1914b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java @@ -1,81 +1,90 @@ -package org.jeecg.modules.hanHaiRealEnterprise.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-08-27 - * @Version: V1.0 - */ -@Data -@TableName("han_hai_real_enterprise") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="han_hai_real_enterprise对象", description="企业认证表") -public class HanHaiRealEnterprise 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; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private java.lang.String sysOrgCode; - /**法人姓名*/ - @Excel(name = "法人姓名", width = 15) - @ApiModelProperty(value = "法人姓名") - private java.lang.String name; - /**法人身份证*/ - @Excel(name = "法人身份证", width = 15) - @ApiModelProperty(value = "法人身份证") - private java.lang.String card; - /**营业执照*/ - @Excel(name = "营业执照", width = 15) - @ApiModelProperty(value = "营业执照") - private java.lang.String tradeImage; - /**其他资质*/ - @Excel(name = "其他资质", width = 15) - @ApiModelProperty(value = "其他资质") - private java.lang.String otherImage; - /**身份证正面*/ - @Excel(name = "身份证正面", width = 15) - @ApiModelProperty(value = "身份证正面") - private java.lang.String imageStraight; - /**身份证反面*/ - @Excel(name = "身份证反面", width = 15) - @ApiModelProperty(value = "身份证反面") - private java.lang.String imageReverseSide; - /**用户标识*/ - @Excel(name = "用户标识", width = 15) - @ApiModelProperty(value = "用户标识") - private java.lang.String userId; -} +package org.jeecg.modules.hanHaiRealEnterprise.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-09-25 + * @Version: V1.0 + */ +@Data +@TableName("han_hai_real_enterprise") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="han_hai_real_enterprise对象", description="企业实名认证") +public class HanHaiRealEnterprise implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**法人姓名*/ + @Excel(name = "法人姓名", width = 15) + @ApiModelProperty(value = "法人姓名") + private java.lang.String name; + /**法人身份证*/ + @Excel(name = "法人身份证", width = 15) + @ApiModelProperty(value = "法人身份证") + private java.lang.String card; + /**营业执照*/ + @Excel(name = "营业执照", width = 15) + @ApiModelProperty(value = "营业执照") + private java.lang.String tradeImage; + /**其他资质*/ + @Excel(name = "其他资质", width = 15) + @ApiModelProperty(value = "其他资质") + private java.lang.String otherImage; + /**身份证正面*/ + @Excel(name = "身份证正面", width = 15) + @ApiModelProperty(value = "身份证正面") + private java.lang.String imageStraight; + /**身份证反面*/ + @Excel(name = "身份证反面", width = 15) + @ApiModelProperty(value = "身份证反面") + private java.lang.String imageReverseSide; + /**用户标识*/ + @Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "用户标识") + private java.lang.String userId; + /**审核状态*/ + @Excel(name = "审核状态", width = 15) + @ApiModelProperty(value = "审核状态") + private java.lang.Integer state; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java index ba51dd9..0c855c5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java @@ -1,17 +1,17 @@ -package org.jeecg.modules.hanHaiRealEnterprise.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 企业认证表 - * @Author: jeecg-boot - * @Date: 2024-08-27 - * @Version: V1.0 - */ -public interface HanHaiRealEnterpriseMapper extends BaseMapper { - -} +package org.jeecg.modules.hanHaiRealEnterprise.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 企业实名认证 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +public interface HanHaiRealEnterpriseMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/xml/HanHaiRealEnterpriseMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/xml/HanHaiRealEnterpriseMapper.xml index 6500d53..aef94eb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/xml/HanHaiRealEnterpriseMapper.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/xml/HanHaiRealEnterpriseMapper.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java index e06b958..5404485 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java @@ -1,14 +1,14 @@ -package org.jeecg.modules.hanHaiRealEnterprise.service; - -import org.jeecg.modules.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 企业认证表 - * @Author: jeecg-boot - * @Date: 2024-08-27 - * @Version: V1.0 - */ -public interface IHanHaiRealEnterpriseService extends IService { - -} +package org.jeecg.modules.hanHaiRealEnterprise.service; + +import org.jeecg.modules.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 企业实名认证 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +public interface IHanHaiRealEnterpriseService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java index 240e06c..fa6c210 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java @@ -1,19 +1,19 @@ -package org.jeecg.modules.hanHaiRealEnterprise.service.impl; - -import org.jeecg.modules.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; -import org.jeecg.modules.hanHaiRealEnterprise.mapper.HanHaiRealEnterpriseMapper; -import org.jeecg.modules.hanHaiRealEnterprise.service.IHanHaiRealEnterpriseService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 企业认证表 - * @Author: jeecg-boot - * @Date: 2024-08-27 - * @Version: V1.0 - */ -@Service -public class HanHaiRealEnterpriseServiceImpl extends ServiceImpl implements IHanHaiRealEnterpriseService { - -} +package org.jeecg.modules.hanHaiRealEnterprise.service.impl; + +import org.jeecg.modules.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; +import org.jeecg.modules.hanHaiRealEnterprise.mapper.HanHaiRealEnterpriseMapper; +import org.jeecg.modules.hanHaiRealEnterprise.service.IHanHaiRealEnterpriseService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 企业实名认证 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +@Service +public class HanHaiRealEnterpriseServiceImpl extends ServiceImpl implements IHanHaiRealEnterpriseService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue index a7171ce..96fe61b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue @@ -1,211 +1,218 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue index f326973..b4d9dfb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue @@ -1,134 +1,139 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseModal.Style#Drawer.vue index c1bcf4e..9307110 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseModal.Style#Drawer.vue @@ -1,84 +1,84 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseModal.vue index 45f796e..b292cb3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseModal.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseModal.vue @@ -1,60 +1,60 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.api.ts index 6f5bb73..23c7b73 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.api.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.api.ts @@ -1,61 +1,61 @@ -import {defHttp} from '/@/utils/http/axios'; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/hanHaiRealEnterprise/hanHaiRealEnterprise/list', - save='/hanHaiRealEnterprise/hanHaiRealEnterprise/add', - edit='/hanHaiRealEnterprise/hanHaiRealEnterprise/edit', - deleteOne = '/hanHaiRealEnterprise/hanHaiRealEnterprise/delete', - deleteBatch = '/hanHaiRealEnterprise/hanHaiRealEnterprise/deleteBatch', - importExcel = '/hanHaiRealEnterprise/hanHaiRealEnterprise/importExcel', - exportXls = '/hanHaiRealEnterprise/hanHaiRealEnterprise/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}); -} +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/hanHaiRealEnterprise/hanHaiRealEnterprise/list', + save='/hanHaiRealEnterprise/hanHaiRealEnterprise/add', + edit='/hanHaiRealEnterprise/hanHaiRealEnterprise/edit', + deleteOne = '/hanHaiRealEnterprise/hanHaiRealEnterprise/delete', + deleteBatch = '/hanHaiRealEnterprise/hanHaiRealEnterprise/deleteBatch', + importExcel = '/hanHaiRealEnterprise/hanHaiRealEnterprise/importExcel', + exportXls = '/hanHaiRealEnterprise/hanHaiRealEnterprise/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/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts index b24e482..ef3581b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts @@ -1,95 +1,108 @@ -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: 'card' - }, - { - title: '营业执照', - align:"center", - dataIndex: 'tradeImage', - customRender:render.renderAvatar, - }, - { - title: '其他资质', - align:"center", - dataIndex: 'otherImage', - customRender:render.renderAvatar, - }, - { - title: '身份证正面', - align:"center", - dataIndex: 'imageStraight', - customRender:render.renderAvatar, - }, - { - title: '身份证反面', - align:"center", - dataIndex: 'imageReverseSide', - customRender:render.renderAvatar, - }, - { - title: '用户标识', - align:"center", - dataIndex: 'userId' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '法人姓名', - field: 'name', - component: 'Input', - }, - { - label: '法人身份证', - field: 'card', - component: 'Input', - }, - { - label: '营业执照', - field: 'tradeImage', - component: 'JImageUpload', - componentProps:{ - }, - }, - { - label: '其他资质', - field: 'otherImage', - component: 'JImageUpload', - componentProps:{ - }, - }, - { - label: '身份证正面', - field: 'imageStraight', - component: 'JImageUpload', - componentProps:{ - }, - }, - { - label: '身份证反面', - field: 'imageReverseSide', - component: 'JImageUpload', - componentProps:{ - }, - }, - { - label: '用户标识', - field: 'userId', - component: 'Input', - }, -]; +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: 'card' + }, + { + title: '营业执照', + align:"center", + dataIndex: 'tradeImage', + customRender:render.renderAvatar, + }, + { + title: '其他资质', + align:"center", + dataIndex: 'otherImage', + customRender:render.renderAvatar, + }, + { + title: '身份证正面', + align:"center", + dataIndex: 'imageStraight', + customRender:render.renderAvatar, + }, + { + title: '身份证反面', + align:"center", + dataIndex: 'imageReverseSide', + customRender:render.renderAvatar, + }, + { + title: '用户标识', + align:"center", + dataIndex: 'userId_dictText' + }, + { + title: '审核状态', + align:"center", + dataIndex: 'state' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '法人姓名', + field: 'name', + component: 'Input', + }, + { + label: '法人身份证', + field: 'card', + component: 'Input', + }, + { + label: '营业执照', + field: 'tradeImage', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '其他资质', + field: 'otherImage', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '身份证正面', + field: 'imageStraight', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '身份证反面', + field: 'imageReverseSide', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '用户标识', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '审核状态', + field: 'state', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterpriseList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterpriseList.vue index 6200951..b9bf646 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterpriseList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterpriseList.vue @@ -1,162 +1,162 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/components/HanHaiRealEnterpriseModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/components/HanHaiRealEnterpriseModal.vue index 93cb591..9e90dd3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/components/HanHaiRealEnterpriseModal.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/components/HanHaiRealEnterpriseModal.vue @@ -1,58 +1,58 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/controller/HanHaiRealNameController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/controller/HanHaiRealNameController.java index 0d3b3cc..9381ce7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/controller/HanHaiRealNameController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/controller/HanHaiRealNameController.java @@ -1,171 +1,171 @@ -package org.jeecg.modules.hanHaiRealName.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.hanHaiRealName.entity.HanHaiRealName; -import org.jeecg.modules.hanHaiRealName.service.IHanHaiRealNameService; - -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-08-25 - * @Version: V1.0 - */ -@Api(tags="个人实名表") -@RestController -@RequestMapping("/hanHaiRealName/hanHaiRealName") -@Slf4j -public class HanHaiRealNameController extends JeecgController { - @Autowired - private IHanHaiRealNameService hanHaiRealNameService; - - /** - * 分页列表查询 - * - * @param hanHaiRealName - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "个人实名表-分页列表查询") - @ApiOperation(value="个人实名表-分页列表查询", notes="个人实名表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(HanHaiRealName hanHaiRealName, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(hanHaiRealName, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = hanHaiRealNameService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param hanHaiRealName - * @return - */ - @AutoLog(value = "个人实名表-添加") - @ApiOperation(value="个人实名表-添加", notes="个人实名表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody HanHaiRealName hanHaiRealName) { - hanHaiRealNameService.save(hanHaiRealName); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param hanHaiRealName - * @return - */ - @AutoLog(value = "个人实名表-编辑") - @ApiOperation(value="个人实名表-编辑", notes="个人实名表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody HanHaiRealName hanHaiRealName) { - hanHaiRealNameService.updateById(hanHaiRealName); - 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) { - hanHaiRealNameService.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.hanHaiRealNameService.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) { - HanHaiRealName hanHaiRealName = hanHaiRealNameService.getById(id); - if(hanHaiRealName==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(hanHaiRealName); - } - - /** - * 导出excel - * - * @param request - * @param hanHaiRealName - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HanHaiRealName hanHaiRealName) { - return super.exportXls(request, hanHaiRealName, HanHaiRealName.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, HanHaiRealName.class); - } - -} +package org.jeecg.modules.hanHaiRealName.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.hanHaiRealName.entity.HanHaiRealName; +import org.jeecg.modules.hanHaiRealName.service.IHanHaiRealNameService; + +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-09-25 + * @Version: V1.0 + */ +@Api(tags="个人实名认证表") +@RestController +@RequestMapping("/hanHaiRealName/hanHaiRealName") +@Slf4j +public class HanHaiRealNameController extends JeecgController { + @Autowired + private IHanHaiRealNameService hanHaiRealNameService; + + /** + * 分页列表查询 + * + * @param hanHaiRealName + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "个人实名认证表-分页列表查询") + @ApiOperation(value="个人实名认证表-分页列表查询", notes="个人实名认证表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(HanHaiRealName hanHaiRealName, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(hanHaiRealName, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = hanHaiRealNameService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param hanHaiRealName + * @return + */ + @AutoLog(value = "个人实名认证表-添加") + @ApiOperation(value="个人实名认证表-添加", notes="个人实名认证表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody HanHaiRealName hanHaiRealName) { + hanHaiRealNameService.save(hanHaiRealName); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param hanHaiRealName + * @return + */ + @AutoLog(value = "个人实名认证表-编辑") + @ApiOperation(value="个人实名认证表-编辑", notes="个人实名认证表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody HanHaiRealName hanHaiRealName) { + hanHaiRealNameService.updateById(hanHaiRealName); + 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) { + hanHaiRealNameService.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.hanHaiRealNameService.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) { + HanHaiRealName hanHaiRealName = hanHaiRealNameService.getById(id); + if(hanHaiRealName==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(hanHaiRealName); + } + + /** + * 导出excel + * + * @param request + * @param hanHaiRealName + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HanHaiRealName hanHaiRealName) { + return super.exportXls(request, hanHaiRealName, HanHaiRealName.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, HanHaiRealName.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/entity/HanHaiRealName.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/entity/HanHaiRealName.java index 05fab0b..bfebf62 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/entity/HanHaiRealName.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/entity/HanHaiRealName.java @@ -1,70 +1,78 @@ -package org.jeecg.modules.hanHaiRealName.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-08-25 - * @Version: V1.0 - */ -@Data -@TableName("han_hai_real_name") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="han_hai_real_name对象", description="个人实名表") -public class HanHaiRealName 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 imageStraight; - /**反面*/ - @Excel(name = "反面", width = 15) - @ApiModelProperty(value = "反面") - private java.lang.String imageReverseSide; - /**姓名*/ - @Excel(name = "姓名", width = 15) - @ApiModelProperty(value = "姓名") - private java.lang.String name; - /**证件号码*/ - @Excel(name = "证件号码", width = 15) - @ApiModelProperty(value = "证件号码") - private java.lang.String card; - /**用户标识*/ - @Excel(name = "用户标识", width = 15) - @ApiModelProperty(value = "用户标识") - private java.lang.String userId; -} +package org.jeecg.modules.hanHaiRealName.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-09-25 + * @Version: V1.0 + */ +@Data +@TableName("han_hai_real_name") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="han_hai_real_name对象", description="个人实名认证表") +public class HanHaiRealName implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**正面*/ + @Excel(name = "正面", width = 15) + @ApiModelProperty(value = "正面") + private java.lang.String imageStraight; + /**反面*/ + @Excel(name = "反面", width = 15) + @ApiModelProperty(value = "反面") + private java.lang.String imageReverseSide; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String name; + /**证件号码*/ + @Excel(name = "证件号码", width = 15) + @ApiModelProperty(value = "证件号码") + private java.lang.String card; + /**用户标识*/ + @Excel(name = "用户标识", width = 15) + @ApiModelProperty(value = "用户标识") + private java.lang.String userId; + /**审核状态*/ + @Excel(name = "审核状态", width = 15) + @ApiModelProperty(value = "审核状态") + private java.lang.Integer state; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/HanHaiRealNameMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/HanHaiRealNameMapper.java index cf6a39c..f97e70c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/HanHaiRealNameMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/HanHaiRealNameMapper.java @@ -1,17 +1,17 @@ -package org.jeecg.modules.hanHaiRealName.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.hanHaiRealName.entity.HanHaiRealName; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 个人实名表 - * @Author: jeecg-boot - * @Date: 2024-08-25 - * @Version: V1.0 - */ -public interface HanHaiRealNameMapper extends BaseMapper { - -} +package org.jeecg.modules.hanHaiRealName.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.hanHaiRealName.entity.HanHaiRealName; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 个人实名认证表 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +public interface HanHaiRealNameMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/xml/HanHaiRealNameMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/xml/HanHaiRealNameMapper.xml index 09c85b0..542f51d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/xml/HanHaiRealNameMapper.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/xml/HanHaiRealNameMapper.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/IHanHaiRealNameService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/IHanHaiRealNameService.java index 78c89ff..8596f99 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/IHanHaiRealNameService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/IHanHaiRealNameService.java @@ -1,14 +1,14 @@ -package org.jeecg.modules.hanHaiRealName.service; - -import org.jeecg.modules.hanHaiRealName.entity.HanHaiRealName; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 个人实名表 - * @Author: jeecg-boot - * @Date: 2024-08-25 - * @Version: V1.0 - */ -public interface IHanHaiRealNameService extends IService { - -} +package org.jeecg.modules.hanHaiRealName.service; + +import org.jeecg.modules.hanHaiRealName.entity.HanHaiRealName; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 个人实名认证表 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +public interface IHanHaiRealNameService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/impl/HanHaiRealNameServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/impl/HanHaiRealNameServiceImpl.java index be16d8e..76506b7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/impl/HanHaiRealNameServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/impl/HanHaiRealNameServiceImpl.java @@ -1,19 +1,19 @@ -package org.jeecg.modules.hanHaiRealName.service.impl; - -import org.jeecg.modules.hanHaiRealName.entity.HanHaiRealName; -import org.jeecg.modules.hanHaiRealName.mapper.HanHaiRealNameMapper; -import org.jeecg.modules.hanHaiRealName.service.IHanHaiRealNameService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 个人实名表 - * @Author: jeecg-boot - * @Date: 2024-08-25 - * @Version: V1.0 - */ -@Service -public class HanHaiRealNameServiceImpl extends ServiceImpl implements IHanHaiRealNameService { - -} +package org.jeecg.modules.hanHaiRealName.service.impl; + +import org.jeecg.modules.hanHaiRealName.entity.HanHaiRealName; +import org.jeecg.modules.hanHaiRealName.mapper.HanHaiRealNameMapper; +import org.jeecg.modules.hanHaiRealName.service.IHanHaiRealNameService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 个人实名认证表 + * @Author: jeecg-boot + * @Date: 2024-09-25 + * @Version: V1.0 + */ +@Service +public class HanHaiRealNameServiceImpl extends ServiceImpl implements IHanHaiRealNameService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/HanHaiRealNameList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/HanHaiRealNameList.vue index 097fa11..54e59f0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/HanHaiRealNameList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/HanHaiRealNameList.vue @@ -1,197 +1,203 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameForm.vue index 6d8354b..7c6ddfd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameForm.vue @@ -1,124 +1,129 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameModal.Style#Drawer.vue index dfe86b2..bb36ae1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameModal.Style#Drawer.vue @@ -1,84 +1,84 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameModal.vue index 0e03cd3..9421b45 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameModal.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameModal.vue @@ -1,60 +1,60 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.api.ts index fc87889..5742138 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.api.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.api.ts @@ -1,61 +1,61 @@ -import {defHttp} from '/@/utils/http/axios'; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/hanHaiRealName/hanHaiRealName/list', - save='/hanHaiRealName/hanHaiRealName/add', - edit='/hanHaiRealName/hanHaiRealName/edit', - deleteOne = '/hanHaiRealName/hanHaiRealName/delete', - deleteBatch = '/hanHaiRealName/hanHaiRealName/deleteBatch', - importExcel = '/hanHaiRealName/hanHaiRealName/importExcel', - exportXls = '/hanHaiRealName/hanHaiRealName/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}); -} +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/hanHaiRealName/hanHaiRealName/list', + save='/hanHaiRealName/hanHaiRealName/add', + edit='/hanHaiRealName/hanHaiRealName/edit', + deleteOne = '/hanHaiRealName/hanHaiRealName/delete', + deleteBatch = '/hanHaiRealName/hanHaiRealName/deleteBatch', + importExcel = '/hanHaiRealName/hanHaiRealName/importExcel', + exportXls = '/hanHaiRealName/hanHaiRealName/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/hanHaiRealName/vue3/HanHaiRealName.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.data.ts index 985dcbd..61c4cb8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.data.ts @@ -1,69 +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: 'imageStraight', - customRender:render.renderAvatar, - }, - { - title: '反面', - align:"center", - dataIndex: 'imageReverseSide', - customRender:render.renderAvatar, - }, - { - title: '姓名', - align:"center", - dataIndex: 'name' - }, - { - title: '证件号码', - align:"center", - dataIndex: 'card' - }, - { - title: '用户标识', - align:"center", - dataIndex: 'userId' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '正面', - field: 'imageStraight', - component: 'JImageUpload', - componentProps:{ - }, - }, - { - label: '反面', - field: 'imageReverseSide', - component: 'JImageUpload', - componentProps:{ - }, - }, - { - label: '姓名', - field: 'name', - component: 'Input', - }, - { - label: '证件号码', - field: 'card', - component: 'Input', - }, - { - label: '用户标识', - field: 'userId', - component: 'Input', - }, -]; +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: 'imageStraight', + customRender:render.renderAvatar, + }, + { + title: '反面', + align:"center", + dataIndex: 'imageReverseSide', + customRender:render.renderAvatar, + }, + { + title: '姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '证件号码', + align:"center", + dataIndex: 'card' + }, + { + title: '用户标识', + align:"center", + dataIndex: 'userId' + }, + { + title: '审核状态', + align:"center", + dataIndex: 'state' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '正面', + field: 'imageStraight', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '反面', + field: 'imageReverseSide', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '证件号码', + field: 'card', + component: 'Input', + }, + { + label: '用户标识', + field: 'userId', + component: 'Input', + }, + { + label: '审核状态', + field: 'state', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealNameList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealNameList.vue index 902026e..d1c9cd4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealNameList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealNameList.vue @@ -1,162 +1,162 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/components/HanHaiRealNameModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/components/HanHaiRealNameModal.vue index ba74d4c..7a855cc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/components/HanHaiRealNameModal.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/components/HanHaiRealNameModal.vue @@ -1,58 +1,58 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java index c6f1263..90ba044 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java @@ -147,7 +147,7 @@ public class InfoApiController { //个人认证提交 @ApiOperation(value="小程序-个人认证提交", notes="小程序-个人认证提交") - @GetMapping("/submitCertification") + @PostMapping("/submitCertification") public Result submitCertification(@RequestHeader("X-Access-Token") String token, HanHaiRealNameBean hanHaiRealNameBean) { return infoApiService.submitCertification(token,hanHaiRealNameBean); @@ -157,7 +157,7 @@ public class InfoApiController { //企业认证提交 @ApiOperation(value="小程序-企业认证提交", notes="小程序-企业认证提交") - @GetMapping("/submitCompanyCertification") + @PostMapping("/submitCompanyCertification") public Result submitCompanyCertification(@RequestHeader("X-Access-Token") String token, HanHaiRealEnterpriseBean hanHaiRealEnterpriseBean) { return infoApiService.submitCompanyCertification(token,hanHaiRealEnterpriseBean); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ActorSetPageBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ActorSetPageBean.java index 58ae17a..9bd96e8 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ActorSetPageBean.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ActorSetPageBean.java @@ -7,6 +7,10 @@ import lombok.Data; public class ActorSetPageBean { + /**搜索条件*/ + @ApiModelProperty(value = "搜索条件" ) + private String title; + /**显示条数*/ @ApiModelProperty(value = "显示条数" ) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PromotionPageBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PromotionPageBean.java index 0f5fbfd..23ca606 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PromotionPageBean.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PromotionPageBean.java @@ -6,7 +6,9 @@ import lombok.Data; @Data public class PromotionPageBean { - + /**搜索条件*/ + @ApiModelProperty(value = "搜索条件" ) + private String title; /**显示条数*/ @ApiModelProperty(value = "显示条数" ) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java index c48a3da..966832b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java @@ -256,7 +256,19 @@ public class IndexApiServiceImpl implements IndexApiService { public Result getActorSetPage(ActorSetPageBean bean){ Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page pageList = atActorCollectionService + .lambdaQuery() + .orderByDesc(AtActorCollection::getCreateTime) .page(page); + + //判断title是否为空 + if (StringUtils.isNotBlank(bean.getTitle())){ + pageList = atActorCollectionService + .lambdaQuery() + .like(AtActorCollection::getTitle,bean.getTitle()) + .orderByDesc(AtActorCollection::getCreateTime) + .page(page); + } + return Result.OK("演员集列表", pageList); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java index b01f49f..4bcf6a5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java @@ -125,7 +125,7 @@ public class InfoApiServiceImpl implements InfoApiService { map.put("todayMoney",100); map.put("userMoney",100); map.put("userSumMoney",100); - map.put("money",88); + map.put("money",hanHaiMember.getPrice()); return Result.OK("查询成功", map); } @@ -214,6 +214,15 @@ public class InfoApiServiceImpl implements InfoApiService { public Result submitCertification(String token, HanHaiRealNameBean hanHaiRealNameBean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //根据用户标识查询是否有认证信息 + HanHaiRealName one = hanHaiRealNameService.lambdaQuery() + .eq(HanHaiRealName::getUserId, hanHaiMember.getId()) + .one(); + if(null != one){ + return Result.OK("您已提交过实名认证，请勿重复提交！"); + } + String imageStraight = hanHaiRealNameBean.getImageStraight(); String imageReverseSide = hanHaiRealNameBean.getImageReverseSide(); String name = hanHaiRealNameBean.getName(); @@ -242,6 +251,7 @@ public class InfoApiServiceImpl implements InfoApiService { } haiRealName.setUserId(hanHaiMember.getId()); + haiRealName.setCard(card); boolean result = hanHaiRealNameService.save(haiRealName); @@ -279,6 +289,14 @@ public class InfoApiServiceImpl implements InfoApiService { public Result submitCompanyCertification(String token, HanHaiRealEnterpriseBean hanHaiRealEnterpriseBean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //根据用户信息查询是否认证 + HanHaiRealEnterprise one = hanHaiRealEnterpriseService.lambdaQuery() + .eq(HanHaiRealEnterprise::getUserId, hanHaiMember.getId()) + .one(); + if(null != one){ + return Result.OK("您已提交过企业认证，请勿重复提交！"); + } + String imageStraight = hanHaiRealEnterpriseBean.getImageStraight(); String imageReverseSide = hanHaiRealEnterpriseBean.getImageReverseSide(); String name = hanHaiRealEnterpriseBean.getName(); @@ -319,6 +337,7 @@ public class InfoApiServiceImpl implements InfoApiService { } haiRealEnterprise.setUserId(hanHaiMember.getId()); + haiRealEnterprise.setCard(card); Boolean result = hanHaiRealEnterpriseService.save(haiRealEnterprise); @@ -363,11 +382,11 @@ public class InfoApiServiceImpl implements InfoApiService { @Override public Result getCompanyCertification(String token){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - List list = hanHaiRealEnterpriseService + HanHaiRealEnterprise one = hanHaiRealEnterpriseService .lambdaQuery() .eq(HanHaiRealEnterprise::getUserId, hanHaiMember.getId()) - .list(); - return Result.OK("企业认证信息", list); + .one(); + return Result.OK("企业认证信息", one); } //获取我的发布列表 @@ -421,6 +440,18 @@ public class InfoApiServiceImpl implements InfoApiService { .orderByDesc(AtOrder::getCreateTime) .eq(AtOrder::getUserId,hanHaiMember.getId()) .page(page); + //判断title是否为空 + if (StringUtils.isNotBlank(bean.getTitle())){ + page1 = atOrderService.lambdaQuery() + .like(AtOrder::getName,bean.getTitle()) + .orderByDesc(AtOrder::getCreateTime) + .eq(AtOrder::getUserId,hanHaiMember.getId()) + .page(page); + } + + + + return Result.OK("推广记录",page1); }