CpopSZ/Cpop-Union
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整市场模块

Browse Source
This commit is contained in:
DB 2024-04-19 10:34:00 +08:00
parent 41bdad5ab4
commit b01aa886c5
11 changed files with 123 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/BusinessDisposeBo.java
View File

@ -1,11 +1,10 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
/** /**
* @author DB * @author DB
@ -14,34 +13,34 @@ import javax.validation.constraints.NotBlank;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "BusinessDisposeBo对象",description = "事务处理请求对象") @Schema(description = "事务处理请求对象")
public class BusinessDisposeBo { public class BusinessDisposeBo {
/** /**
* 详情描述 * 详情描述
*/ */
@ApiModelProperty(value = "详情描述") @Schema(description = "详情描述")
private String detailDesc; private String detailDesc;
/** /**
* 详情状态，状态(0：进行中;1:完成：2：挂起) * 详情状态，状态(0：进行中;1:完成：2：挂起)
*/ */
@ApiModelProperty(value = "详情状态") @Schema(description = "详情状态")
private Integer detailStatus; private Integer detailStatus;
/** /**
* 事务详情id * 事务详情id
*/ */
@ApiModelProperty(value = "事务详情id") @Schema(description = "事务详情id")
private String id; private String id;
/** /**
* 校区id * 校区id
*/ */
@ApiModelProperty(value = "校区id") @Schema(description = "校区id")
private String storeId; private String storeId;
/** /**
* 事务id * 事务id
*/ */
@NotBlank(message = "不能为空") @NotBlank(message = "不能为空")
@ApiModelProperty(value = "事务id", required = true) @Schema(description = "事务id", requiredMode = Schema.RequiredMode.REQUIRED)
private String businessId; private String businessId;
} }

28
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/BusinessDistributeBo.java
View File

@ -1,17 +1,13 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModel; import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.util.List; import java.util.List;
/** /**
@ -21,37 +17,37 @@ import java.util.List;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "BusinessDistributeBo对象",description = "事务分发请求对象") @Schema(description = "事务分发请求对象")
public class BusinessDistributeBo { public class BusinessDistributeBo {
/** /**
* 业务等级 * 业务等级
*/ */
@NotNull(message = "业务等级不能为空") @NotNull(message = "业务等级不能为空")
@ApiModelProperty(value = "业务等级") @Schema(description = "业务等级")
private Integer businessLevel; private Integer businessLevel;
/** /**
* 对接列表 * 对接列表
*/ */
@ApiModelProperty(value = "对接列表") @Schema(description = "对接列表")
private List<ButtJoint> buttJoint; private List<ButtJoint> buttJoint;
/** /**
* 描述 * 描述
*/ */
@NotBlank(message = "描述不能为空") @NotBlank(message = "描述不能为空")
@ApiModelProperty(value = "描述") @Schema(description = "描述")
private String desc; private String desc;
/** /**
* 到期时间 * 到期时间
*/ */
@NotEmpty(message = "开始结束时间不能为空") @NotEmpty(message = "开始结束时间不能为空")
@ApiModelProperty(value = "开始结束") @Schema(description = "开始结束")
private List<LocalDate> startAndEnd; private List<LocalDate> startAndEnd;
/** /**
* 备注 * 备注
*/ */
@ApiModelProperty(value = "备注") @Schema(description = "备注")
private String remark; private String remark;
@Data @Data
@ -59,12 +55,12 @@ public class BusinessDistributeBo {
/** /**
* 文档地址 * 文档地址
*/ */
@ApiModelProperty(value = "文档地址") @Schema(description = "文档地址")
private String businessDocUrl; private String businessDocUrl;
/** /**
* 接收员工id * 接收员工id
*/ */
@ApiModelProperty(value = "接收员工id") @Schema(description = "接收员工id")
private String staffId; private String staffId;
} }
} }

17
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/BusinessInfoPageBo.java
View File

