springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; @@ -168,7 +169,7 @@ */ @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class) @PostMapping("/merchant/page") public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) { public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO) { return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/JinhuiPageConvenientMerchantDTO.java
New file @@ -0,0 +1,47 @@ package com.panzhihua.common.model.dtos.community.convenient; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; /** * @title: PageConvenientMerchantDTO * @projectName: 成都呐喊信息技术有限公司-智慧社区项目 * @description: 分页查询便民服务商家请求参数 * @author: hans * @date: 2021/09/16 15:03 */ @Data @ApiModel("分页查询便民服务商家请求参数") public class JinhuiPageConvenientMerchantDTO { @ApiModelProperty("关键词") private String keyword; @ApiModelProperty("社区id") private Long communityId; @ApiModelProperty("服务分类id") private Long serviceId; @ApiModelProperty("营业状态(1.在营 0.已关闭)") private Integer businessStatus; @ApiModelProperty("账号状态(1.启用 2.禁用)") private Integer accountStatus; @ApiModelProperty(value = "分页-当前页数", example = "1") @NotNull(message = "分页参数不能为空") @Min(value = 1) private Long pageNum; @ApiModelProperty(value = "分页-每页记录数", example = "10") @NotNull(message = "分页参数不能为空") @Min(value = 1) private Long pageSize; private String areaCode; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
New file @@ -0,0 +1,142 @@ package com.panzhihua.common.model.vos.community.convenient; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.panzhihua.common.enums.MerchantBusinessPeriod; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Date; import java.util.List; /** * @title: ConvenientMerchantVO * @projectName: 成都呐喊信息技术有限公司-智慧社区项目 * @description: 便民服务商家信息 * @author: hans * @date: 2021/09/16 13:49 */ @Data @ApiModel("便民服务商家信息") public class JinhuiConvenientMerchantVO { @ApiModelProperty("商家ID") @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty("商家名称") private String name; @ApiModelProperty("商家logo") private String logo; @ApiModelProperty("联系人") private String contacts; @ApiModelProperty("负责人身份证号码") private String idCard; @ApiModelProperty("咨询电话") private String phone; @ApiModelProperty("商家地址") private String address; @ApiModelProperty("纬度") private String lat; @ApiModelProperty("经度") private String lon; @ApiModelProperty("营业开始时间") @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8") private Date beginAt; @ApiModelProperty("营业截止时间") @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8") private Date endAt; @ApiModelProperty("营业周期") private MerchantBusinessPeriod period; @ApiModelProperty("商家介绍") private String introduction; @ApiModelProperty("营业状态") private Integer businessStatus; @ApiModelProperty("总咨询量") private Integer consultationVolume; @ApiModelProperty("月咨询量") private Integer monthConsultationVolume; @ApiModelProperty("日咨询量") private Integer dayConsultationVolume; @ApiModelProperty("总浏览量") private Integer viewNum; @ApiModelProperty("月浏览量") private Integer monthViewNum; @ApiModelProperty("日总浏览量") private Integer dayViewNum; @ApiModelProperty("商家绑定账户") private String account; @ApiModelProperty("商家账户状态(1.启用 2.禁用)") private Integer accountStatus; @ApiModelProperty("所属社区id") private String communityId; @ApiModelProperty("所属社区名称") private String communityName; @ApiModelProperty("服务范围,多个服务类型','拼接") private String serviceScope; @ApiModelProperty("服务类型id列表") private List<String> serviceIds; @ApiModelProperty("该商家存有商品,最多返回两条") private List<ConvenientProductVO> productVOList; @ApiModelProperty("服务范围") private Integer serviceRange; @ApiModelProperty("手机号") private String mobilePhone; @ApiModelProperty("店铺销量") private Integer sale; @ApiModelProperty("店铺销售额") private BigDecimal saleVolume; @ApiModelProperty("详细地址") private String detailedAddress; @ApiModelProperty("商家评分") private BigDecimal score; @ApiModelProperty("审核状态 (1待审核 2已通过 3未通过 )") private String auditType; @ApiModelProperty("审核意见") private String auditOpinion; public void setPeriod(String period) { this.period = MerchantBusinessPeriod.valueOf(period); } public void setBusinessStatus(Boolean businessStatus) { this.businessStatus = businessStatus ? 1 : 0; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceApplyForVO.java
@@ -56,7 +56,11 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; @ApiModelProperty(value = "回复") private String reply; @ApiModelProperty(value = "图片") private String imgUrl; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java
@@ -31,7 +31,7 @@ @ApiModelProperty(value = "下单人id") private String userId; @ApiModelProperty(value = "核销状态(0待核销 1已核销)") @ApiModelProperty(value = "核销状态(0待核销 1已核销 2订单已取消)") private String cancelType; @ApiModelProperty(value = "核销时间") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO; import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO; @@ -218,7 +219,7 @@ * @return */ @PostMapping("/jinhuiMerchant/page") public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO); public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO); /** * 获取便民服务商家详情 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiMerchantApi.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_jinhui_community.api; import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_jinhui_community.service.JinhuiComConvenientServiceCategoriesService; @@ -45,7 +46,7 @@ * @return */ @PostMapping("/page") public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) { public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO) { return jinhuiConvenientMerchantService.pageMerchant(pageConvenientMerchantDTO); } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java
@@ -7,10 +7,7 @@ import com.panzhihua.common.model.dtos.community.convenient.*; import com.panzhihua.common.model.vos.community.StatisticsCommVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo; import com.panzhihua.common.model.vos.community.convenient.ConvenientConsultationStatisticsVO; import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO; import com.panzhihua.common.model.vos.community.convenient.ConvenientViewStatisticsVO; import com.panzhihua.common.model.vos.community.convenient.ExportMerchantVO; import com.panzhihua.common.model.vos.community.convenient.*; import com.panzhihua.service_jinhui_community.entity.JinhuiConvenientMerchant; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,11 +37,11 @@ * 分页查询便民服务商家 运营后台 * * @param page 分页参数 * @param pageConvenientMerchantDTO * @param item * @return */ IPage<ConvenientMerchantVO> pageMerchant(@Param("page") Page page, @Param("pageConvenientMerchantDTO") PageConvenientMerchantDTO pageConvenientMerchantDTO); IPage<JinhuiConvenientMerchantVO> pageMerchant(@Param("page") Page page, @Param("item") JinhuiPageConvenientMerchantDTO item); /** * 查询商家信息 @@ -52,7 +49,7 @@ * @param merchantId * @return */ ConvenientMerchantVO selectMerchantById(@Param("merchantId") String merchantId); JinhuiConvenientMerchantVO selectMerchantById(@Param("merchantId") String merchantId); } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiShoppingOrderDao.java
@@ -25,7 +25,7 @@ @Param("goodName") String goodName, @Param("name") String name, @Param("cancelType") String cancelType, @Param("community_id") String communityId); @Param("communityId") String communityId); /** * 详情 @@ -33,7 +33,7 @@ * @return */ JinhuiShoppingOrder getDetails(@Param("id") String id, @Param("community_id") String communityId); @Param("communityId") String communityId); /** * 新增 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java
@@ -147,4 +147,9 @@ * 店铺销售额 */ private BigDecimal saleVolume; private String auditType; private String auditOpinion; } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiInterspaceApplyFor.java
@@ -58,7 +58,11 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; @ApiModelProperty(value = "回复") private String reply; @ApiModelProperty(value = "图片") private String imgUrl; } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShoppingOrder.java
@@ -31,7 +31,7 @@ @ApiModelProperty(value = "下单人id") private String userId; @ApiModelProperty(value = "核销状态(0待核销 1已核销)") @ApiModelProperty(value = "核销状态(0待核销 1已核销 2订单已取消)") private String cancelType; @ApiModelProperty(value = "核销时间") springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiConvenientMerchantService.java
@@ -29,7 +29,7 @@ * @param pageConvenientMerchantDTO * @return */ R pageMerchant(PageConvenientMerchantDTO pageConvenientMerchantDTO); R pageMerchant(JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO); /** * 获取便民服务商家详情 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java
@@ -3,9 +3,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO; import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO; import com.panzhihua.service_jinhui_community.dao.JinhuiConvenientMerchantDao; import com.panzhihua.service_jinhui_community.entity.JinhuiConvenientMerchant; import com.panzhihua.service_jinhui_community.service.JinhuiConvenientMerchantService; @@ -38,17 +40,17 @@ } @Override public R pageMerchant(PageConvenientMerchantDTO pageConvenientMerchantDTO) { public R pageMerchant(JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO) { Page page = new Page<>(); page.setSize(pageConvenientMerchantDTO.getPageSize()); page.setCurrent(pageConvenientMerchantDTO.getPageNum()); IPage<ConvenientMerchantVO> iPage = this.baseMapper.pageMerchant(page, pageConvenientMerchantDTO); IPage<JinhuiConvenientMerchantVO> iPage = this.baseMapper.pageMerchant(page, pageConvenientMerchantDTO); return R.ok(iPage); } @Override public R getMerchant(String merchantId) { ConvenientMerchantVO convenientMerchantVO = this.baseMapper.selectMerchantById(merchantId); JinhuiConvenientMerchantVO convenientMerchantVO = this.baseMapper.selectMerchantById(merchantId); return R.ok(convenientMerchantVO); } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml
@@ -33,6 +33,8 @@ <id column="area_code" property="areaCode" /> <id column="service_range" property="serviceRange" /> <id column="mobile_phone" property="mobilePhone" /> <id column="audit_type" property="auditType" /> <id column="audit_opinion" property="auditOpinion" /> </resultMap> <!-- 通用查询结果列 --> @@ -41,43 +43,332 @@ period,introduction,business_status,user_id,consultation_volume,is_del,created_at,created_by,updated_at, updated_by,area_code,service_range,mobile_phone,detailed_address </sql> <select id="pageMerchant" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO"> <select id="pageMerchant" resultType="com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO"> SELECT ccm.*, su.account, su.status AS accountStatus FROM jinhui_com_convenient_merchants ccm LEFT JOIN sys_user su ON ccm.user_id = su.user_id WHERE ccm.is_del = 0 <if test="pageConvenientMerchantDTO.accountStatus != null"> AND su.status = #{pageConvenientMerchantDTO.accountStatus} <if test="item.accountStatus != null"> AND su.status = #{item.accountStatus} </if> <if test="pageConvenientMerchantDTO.communityId != null and pageConvenientMerchantDTO.communityId != 0"> AND ccm.community_id = ${pageConvenientMerchantDTO.communityId} <if test="item.communityId != null and item.communityId != 0"> AND ccm.community_id = ${item.communityId} </if> <if test="pageConvenientMerchantDTO.areaCode != null and pageConvenientMerchantDTO.areaCode != ''"> AND ccm.area_code = ${pageConvenientMerchantDTO.areaCode} <if test="item.areaCode != null and item.areaCode != ''"> AND ccm.area_code = ${item.areaCode} </if> <if test="pageConvenientMerchantDTO.businessStatus != null"> AND ccm.business_status = #{pageConvenientMerchantDTO.businessStatus} <if test="item.businessStatus != null"> AND ccm.business_status = #{item.businessStatus} </if> <if test="pageConvenientMerchantDTO.keyword != null and pageConvenientMerchantDTO.keyword != """> <if test="item.keyword != null and item.keyword != """> AND ( ccm.name LIKE CONCAT('%', #{pageConvenientMerchantDTO.keyword}, '%') OR ccm.address LIKE CONCAT('%', #{pageConvenientMerchantDTO.keyword}, '%') OR ccm.phone LIKE CONCAT('%', #{pageConvenientMerchantDTO.keyword}, '%') ccm.name LIKE CONCAT('%', #{item.keyword}, '%') OR ccm.address LIKE CONCAT('%', #{item.keyword}, '%') OR ccm.phone LIKE CONCAT('%', #{item.keyword}, '%') ) </if> GROUP BY ccm.id ORDER BY ccm.created_at DESC </select> <select id="selectMerchantById" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO"> <select id="selectMerchantById" resultType="com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO"> SELECT ccm.*, su.account, su.status AS accountStatus FROM jinhui_com_convenient_merchants ccm LEFT JOIN sys_user su ON ccm.user_id = su.user_id WHERE ccm.id = #{merchantId} </select> <update id="deleteMerchantById"> UPDATE jinhui_com_convenient_merchants SET is_del = 1, updated_by = #{operator} WHERE id = #{merchantId} </update> <insert id="addData"> insert into jinhui_com_convenient_merchants <trim prefix="(" suffix=")" suffixOverrides=","> <if test="item.id != null and item.id != '' "> id, </if> <if test="item.name != null and item.name != '' "> `name`, </if> <if test="item.communityId != null and item.communityId != '' "> community_id, </if> <if test="item.logo != null and item.logo != '' "> logo, </if> <if test="item.contacts != null and item.contacts != '' "> contacts, </if> <if test="item.idCard != null and item.idCard != '' "> id_card, </if> <if test="item.phone != null and item.phone != '' "> phone, </if> <if test="item.address != null and item.address != '' "> address, </if> <if test="item.detailedAddress != null and item.detailedAddress != '' "> detailed_address, </if> <if test="item.lat != null and item.lat != '' "> lat, </if> <if test="item.lon != null and item.lon != '' "> lon, </if> <if test="item.beginAt != null and item.beginAt != '' "> begin_at, </if> <if test="item.endAt != null and item.endAt != '' "> end_at, </if> <if test="item.period != null and item.period != '' "> `period`, </if> <if test="item.introduction != null and item.introduction != '' "> introduction, </if> <if test="item.businessStatus != null and item.businessStatus != '' "> business_status, </if> <if test="item.userId != null and item.userId != '' "> user_id, </if> <if test="item.consultationVolume != null and item.consultationVolume != '' "> consultation_volume, </if> <if test="item.viewNum != null and item.viewNum != '' "> view_num, </if> <if test="item.isDel != null and item.isDel != '' "> is_del, </if> <if test="item.createdBy != null and item.createdBy != '' "> created_by, </if> <if test="item.updatedBy != null and item.updatedBy != '' "> updated_by, </if> <if test="item.areaCode != null and item.areaCode != '' "> area_code, </if> <if test="item.mobilePhone != null and item.mobilePhone != '' "> mobile_phone, </if> <if test="item.serviceRange != null and item.serviceRange != '' "> service_range, </if> <if test="item.sale != null and item.sale != '' "> sale, </if> <if test="item.saleVolume != null and item.saleVolume != '' "> sale_volume, </if> <if test="item.convenientType != null and item.convenientType != '' "> convenient_type, </if> <if test="item.auditType != null and item.auditType != '' "> audit_type, </if> <if test="item.auditOpinion != null and item.auditOpinion != '' "> audit_opinion, </if> created_at </trim> values <trim prefix="(" suffix=")" suffixOverrides=","> <if test="item.id != null and item.id != '' "> #{item.id}, </if> <if test="item.name != null and item.name != '' "> #{item.name}, </if> <if test="item.communityId != null and item.communityId != '' "> #{item.communityId}, </if> <if test="item.logo != null and item.logo != '' "> #{item.logo}, </if> <if test="item.contacts != null and item.contacts != '' "> #{item.contacts}, </if> <if test="item.idCard != null and item.idCard != '' "> #{item.idCard}, </if> <if test="item.phone != null and item.phone != '' "> #{item.phone}, </if> <if test="item.address != null and item.address != '' "> #{item.address}, </if> <if test="item.detailedAddress != null and item.detailedAddress != '' "> #{item.detailedAddress}, </if> <if test="item.lat != null and item.lat != '' "> #{item.lat}, </if> <if test="item.lon != null and item.lon != '' "> #{item.lon}, </if> <if test="item.beginAt != null and item.beginAt != '' "> #{item.beginAt}, </if> <if test="item.endAt != null and item.endAt != '' "> #{item.endAt}, </if> <if test="item.period != null and item.period != '' "> #{item.period}, </if> <if test="item.introduction != null and item.introduction != '' "> #{item.introduction}, </if> <if test="item.businessStatus != null and item.businessStatus != '' "> #{item.businessStatus}, </if> <if test="item.userId != null and item.userId != '' "> #{item.userId}, </if> <if test="item.consultationVolume != null and item.consultationVolume != '' "> #{item.consultationVolume}, </if> <if test="item.viewNum != null and item.viewNum != '' "> #{item.viewNum}, </if> <if test="item.isDel != null and item.isDel != '' "> #{item.isDel}, </if> <if test="item.createdBy != null and item.createdBy != '' "> #{item.createdBy}, </if> <if test="item.updatedBy != null and item.updatedBy != '' "> #{item.updatedBy}, </if> <if test="item.areaCode != null and item.areaCode != '' "> #{item.areaCode}, </if> <if test="item.mobilePhone != null and item.mobilePhone != '' "> #{item.mobilePhone}, </if> <if test="item.serviceRange != null and item.serviceRange != '' "> #{item.serviceRange}, </if> <if test="item.sale != null and item.sale != '' "> #{item.sale}, </if> <if test="item.saleVolume != null and item.saleVolume != '' "> #{item.saleVolume}, </if> <if test="item.convenientType != null and item.convenientType != '' "> #{item.convenientType}, </if> <if test="item.auditType != null and item.auditType != '' "> #{item.auditType}, </if> <if test="item.auditOpinion != null and item.auditOpinion != '' "> #{item.auditOpinion}, </if> sysdate() </trim> </insert> <update id="editData"> update jinhui_com_convenient_merchants <set> <if test="item.id != null and item.id != '' "> id=#{item.id}, </if> <if test="item.name != null and item.name != '' "> `name`=#{item.name}, </if> <if test="item.communityId != null and item.communityId != '' "> community_id=#{item.communityId}, </if> <if test="item.logo != null and item.logo != '' "> logo=#{item.logo}, </if> <if test="item.contacts != null and item.contacts != '' "> contacts=#{item.contacts}, </if> <if test="item.idCard != null and item.idCard != '' "> id_card=#{item.idCard}, </if> <if test="item.phone != null and item.phone != '' "> phone=#{item.phone}, </if> <if test="item.address != null and item.address != '' "> address=#{item.address}, </if> <if test="item.detailedAddress != null and item.detailedAddress != '' "> detailed_address=#{item.detailedAddress}, </if> <if test="item.lat != null and item.lat != '' "> lat=#{item.lat}, </if> <if test="item.lon != null and item.lon != '' "> lon=#{item.lon}, </if> <if test="item.beginAt != null and item.beginAt != '' "> begin_at=#{item.beginAt}, </if> <if test="item.endAt != null and item.endAt != '' "> end_at=#{item.endAt}, </if> <if test="item.period != null and item.period != '' "> `period`=#{item.period}, </if> <if test="item.introduction != null and item.introduction != '' "> introduction=#{item.introduction}, </if> <if test="item.businessStatus != null and item.businessStatus != '' "> business_status=#{item.businessStatus}, </if> <if test="item.userId != null and item.userId != '' "> user_id=#{item.userId}, </if> <if test="item.consultationVolume != null and item.consultationVolume != '' "> consultation_volume=#{item.consultationVolume}, </if> <if test="item.viewNum != null and item.viewNum != '' "> view_num=#{item.viewNum}, </if> <if test="item.isDel != null and item.isDel != '' "> is_del=#{item.isDel}, </if> <if test="item.createdBy != null and item.createdBy != '' "> created_by=#{item.createdBy}, </if> <if test="item.updatedBy != null and item.updatedBy != '' "> updated_by=#{item.updatedBy}, </if> <if test="item.areaCode != null and item.areaCode != '' "> area_code=#{item.areaCode}, </if> <if test="item.mobilePhone != null and item.mobilePhone != '' "> mobile_phone=#{item.mobilePhone}, </if> <if test="item.serviceRange != null and item.serviceRange != '' "> service_range=#{item.serviceRange}, </if> <if test="item.sale != null and item.sale != '' "> sale=#{item.sale}, </if> <if test="item.saleVolume != null and item.saleVolume != '' "> sale_volume=#{item.saleVolume}, </if> <if test="item.convenientType != null and item.convenientType != '' "> convenient_type=#{item.convenientType}, </if> <if test="item.auditType != null and item.auditType != '' "> audit_type=#{item.auditType}, </if> <if test="item.auditOpinion != null and item.auditOpinion != '' "> audit_opinion=#{item.auditOpinion}, </if> updated_at=sysdate() </set> where id = #{item.id} </update> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiInterspaceApplyForMapper.xml
@@ -13,6 +13,7 @@ <result property="creationTime" column="creation_time" /> <result property="updateTime" column="update_time" /> <result property="content" column="content" /> <result property="reply" column="reply" /> </resultMap> @@ -22,6 +23,7 @@ jiaf.id, jiaf.interspace_id, ji.title as interspaceName, ji.img_url, jiaf.interspace_time, jiaf.subscribe_time_frame, jiaf.user_name, @@ -29,7 +31,8 @@ jiaf.state, jiaf.creation_time, jiaf.update_time, jiaf.content jiaf.content, jiaf.reply from jinhui_interspace_apply_for as jiaf LEFT JOIN jinhui_interspace as ji ON ji.id = jiaf.interspace_id <where> @@ -59,6 +62,7 @@ jiaf.id, jiaf.interspace_id, ji.title as interspaceName, ji.img_url as imgUrl, jiaf.interspace_time, jiaf.subscribe_time_frame, jiaf.user_name, @@ -66,7 +70,8 @@ jiaf.state, jiaf.creation_time, jiaf.update_time, jiaf.content jiaf.content, jiaf.reply from jinhui_interspace_apply_for as jiaf LEFT JOIN jinhui_interspace as ji ON ji.id = jiaf.interspace_id where