From 47aadfc3d7e5e20730f10b95c757dee490770918 Mon Sep 17 00:00:00 2001 From: guohb Date: Mon, 6 May 2024 09:53:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=AE=9E=E4=BD=93=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/mapper/ShopAuditInfoMapper.java | 3 +- .../resources/mapper/ShopAuditInfoMapper.xml | 5 +- .../store/response/AuditDetailResponse.java | 7 +-- .../store/response/SubmitLicenseResponse.java | 3 +- .../com/cool/store/vo/ShopAuditInfoVO.java | 59 +++++++++++++++++++ .../service/impl/ApplyLicenseServiceImpl.java | 24 ++++---- .../service/impl/AuditStatusServiceImpl.java | 2 +- 7 files changed, 81 insertions(+), 22 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/ShopAuditInfoVO.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java index 417e91578..504b20a8f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.entity.ShopAuditInfoDO; +import com.cool.store.vo.ShopAuditInfoVO; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; @@ -12,7 +13,7 @@ public interface ShopAuditInfoMapper extends Mapper { List getAuditInfoList(@Param("auditIds") List auditIds); - List getListByShopIdAndType(@Param("shopId") Long shopId, + List getListByShopIdAndType(@Param("shopId") Long shopId, @Param("type") Integer type); /** * @Auther: wangshuo diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml index d251aa933..a552058b6 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml @@ -47,8 +47,9 @@ where shop_id = #{shopId} and deleted = 0 - + select + from xfsg_shop_audit_info where shop_id = #{shopId} and audit_type = #{type} order by create_time diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AuditDetailResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AuditDetailResponse.java index 081fc539e..fad87d81a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AuditDetailResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AuditDetailResponse.java @@ -1,11 +1,8 @@ package com.cool.store.response; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.Data; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; @Data @@ -19,7 +16,7 @@ public class AuditDetailResponse { private String endTime; private String checkUser; - + @ApiModelProperty("稽核时间") private String checkTime; private Integer checkStatus; @@ -27,6 +24,4 @@ public class AuditDetailResponse { private String checkResult; - - } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java index 3ad1ba322..8bd414db2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java @@ -2,6 +2,7 @@ package com.cool.store.response; import com.cool.store.entity.LicenseTransactDO; import com.cool.store.entity.ShopAuditInfoDO; +import com.cool.store.vo.ShopAuditInfoVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -86,7 +87,7 @@ public class SubmitLicenseResponse { private Integer submitStatus; @ApiModelProperty("流程记录") - private List processRecords; + private List processRecords; public static SubmitLicenseResponse from(LicenseTransactDO licenseTransactDO) { if (licenseTransactDO == null) { diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/ShopAuditInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/ShopAuditInfoVO.java new file mode 100644 index 000000000..67871cadd --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/ShopAuditInfoVO.java @@ -0,0 +1,59 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +@Data +public class ShopAuditInfoVO { + + private Long id; + + private Long shopId; + + @ApiModelProperty("'0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批 4-系统建店5-三方验收") + private Integer auditType; + + + @ApiModelProperty("提交人ID") + private String submittedUserId; + + + @ApiModelProperty("提交人名称") + private String submittedUserName; + + + @ApiModelProperty("结果类型 0通过,1拒绝") + private Integer resultType; + + + @ApiModelProperty("通过原因") + private String passReason; + + + @ApiModelProperty("拒绝原因") + private String rejectReason; + + + private String certifyFile; + + + @ApiModelProperty("时间") + private Date createTime; + + + private Date updateTime; + + /** + * 是否删除：0.否 1.是 + */ + private Boolean deleted; + + + @ApiModelProperty("数据类型 0-提交 1-审批") + private Integer dataType; + + @ApiModelProperty("头像") + private String avatar; + +} \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 72a0363ae..2a1c9d3c1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -25,6 +25,7 @@ import com.cool.store.service.RegionService; import com.cool.store.utils.StringUtil; import com.cool.store.utils.poi.constant.Constants; import com.cool.store.vo.OpenAcceptanceInfoListVO; +import com.cool.store.vo.ShopAuditInfoVO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -99,18 +100,19 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { throw new ServiceException(ErrorCodeEnum.LICENSE_NOT_EXIST); } SubmitLicenseResponse submitLicenseResponse = SubmitLicenseResponse.from(result); - List listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode()); - List userIds = listByShopIdAndType.stream().map(ShopAuditInfoDO::getSubmittedUserId).collect(Collectors.toList()); + List listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode()); + List userIds = listByShopIdAndType.stream().map(ShopAuditInfoVO::getSubmittedUserId).collect(Collectors.toList()); List userInfoByUserIds = new ArrayList<>(); -// if (CollectionUtils.isNotEmpty(userIds)){ -// userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds); -// Map userAvatarMap = userInfoByUserIds.stream() -// .filter(item -> StringUtil.isNotBlank(item.getUserId()) && StringUtil.isNotBlank(item.getAvatar())) -// .collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar())); -// listByShopIdAndType.stream().forEach( item -> { -// item.setAvatar(userAvatarMap.get(item.getSubmittedUserId())); -// }); -// } + + if (CollectionUtils.isNotEmpty(userIds)){ + userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds); + Map userAvatarMap = userInfoByUserIds.stream() + .filter(item -> StringUtil.isNotBlank(item.getUserId()) && StringUtil.isNotBlank(item.getAvatar())) + .collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar())); + listByShopIdAndType.stream().forEach( item -> { + item.setAvatar(userAvatarMap.get(item.getSubmittedUserId())); + }); + } submitLicenseResponse.setProcessRecords(listByShopIdAndType); return submitLicenseResponse; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java index 3f25549cc..e5e9cc881 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java @@ -107,7 +107,7 @@ public class AuditStatusServiceImpl implements AuditStatusService { response.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lineInterviewDO.getActualEndTime())); } if (Objects.nonNull(auditStatusDO.getCreateTime())){ - response.setCheckTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, auditStatusDO.getCreateTime())); + response.setCheckTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, auditStatusDO.getUpdateTime())); } response.setCheckUser(auditStatusDO.getAuditUserName()); response.setCheckStatus(auditStatusDO.getAuditStatus());