@ -1,11 +1,10 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import java.util.List; import java.util.List;
/** /**
@ -15,37 +14,37 @@ import java.util.List;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "BusinessInfoPageBo对象",description = "事务详情请求分页对象") @Schema(description = "事务详情请求分页对象")
public class BusinessInfoPageBo { public class BusinessInfoPageBo {
/** /**
* 品牌或校区名模糊查询 * 品牌或校区名模糊查询
*/ */
@ApiModelProperty(value = "品牌或校区名模糊查询") @Schema(description = "品牌或校区名模糊查询")
private String brandOrStore; private String brandOrStore;
/** /**
* 校区地址或校区名模糊查询 * 校区地址或校区名模糊查询
*/ */
@ApiModelProperty(value = "校区地址或校区名模糊查询") @Schema(description = "校区地址或校区名模糊查询")
private String addrOrName; private String addrOrName;
/** /**
* 事务详情状态 * 事务详情状态
*/ */
@ApiModelProperty(value = "事务详情状态(0：进行中;1:完成：2：挂起)") @Schema(description = "事务详情状态(0：进行中;1:完成：2：挂起)")
private Integer detailStatus; private Integer detailStatus;
/** /**
* 接收人 * 接收人
*/ */
@ApiModelProperty(value = "接收人") @Schema(description = "接收人")
private List<String> staffIds; private List<String> staffIds;
/** /**
* 事务id * 事务id
*/ */
@NotBlank(message = "事务id不能为空") @NotBlank(message = "事务id不能为空")
@ApiModelProperty(value = "事务id",required = true) @Schema(description = "事务id",requiredMode = Schema.RequiredMode.REQUIRED)
private String id; private String id;
} }

13
Cpop-Oam/src/main/java/com/cpop/oam/business/bo/BusinessRemoveBo.java
View File

@ -1,11 +1,10 @@
package com.cpop.oam.business.bo; package com.cpop.oam.business.bo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
/** /**
* @author DB * @author DB
@ -14,26 +13,26 @@ import javax.validation.constraints.NotBlank;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "BusinessRemoveBo对象",description = "事务删除对象") @Schema(description = "事务删除对象")
public class BusinessRemoveBo { public class BusinessRemoveBo {
/** /**
* 事务详情id * 事务详情id
*/ */
@ApiModelProperty(value = "事务详情id") @Schema(description = "事务详情id")
private String id; private String id;
/** /**
* 校区id * 校区id
*/ */
@NotBlank(message = "校区id不能为空") @NotBlank(message = "校区id不能为空")
@ApiModelProperty(value = "校区id",required = true) @Schema(description = "校区id",requiredMode = Schema.RequiredMode.REQUIRED)
private String storeId; private String storeId;
/** /**
* 事务id * 事务id
*/ */
@NotBlank(message = "事务id不能为空") @NotBlank(message = "事务id不能为空")
@ApiModelProperty(value = "事务id",required = true) @Schema(description = "事务id",requiredMode = Schema.RequiredMode.REQUIRED)
private String businessId; private String businessId;
} }

51
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageBusinessController.java
View File

@ -12,16 +12,17 @@ import com.cpop.oam.business.service.BusinessService;
import com.cpop.oam.business.service.StaffService; import com.cpop.oam.business.service.StaffService;
import com.cpop.oam.business.vo.*; import com.cpop.oam.business.vo.*;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -35,7 +36,7 @@ import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF;
* @since 2023-12-12 * @since 2023-12-12
*/ */
@RestController @RestController
@Api(tags = "市场模块") @Tag(name = "市场模块")
@RequestMapping("/backstage/business") @RequestMapping("/backstage/business")
public class BackstageBusinessController { public class BackstageBusinessController {
@ -50,8 +51,8 @@ public class BackstageBusinessController {
* @return R<Page<BusinessPageVo>> * @return R<Page<BusinessPageVo>>
*/ */
@GetMapping("/getBusinessPage") @GetMapping("/getBusinessPage")
@ApiOperation("获取事务分页列表") @Operation(summary = "获取事务分页列表")
public R<Page<BusinessPageVo>> getBusinessPage(@ApiParam("状态（0:进行中;1:已完成）") Integer status) { public R<Page<BusinessPageVo>> getBusinessPage(@Parameter(description = "状态（0:进行中;1:已完成）") Integer status) {
Page<BusinessPageVo> page = businessService.getBusinessPage(status); Page<BusinessPageVo> page = businessService.getBusinessPage(status);
return R.ok(page); return R.ok(page);
} }
@ -60,18 +61,18 @@ public class BackstageBusinessController {
* 获取机构对接xml模板 * 获取机构对接xml模板
* @author DB * @author DB
* @since 2023/12/13 * @since 2023/12/13
* @return R<Void>
*/ */
@GetMapping("/getBusinessTemplate") @GetMapping("/getBusinessTemplate")
@ApiOperation("获取机构对接xml模板") @Operation(summary = "获取机构对接xml模板")
public void getBusinessTemplate(HttpServletResponse response) throws IOException { public R<Void> getBusinessTemplate(HttpServletResponse response) throws IOException {
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8");
// 这里URLEncoder.encode可以防止中文乱码 当然和easyExcel没有关系 // 这里URLEncoder.encode可以防止中文乱码 当然和easyExcel没有关系
String fileName = URLEncoder.encode("事务分发模板", "UTF-8").replaceAll("\\+", "%20"); String fileName = URLEncoder.encode("事务分发模板", StandardCharsets.UTF_8).replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), BusinessDistributeDto.class).sheet("模板").doWrite(new ArrayList<>()); EasyExcel.write(response.getOutputStream(), BusinessDistributeDto.class).sheet("模板").doWrite(new ArrayList<>());
return R.ok();
} }
/** /**
@ -82,8 +83,8 @@ public class BackstageBusinessController {
* @return R<Void> * @return R<Void>
*/ */
@PostMapping("/businessDistribute") @PostMapping("/businessDistribute")
@ApiOperation("事务分发") @Operation(summary = "事务分发")
public R<Void> businessDistribute(@RequestBody @ApiParam("请求参数") @Validated BusinessDistributeBo bo) { public R<Void> businessDistribute(@RequestBody @Validated BusinessDistributeBo bo) {
businessService.businessDistribute(bo); businessService.businessDistribute(bo);
return R.ok(); return R.ok();
} }
@ -95,7 +96,7 @@ public class BackstageBusinessController {
* @return R<List<StaffVo>> * @return R<List<StaffVo>>
*/ */
@GetMapping("/getBusinessStaff") @GetMapping("/getBusinessStaff")
@ApiOperation("获取市场部员工") @Operation(summary = "获取市场部员工")
public R<List<StaffVo>> getBusinessStaff() { public R<List<StaffVo>> getBusinessStaff() {
List<StaffVo> list = SpringUtils.getBean(StaffService.class).queryChain() List<StaffVo> list = SpringUtils.getBean(StaffService.class).queryChain()
.leftJoin(SYS_USER).on(SYS_USER.ID.eq(STAFF.USER_ID)) .leftJoin(SYS_USER).on(SYS_USER.ID.eq(STAFF.USER_ID))
@ -113,8 +114,8 @@ public class BackstageBusinessController {
* @return R<Page<BusinessInfoPageVo>> * @return R<Page<BusinessInfoPageVo>>
*/ */
@PostMapping("/getBusinessInfoPage") @PostMapping("/getBusinessInfoPage")
@ApiOperation("获取个人事务分页列表/管理人员事务详情列表") @Operation(summary = "获取个人事务分页列表/管理人员事务详情列表")
public R<Page<BusinessInfoPageVo>> getBusinessInfoPage(@ApiParam("请求参数") @RequestBody @Validated BusinessInfoPageBo bo) { public R<Page<BusinessInfoPageVo>> getBusinessInfoPage(@RequestBody @Validated BusinessInfoPageBo bo) {
Page<BusinessInfoPageVo> page = businessService.getBusinessInfoPage(bo); Page<BusinessInfoPageVo> page = businessService.getBusinessInfoPage(bo);
return R.ok(page); return R.ok(page);
} }
@ -127,8 +128,8 @@ public class BackstageBusinessController {
* @return R<PersonBusinessInfoVo> * @return R<PersonBusinessInfoVo>
*/ */
@GetMapping("/getPersonBusinessInfoById/{id}") @GetMapping("/getPersonBusinessInfoById/{id}")
@ApiOperation("获取个人当前事务详情") @Operation(summary = "获取个人当前事务详情")
public R<PersonBusinessInfoVo> getPersonBusinessInfoById(@ApiParam("请求参数") @PathVariable String id) { public R<PersonBusinessInfoVo> getPersonBusinessInfoById(@Parameter(description = "请求参数") @PathVariable String id) {
PersonBusinessInfoVo vo = businessService.getPersonBusinessInfoById(id); PersonBusinessInfoVo vo = businessService.getPersonBusinessInfoById(id);
return R.ok(vo); return R.ok(vo);
} }
@ -141,8 +142,8 @@ public class BackstageBusinessController {
* @return R<Void> * @return R<Void>
*/ */
@PutMapping("/businessDispose") @PutMapping("/businessDispose")
@ApiOperation("员工事务处理") @Operation(summary = "员工事务处理")
public R<Void> businessDistribute(@RequestBody @ApiParam("请求参数") @Validated BusinessDisposeBo bo) { public R<Void> businessDistribute(@RequestBody @Validated BusinessDisposeBo bo) {
businessService.businessDispose(bo); businessService.businessDispose(bo);
return R.ok(); return R.ok();
} }
@ -154,7 +155,7 @@ public class BackstageBusinessController {
* @return R<Void> * @return R<Void>
*/ */
@DeleteMapping("/businessRemove") @DeleteMapping("/businessRemove")
@ApiOperation("事务详情删除") @Operation(summary = "事务详情删除")
public R<Void> businessRemove(@Validated @RequestBody BusinessRemoveBo bo) { public R<Void> businessRemove(@Validated @RequestBody BusinessRemoveBo bo) {
businessService.businessRemove(bo); businessService.businessRemove(bo);
return R.ok(); return R.ok();
@ -167,9 +168,9 @@ public class BackstageBusinessController {
* @param params 请求参数 * @param params 请求参数
* @return R<Page<StorePoolPageVo>> * @return R<Page<StorePoolPageVo>>
*/ */
@ApiOperation("查询未签约校区分页列表") @Operation(summary = "查询未签约校区分页列表")
@GetMapping("/getUnSignStorePage") @GetMapping("/getUnSignStorePage")
public R<Page<BusinessUnSignPageVo>> getUnSignStorePage(@ApiParam("查询参数") @RequestParam(value = "params", required = false) String params) { public R<Page<BusinessUnSignPageVo>> getUnSignStorePage(@Parameter(description = "查询参数") @RequestParam(value = "params", required = false) String params) {
Page<BusinessUnSignPageVo> pageVo = businessService.getUnSignStorePage(params); Page<BusinessUnSignPageVo> pageVo = businessService.getUnSignStorePage(params);
return R.ok(pageVo); return R.ok(pageVo);
} }
@ -181,9 +182,9 @@ public class BackstageBusinessController {
* @param id 校区id * @param id 校区id
* @return R<Void> * @return R<Void>
*/ */
@ApiOperation("校区签约") @Operation(summary = "校区签约")
@PutMapping("/storeSign/{id}") @PutMapping("/storeSign/{id}")
public R<Void> storeSign(@ApiParam(value = "校区id", required = true) @PathVariable String id) { public R<Void> storeSign(@Parameter(description = "校区id", required = true) @PathVariable String id) {
businessService.storeSign(id); businessService.storeSign(id);
return R.ok(); return R.ok();
} }

7
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/BrandManagerServiceImpl.java
View File

@ -1,13 +1,11 @@
package com.cpop.oam.business.service.impl; package com.cpop.oam.business.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.cpop.common.utils.bean.BeanUtils;
import com.cpop.common.utils.http.HttpUtils;
import com.cpop.core.base.entity.PageDomain; import com.cpop.core.base.entity.PageDomain;
import com.cpop.core.base.exception.ServiceException; import com.cpop.core.base.exception.ServiceException;
import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.SqlUtils; import com.cpop.core.utils.SqlUtils;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.jambox.business.entity.BrandExtend; import com.cpop.jambox.business.entity.BrandExtend;
import com.cpop.jambox.business.entity.StoreExtend; import com.cpop.jambox.business.entity.StoreExtend;
import com.cpop.jambox.business.entity.table.BrandExtendTableDef; import com.cpop.jambox.business.entity.table.BrandExtendTableDef;
@ -27,7 +25,6 @@ import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl; import com.mybatisflex.spring.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import okhttp3.Response;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;

31
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/BusinessInfoPageVo.java
View File

@ -1,8 +1,7 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -15,75 +14,75 @@ import java.time.LocalDateTime;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "BusinessInfoPageVo对象", description = "事务详情分页返回对象") @Schema(description = "事务详情分页返回对象")
public class BusinessInfoPageVo { public class BusinessInfoPageVo {
/** /**
* 品牌名 * 品牌名
*/ */
@ApiModelProperty(value = "品牌名") @Schema(description = "品牌名")
private String brandName; private String brandName;
/** /**
* 处理描述 * 处理描述
*/ */
@ApiModelProperty(value = "处理描述") @Schema(description = "处理描述")
private String detailDesc; private String detailDesc;
/** /**
* 处理时间 * 处理时间
*/ */
@ApiModelProperty(value = "处理时间") @Schema(description = "处理时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private LocalDateTime detailRecordTime; private LocalDateTime detailRecordTime;
/** /**
* 事务详情状态(0：进行中;1:完成：2：挂起) * 事务详情状态(0：进行中;1:完成：2：挂起)
*/ */
@ApiModelProperty(value = "事务详情状态(0：进行中;1:完成：2：挂起)") @Schema(description = "事务详情状态(0：进行中;1:完成：2：挂起)")
private long detailStatus; private long detailStatus;
/** /**
* 营业执照地址 * 营业执照地址
*/ */
@ApiModelProperty(value = "营业执照地址") @Schema(description = "营业执照地址")
private String licenseAddr; private String licenseAddr;
/** /**
* 营业执照公司 * 营业执照公司
*/ */
@ApiModelProperty(value = "营业执照公司") @Schema(description = "营业执照公司")
private String licenseName; private String licenseName;
/** /**
* 营业执照法人 * 营业执照法人
*/ */
@ApiModelProperty(value = "营业执照法人") @Schema(description = "营业执照法人")
private String licenseUserName; private String licenseUserName;
/** /**
* 联系人 * 联系人
*/ */
@ApiModelProperty(value = "联系人") @Schema(description = "联系人")
private String personCharge; private String personCharge;
/** /**
* 联系电话 * 联系电话
*/ */
@ApiModelProperty(value = "联系电话") @Schema(description = "联系电话")
private String phone; private String phone;
/** /**
* 负责员工 * 负责员工
*/ */
@ApiModelProperty(value = "负责员工") @Schema(description = "负责员工")
private String staffName; private String staffName;
/** /**
* 校区名 * 校区名
*/ */
@ApiModelProperty(value = "校区名") @Schema(description = "校区名")
private String storeName; private String storeName;
/** /**
* 校区Id * 校区Id
*/ */
@ApiModelProperty(value = "校区Id") @Schema(description = "校区Id")
private String storeId; private String storeId;
/** /**
* 事务详情id * 事务详情id
*/ */
@ApiModelProperty(value = "事务详情id") @Schema(description = "事务详情id")
private String id; private String id;
} }

32
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/BusinessPageVo.java
View File

@ -1,14 +1,11 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
/** /**
* @author DB * @author DB
@ -17,59 +14,64 @@ import java.time.OffsetDateTime;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "BusinessPageVoe对象", description = "事务分页返回对象") @Schema(description = "事务分页返回对象")
public class BusinessPageVo { public class BusinessPageVo {
/** /**
* 总剩余数量 * 总剩余数量
*/ */
@ApiModelProperty(value = "总剩余数量") @Schema(description = "总剩余数量")
private Integer allSurplusQuantity; private Integer allSurplusQuantity;
/** /**
* 业务等级，业务等级(0：轻；1：重；2：缓；3：急) * 业务等级，业务等级(0：轻；1：重；2：缓；3：急)
*/ */
@ApiModelProperty(value = "业务等级(0：轻；1：重；2：缓；3：急)") @Schema(description = "业务等级(0：轻；1：重；2：缓；3：急)")
private Integer businessLevel; private Integer businessLevel;
/** /**
* 业务类型，业务类型(0:机构对接；1：机构签约) * 业务类型，业务类型(0:机构对接；1：机构签约)
*/ */
@ApiModelProperty(value = "业务类型(0:机构对接；1：机构签约)") @Schema(description = "业务类型(0:机构对接；1：机构签约)")
private Integer businessType; private Integer businessType;
/** /**
* 描述 * 描述
*/ */
@ApiModelProperty(value = "描述") @Schema(description = "描述")
private String desc; private String desc;
/** /**
* 结束时间 * 结束时间
*/ */
@ApiModelProperty(value = "结束时间") @Schema(description = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate; private LocalDate endDate;
/** /**
* 事务id * 事务id
*/ */
@ApiModelProperty(value = "事务id") @Schema(description = "事务id")
private String id; private String id;
/** /**
* 分发人 * 分发人
*/ */
@ApiModelProperty(value = "分发人") @Schema(description = "分发人")
private String initiatorName; private String initiatorName;
/** /**
* 备注 * 备注
*/ */
@ApiModelProperty(value = "备注") @Schema(description = "备注")
private String remark; private String remark;
/** /**
* 开始时间 * 开始时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "开始时间") @Schema(description = "开始时间")
private LocalDate startDate; private LocalDate startDate;
/** /**
* 状态，状态（0:进行中;1:已完成） * 状态，状态（0:进行中;1:已完成）
*/ */
@ApiModelProperty(value = "状态（0:进行中;1:已完成）") @Schema(description = "状态（0:进行中;1:已完成）")
private Integer status; private Integer status;
} }

23
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/BusinessUnSignPageVo.java
View File

@ -1,7 +1,6 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -12,60 +11,60 @@ import lombok.experimental.Accessors;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "校区/店铺未签约分页返回对象") @Schema(description = "校区/店铺未签约分页返回对象")
public class BusinessUnSignPageVo { public class BusinessUnSignPageVo {
/** /**
* 校区id * 校区id
*/ */
@ApiModelProperty(value = "校区id") @Schema(description = "校区id")
private String id; private String id;
/** /**
* 校区名 * 校区名
*/ */
@ApiModelProperty(value = "校区名") @Schema(description = "校区名")
private String storeName; private String storeName;
/** /**
* 负责人 * 负责人
*/ */
@ApiModelProperty(value = "负责人") @Schema(description = "负责人")
private String personCharge; private String personCharge;
/** /**
* 手机号 * 手机号
*/ */
@ApiModelProperty(value = "手机号") @Schema(description = "手机号")
private String phone; private String phone;
/** /**
* 营业执照地址 * 营业执照地址
*/ */
@ApiModelProperty(value = "营业执照地址") @Schema(description = "营业执照地址")
private String licensePicUrl; private String licensePicUrl;
/** /**
* 云校区id * 云校区id
*/ */
@ApiModelProperty(value = "云校区id") @Schema(description = "云校区id")
private String storeCloudId; private String storeCloudId;
/** /**
* 品牌id * 品牌id
*/ */
@ApiModelProperty(value = "品牌id") @Schema(description = "品牌id")
private String brandId; private String brandId;
/** /**
* 云品牌id * 云品牌id
*/ */
@ApiModelProperty(value = "云品牌id") @Schema(description = "云品牌id")
private String brandCloudId; private String brandCloudId;
/** /**
* 品牌名 * 品牌名
*/ */
@ApiModelProperty(value = "品牌名") @Schema(description = "品牌名")
private String brandName; private String brandName;
} }

21
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/PersonBusinessInfoVo.java
View File

@ -1,8 +1,7 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -15,49 +14,49 @@ import java.time.LocalDate;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "PersonBusinessInfoVo对象") @Schema(description = "PersonBusinessInfoVo对象")
public class PersonBusinessInfoVo { public class PersonBusinessInfoVo {
/** /**
* 剩余数量 * 剩余数量
*/ */
@ApiModelProperty(value = "剩余数量") @Schema(description = "剩余数量")
private Integer surplusQuantity; private Integer surplusQuantity;
/** /**
* 业务等级，业务等级(0：轻；1：重；2：缓；3：急) * 业务等级，业务等级(0：轻；1：重；2：缓；3：急)
*/ */
@ApiModelProperty(value = "业务等级(0：轻；1：重；2：缓；3：急)") @Schema(description = "业务等级(0：轻；1：重；2：缓；3：急)")
private Integer businessLevel; private Integer businessLevel;
/** /**
* 业务类型，业务类型(0:机构对接；1：机构签约) * 业务类型，业务类型(0:机构对接；1：机构签约)
*/ */
@ApiModelProperty(value = "业务类型(0:机构对接；1：机构签约)") @Schema(description = "业务类型(0:机构对接；1：机构签约)")
private Integer businessType; private Integer businessType;
/** /**
* 描述 * 描述
*/ */
@ApiModelProperty(value = "描述") @Schema(description = "描述")
private String desc; private String desc;
/** /**
* 结束时间 * 结束时间
*/ */
@ApiModelProperty(value = "结束时间") @Schema(description = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate; private LocalDate endDate;
/** /**
* 分发人 * 分发人
*/ */
@ApiModelProperty(value = "分发人") @Schema(description = "分发人")
private String initiatorName; private String initiatorName;
/** /**
* 备注 * 备注
*/ */
@ApiModelProperty(value = "备注") @Schema(description = "备注")
private String remark; private String remark;
/** /**
* 开始时间 * 开始时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "开始时间") @Schema(description = "开始时间")
private LocalDate startDate; private LocalDate startDate;
} }

21
Cpop-Oam/src/main/java/com/cpop/oam/business/vo/StaffVo.java
View File

@ -1,12 +1,9 @@
package com.cpop.oam.business.vo; package com.cpop.oam.business.vo;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* 员工表Vo输出 * 员工表Vo输出
* *
@ -15,39 +12,37 @@ import java.io.Serializable;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "Staff对象", description = "员工表") @Schema(description = "员工对象")
public class StaffVo implements Serializable { public class StaffVo {
private static final long serialVersionUID = 1L;
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty("主键") @Schema(description ="主键")
private String id; private String id;
/** /**
* 姓名 * 姓名
*/ */
@ApiModelProperty("姓名") @Schema(description ="姓名")
private String name; private String name;
/** /**
* 部门id * 部门id
*/ */
@ApiModelProperty("部门id") @Schema(description ="部门id")
private String deptId; private String deptId;
/** /**
* 用户id * 用户id
*/ */
@ApiModelProperty("用户id") @Schema(description ="用户id")
private String userId; private String userId;
/** /**
* 员工类型 * 员工类型
*/ */
@ApiModelProperty("员工类型") @Schema(description ="员工类型")
private Integer staffType; private Integer staffType;