diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 9262831f..a2856ff3 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -104,6 +104,24 @@ public class BmsSupplierController { return R.byPageHelperList(list); } + /** + * 翻页查询,值=1,过滤当前用户负责数据 + * @param param + * @return + */ + @PostMapping("/getPageForVisit") + public R> getPageForVisit(@RequestBody BmsSupplier param){ + String userId = AuthContextUtils.getSysUserId(); + hisUserSupplierService.initByUserId(userId,false); + HisUserSupplier userSupplier = param.toHisUserSupplier(userId,null); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(userSupplier); + lqw.ne(HisUserSupplier::getSupplierId,0); + PageHelper.startPage(param.getPageNum(),param.getPageSize()); + List list = hisUserSupplierService.list(lqw); + List supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList()); + return R.byPageHelperList(list,supplierList); + } + /** * 树查询 * @param param diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java new file mode 100644 index 00000000..9bc22fe1 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java @@ -0,0 +1,120 @@ +package com.qs.serve.modules.bms.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.PageUtil; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.StringUtils; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import com.qs.serve.modules.bms.entity.BmsSupplierVisitAddress; +import com.qs.serve.modules.bms.service.BmsSupplierVisitAddressService; + +import javax.validation.Valid; +import java.util.List; + +/** + * 基础档案 供应商拜访地址 + * @author YenHex + * @since 2023-03-28 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("bms/supplierVisitAddress") +public class BmsSupplierVisitAddressController { + + private BmsSupplierVisitAddressService bmsSupplierVisitAddressService; + + /** + * 列表 + * @param param + * @return + */ + //@GetMapping("/list") + @PreAuthorize("hasRole('bms:supplierVisitAddress:query')") + public R> getList(BmsSupplierVisitAddress param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = bmsSupplierVisitAddressService.list(lqw); + return R.ok(list); + } + + /** + * 翻页 + * @param param + * @return + */ + //@GetMapping("/page") + @PreAuthorize("hasRole('bms:supplierVisitAddress:query')") + public R> getPage(BmsSupplierVisitAddress param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = bmsSupplierVisitAddressService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * ID查询 + * @param id + * @return + */ + //@GetMapping("/getById/{id}") + @SysLog(module = SystemModule.BASE, title = "供应商拜访地址", biz = BizType.QUERY) + @PreAuthorize("hasRole('bms:supplierVisitAddress:query')") + public R getById(@PathVariable("id") String id){ + BmsSupplierVisitAddress bmsSupplierVisitAddress = bmsSupplierVisitAddressService.getById(id); + return R.ok(bmsSupplierVisitAddress); + } + + + + /** + * 更新 + * @param param + * @return + */ + //@PostMapping("/updateById") + @SysLog(module = SystemModule.BASE, title = "供应商拜访地址", biz = BizType.UPDATE) + @PreAuthorize("hasRole('bms:supplierVisitAddress:update')") + public R updateById(@RequestBody @Valid BmsSupplierVisitAddress param){ + boolean result = bmsSupplierVisitAddressService.updateById(param); + return R.isTrue(result); + } + + /** + * 新增 + * @param param + * @return + */ + //@PostMapping("/save") + @SysLog(module = SystemModule.BASE, title = "供应商拜访地址", biz = BizType.INSERT) + @PreAuthorize("hasRole('bms:supplierVisitAddress:insert')") + public R save(@RequestBody @Valid BmsSupplierVisitAddress param){ + boolean result = bmsSupplierVisitAddressService.save(param); + return R.isTrue(result); + } + + /** + * 删除 + * @param ids + * @return + */ + @DeleteMapping("/deleteById/{ids}") + @SysLog(module = SystemModule.BASE, title = "供应商拜访地址", biz = BizType.DELETE) + @PreAuthorize("hasRole('bms:supplierVisitAddress:delete')") + public R deleteById(@PathVariable("ids") String ids){ + List idsLong = StringUtils.splitIdLong(ids); + boolean result = bmsSupplierVisitAddressService.removeByIds(idsLong); + return R.isTrue(result); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java new file mode 100644 index 00000000..08e7c321 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java @@ -0,0 +1,119 @@ +package com.qs.serve.modules.bms.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.PageUtil; +import com.qs.serve.common.util.StringUtils; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm; +import com.qs.serve.modules.bms.service.BmsSupplierVisitFormService; + +import javax.validation.Valid; +import java.util.List; + +/** + * 基础档案 科目表单 + * @author YenHex + * @since 2023-03-28 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("bms/supplierVisitForm") +public class BmsSupplierVisitFormController { + + private BmsSupplierVisitFormService bmsSupplierVisitFormService; + + /** + * 列表 + * @param param + * @return + */ + //@GetMapping("/list") + @PreAuthorize("hasRole('bms:supplierVisitForm:query')") + public R> getList(BmsSupplierVisitForm param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = bmsSupplierVisitFormService.list(lqw); + return R.ok(list); + } + + /** + * 翻页 + * @param param + * @return + */ + //@GetMapping("/page") + @PreAuthorize("hasRole('bms:supplierVisitForm:query')") + public R> getPage(BmsSupplierVisitForm param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = bmsSupplierVisitFormService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * ID查询 + * @param id + * @return + */ + //@GetMapping("/getById/{id}") + @SysLog(module = SystemModule.BASE, title = "科目表单", biz = BizType.QUERY) + @PreAuthorize("hasRole('bms:supplierVisitForm:query')") + public R getById(@PathVariable("id") String id){ + BmsSupplierVisitForm bmsSupplierVisitForm = bmsSupplierVisitFormService.getById(id); + return R.ok(bmsSupplierVisitForm); + } + + + + /** + * 更新 + * @param param + * @return + */ + //@PostMapping("/updateById") + @SysLog(module = SystemModule.BASE, title = "科目表单", biz = BizType.UPDATE) + @PreAuthorize("hasRole('bms:supplierVisitForm:update')") + public R updateById(@RequestBody @Valid BmsSupplierVisitForm param){ + boolean result = bmsSupplierVisitFormService.updateById(param); + return R.isTrue(result); + } + + /** + * 新增 + * @param param + * @return + */ + //@PostMapping("/save") + @SysLog(module = SystemModule.BASE, title = "科目表单", biz = BizType.INSERT) + @PreAuthorize("hasRole('bms:supplierVisitForm:insert')") + public R save(@RequestBody @Valid BmsSupplierVisitForm param){ + boolean result = bmsSupplierVisitFormService.save(param); + return R.isTrue(result); + } + + /** + * 删除 + * @param ids + * @return + */ + @DeleteMapping("/deleteById/{ids}") + @SysLog(module = SystemModule.BASE, title = "科目表单", biz = BizType.DELETE) + @PreAuthorize("hasRole('bms:supplierVisitForm:delete')") + public R deleteById(@PathVariable("ids") String ids){ + List idsLong = StringUtils.splitIdLong(ids); + boolean result = bmsSupplierVisitFormService.removeByIds(idsLong); + return R.isTrue(result); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java new file mode 100644 index 00000000..eaf75e64 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java @@ -0,0 +1,120 @@ +package com.qs.serve.modules.bms.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.PageUtil; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.StringUtils; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import com.qs.serve.modules.bms.entity.BmsSupplierVisitType; +import com.qs.serve.modules.bms.service.BmsSupplierVisitTypeService; + +import javax.validation.Valid; +import java.util.List; + +/** + * 基础档案 拜访类型 + * @author YenHex + * @since 2023-03-28 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("bms/supplierVisitType") +public class BmsSupplierVisitTypeController { + + private BmsSupplierVisitTypeService bmsSupplierVisitTypeService; + + /** + * 列表 + * @param param + * @return + */ + //@GetMapping("/list") + @PreAuthorize("hasRole('bms:supplierVisitType:query')") + public R> getList(BmsSupplierVisitType param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = bmsSupplierVisitTypeService.list(lqw); + return R.ok(list); + } + + /** + * 翻页 + * @param param + * @return + */ + //@GetMapping("/page") + @PreAuthorize("hasRole('bms:supplierVisitType:query')") + public R> getPage(BmsSupplierVisitType param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = bmsSupplierVisitTypeService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * ID查询 + * @param id + * @return + */ + //@GetMapping("/getById/{id}") + @SysLog(module = SystemModule.BASE, title = "拜访类型", biz = BizType.QUERY) + @PreAuthorize("hasRole('bms:supplierVisitType:query')") + public R getById(@PathVariable("id") String id){ + BmsSupplierVisitType bmsSupplierVisitType = bmsSupplierVisitTypeService.getById(id); + return R.ok(bmsSupplierVisitType); + } + + + + /** + * 更新 + * @param param + * @return + */ + //@PostMapping("/updateById") + @SysLog(module = SystemModule.BASE, title = "拜访类型", biz = BizType.UPDATE) + @PreAuthorize("hasRole('bms:supplierVisitType:update')") + public R updateById(@RequestBody @Valid BmsSupplierVisitType param){ + boolean result = bmsSupplierVisitTypeService.updateById(param); + return R.isTrue(result); + } + + /** + * 新增 + * @param param + * @return + */ + //@PostMapping("/save") + @SysLog(module = SystemModule.BASE, title = "拜访类型", biz = BizType.INSERT) + @PreAuthorize("hasRole('bms:supplierVisitType:insert')") + public R save(@RequestBody @Valid BmsSupplierVisitType param){ + boolean result = bmsSupplierVisitTypeService.save(param); + return R.isTrue(result); + } + + /** + * 删除 + * @param ids + * @return + */ + @DeleteMapping("/deleteById/{ids}") + @SysLog(module = SystemModule.BASE, title = "拜访类型", biz = BizType.DELETE) + @PreAuthorize("hasRole('bms:supplierVisitType:delete')") + public R deleteById(@PathVariable("ids") String ids){ + List idsLong = StringUtils.splitIdLong(ids); + boolean result = bmsSupplierVisitTypeService.removeByIds(idsLong); + return R.isTrue(result); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisit.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisit.java new file mode 100644 index 00000000..5ddc84ec --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisit.java @@ -0,0 +1,100 @@ +package com.qs.serve.modules.bms.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +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 javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 供应商拜访信息 实体类 + * @author YenHex + * @since 2023-03-28 + */ +@Data +@TableName("bms_supplier_visit") +public class BmsSupplierVisit implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 供应商id */ + @NotNull(message = "供应商id不能为空") + private Long supplierId; + + /** 拜访次数 */ + @NotNull(message = "拜访次数不能为空") + private Integer visitCount; + + /** 上次拜访时间 */ + @Length(max = 0,message = "上次拜访时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime lastVisitTime; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @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; + + /** 最后更新时间 */ + @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; + + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 逻辑删除标记(0:显示;1:隐藏) */ + @JsonIgnore + @JsonProperty + private String delFlag; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + + public static BmsSupplierVisit toNewObject(BmsSupplierVisit source){ + BmsSupplierVisit supplierVisit = new BmsSupplierVisit(); + supplierVisit.setId(source.getId()); + supplierVisit.setSupplierId(source.getSupplierId()); + supplierVisit.setVisitCount(source.getVisitCount()); + supplierVisit.setLastVisitTime(source.getLastVisitTime()); + supplierVisit.setRemark(source.getRemark()); + supplierVisit.setCreateTime(source.getCreateTime()); + supplierVisit.setUpdateTime(source.getUpdateTime()); + supplierVisit.setTenantId(source.getTenantId()); + supplierVisit.setDelFlag(source.getDelFlag()); + supplierVisit.setCreateBy(source.getCreateBy()); + supplierVisit.setUpdateBy(source.getUpdateBy()); + return supplierVisit; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java new file mode 100644 index 00000000..07484236 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java @@ -0,0 +1,104 @@ +package com.qs.serve.modules.bms.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +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 javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 供应商拜访地址 实体类 + * @author YenHex + * @since 2023-03-28 + */ +@Data +@TableName("bms_supplier_visit_address") +public class BmsSupplierVisitAddress implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 供应商id */ + @NotNull(message = "供应商id不能为空") + private Long supplierId; + + /** 详细地址 */ + @NotBlank(message = "详细地址不能为空") + @Length(max = 255,message = "详细地址长度不能超过255字") + private String addressDetail; + + /** 纬度 */ + @Length(max = 255,message = "纬度长度不能超过255字") + private String varX; + + /** 经度 */ + @Length(max = 255,message = "经度长度不能超过255字") + private String varY; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @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; + + /** 最后更新时间 */ + @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; + + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 逻辑删除标记(0:显示;1:隐藏) */ + @JsonIgnore + @JsonProperty + private String delFlag; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + + public static BmsSupplierVisitAddress toNewObject(BmsSupplierVisitAddress source){ + BmsSupplierVisitAddress supplierVisitAddress = new BmsSupplierVisitAddress(); + supplierVisitAddress.setId(source.getId()); + supplierVisitAddress.setSupplierId(source.getSupplierId()); + supplierVisitAddress.setAddressDetail(source.getAddressDetail()); + supplierVisitAddress.setVarX(source.getVarX()); + supplierVisitAddress.setVarY(source.getVarY()); + supplierVisitAddress.setRemark(source.getRemark()); + supplierVisitAddress.setCreateTime(source.getCreateTime()); + supplierVisitAddress.setUpdateTime(source.getUpdateTime()); + supplierVisitAddress.setTenantId(source.getTenantId()); + supplierVisitAddress.setDelFlag(source.getDelFlag()); + supplierVisitAddress.setCreateBy(source.getCreateBy()); + supplierVisitAddress.setUpdateBy(source.getUpdateBy()); + return supplierVisitAddress; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitForm.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitForm.java new file mode 100644 index 00000000..fdfed64b --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitForm.java @@ -0,0 +1,104 @@ +package com.qs.serve.modules.bms.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +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 javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 科目表单 实体类 + * @author YenHex + * @since 2023-03-28 + */ +@Data +@TableName("bms_supplier_visit_form") +public class BmsSupplierVisitForm implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 标题 */ + @NotBlank(message = "标题不能为空") + @Length(max = 40,message = "标题长度不能超过40字") + private String title; + + /** 子标题 */ + @Length(max = 255,message = "子标题长度不能超过255字") + private String subtitle; + + /** 描述 */ + @Length(max = 255,message = "描述长度不能超过255字") + private String descr; + + /** 表单json */ + @NotBlank(message = "表单json不能为空") + @Length(max = 0,message = "表单json长度不能超过0字") + private String formContext; + + /** 表单版本 */ + private Integer version; + + /** 创建时间 */ + @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; + + /** 租户id */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + + + public static BmsSupplierVisitForm toNewObject(BmsSupplierVisitForm source){ + BmsSupplierVisitForm supplierVisitForm = new BmsSupplierVisitForm(); + supplierVisitForm.setId(source.getId()); + supplierVisitForm.setTitle(source.getTitle()); + supplierVisitForm.setSubtitle(source.getSubtitle()); + supplierVisitForm.setDescr(source.getDescr()); + supplierVisitForm.setFormContext(source.getFormContext()); + supplierVisitForm.setVersion(source.getVersion()); + supplierVisitForm.setCreateTime(source.getCreateTime()); + supplierVisitForm.setCreateBy(source.getCreateBy()); + supplierVisitForm.setUpdateTime(source.getUpdateTime()); + supplierVisitForm.setUpdateBy(source.getUpdateBy()); + supplierVisitForm.setTenantId(source.getTenantId()); + supplierVisitForm.setDelFlag(source.getDelFlag()); + return supplierVisitForm; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitType.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitType.java new file mode 100644 index 00000000..00a8444e --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitType.java @@ -0,0 +1,96 @@ +package com.qs.serve.modules.bms.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +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 javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 拜访类型 实体类 + * @author YenHex + * @since 2023-03-28 + */ +@Data +@TableName("bms_supplier_visit_type") +public class BmsSupplierVisitType implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 类型名称 */ + @Length(max = 255,message = "类型名称长度不能超过255字") + private String typeName; + + /** 模板id */ + private Long typeFormId; + + /** 排序 */ + private Integer sort; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @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; + + /** 最后更新时间 */ + @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; + + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 逻辑删除标记(0:显示;1:隐藏) */ + @JsonIgnore + @JsonProperty + private String delFlag; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + + public static BmsSupplierVisitType toNewObject(BmsSupplierVisitType source){ + BmsSupplierVisitType supplierVisitType = new BmsSupplierVisitType(); + supplierVisitType.setId(source.getId()); + supplierVisitType.setTypeName(source.getTypeName()); + supplierVisitType.setTypeFormId(source.getTypeFormId()); + supplierVisitType.setSort(source.getSort()); + supplierVisitType.setRemark(source.getRemark()); + supplierVisitType.setCreateTime(source.getCreateTime()); + supplierVisitType.setUpdateTime(source.getUpdateTime()); + supplierVisitType.setTenantId(source.getTenantId()); + supplierVisitType.setDelFlag(source.getDelFlag()); + supplierVisitType.setCreateBy(source.getCreateBy()); + supplierVisitType.setUpdateBy(source.getUpdateBy()); + return supplierVisitType; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitAddressMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitAddressMapper.java new file mode 100644 index 00000000..d545b5ec --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitAddressMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitAddress; + +/** + * 供应商拜访地址 Mapper + * @author YenHex + * @date 2023-03-28 + */ +public interface BmsSupplierVisitAddressMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitFormMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitFormMapper.java new file mode 100644 index 00000000..8f499701 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitFormMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm; + +/** + * 科目表单 Mapper + * @author YenHex + * @date 2023-03-28 + */ +public interface BmsSupplierVisitFormMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitMapper.java new file mode 100644 index 00000000..83cbb023 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.bms.entity.BmsSupplierVisit; + +/** + * 供应商拜访信息 Mapper + * @author YenHex + * @date 2023-03-28 + */ +public interface BmsSupplierVisitMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitTypeMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitTypeMapper.java new file mode 100644 index 00000000..dda96cd3 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierVisitTypeMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitType; + +/** + * 拜访类型 Mapper + * @author YenHex + * @date 2023-03-28 + */ +public interface BmsSupplierVisitTypeMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitAddressService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitAddressService.java new file mode 100644 index 00000000..9ce193fa --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitAddressService.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitAddress; + +/** + * 供应商拜访地址 服务接口 + * @author YenHex + * @date 2023-03-28 + */ +public interface BmsSupplierVisitAddressService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitFormService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitFormService.java new file mode 100644 index 00000000..ba520a38 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitFormService.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm; + +/** + * 科目表单 服务接口 + * @author YenHex + * @date 2023-03-28 + */ +public interface BmsSupplierVisitFormService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitService.java new file mode 100644 index 00000000..79ead82d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitService.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.bms.entity.BmsSupplierVisit; + +/** + * 供应商拜访信息 服务接口 + * @author YenHex + * @date 2023-03-28 + */ +public interface BmsSupplierVisitService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitTypeService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitTypeService.java new file mode 100644 index 00000000..aaf0acc1 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierVisitTypeService.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitType; + +/** + * 拜访类型 服务接口 + * @author YenHex + * @date 2023-03-28 + */ +public interface BmsSupplierVisitTypeService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitAddressServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitAddressServiceImpl.java new file mode 100644 index 00000000..8a5b92ea --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitAddressServiceImpl.java @@ -0,0 +1,22 @@ +package com.qs.serve.modules.bms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitAddress; +import com.qs.serve.modules.bms.service.BmsSupplierVisitAddressService; +import com.qs.serve.modules.bms.mapper.BmsSupplierVisitAddressMapper; + +/** + * 供应商拜访地址 服务实现类 + * @author YenHex + * @since 2023-03-28 + */ +@Slf4j +@Service +@AllArgsConstructor +public class BmsSupplierVisitAddressServiceImpl extends ServiceImpl implements BmsSupplierVisitAddressService { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitFormServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitFormServiceImpl.java new file mode 100644 index 00000000..1b7637a8 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitFormServiceImpl.java @@ -0,0 +1,22 @@ +package com.qs.serve.modules.bms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm; +import com.qs.serve.modules.bms.service.BmsSupplierVisitFormService; +import com.qs.serve.modules.bms.mapper.BmsSupplierVisitFormMapper; + +/** + * 科目表单 服务实现类 + * @author YenHex + * @since 2023-03-28 + */ +@Slf4j +@Service +@AllArgsConstructor +public class BmsSupplierVisitFormServiceImpl extends ServiceImpl implements BmsSupplierVisitFormService { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitServiceImpl.java new file mode 100644 index 00000000..a4279347 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitServiceImpl.java @@ -0,0 +1,22 @@ +package com.qs.serve.modules.bms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.bms.entity.BmsSupplierVisit; +import com.qs.serve.modules.bms.service.BmsSupplierVisitService; +import com.qs.serve.modules.bms.mapper.BmsSupplierVisitMapper; + +/** + * 供应商拜访信息 服务实现类 + * @author YenHex + * @since 2023-03-28 + */ +@Slf4j +@Service +@AllArgsConstructor +public class BmsSupplierVisitServiceImpl extends ServiceImpl implements BmsSupplierVisitService { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitTypeServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitTypeServiceImpl.java new file mode 100644 index 00000000..d030d0b3 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierVisitTypeServiceImpl.java @@ -0,0 +1,22 @@ +package com.qs.serve.modules.bms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitType; +import com.qs.serve.modules.bms.service.BmsSupplierVisitTypeService; +import com.qs.serve.modules.bms.mapper.BmsSupplierVisitTypeMapper; + +/** + * 拜访类型 服务实现类 + * @author YenHex + * @since 2023-03-28 + */ +@Slf4j +@Service +@AllArgsConstructor +public class BmsSupplierVisitTypeServiceImpl extends ServiceImpl implements BmsSupplierVisitTypeService { + +} + diff --git a/src/main/java/com/qs/serve/modules/third/PortalController.java b/src/main/java/com/qs/serve/modules/third/PortalController.java index dc117f5f..b9231460 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalController.java @@ -16,8 +16,6 @@ import javax.servlet.http.HttpServletRequest; /** * 【第三方接口】核销系统 - * headers+ => tenant-id = 001 - * headers+ => v-token = MD5.encrypt('jslApi-'+yyyy-MM-dd) * @author YenHex * @since 2023/2/14 */ @@ -31,6 +29,7 @@ public class PortalController { /** * 测试连通性 + * @apiNote headers+ => tenant-id = 001 \n headers+ => v-token = MD5.encrypt('jslApi-'+yyyy-MM-dd) * @param request * @return */ diff --git a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java index 52b14fd1..ec4cb883 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java @@ -26,8 +26,6 @@ import java.time.LocalDateTime; /** * 【第三方接口】核销系统 - * headers+ => tenant-id = 001 - * headers+ => v-token = MD5.encrypt('jslApi-'+yyyy-MM-dd) * @author YenHex * @since 2023/2/14 */