From 233b25e548685d96d9abdf7a14a6c28de373f618 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 28 Mar 2023 17:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=9C=E8=AE=BF=E6=B5=81=E7=A8=8B=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/controller/api/BizCusVisitApi.java | 56 ++++++----- .../serve/modules/biz/entity/BizCusVisit.java | 22 ++--- .../qs/serve/modules/biz/entity/BizVisit.java | 2 +- .../modules/biz/entity/bo/BizCusVisitBo.java | 59 ++++++++++++ .../bms/controller/BmsSupplierController.java | 17 ---- .../BmsSupplierVisitAddressController.java | 49 +++++++++- .../BmsSupplierVisitFormController.java | 10 +- .../BmsSupplierVisitTypeController.java | 8 +- .../bms/entity/BmsSupplierVisitAddress.java | 8 +- .../bms/entity/so/BmsSupplierVisitSo.java | 40 ++++++++ .../modules/his/entity/HisUserSupplier.java | 14 +++ .../his/mapper/HisUserSupplierMapper.java | 5 +- .../mapper/his/HisUserSupplierMapper.xml | 94 +++++++++++++++++++ 13 files changed, 314 insertions(+), 70 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java create mode 100644 src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java create mode 100644 src/main/resources/mapper/his/HisUserSupplierMapper.xml diff --git a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java index f84eaf5b..521fa298 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java @@ -7,10 +7,15 @@ import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.StringUtils; import com.qs.serve.modules.biz.entity.BizCusVisit; import com.qs.serve.modules.biz.entity.BizVisit; +import com.qs.serve.modules.biz.entity.bo.BizCusVisitBo; import com.qs.serve.modules.biz.service.BizCusVisitService; import com.qs.serve.modules.biz.service.BizVisitService; import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitType; import com.qs.serve.modules.bms.service.BmsSupplierService; +import com.qs.serve.modules.bms.service.BmsSupplierVisitFormService; +import com.qs.serve.modules.bms.service.BmsSupplierVisitTypeService; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.wx.entity.WxUser; @@ -38,6 +43,9 @@ public class BizCusVisitApi { private SysUserService sysUserService; private BmsSupplierService supplierService; + private BmsSupplierVisitTypeService bmsSupplierVisitTypeService; + private BmsSupplierVisitFormService bmsSupplierVisitFormService; + /** * 翻页 * @param param @@ -84,24 +92,14 @@ public class BizCusVisitApi { * @return */ @PostMapping("/updateById") - public R updateById(@RequestBody @Valid BizCusVisit param){ + public R updateById(@RequestBody @Valid BizCusVisitBo param){ WxUser wxUser = wxUserService.getCurrentWxUser(); if(wxUser.getSysUserId()==null||wxUser.getSysUserId().equals("0")){ return R.ok(); } String userId = wxUser.getSysUserId(); - BizCusVisit bizVisit = bizVisitService.getById(param.getId()); - if(!bizVisit.getVisitorId().equals(userId)){ - return R.ok(); - } - if(StringUtils.hasText(param.getCustomerId())){ - BmsSupplier supplier = supplierService.getById(param.getCustomerId()); - param.setCustomerId(supplier.getId()); - param.setCustomerName(supplier.getName()); - param.setCustomerCode(supplier.getCode()); - } - boolean result = bizVisitService.updateById(param); - return R.isTrue(result); + this.saveOrUpdate(param,userId); + return R.ok(); } /** @@ -110,21 +108,35 @@ public class BizCusVisitApi { * @return */ @PostMapping("/save") - public R save(@RequestBody @Valid BizCusVisit param){ + public R save(@RequestBody @Valid BizCusVisitBo param){ WxUser wxUser = wxUserService.getCurrentWxUser(); + String userId = wxUser.getSysUserId(); if(wxUser.getSysUserId()==null||wxUser.getSysUserId().equals("0")){ return R.ok(); } - String userId = wxUser.getSysUserId(); + saveOrUpdate(param, userId); + return R.ok(); + } + + private void saveOrUpdate(BizCusVisitBo param, String userId) { + BizCusVisit cusVisit = BizCusVisit.toNewObject(param); SysUser sysUser = sysUserService.getById(userId); - param.setVisitorId(userId); - param.setVisitorName(sysUser.getName()); + cusVisit.setVisitorId(userId); + cusVisit.setVisitorName(sysUser.getName()); BmsSupplier supplier = supplierService.getById(param.getCustomerId()); - param.setCustomerId(supplier.getId()); - param.setCustomerName(supplier.getName()); - param.setCustomerCode(supplier.getCode()); - boolean result = bizVisitService.save(param); - return R.isTrue(result); + cusVisit.setCustomerId(supplier.getId()); + cusVisit.setCustomerName(supplier.getName()); + cusVisit.setCustomerCode(supplier.getCode()); + BmsSupplierVisitType visitType = bmsSupplierVisitTypeService.getById(param.getSignTypeId()); + cusVisit.setSignTypeId(visitType.getId()); + cusVisit.setSignType(visitType.getTypeName()); + if(visitType.getTypeFormId()!=null){ + BmsSupplierVisitForm visitForm = bmsSupplierVisitFormService.getById(visitType.getTypeFormId()); + cusVisit.setSignTypeFormId(visitForm.getId()); + cusVisit.setSignTypeForm(visitForm.getFormContext()); + cusVisit.setSignTypeFormValue(param.getFormJson()); + } + bizVisitService.saveOrUpdate(cusVisit); } /** diff --git a/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java b/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java index 77fdd350..f11387ed 100644 --- a/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java +++ b/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler; +import com.qs.serve.modules.biz.entity.bo.BizCusVisitBo; import lombok.Data; import org.apache.ibatis.type.JdbcType; import org.hibernate.validator.constraints.Length; @@ -49,10 +50,18 @@ public class BizCusVisit implements Serializable { @Length(max = 512,message = "地址长度不能超过512字") private String address; + /** 签到类型Id */ + @NotNull(message = "签到类型不能为空") + private Long signTypeId; + /** 类型：单选 【潜在客户签到；培训会议；其他定点签到；在家办公 】 */ @Length(max = 255,message = "类型：单选 【潜在客户签到；培训会议；其他定点签到；在家办公 】长度不能超过255字") private String signType; + private String signTypeForm; + private Long signTypeFormId; + private String signTypeFormValue; + /** 拜访人id */ @Length(max = 32,message = "拜访人id长度不能超过32字") private String visitorId; @@ -108,26 +117,15 @@ public class BizCusVisit implements Serializable { private String updateBy; - public static BizCusVisit toNewObject(BizCusVisit source){ + public static BizCusVisit toNewObject(BizCusVisitBo source){ BizCusVisit cusVisit = new BizCusVisit(); cusVisit.setId(source.getId()); cusVisit.setPhotos(source.getPhotos()); cusVisit.setLocalX(source.getLocalX()); cusVisit.setLocalY(source.getLocalY()); cusVisit.setAddress(source.getAddress()); - cusVisit.setSignType(source.getSignType()); - cusVisit.setVisitorId(source.getVisitorId()); - cusVisit.setVisitorName(source.getVisitorName()); cusVisit.setCustomerId(source.getCustomerId()); - cusVisit.setCustomerName(source.getCustomerName()); - cusVisit.setCustomerCode(source.getCustomerCode()); cusVisit.setRemark(source.getRemark()); - cusVisit.setCreateTime(source.getCreateTime()); - cusVisit.setUpdateTime(source.getUpdateTime()); - cusVisit.setTenantId(source.getTenantId()); - cusVisit.setDelFlag(source.getDelFlag()); - cusVisit.setCreateBy(source.getCreateBy()); - cusVisit.setUpdateBy(source.getUpdateBy()); return cusVisit; } diff --git a/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java b/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java index 02fa689e..5c585e9d 100644 --- a/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java +++ b/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java @@ -47,8 +47,8 @@ public class BizVisit implements Serializable { @Length(max = 512,message = "地址长度不能超过512字") private String address; + /** 类型：单选 【潜在客户签到；培训会议；其他定点签到；在家办公 】 */ - @Length(max = 255,message = "类型：单选 【潜在客户签到；培训会议；其他定点签到；在家办公 】长度不能超过255字") private String signType; /** 拜访人id */ diff --git a/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java b/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java new file mode 100644 index 00000000..68c77796 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java @@ -0,0 +1,59 @@ +package com.qs.serve.modules.biz.entity.bo; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler; +import lombok.Data; +import org.apache.ibatis.type.JdbcType; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 拜访日志 实体类 + * @author YenHex + * @since 2023-03-24 + */ +@Data +public class BizCusVisitBo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 图片 */ + private String[] photos; + + /** 纬度 */ + private String localX; + + /** 经度 */ + private String localY; + + /** 地址 */ + private String address; + + /** 签到类型Id */ + private Long signTypeId; + + /** 客户id */ + private String customerId; + + /** + * 填写的表单内容 + */ + private String formJson; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + +} + 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 a2856ff3..57137df0 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,23 +104,6 @@ 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); - } /** * 树查询 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 index 9bc22fe1..5a4ef84a 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java @@ -1,14 +1,26 @@ package com.qs.serve.modules.bms.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.pagehelper.PageHelper; 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.AuthContextUtils; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.bms.entity.so.BmsSupplierVisitSo; +import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; +import com.qs.serve.modules.bms.service.BmsRegion2Service; +import com.qs.serve.modules.bms.service.BmsRegionService; +import com.qs.serve.modules.bms.service.BmsSupplierService; +import com.qs.serve.modules.his.entity.HisUserSupplier; +import com.qs.serve.modules.his.mapper.HisUserSupplierMapper; +import com.qs.serve.modules.his.service.HisUserSupplierService; +import com.qs.serve.modules.sys.service.SysUserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -19,6 +31,7 @@ import com.qs.serve.modules.bms.service.BmsSupplierVisitAddressService; import javax.validation.Valid; import java.util.List; +import java.util.stream.Collectors; /** * 基础档案 供应商拜访地址 @@ -32,6 +45,8 @@ import java.util.List; public class BmsSupplierVisitAddressController { private BmsSupplierVisitAddressService bmsSupplierVisitAddressService; + private HisUserSupplierService hisUserSupplierService; + private HisUserSupplierMapper hisUserSupplierMapper; /** * 列表 @@ -47,12 +62,38 @@ public class BmsSupplierVisitAddressController { return R.ok(list); } + + /** + * 翻页查询，值=1，过滤当前用户负责数据 + * @param param + * @return + */ + @GetMapping("/getPageForVisit") + public R> getPageForVisit(BmsSupplierVisitSo param){ + String userId = AuthContextUtils.getSysUserId(); + hisUserSupplierService.initByUserId(userId,false); + HisUserSupplier userSupplier = new HisUserSupplier(); + userSupplier.setUserId(userId); + userSupplier.setSupplierName(param.getSupplierName()); + userSupplier.setSupplierCode(param.getSupplierCode()); + userSupplier.setQueryAddress(param.getAddress()); + userSupplier.setQueryValue(param.getSearchValue()); + + //lqw.ne(HisUserSupplier::getSupplierId,0); + //PageHelper.startPage(param.getPageNum(),param.getPageSize()); + PageUtil.startPage(); + List list = hisUserSupplierMapper.selectHisUserSupplierAddressList(userSupplier); + + //List supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList()); + return R.byPageHelperList(list); + } + /** * 翻页 * @param param * @return */ - //@GetMapping("/page") + @GetMapping("/page") @PreAuthorize("hasRole('bms:supplierVisitAddress:query')") public R> getPage(BmsSupplierVisitAddress param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); @@ -66,7 +107,7 @@ public class BmsSupplierVisitAddressController { * @param id * @return */ - //@GetMapping("/getById/{id}") + @GetMapping("/getById/{id}") @SysLog(module = SystemModule.BASE, title = "供应商拜访地址", biz = BizType.QUERY) @PreAuthorize("hasRole('bms:supplierVisitAddress:query')") public R getById(@PathVariable("id") String id){ @@ -81,7 +122,7 @@ public class BmsSupplierVisitAddressController { * @param param * @return */ - //@PostMapping("/updateById") + @PostMapping("/updateById") @SysLog(module = SystemModule.BASE, title = "供应商拜访地址", biz = BizType.UPDATE) @PreAuthorize("hasRole('bms:supplierVisitAddress:update')") public R updateById(@RequestBody @Valid BmsSupplierVisitAddress param){ @@ -94,7 +135,7 @@ public class BmsSupplierVisitAddressController { * @param param * @return */ - //@PostMapping("/save") + @PostMapping("/save") @SysLog(module = SystemModule.BASE, title = "供应商拜访地址", biz = BizType.INSERT) @PreAuthorize("hasRole('bms:supplierVisitAddress:insert')") public R save(@RequestBody @Valid BmsSupplierVisitAddress param){ 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 index 08e7c321..ad1fd87f 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java @@ -20,7 +20,7 @@ import javax.validation.Valid; import java.util.List; /** - * 基础档案 科目表单 + * 基础档案 拜访类型表单 * @author YenHex * @since 2023-03-28 */ @@ -51,7 +51,7 @@ public class BmsSupplierVisitFormController { * @param param * @return */ - //@GetMapping("/page") + @GetMapping("/page") @PreAuthorize("hasRole('bms:supplierVisitForm:query')") public R> getPage(BmsSupplierVisitForm param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); @@ -65,7 +65,7 @@ public class BmsSupplierVisitFormController { * @param id * @return */ - //@GetMapping("/getById/{id}") + @GetMapping("/getById/{id}") @SysLog(module = SystemModule.BASE, title = "科目表单", biz = BizType.QUERY) @PreAuthorize("hasRole('bms:supplierVisitForm:query')") public R getById(@PathVariable("id") String id){ @@ -80,7 +80,7 @@ public class BmsSupplierVisitFormController { * @param param * @return */ - //@PostMapping("/updateById") + @PostMapping("/updateById") @SysLog(module = SystemModule.BASE, title = "科目表单", biz = BizType.UPDATE) @PreAuthorize("hasRole('bms:supplierVisitForm:update')") public R updateById(@RequestBody @Valid BmsSupplierVisitForm param){ @@ -93,7 +93,7 @@ public class BmsSupplierVisitFormController { * @param param * @return */ - //@PostMapping("/save") + @PostMapping("/save") @SysLog(module = SystemModule.BASE, title = "科目表单", biz = BizType.INSERT) @PreAuthorize("hasRole('bms:supplierVisitForm:insert')") public R save(@RequestBody @Valid BmsSupplierVisitForm param){ 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 index eaf75e64..6c5ab9aa 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java @@ -52,7 +52,7 @@ public class BmsSupplierVisitTypeController { * @param param * @return */ - //@GetMapping("/page") + @GetMapping("/page") @PreAuthorize("hasRole('bms:supplierVisitType:query')") public R> getPage(BmsSupplierVisitType param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); @@ -66,7 +66,7 @@ public class BmsSupplierVisitTypeController { * @param id * @return */ - //@GetMapping("/getById/{id}") + @GetMapping("/getById/{id}") @SysLog(module = SystemModule.BASE, title = "拜访类型", biz = BizType.QUERY) @PreAuthorize("hasRole('bms:supplierVisitType:query')") public R getById(@PathVariable("id") String id){ @@ -81,7 +81,7 @@ public class BmsSupplierVisitTypeController { * @param param * @return */ - //@PostMapping("/updateById") + @PostMapping("/updateById") @SysLog(module = SystemModule.BASE, title = "拜访类型", biz = BizType.UPDATE) @PreAuthorize("hasRole('bms:supplierVisitType:update')") public R updateById(@RequestBody @Valid BmsSupplierVisitType param){ @@ -94,7 +94,7 @@ public class BmsSupplierVisitTypeController { * @param param * @return */ - //@PostMapping("/save") + @PostMapping("/save") @SysLog(module = SystemModule.BASE, title = "拜访类型", biz = BizType.INSERT) @PreAuthorize("hasRole('bms:supplierVisitType:insert')") public R save(@RequestBody @Valid BmsSupplierVisitType param){ 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 index 07484236..c520b0a8 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java @@ -42,11 +42,11 @@ public class BmsSupplierVisitAddress implements Serializable { /** 纬度 */ @Length(max = 255,message = "纬度长度不能超过255字") - private String varX; + private String localX; /** 经度 */ @Length(max = 255,message = "经度长度不能超过255字") - private String varY; + private String localY; /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") @@ -88,8 +88,8 @@ public class BmsSupplierVisitAddress implements Serializable { supplierVisitAddress.setId(source.getId()); supplierVisitAddress.setSupplierId(source.getSupplierId()); supplierVisitAddress.setAddressDetail(source.getAddressDetail()); - supplierVisitAddress.setVarX(source.getVarX()); - supplierVisitAddress.setVarY(source.getVarY()); + supplierVisitAddress.setLocalX(source.getLocalX()); + supplierVisitAddress.setLocalY(source.getLocalY()); supplierVisitAddress.setRemark(source.getRemark()); supplierVisitAddress.setCreateTime(source.getCreateTime()); supplierVisitAddress.setUpdateTime(source.getUpdateTime()); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java b/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java new file mode 100644 index 00000000..f98cf3f6 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java @@ -0,0 +1,40 @@ +package com.qs.serve.modules.bms.entity.so; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +/** + * @author YenHex + * @since 2023/3/28 + */ +@Data +public class BmsSupplierVisitSo { + + /** + * 供应商名称 + */ + String supplierName; + + /** + * 供应商编码 + */ + String supplierCode; + + /** + * 供应商地址 + */ + String address; + + /** + * 搜索值 + */ + String searchValue; + + /** 翻页参数 */ + @TableField(exist = false) + private Integer pageNum; + + /** 翻页参数2 */ + @TableField(exist = false) + private Integer pageSize; +} diff --git a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java index 19857c5d..da400923 100644 --- a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java +++ b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java @@ -98,8 +98,22 @@ public class HisUserSupplier implements Serializable { @Length(max = 32,message = "行政区域4长度不能超过32字") private String bizRegionFourthly; + private String tenantId; + private Integer costFlag; + @TableField(exist = false) + private String queryAddress; + + @TableField(exist = false) + private String queryValue; + + @TableField(exist = false) + private String addressId; + + @TableField(exist = false) + private String addressDetail; + public BmsSupplier toSupplier(){ BmsSupplier bmsSupplier = new BmsSupplier(); bmsSupplier.setId(this.getSupplierId()+""); diff --git a/src/main/java/com/qs/serve/modules/his/mapper/HisUserSupplierMapper.java b/src/main/java/com/qs/serve/modules/his/mapper/HisUserSupplierMapper.java index 5458121f..98531207 100644 --- a/src/main/java/com/qs/serve/modules/his/mapper/HisUserSupplierMapper.java +++ b/src/main/java/com/qs/serve/modules/his/mapper/HisUserSupplierMapper.java @@ -2,7 +2,8 @@ package com.qs.serve.modules.his.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.his.entity.HisUserSupplier; - +import org.apache.ibatis.annotations.Param; +import java.util.List; /** * 供应商负责人 Mapper * @author YenHex @@ -10,5 +11,7 @@ import com.qs.serve.modules.his.entity.HisUserSupplier; */ public interface HisUserSupplierMapper extends BaseMapper { + List selectHisUserSupplierAddressList(@Param("query") HisUserSupplier param); + } diff --git a/src/main/resources/mapper/his/HisUserSupplierMapper.xml b/src/main/resources/mapper/his/HisUserSupplierMapper.xml new file mode 100644 index 00000000..930d70a1 --- /dev/null +++ b/src/main/resources/mapper/his/HisUserSupplierMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + his_user_supplier.`id`, + his_user_supplier.`user_id`, + his_user_supplier.`supplier_id`, + his_user_supplier.`supplier_name`, + his_user_supplier.`supplier_code`, + his_user_supplier.`type`, + his_user_supplier.`region_id`, + his_user_supplier.`sale_region_first`, + his_user_supplier.`sale_region_second`, + his_user_supplier.`sale_region_third`, + his_user_supplier.`sale_region_fourthly`, + his_user_supplier.`master_flag`, + his_user_supplier.`create_time`, + his_user_supplier.`biz_region_first`, + his_user_supplier.`biz_region_second`, + his_user_supplier.`biz_region_third`, + his_user_supplier.`biz_region_fourthly`, + his_user_supplier.`tenant_id`, + his_user_supplier.`cost_flag` + + + +