diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingController.java b/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingController.java index 8a5f4ed..4f57d7b 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingController.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingController.java @@ -13,10 +13,7 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; @@ -111,6 +108,28 @@ public class ViewMeetingController extends BaseController { return AjaxResult.success(viewMeetingService.oneView(params, ".pageList")); } + /** + * 查询市场活动-产品列表 + * + * @author mzr + * @date 2024/11/13 + */ + @ResponseBody + @PatchMapping(value = "/listDetail") + @ApiOperation(value = "查询市场活动-产品列表") + public Map listDetail( + @ApiParam(required = true, value = "市场活动id") @RequestParam(required = true) String viewId, + HttpServletRequest request) { + Map params = new HashMap<>(); + Map result = new HashMap<>(); + String token = request.getHeader("token"); + if (!redisService.isKey(token)) { + return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录"); + } + params.put("viewId", viewId); + return AjaxResult.success(viewMeetingService.listDetail(params, ".findCrmMarketingDetailByCondition")); + } + /** * @description: 市场活动报表-按照区域分组 * @author: mzr diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/view/CrmMarketingDetailMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/view/CrmMarketingDetailMapper.xml new file mode 100644 index 0000000..e9f75e6 --- /dev/null +++ b/crm-common/src/main/resources/mapper/mapper_oracle/view/CrmMarketingDetailMapper.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + a.id, a.view_id, a.goods_id, a.goods_no, a.goods_name, a.spec, a.create_time, a.earnest, + a.goods_num, a.reserve_acre + + + + + + + + INSERT INTO crm_marketing_detail ( + id, view_id, goods_id, goods_no, goods_name, spec, create_time, earnest, + goods_num, reserve_acre + ) VALUES ( + #{id,jdbcType=VARCHAR}, + #{viewId,jdbcType=VARCHAR}, + #{goodsId,jdbcType=VARCHAR}, + #{goodsNo,jdbcType=VARCHAR}, + #{goodsName,jdbcType=VARCHAR}, + #{spec,jdbcType=VARCHAR}, + #{createTime,jdbcType=VARCHAR}, + #{earnest,jdbcType=VARCHAR}, + #{goodsNum,jdbcType=VARCHAR}, + #{reserveAcre,jdbcType=VARCHAR} + ) + + + + + INSERT INTO crm_marketing_detail ( + id, view_id, goods_id, goods_no, goods_name, spec, create_time, earnest, + goods_num, reserve_acre + ) + + SELECT + #{item.id,jdbcType=VARCHAR}, + #{item.viewId,jdbcType=VARCHAR}, + #{item.goodsId,jdbcType=VARCHAR}, + #{item.goodsNo,jdbcType=VARCHAR}, + #{item.goodsName,jdbcType=VARCHAR}, + #{item.spec,jdbcType=VARCHAR}, + #{item.createTime,jdbcType=VARCHAR}, + #{item.earnest,jdbcType=VARCHAR}, + #{item.goodsNum,jdbcType=VARCHAR}, + #{item.reserveAcre,jdbcType=VARCHAR} + FROM DUAL + + + + + + UPDATE crm_marketing_detail + + + view_id = #{viewId,jdbcType=VARCHAR}, + + + goods_id = #{goodsId,jdbcType=VARCHAR}, + + + goods_no = #{goodsNo,jdbcType=VARCHAR}, + + + goods_name = #{goodsName,jdbcType=VARCHAR}, + + + spec = #{spec,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=VARCHAR}, + + + earnest = #{earnest,jdbcType=VARCHAR}, + + + goods_num = #{goodsNum,jdbcType=VARCHAR}, + + + reserve_acre = #{reserveAcre,jdbcType=VARCHAR} + + + WHERE id = #{id} + + + + + DELETE FROM crm_marketing_detail WHERE id = #{id} + + + + + DELETE FROM crm_marketing_detail WHERE id IN + + #{id} + + + \ No newline at end of file diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/entity/CrmMarketingDetail.java b/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/entity/CrmMarketingDetail.java new file mode 100644 index 0000000..1575e7f --- /dev/null +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/entity/CrmMarketingDetail.java @@ -0,0 +1,46 @@ +package com.yb.lb.webapp.view.view.entity; + +import lombok.Data; + +/** + * 市场活动-产品表(crm_marketing_detail) + * + * @author mzr + * @version 1.0.0 2024-11-13 + */ +@Data +public class CrmMarketingDetail implements java.io.Serializable { + /** 版本号 */ + private static final long serialVersionUID = -423516422284485951L; + + /** 主键Id */ + private String id; + + /** 主键Id(市场活动) */ + private String viewId; + + /** 商品id */ + private String goodsId; + + /** 商品编码 */ + private String goodsNo; + + /** 商品名称 */ + private String goodsName; + + /** 规格 */ + private String spec; + + /** 制单时间 */ + private String createTime; + + /** 亩定金(元) */ + private String earnest; + + /** 件数 */ + private String goodsNum; + + /** 预定亩数 */ + private String reserveAcre; + +} \ No newline at end of file diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/sevice/ViewMeetingService.java b/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/sevice/ViewMeetingService.java index fdec948..d5c0fe2 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/sevice/ViewMeetingService.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/sevice/ViewMeetingService.java @@ -7,6 +7,7 @@ import com.yb.lb.common.utils.StringUtil; import com.yb.lb.webapp.archives.dictionary.entity.Dictionaryies; import com.yb.lb.webapp.archives.dictionary.service.DictionaryiesService; import com.yb.lb.webapp.redis.service.RedisService; +import com.yb.lb.webapp.view.view.entity.CrmMarketingDetail; import com.yb.lb.webapp.view.view.entity.ViewMeeting; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +22,8 @@ public class ViewMeetingService { @Autowired BaseOracleDao dao; @Autowired + BaseOracleDao detailDao; + @Autowired RedisService redisService; @Autowired DictionaryiesService dictionaryiesService; @@ -80,6 +83,16 @@ public class ViewMeetingService { return dao.update(ViewMeeting.class.getName() + id, params); } + /** + * 查询市场活动-产品 + * + * @author mzr + * @date 2024/11/13 + */ + public List listDetail(Map params, String id) { + return detailDao.list(CrmMarketingDetail.class.getName() + id, params); + } + /** * @description: 根据条件查询数量 */