diff --git a/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java b/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java index 8813aa7..1ceec49 100644 --- a/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java +++ b/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java @@ -7,14 +7,18 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.StringUtils; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.visit.common.VisitMainConst; import com.qs.serve.modules.visit.entity.VisitMain; +import com.qs.serve.modules.visit.entity.VisitTheme; import com.qs.serve.modules.visit.entity.bo.VisitCheckIn; +import com.qs.serve.modules.visit.entity.vo.VisitMainVo; import com.qs.serve.modules.visit.service.VisitMainService; +import com.qs.serve.modules.visit.service.VisitThemeService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -35,6 +39,7 @@ import java.util.List; public class VisitMainInnerController { private VisitMainService visitMainService; + private VisitThemeService visitThemeService; private SysUserService sysUserService; /** @@ -58,9 +63,15 @@ public class VisitMainInnerController { */ @GetMapping("/getById/{id}") @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.QUERY) - public R getById(@PathVariable("id") String id){ + public R getById(@PathVariable("id") String id){ VisitMain visitMain = visitMainService.getById(id); - return R.ok(visitMain); + VisitMainVo mainVo = CopierUtil.copy(visitMain,new VisitMainVo()); + VisitTheme visitTheme = visitThemeService.getById(visitMain.getThemeId()); + if(visitTheme!=null){ + mainVo.setThemeTitle(visitTheme.getThemeTitle()); + mainVo.setThemeCode(visitTheme.getThemeCode()); + } + return R.ok(mainVo); } /** diff --git a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java index 9ed7493..698763f 100644 --- a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java +++ b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java @@ -6,12 +6,13 @@ import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; -import com.qs.serve.common.util.AuthContextUtils; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.visit.common.VisitMainConst; import com.qs.serve.modules.visit.entity.VisitMain; +import com.qs.serve.modules.visit.entity.VisitTheme; +import com.qs.serve.modules.visit.entity.vo.VisitMainVo; import com.qs.serve.modules.visit.service.VisitMainService; +import com.qs.serve.modules.visit.service.VisitThemeService; import com.qs.serve.modules.wx.common.consts.WxUserTypeConst; import com.qs.serve.modules.wx.entity.WxUser; import com.qs.serve.modules.wx.service.WxUserService; @@ -35,6 +36,7 @@ import java.util.List; public class VisitMainOuterApi { private WxUserService wxUserService; + private VisitThemeService visitThemeService; private VisitMainService visitMainService; /** @@ -47,7 +49,7 @@ public class VisitMainOuterApi { WxUser wxUser = wxUserService.getCurrentWxUser(); if(wxUser.getUserType().equals(WxUserTypeConst.UMS_MEMBER)){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); - lqw.eq(VisitMain::getVisitorId,wxUser.getUserId()); + lqw.eq(VisitMain::getVisitorId,wxUser.getId()); lqw.orderByDesc(VisitMain::getCreateTime); PageUtil.startPage(); List list = visitMainService.list(lqw); @@ -57,19 +59,49 @@ public class VisitMainOuterApi { } /** - * ID查询 + * ID查询(查询实例id) * @param id * @return */ @GetMapping("/getById/{id}") @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.QUERY) - public R getById(@PathVariable("id") String id){ + public R getById(@PathVariable("id") String id){ VisitMain visitMain = visitMainService.getById(id); - return R.ok(visitMain); + VisitTheme visitTheme = visitThemeService.getById(visitMain.getThemeId()); + VisitMainVo mainVo = CopierUtil.copy(visitMain,new VisitMainVo()); + if(visitTheme!=null){ + mainVo.setThemeTitle(visitTheme.getThemeTitle()); + mainVo.setThemeCode(visitTheme.getThemeCode()); + } + return R.ok(mainVo); + } + + /** + * ID查询(查询主题id) + * @param id + * @return + */ + @GetMapping("/getThemeById/{id}") + @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.QUERY) + public R getByThemeId(@PathVariable("id") String id){ + WxUser wxUser = wxUserService.getCurrentWxUser(); + + VisitMain dbMain = visitMainService.getOne(new LambdaQueryWrapper() + .eq(VisitMain::getThemeId,id) + .eq(VisitMain::getVisitorId,wxUser.getId()), + false + ); + VisitTheme visitTheme = visitThemeService.getById(id); + VisitMainVo mainVo = CopierUtil.copy(visitTheme,new VisitMainVo()); + if(dbMain != null){ + CopierUtil.copy(dbMain, mainVo); + return R.ok(mainVo); + } + return R.ok(mainVo); } /** - * 更新 + * 更新(主题id参数名 themeId ) * @param param * @return */ @@ -78,16 +110,28 @@ public class VisitMainOuterApi { public R updateById(@RequestBody @Valid VisitMain param){ WxUser wxUser = wxUserService.getCurrentWxUser(); if(wxUser.getUserType().equals(WxUserTypeConst.UMS_MEMBER)){ - param.setCheckState(null); - param.setVisitStatus(null); - param.setDeptId(null); - param.setDeptName(null); - param.setUserId(null); - param.setUserCode(null); - param.setUserName(null); - param.setSubmitTime(null); - boolean result = visitMainService.updateById(param); - return R.isTrue(result); + VisitMain dbMain = visitMainService.getOne(new LambdaQueryWrapper() + .eq(VisitMain::getThemeId,param.getThemeId()) + .eq(VisitMain::getVisitorId,wxUser.getId()), + false + ); + if(dbMain!=null){ + param.setCheckState(null); + param.setVisitStatus(null); + param.setDeptId(null); + param.setDeptName(null); + param.setUserId(null); + param.setUserCode(null); + param.setUserName(null); + param.setSubmitTime(null); + visitMainService.updateById(param); + }else { + VisitTheme visitTheme = visitThemeService.getById(param.getId()); + VisitMain main = CopierUtil.copy(visitTheme,new VisitMain()); + main.setVisitCode("V"+CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply)); + visitMainService.save(main); + } + return R.ok(); } return R.error("用户角色暂不支持"); } @@ -102,23 +146,35 @@ public class VisitMainOuterApi { public R submit(@RequestBody @Valid VisitMain param){ WxUser wxUser = wxUserService.getCurrentWxUser(); if(wxUser.getUserType().equals(WxUserTypeConst.UMS_MEMBER)){ + if(param.getId()==null){ + VisitMain dbMain = visitMainService.getOne(new LambdaQueryWrapper() + .eq(VisitMain::getThemeId,param.getThemeId()) + .eq(VisitMain::getVisitorId,wxUser.getId()), + false + ); + if(dbMain!=null){ + VisitTheme visitTheme = visitThemeService.getById(param.getThemeId()); + if(visitTheme==null){ + return R.error("主题标识为空"); + } + param.setDeptId(visitTheme.getDeptId()); + param.setDeptName(visitTheme.getDeptName()); + param.setUserId(visitTheme.getUserId()); + param.setUserCode(visitTheme.getUserCode()); + param.setUserName(visitTheme.getUserName()); + param.setId(dbMain.getId()); + } + } param.setCheckState(null); param.setVisitStatus(null); - param.setDeptId(null); - param.setDeptName(null); - param.setUserId(null); - param.setUserCode(null); - param.setUserName(null); param.setSubmitTime(null); - - param.setVisitorId(wxUser.getUserId()); - + param.setVisitorId(wxUser.getId()); param.setSyFormId("test"); param.setSubmitTime(LocalDateTime.now()); - param.setCheckState(VisitMainConst.CheckState_0); - visitMainService.updateById(param); - - visitMainService.submitOaFlow(param.getId()); + param.setCheckState(VisitMainConst.CheckState_1); + param.setVisitStatus(VisitMainConst.VisitStatus_1); + visitMainService.saveOrUpdate(param); + //visitMainService.submitOaFlow(param.getId()); return R.ok(); } return R.error("用户角色暂不支持"); diff --git a/src/main/java/com/qs/serve/modules/visit/controller/VisitMainController.java b/src/main/java/com/qs/serve/modules/visit/controller/VisitMainController.java index 685fc8a..a3b7a3c 100644 --- a/src/main/java/com/qs/serve/modules/visit/controller/VisitMainController.java +++ b/src/main/java/com/qs/serve/modules/visit/controller/VisitMainController.java @@ -10,7 +10,10 @@ import com.qs.serve.common.util.*; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.visit.common.VisitMainConst; +import com.qs.serve.modules.visit.entity.VisitTheme; +import com.qs.serve.modules.visit.entity.vo.VisitMainVo; import com.qs.serve.modules.visit.service.impl.VisitMainServiceImpl; +import com.qs.serve.modules.visit.service.impl.VisitThemeServiceImpl; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -35,6 +38,7 @@ public class VisitMainController { private VisitMainServiceImpl visitMainService; private SysUserService sysUserService; + private VisitThemeServiceImpl visitThemeService; /** * 翻页 @@ -86,9 +90,18 @@ public class VisitMainController { */ @GetMapping("/getById/{id}") @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.QUERY) - public R getById(@PathVariable("id") String id){ + public R getById(@PathVariable("id") String id){ VisitMain visitMain = visitMainService.getById(id); - return R.ok(visitMain); + if(visitMain==null){ + return R.error("来访实例不存在"); + } + VisitMainVo mainVo = CopierUtil.copy(visitMain,new VisitMainVo()); + VisitTheme visitTheme = visitThemeService.getById(visitMain.getThemeId()); + if(visitTheme!=null){ + mainVo.setThemeTitle(visitTheme.getThemeTitle()); + mainVo.setThemeCode(visitTheme.getThemeCode()); + } + return R.ok(mainVo); } /** @@ -152,7 +165,7 @@ public class VisitMainController { @DeleteMapping("/deleteById/{ids}") @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.DELETE) public R deleteById(@PathVariable("ids") String ids){ - List idsLong = StringUtils.splitIdLong(ids); + List idsLong = StringUtils.splitIdString(ids); boolean result = visitMainService.removeByIds(idsLong); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/visit/controller/VisitThemeController.java b/src/main/java/com/qs/serve/modules/visit/controller/VisitThemeController.java new file mode 100644 index 0000000..39bbf29 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/visit/controller/VisitThemeController.java @@ -0,0 +1,132 @@ +package com.qs.serve.modules.visit.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.*; +import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysUserService; +import com.qs.serve.modules.visit.common.VisitMainConst; +import com.qs.serve.modules.visit.entity.VisitTheme; +import com.qs.serve.modules.visit.service.impl.VisitThemeServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 系统 拜访主题 + * @author YenHex + * @since 2024-09-11 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("visit/theme") +public class VisitThemeController { + + private VisitThemeServiceImpl visitThemeService; + private SysUserService sysUserService; + + /** + * 翻页 + * @param param + * @return + */ + @GetMapping("/page") + public R> getPage(VisitTheme param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = visitThemeService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * 翻页(我的) + * @param param + * @return + */ + @GetMapping("/pageMy") + public R> getPageMy(VisitTheme param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + lqw.eq(VisitTheme::getUserId,AuthContextUtils.getSysUserId()); + PageUtil.startPage(); + List list = visitThemeService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * ID查询 + * @param id + * @return + */ + @GetMapping("/getById/{id}") + @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.QUERY) + public R getById(@PathVariable("id") String id){ + VisitTheme visitTheme = visitThemeService.getById(id); + return R.ok(visitTheme); + } + + /** + * 更新 + * @param param + * @return + */ + @PostMapping("/updateById") + @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.UPDATE) + public R updateById(@RequestBody @Valid VisitTheme param){ + boolean result = visitThemeService.updateById(param); + return R.isTrue(result); + } + + /** + * 取消/恢复 + * @param id + * @param option 0-恢复 1-取消(默认) + * @return + */ + @PostMapping("/cancel/{id}/{option}") + public R cancel(@PathVariable("id") String id,@PathVariable("option")Integer option){ + VisitTheme visitMain = visitThemeService.getById(id); + visitMain.setStopState(option); + visitThemeService.updateById(visitMain); + return R.ok(); + } + + /** + * 新增 + * @param param + * @return + */ + @PostMapping("/save") + @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.INSERT) + public R save(@RequestBody @Valid VisitTheme param){ + SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); + param.setThemeCode("TP"+CodeGenUtil.getDataCode(CodeGenUtil.SourceDataKey.VISIT)); + param.setUserId(sysUser.getId()); + param.setUserCode(sysUser.getCode()); + param.setUserName(sysUser.getName()); + boolean result = visitThemeService.save(param); + return R.isTrue(result); + } + + /** + * 删除 + * @param ids + * @return + */ + @DeleteMapping("/deleteById/{ids}") + @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.DELETE) + public R deleteById(@PathVariable("ids") String ids){ + List idsLong = StringUtils.splitIdString(ids); + boolean result = visitThemeService.removeByIds(idsLong); + return R.isTrue(result); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/visit/entity/VisitMain.java b/src/main/java/com/qs/serve/modules/visit/entity/VisitMain.java index d96e62c..f296231 100644 --- a/src/main/java/com/qs/serve/modules/visit/entity/VisitMain.java +++ b/src/main/java/com/qs/serve/modules/visit/entity/VisitMain.java @@ -31,6 +31,9 @@ public class VisitMain implements Serializable { @TableId(type = IdType.ASSIGN_UUID) private String id; + /** 拜访主题id */ + private String themeId; + /** 拜访编码 */ private String visitCode; @@ -60,6 +63,8 @@ public class VisitMain implements Serializable { @Length(max = 255,message = "用户名称长度不能超过255字") private String userName; + private String userRoom; + /** 门卫id */ @Length(max = 255,message = "用户id长度不能超过255字") private String checkUserId; @@ -109,6 +114,12 @@ public class VisitMain implements Serializable { @Length(max = 255,message = "来访人数合计长度不能超过255字") private String visitorSum; + /** 来访车辆 */ + private String visitorCar; + + /** 来访邮箱 */ + private String visitorEmail; + /** 来访内容 */ @Length(max = 255,message = "来访内容长度不能超过255字") private String visitorContext; diff --git a/src/main/java/com/qs/serve/modules/visit/entity/VisitTheme.java b/src/main/java/com/qs/serve/modules/visit/entity/VisitTheme.java new file mode 100644 index 0000000..20951ec --- /dev/null +++ b/src/main/java/com/qs/serve/modules/visit/entity/VisitTheme.java @@ -0,0 +1,135 @@ +package com.qs.serve.modules.visit.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 拜访 实体类 + * @author YenHex + * @since 2024-09-11 + */ +@Data +@TableName("visit_theme") +public class VisitTheme implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + /** 拜访编码 */ + private String themeCode; + + private String themeTitle; + + /** 审批状态: 0=正常；1=关闭 */ + private Integer stopState; + + /** 部门id */ + @Length(max = 255,message = "部门id长度不能超过255字") + private String deptId; + + /** 部门昵称 */ + @Length(max = 255,message = "部门昵称长度不能超过255字") + private String deptName; + + /** 用户id */ + @Length(max = 255,message = "用户id长度不能超过255字") + private String userId; + + /** 用户编码 */ + @Length(max = 255,message = "用户编码长度不能超过255字") + private String userCode; + + /** 用户名称 */ + @Length(max = 255,message = "用户名称长度不能超过255字") + private String userName; + + /** 接待地点 */ + private String userRoom; + + /** 预约拜访日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate preVisitDate; + + /** 实际来访时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime visitTime; + + /** 提交时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime submitTime; + + private String syFormId; + + /** 来访公司 */ + @Length(max = 255,message = "来访公司长度不能超过255字") + private String visitorCompany; + + /** 来访人ID */ + @Length(max = 255,message = "来访人姓名长度不能超过255字") + private String visitorId; + + /** 来访人姓名 */ + @Length(max = 255,message = "来访人姓名长度不能超过255字") + private String visitorName; + + /** 来访人电话 */ + @Length(max = 255,message = "来访人电话长度不能超过255字") + private String visitorMobile; + + /** 来访人数合计 */ + @Length(max = 255,message = "来访人数合计长度不能超过255字") + private String visitorSum; + + /** 来访内容 */ + @Length(max = 255,message = "来访内容长度不能超过255字") + private String visitorContext; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + private String remark2; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + + +} + diff --git a/src/main/java/com/qs/serve/modules/visit/entity/vo/VisitMainVo.java b/src/main/java/com/qs/serve/modules/visit/entity/vo/VisitMainVo.java new file mode 100644 index 0000000..6b645d8 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/visit/entity/vo/VisitMainVo.java @@ -0,0 +1,18 @@ +package com.qs.serve.modules.visit.entity.vo; + +import com.qs.serve.modules.visit.entity.VisitMain; +import lombok.Data; + +/** + * @author YenHex + * @since 2024/11/11 + */ +@Data +public class VisitMainVo extends VisitMain { + + /** 拜访编码 */ + private String themeCode; + + private String themeTitle; + +} diff --git a/src/main/java/com/qs/serve/modules/visit/mapper/VisitMainMapper.java b/src/main/java/com/qs/serve/modules/visit/mapper/VisitMainMapper.java index 3e3d230..bbf1a23 100644 --- a/src/main/java/com/qs/serve/modules/visit/mapper/VisitMainMapper.java +++ b/src/main/java/com/qs/serve/modules/visit/mapper/VisitMainMapper.java @@ -1,7 +1,12 @@ package com.qs.serve.modules.visit.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qs.serve.modules.visit.entity.VisitMain; +import com.qs.serve.modules.visit.entity.vo.VisitMainVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 拜访 Mapper @@ -10,5 +15,7 @@ import com.qs.serve.modules.visit.entity.VisitMain; */ public interface VisitMainMapper extends BaseMapper { + List selectListVo(@Param("page") Page pager, @Param("query") VisitMain main); + } diff --git a/src/main/java/com/qs/serve/modules/visit/mapper/VisitThemeMapper.java b/src/main/java/com/qs/serve/modules/visit/mapper/VisitThemeMapper.java new file mode 100644 index 0000000..9ac0812 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/visit/mapper/VisitThemeMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.visit.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.visit.entity.VisitTheme; + +/** + * 拜访 Mapper + * @author YenHex + * @date 2024-09-11 + */ +public interface VisitThemeMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/visit/service/VisitThemeService.java b/src/main/java/com/qs/serve/modules/visit/service/VisitThemeService.java new file mode 100644 index 0000000..0518c56 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/visit/service/VisitThemeService.java @@ -0,0 +1,15 @@ +package com.qs.serve.modules.visit.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.visit.entity.VisitMain; +import com.qs.serve.modules.visit.entity.VisitTheme; + +/** + * 拜访 服务接口 + * @author YenHex + * @date 2024-09-11 + */ +public interface VisitThemeService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/visit/service/impl/VisitThemeServiceImpl.java b/src/main/java/com/qs/serve/modules/visit/service/impl/VisitThemeServiceImpl.java new file mode 100644 index 0000000..e29154d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/visit/service/impl/VisitThemeServiceImpl.java @@ -0,0 +1,40 @@ +package com.qs.serve.modules.visit.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.oa.BaseCreateCallbackBo; +import com.qs.serve.common.model.oa.OaFormMainProcess; +import com.qs.serve.common.util.Assert; +import com.qs.serve.modules.flow.model.TbsAffairCommitBo; +import com.qs.serve.modules.flow.service.SeeYonOptionService; +import com.qs.serve.modules.flow.service.SeeYonService; +import com.qs.serve.modules.visit.common.VisitMainConst; +import com.qs.serve.modules.visit.entity.VisitMain; +import com.qs.serve.modules.visit.entity.VisitTheme; +import com.qs.serve.modules.visit.mapper.VisitMainMapper; +import com.qs.serve.modules.visit.mapper.VisitThemeMapper; +import com.qs.serve.modules.visit.service.VisitMainService; +import com.qs.serve.modules.visit.service.VisitThemeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +/** + * 拜访 服务实现类 + * @author YenHex + * @since 2024-09-11 + */ +@Slf4j +@Service +public class VisitThemeServiceImpl extends ServiceImpl implements VisitThemeService { + +} + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4e89a6e..4f2ae63 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: max-file-size: 100MB max-request-size: 160MB profiles: - active: pro + active: dev main: #easypoi启用覆盖 allow-bean-definition-overriding: true diff --git a/src/main/resources/mapper/visit/VisitMainMapper.xml b/src/main/resources/mapper/visit/VisitMainMapper.xml new file mode 100644 index 0000000..60e92b3 --- /dev/null +++ b/src/main/resources/mapper/visit/VisitMainMapper.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visit_main.`id`, + visit_main.`theme_id`, + visit_main.`visit_code`, + visit_main.`check_state`, + visit_main.`visit_status`, + visit_main.`dept_id`, + visit_main.`dept_name`, + visit_main.`user_id`, + visit_main.`user_code`, + visit_main.`user_name`, + visit_main.`user_room`, + visit_main.`pre_visit_date`, + visit_main.`sy_form_id`, + visit_main.`submit_time`, + visit_main.`visit_time`, + visit_main.`visitor_id`, + visit_main.`visitor_company`, + visit_main.`visitor_name`, + visit_main.`visitor_mobile`, + visit_main.`visitor_sum`, + visit_main.`visitor_car`, + visit_main.`visitor_email`, + visit_main.`visitor_context`, + visit_main.`check_user_id`, + visit_main.`check_user_code`, + visit_main.`check_user_name`, + visit_main.`remark`, + visit_main.`remark2`, + visit_main.`create_time`, + visit_main.`create_by`, + visit_main.`update_time`, + visit_main.`update_by`, + visit_main.`del_flag` + + + + + +