diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/pojo/result/SearchCustomerResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/pojo/result/SearchCustomerResult.java index 8e90f65..d64cfbb 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/pojo/result/SearchCustomerResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/pojo/result/SearchCustomerResult.java @@ -1,7 +1,5 @@ package com.njzscloud.dispose.cst.customer.pojo.result; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.njzscloud.dispose.cst.customer.constant.IdentityCategory; import com.njzscloud.dispose.cst.customer.constant.SettlementWay; import com.njzscloud.dispose.cst.org.constant.OrgCategory; @@ -25,7 +23,6 @@ public class SearchCustomerResult { /** * Id */ - @TableId(type = IdType.ASSIGN_ID) private Long id; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/pojo/result/SearchOrgResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/pojo/result/SearchOrgResult.java new file mode 100644 index 0000000..1b6566e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/pojo/result/SearchOrgResult.java @@ -0,0 +1,146 @@ +package com.njzscloud.dispose.cst.org.pojo.result; + +import com.njzscloud.dispose.cst.customer.pojo.result.SearchCustomerResult; +import com.njzscloud.dispose.cst.org.constant.OrgCategory; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 组织信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchOrgResult { + + /** + * Id + */ + private Long id; + + /** + * 主体类型，GeTiHu-->个体户、QiYe-->企业 + */ + private OrgCategory orgCategory; + + /** + * 统一社会信用代码 + */ + private String uscc; + + /** + * 组织名称 + */ + private String orgName; + + /** + * 营业执照 + */ + private String businessLicense; + + /** + * 营业执照有效期 + */ + private LocalDate licenseStartTime; + + /** + * 营业执照有效期 + */ + private LocalDate licenseEndTime; + + /** + * 法人名称 + */ + private String legalRepresentative; + + /** + * 法人身份证号 + */ + private String idcard; + + /** + * 法人身份证有效期 + */ + private LocalDate idcardStartTime; + + /** + * 法人身份证有效期 + */ + private LocalDate idcardEndTime; + + /** + * 法人身份证正面 + */ + private String idcardFront; + + /** + * 法人身份证反面 + */ + private String idcardBack; + + /** + * 省；代码 + */ + private String province; + + /** + * 市；代码 + */ + private String city; + + /** + * 区县；代码 + */ + private String area; + + /** + * 乡镇街道；代码 + */ + private String town; + + /** + * 省；名称 + */ + private String provinceName; + + /** + * 市；名称 + */ + private String cityName; + + /** + * 区县；名称 + */ + private String areaName; + + /** + * 乡镇街道；名称 + */ + private String townName; + + /** + * 详细地址 + */ + private String address; + + /** + * 经度 + */ + private Double lng; + + /** + * 纬度 + */ + private Double lat; + /** + * 创建时间 + */ + private LocalDateTime createTime; + private SearchCustomerResult customer; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/service/OrgService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/service/OrgService.java index fe19ce7..7905307 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/service/OrgService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/service/OrgService.java @@ -50,7 +50,7 @@ public class OrgService extends ServiceImpl implements ISe String orgName = addOrgParam.getOrgName(); boolean exists = this.exists(Wrappers.lambdaQuery(OrgEntity.class) .eq(OrgEntity::getUscc, uscc) - .eq(OrgEntity::getOrgName, orgName) + .or().eq(OrgEntity::getOrgName, orgName) ); Assert.isFalse(exists, () -> Exceptions.exception("当前组织已存在，组织名称：{}，统一社会信用代码：{}", orgName, uscc)); OrgEntity entity = BeanUtil.copyProperties(addOrgParam, OrgEntity.class); diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/controller/StationController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/controller/StationController.java index 4125bab..c360f38 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/controller/StationController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/controller/StationController.java @@ -3,7 +3,8 @@ package com.njzscloud.dispose.cst.station.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; +import com.njzscloud.dispose.cst.station.pojo.param.AddStationParam; +import com.njzscloud.dispose.cst.station.pojo.param.ModifyStationParam; import com.njzscloud.dispose.cst.station.pojo.param.StationQueryParam; import com.njzscloud.dispose.cst.station.pojo.result.StationResult; import com.njzscloud.dispose.cst.station.service.StationService; @@ -11,8 +12,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 站点信息 * @author ljw @@ -29,8 +28,8 @@ public class StationController { * 新增 */ @PostMapping("/add") - public R add(@RequestBody StationEntity stationEntity) { - stationService.add(stationEntity); + public R add(@RequestBody AddStationParam addStationParam) { + stationService.add(addStationParam); return R.success(); } @@ -38,17 +37,8 @@ public class StationController { * 修改 */ @PostMapping("/modify") - public R modify(@RequestBody StationEntity stationEntity) { - stationService.modify(stationEntity); - return R.success(); - } - - /** - * 删除 - */ - @PostMapping("/del") - public R del(@RequestBody List ids) { - stationService.del(ids); + public R modify(@RequestBody ModifyStationParam modifyStationParam) { + stationService.modify(modifyStationParam); return R.success(); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/mapper/StationMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/mapper/StationMapper.java index f58099a..6ad5955 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/mapper/StationMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/mapper/StationMapper.java @@ -2,7 +2,7 @@ package com.njzscloud.dispose.cst.station.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; import com.njzscloud.dispose.cst.station.pojo.result.StationResult; import org.apache.ibatis.annotations.Mapper; @@ -15,8 +15,9 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface StationMapper extends BaseMapper { - Page paging(Page page, @Param("ew") QueryWrapper ew); + IPage paging(IPage page, @Param("ew") QueryWrapper ew); + StationResult detail(@Param("id") Long id); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java index 84de899..da06903 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java @@ -1,15 +1,16 @@ package com.njzscloud.dispose.cst.station.pojo.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import com.njzscloud.dispose.common.pojo.entity.BaseEntity; -import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; +import com.baomidou.mybatisplus.annotation.*; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; +import java.time.LocalDateTime; + /** * 站点信息实体（仅包含表字段） + * * @author ljw */ @Getter @@ -17,8 +18,12 @@ import lombok.experimental.Accessors; @ToString @Accessors(chain = true) @TableName(value = "cst_station", autoResultMap = true) -public class StationEntity extends BaseEntity { - +public class StationEntity { + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 组织信息 Id */ @@ -84,5 +89,34 @@ public class StationEntity extends BaseEntity { */ private Double lat; + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id； sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除； 0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/AddStationParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/AddStationParam.java new file mode 100644 index 0000000..50fbf28 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/AddStationParam.java @@ -0,0 +1,152 @@ +package com.njzscloud.dispose.cst.station.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 站点信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddStationParam { + /** + * 站点名称 + */ + private String stationName; + + /** + * 省；代码 + */ + private String province; + + /** + * 市；代码 + */ + private String city; + + /** + * 区县；代码 + */ + private String area; + + /** + * 乡镇街道；代码 + */ + private String town; + + /** + * 省；名称 + */ + private String provinceName; + + /** + * 市；名称 + */ + private String cityName; + + /** + * 区县；名称 + */ + private String areaName; + + /** + * 乡镇街道；名称 + */ + private String townName; + + /** + * 详细地址 + */ + private String address; + /** + * 经度 + */ + private Double lng; + + /** + * 纬度 + */ + private Double lat; + + private Long userId; + + /** + * 联系人姓名 + */ + private String customerName; + + /** + * 联系电话 + */ + private String phone; + private OrgInfo orgInfo; + + @Getter + @Setter + @ToString + @Accessors(chain = true) + public static class OrgInfo { + /** + * 统一社会信用代码 + */ + private String uscc; + + /** + * 组织名称 + */ + private String orgName; + + /** + * 营业执照 + */ + private String businessLicense; + + /** + * 营业执照有效期 + */ + private LocalDateTime licenseStartTime; + + /** + * 营业执照有效期 + */ + private LocalDateTime licenseEndTime; + + /** + * 法人名称 + */ + private String legalRepresentative; + + /** + * 法人身份证号 + */ + private String idcard; + + /** + * 法人身份证有效期 + */ + private LocalDateTime idcardStartTime; + + /** + * 法人身份证有效期 + */ + private LocalDateTime idcardEndTime; + + /** + * 法人身份证正面 + */ + private String idcardFront; + + /** + * 法人身份证反面 + */ + private String idcardBack; + + } +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/ModifyStationParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/ModifyStationParam.java new file mode 100644 index 0000000..8bb0305 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/ModifyStationParam.java @@ -0,0 +1,84 @@ +package com.njzscloud.dispose.cst.station.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 站点信息实体（仅包含表字段） + * + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class ModifyStationParam { + /** + * 主键 + */ + private Long id; + + /** + * 站点名称 + */ + private String stationName; + + /** + * 省；代码 + */ + private String province; + + /** + * 市；代码 + */ + private String city; + + /** + * 区县；代码 + */ + private String area; + + /** + * 乡镇街道；代码 + */ + private String town; + + /** + * 省；名称 + */ + private String provinceName; + + /** + * 市；名称 + */ + private String cityName; + + /** + * 区县；名称 + */ + private String areaName; + + /** + * 乡镇街道；名称 + */ + private String townName; + + /** + * 详细地址 + */ + private String address; + + /** + * 经度 + */ + private Double lng; + + /** + * 纬度 + */ + private Double lat; + +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/StationQueryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/StationQueryParam.java index f49f8d5..c286be5 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/StationQueryParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/StationQueryParam.java @@ -11,13 +11,6 @@ import lombok.Setter; @Getter @Setter public class StationQueryParam { - - /** - * 是否删除； 0-->未删除、1-->已删除 - * 作为查询条件时，默认按未删除（0）处理 - */ - private Boolean deleted; - /** * 站点名称（模糊查询） */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/result/StationResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/result/StationResult.java index 30ddf4e..27b290a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/result/StationResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/result/StationResult.java @@ -1,13 +1,11 @@ package com.njzscloud.dispose.cst.station.pojo.result; -import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; +import com.njzscloud.dispose.cst.customer.pojo.result.SearchCustomerResult; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.time.LocalDateTime; - /** * 站点详情 / 列表返回结果 * @@ -89,35 +87,7 @@ public class StationResult { */ private Double lat; - /** - * 创建人 Id；sys_user.id - */ - private Long creatorId; - - /** - * 修改人 Id； sys_user.id - */ - private Long modifierId; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 修改时间 - */ - private LocalDateTime modifyTime; - - /** - * 是否删除； 0-->未删除、1-->已删除 - */ - private Boolean deleted; - - /** - * 关联组织信息（返回用） - */ - private OrgEntity org; + private SearchCustomerResult customer; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/StationService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/StationService.java index 10a2a48..4a80ef4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/StationService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/StationService.java @@ -1,29 +1,91 @@ package com.njzscloud.dispose.cst.station.service; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.cst.customer.constant.IdentityCategory; +import com.njzscloud.dispose.cst.customer.pojo.param.AddCustomerParam; +import com.njzscloud.dispose.cst.customer.pojo.result.AddCustomerResult; +import com.njzscloud.dispose.cst.customer.service.CustomerService; +import com.njzscloud.dispose.cst.org.constant.OrgCategory; +import com.njzscloud.dispose.cst.org.pojo.param.AddOrgParam; +import com.njzscloud.dispose.cst.station.mapper.StationMapper; import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; +import com.njzscloud.dispose.cst.station.pojo.param.AddStationParam; +import com.njzscloud.dispose.cst.station.pojo.param.ModifyStationParam; import com.njzscloud.dispose.cst.station.pojo.param.StationQueryParam; import com.njzscloud.dispose.cst.station.pojo.result.StationResult; - -import java.util.List; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 站点信息 + * * @author ljw */ -public interface StationService extends IService { +@Slf4j +@Service +@RequiredArgsConstructor +public class StationService extends ServiceImpl implements IService { - void add(StationEntity stationEntity); + private final CustomerService customerService; - void modify(StationEntity stationEntity); + @Transactional(rollbackFor = Exception.class) + public void add(AddStationParam addStationParam) { + Long userId = addStationParam.getUserId(); + String customerName = addStationParam.getCustomerName(); + String phone = addStationParam.getPhone(); + AddCustomerParam customer = new AddCustomerParam() + .setUserId(userId) + .setIdentityCategory(IdentityCategory.XiaoNa) + .setManager(Boolean.TRUE) + .setCustomerName(customerName) + .setPhone(phone) + .setAddOrgParam(BeanUtil.copyProperties(addStationParam.getOrgInfo(), AddOrgParam.class) + .setOrgCategory(OrgCategory.QiYe) + ); + AddCustomerResult customerResult = customerService.add(customer); + StationEntity stationEntity = BeanUtil.copyProperties(addStationParam, StationEntity.class) + .setOrgId(customerResult.getOrgId()); + this.save(stationEntity); + } - void del(List ids); + @Transactional(rollbackFor = Exception.class) + public void modify(ModifyStationParam modifyStationParam) { + StationEntity stationEntity = BeanUtil.copyProperties(modifyStationParam, StationEntity.class); + this.updateById(stationEntity); + } - StationResult detail(Long id); - PageResult paging(PageParam pageParam, StationQueryParam queryParam); + public StationResult detail(Long id) { + return baseMapper.detail(id); + } + + public PageResult paging(PageParam pageParam, StationQueryParam queryParam) { + String stationName = queryParam.getStationName(); + + QueryWrapper ew = Wrappers.query() + .eq("a.deleted", 0) + .and(StrUtil.isNotBlank(stationName), it -> + it.like("a.station_name", stationName) + .or().like("a.address", stationName) + ); + + IPage page = pageParam.toPage() + .addOrder(OrderItem.desc("a.create_time"), OrderItem.desc("b.create_time")); + + return PageResult.of(baseMapper.paging(page, ew)); + } + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/impl/StationServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/impl/StationServiceImpl.java deleted file mode 100644 index c384f6f..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/impl/StationServiceImpl.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.njzscloud.dispose.cst.station.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njzscloud.common.mp.support.PageParam; -import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; -import com.njzscloud.dispose.cst.org.service.OrgService; -import com.njzscloud.dispose.cst.station.mapper.StationMapper; -import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; -import com.njzscloud.dispose.cst.station.pojo.param.StationQueryParam; -import com.njzscloud.dispose.cst.station.pojo.result.StationResult; -import com.njzscloud.dispose.cst.station.service.StationService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * 站点信息 - * - * @author ljw - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class StationServiceImpl extends ServiceImpl implements StationService { - - private final OrgService orgService; - - @Override - @Transactional(rollbackFor = Exception.class) - public void add(StationEntity stationEntity) { - this.save(stationEntity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void modify(StationEntity stationEntity) { - this.updateById(stationEntity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void del(List ids) { - List stations = this.listByIds(ids); - this.removeBatchByIds(ids); - List orgIds = stations.stream() - .map(StationEntity::getOrgId) - .filter(Objects::nonNull).toList(); - if (!orgIds.isEmpty()) { - orgService.removeBatchByIds(orgIds); - } - } - - @Override - public StationResult detail(Long id) { - StationEntity station = this.getById(id); - if (station == null) { - return null; - } - StationResult result = BeanUtil.copyProperties(station, StationResult.class); - if (station.getOrgId() != null) { - result.setOrg(orgService.getById(station.getOrgId())); - } - return result; - } - - @Override - public PageResult paging(PageParam pageParam, StationQueryParam queryParam) { - if (queryParam == null) { - queryParam = new StationQueryParam(); - } - String stationName = queryParam.getStationName(); - - QueryWrapper ew = Wrappers.query().eq("deleted", Boolean.FALSE); - // 添加站点名称的模糊查询，并判空 - ew.like(StrUtil.isNotBlank(stationName), "station_name", stationName); - pageParam.toPage().addOrder(OrderItem.desc("create_time")); - PageResult page = PageResult.of(baseMapper.paging(pageParam.toPage(), ew)); - List records = page.getRecords(); - if (records.isEmpty()) { - return page; - } - List orgIds = records.stream() - .map(StationResult::getOrgId) - .filter(Objects::nonNull) - .toList(); - if (!orgIds.isEmpty()) { - Map orgMap = orgService.listByIds(orgIds).stream() - .collect(Collectors.toMap(OrgEntity::getId, it -> it)); - records.forEach(station -> station.setOrg(orgMap.get(station.getOrgId()))); - } - return page; - } - -} - - diff --git a/njzscloud-svr/src/main/resources/mapper/cst/customer/CustomerMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/customer/CustomerMapper.xml index b1d456f..b159db4 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/customer/CustomerMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/customer/CustomerMapper.xml @@ -44,7 +44,7 @@ FROM cst_customer a INNER JOIN sys_user b ON b.id = a.user_id AND b.deleted = 0 INNER JOIN sys_user_account c ON c.user_id = b.id AND b.deleted = 0 - LEFT JOIN cst_org d ON d.id = a.org_id AND d.deleted = 0 + INNER JOIN cst_org d ON d.id = a.org_id AND d.deleted = 0 diff --git a/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml index 16334f0..167fb4f 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml @@ -1,41 +1,67 @@ - + - - - - - - - - - - - - - - - - - - + + + - - - id - , org_id, station_name, province, city, area, town, - province_name, city_name, area_name, town_name, address, lng, lat, - creator_id, modifier_id, create_time, modify_time, deleted + + SELECT a.id, + a.org_id, + a.station_name, + a.province, + a.city, + a.area, + a.town, + a.province_name, + a.city_name, + a.area_name, + a.town_name, + a.address, + a.lng, + a.lat, + a.create_time, + b.id customer_id, + b.user_id, + b.identity_category, + b.customer_name, + b.phone, + b.settlement_way, + b.manager, + c.avatar, + d.id account_id, + d.username, + d.wechat_openid, + d.regdate, + d.client_code, + e.org_category, + e.uscc, + e.org_name, + e.business_license, + e.license_start_time, + e.license_end_time, + e.legal_representative, + e.idcard, + e.idcard_start_time, + e.idcard_end_time, + e.idcard_front, + e.idcard_back + FROM cst_station a + INNER JOIN cst_customer b ON b.org_id = a.org_id AND b.manager = 1 AND b.deleted = 0 + INNER JOIN sys_user c ON c.id = b.user_id AND c.deleted = 0 + INNER JOIN sys_user_account d ON d.user_id = c.id AND d.deleted = 0 + INNER JOIN cst_org e ON e.id = a.org_id AND e.deleted = 0 - - + ${ew.customSqlSegment} +