Commit 585fa458 by yao.xiao

代码迁移-经纪人公告/海报

parent 3e5b865b
......@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/market")
public class MarketController {
@Autowired
......
......@@ -7,8 +7,12 @@ import com.yd.api.market.vo.announcement.AnnouncementQueryResponseVO;
import com.yd.api.market.vo.poster.PosterQueryRequestVO;
import com.yd.api.market.vo.poster.PosterQueryResponseVO;
import com.yd.api.result.CommonResult;
import com.yd.dal.entity.customer.AclPractitioner;
import com.yd.dal.entity.marketing.MktAnnouncement;
import com.yd.dal.entity.marketing.PosterInfo;
import com.yd.dal.entity.meta.MdDropOptions;
import com.yd.dal.service.customer.AclPractitionerDALService;
import com.yd.dal.service.marketing.MarketDALService;
import com.yd.dal.service.marketing.MktAnnouncementDALService;
import com.yd.dal.service.meta.MdDropOptionsDALService;
import com.yd.util.CommonUtil;
......@@ -27,6 +31,10 @@ public class MarketServiceImpl implements MarketService {
private MktAnnouncementDALService mktAnnouncementDALService;
@Autowired
private MdDropOptionsDALService mdDropOptionsDALService;
@Autowired
private AclPractitionerDALService aclPractitionerDALService;
@Autowired
private MarketDALService marketDALService;
@Override
public AnnouncementQueryResponseVO announcementQuery(AnnouncementQueryRequestVO requestVO) {
......@@ -73,6 +81,15 @@ public class MarketServiceImpl implements MarketService {
@Override
public PosterQueryResponseVO posterQuery(PosterQueryRequestVO requestVO) {
return null;
PosterQueryResponseVO responseVO = new PosterQueryResponseVO();
Long practitionerId = requestVO.getPractitionerId();
AclPractitioner practitioner = aclPractitionerDALService.findPractitionerById(practitionerId);
responseVO.setIsNameShow(practitioner.getIsNameShow());
responseVO.setIsMobileShow(practitioner.getIsMobileShow());
Long mdDropOptionId = requestVO.getMdDropOptionId();
List<PosterInfo> posterInfos = marketDALService.posterQuery(mdDropOptionId);
responseVO.setPosterInfos(posterInfos);
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
return responseVO;
}
}
package com.yd.api.market.vo.poster;
import com.yd.util.page.PaginationInfo;
import lombok.Data;
@Data
public class PosterQueryRequestVO {
private Long practitionerId;
private Long mdDropOptionId;
private PaginationInfo paginationInfo;
}
......@@ -2,7 +2,6 @@ package com.yd.api.market.vo.poster;
import com.yd.api.result.CommonResult;
import com.yd.dal.entity.marketing.PosterInfo;
import com.yd.util.page.PaginationInfo;
import lombok.Data;
import java.util.List;
......@@ -11,6 +10,5 @@ public class PosterQueryResponseVO {
private Integer isNameShow;//姓名是否显示 0=No=不显示 1=Yes=显示
private Integer isMobileShow;//电话是否显示 0=No=不显示 1=Yes=显示
private List<PosterInfo> posterInfos;
private PaginationInfo paginationInfo;
private CommonResult commonResult;
}
package com.yd.dal.mapper.marketing;
import com.yd.dal.entity.marketing.PosterInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface MarketMapper {
List<PosterInfo> posterQuery(@Param("mdDropOptionId") Long mdDropOptionId);
}
package com.yd.dal.mapper.marketing;
import com.github.pagehelper.PageInfo;
import com.github.pagehelper.Page;
import com.yd.dal.entity.marketing.MktAnnouncement;
import org.apache.ibatis.annotations.Param;
......@@ -20,7 +20,7 @@ public interface MktAnnouncementMapper {
int updateByPrimaryKey(MktAnnouncement record);
PageInfo<MktAnnouncement> selectByObj(MktAnnouncement info);
Page<MktAnnouncement> selectByObj(MktAnnouncement info);
List<MktAnnouncement> findByIsActiveAndAnnouncementAtBefore(@Param("isActive") int isActive,@Param("date") Date date);
}
\ No newline at end of file
package com.yd.dal.service.marketing.Impl;
import com.yd.api.market.vo.poster.PosterQueryRequestVO;
import com.yd.dal.entity.marketing.PosterInfo;
import com.yd.dal.mapper.marketing.MarketMapper;
import com.yd.dal.service.marketing.MarketDALService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service("marketDALService")
public class MarketDALServiceImpl implements MarketDALService {
@Resource
private MarketMapper marketMapper;
@Override
public List<PosterInfo> posterQuery(Long mdDropOptionId) {
return marketMapper.posterQuery(mdDropOptionId);
}
}
package com.yd.dal.service.marketing.Impl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yd.dal.entity.marketing.MktAnnouncement;
import com.yd.dal.entity.marketing.MktLeadsAssignedTrack;
import com.yd.dal.mapper.marketing.MktAnnouncementMapper;
import com.yd.dal.service.marketing.MktAnnouncementDALService;
import org.springframework.stereotype.Service;
......@@ -27,8 +29,9 @@ public class MktAnnouncementDALServiceImpl implements MktAnnouncementDALService
info.setAnnouncementType(announcementType);
info.setIsActive(1);
PageHelper.orderBy("seq asc , created_at desc");
PageInfo<MktAnnouncement> mktAnnouncementPageInfo = mktAnnouncementMapper.selectByObj(info);
List<MktAnnouncement> list = mktAnnouncementPageInfo.getList();
Page<MktAnnouncement> mktAnnouncementPageInfo = mktAnnouncementMapper.selectByObj(info);
PageInfo<MktAnnouncement> pageInfo = new PageInfo<>(mktAnnouncementPageInfo);
List<MktAnnouncement> list = pageInfo.getList();
return list;
}
......
package com.yd.dal.service.marketing;
import com.yd.api.market.vo.poster.PosterQueryRequestVO;
import com.yd.dal.entity.marketing.PosterInfo;
import java.util.List;
public interface MarketDALService {
List<PosterInfo> posterQuery(Long mdDropOptionId);
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yd.dal.mapper.marketing.MarketMapper">
<resultMap id="PosterQueryResultMap" type="com.yd.dal.entity.marketing.PosterInfo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="itemType" jdbcType="BIGINT" property="itemType"/>
<result column="itemId" jdbcType="BIGINT" property="itemId"/>
<result column="productCategoryId" jdbcType="BIGINT" property="productCategoryId"/>
<result column="title" jdbcType="LONGVARCHAR" property="title"/>
<result column="productPosterPath" jdbcType="LONGVARCHAR" property="productPosterPath"/>
<result column="isPlan" jdbcType="LONGVARCHAR" property="isPlan"/>
</resultMap>
<select id="posterQuery" resultMap="PosterQueryResultMap">
select
t.id id,
t.item_type itemType,
t.item_id itemId,
t.item_name title,
t.file_path_oss productPosterPath,
p.product_category_id productCategoryId,
if(t.item_type = 2 ,0,1) isPlan
from
ag_product_file_upload t
LEFT JOIN ag_product p on p.id = (if (t.item_type= 1,t.item_id,(SELECT pp.product_id from ag_product_plan pp where pp.id = t.item_id) ))
where
t.is_active = 1
AND t.file_category = 22
<if test="mdDropOptionId != null">
and t.md_drop_option_id = #{mdDropOptionId,jdbcType=BIGINT}
</if>
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment