傅行帆 5 yıl önce
ebeveyn
işleme
e0777334b5

+ 6
- 6
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java Dosyayı Görüntüle

270
     
270
     
271
     /**
271
     /**
272
      * 微信端根据id查询详情
272
      * 微信端根据id查询详情
273
-     * @param groupActicityId  实体ID
273
+     * @param groupActivityId  实体ID
274
      */
274
      */
275
-    @RequestMapping(value="/wx/taShareActivity/{groupActicityId}",method= RequestMethod.GET)
276
-    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActicityId,
275
+    @RequestMapping(value="/wx/taShareActivity/{groupActivityId}",method= RequestMethod.GET)
276
+    public ResponseBean wxShareActivityGet(@PathVariable Integer groupActivityId,
277
                                            @RequestParam(value = "recordId",required = false) Integer recordId, HttpServletRequest request){
277
                                            @RequestParam(value = "recordId",required = false) Integer recordId, HttpServletRequest request){
278
         ResponseBean responseBean = new ResponseBean();
278
         ResponseBean responseBean = new ResponseBean();
279
         String openid = getOpenId(request);
279
         String openid = getOpenId(request);
286
         Map<String,Object> map = new HashMap<>();
286
         Map<String,Object> map = new HashMap<>();
287
         try {
287
         try {
288
             //活动详情
288
             //活动详情
289
-            TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActicityId);
289
+            TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActivityId);
290
             //查看此活动已经完成的数量
290
             //查看此活动已经完成的数量
291
             QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
291
             QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
292
             shareRecordQueryWrapper.eq("org_id",orgId);
292
             shareRecordQueryWrapper.eq("org_id",orgId);
324
             //获取海报信息
324
             //获取海报信息
325
             QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
325
             QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
326
             posterQueryWrapper.eq("target_type",CommConstant.GROUP_ACTIVITY);
326
             posterQueryWrapper.eq("target_type",CommConstant.GROUP_ACTIVITY);
327
-            posterQueryWrapper.eq("target_id",groupActicityId);
327
+            posterQueryWrapper.eq("target_id",groupActivityId);
328
             posterQueryWrapper.eq("org_id",orgId);
328
             posterQueryWrapper.eq("org_id",orgId);
329
             List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
329
             List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
330
             map.put("postList",postList);
330
             map.put("postList",postList);
339
             //获取分享信息
339
             //获取分享信息
340
             QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
340
             QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
341
             taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);
341
             taShareContentQueryWrapper.eq("share_content_type",CommConstant.GROUP_ACTIVITY);
342
-            taShareContentQueryWrapper.eq("target_id",groupActicityId);
342
+            taShareContentQueryWrapper.eq("target_id",groupActivityId);
343
             taShareContentQueryWrapper.eq("org_id",orgId);
343
             taShareContentQueryWrapper.eq("org_id",orgId);
344
             List<TaShareContent> shareContentList = taShareContentService.list(taShareContentQueryWrapper);
344
             List<TaShareContent> shareContentList = taShareContentService.list(taShareContentQueryWrapper);
345
             map.put("shareContentList",shareContentList);
345
             map.put("shareContentList",shareContentList);

+ 3
- 1
src/main/java/com/huiju/estateagents/controller/TdPosterTemplateController.java Dosyayı Görüntüle

12
 import org.springframework.beans.factory.annotation.Autowired;
12
 import org.springframework.beans.factory.annotation.Autowired;
13
 import org.springframework.web.bind.annotation.*;
13
 import org.springframework.web.bind.annotation.*;
14
 
14
 
15
+import javax.servlet.http.HttpServletRequest;
15
 import java.util.List;
16
 import java.util.List;
16
 
17
 
17
 /**
18
 /**
149
      * @return
150
      * @return
150
      */
151
      */
151
     @RequestMapping(value="/admin/posterTemplate",method= RequestMethod.GET)
152
     @RequestMapping(value="/admin/posterTemplate",method= RequestMethod.GET)
152
-    public ResponseBean posterTemplateList(@RequestParam(value ="type") String type){
153
+    public ResponseBean posterTemplateList(@RequestParam(value ="type") String type, HttpServletRequest request){
153
         ResponseBean responseBean = new ResponseBean();
154
         ResponseBean responseBean = new ResponseBean();
154
         try {
155
         try {
155
             QueryWrapper<TdPosterTemplate> queryWrapper = new QueryWrapper<>();
156
             QueryWrapper<TdPosterTemplate> queryWrapper = new QueryWrapper<>();
156
             queryWrapper.eq("type",type);
157
             queryWrapper.eq("type",type);
158
+            queryWrapper.eq("org_id",getOrgId(request));
157
             queryWrapper.orderByDesc("create_date");
159
             queryWrapper.orderByDesc("create_date");
158
             
160
             
159
             List<TdPosterTemplate> result = iTdPosterTemplateService.list(queryWrapper);
161
             List<TdPosterTemplate> result = iTdPosterTemplateService.list(queryWrapper);

+ 1
- 1
src/main/resources/mapper/TaShareActivityMapper.xml Dosyayı Görüntüle

3
 <mapper namespace="com.huiju.estateagents.mapper.TaShareActivityMapper">
3
 <mapper namespace="com.huiju.estateagents.mapper.TaShareActivityMapper">
4
     <select id="selectTaShareActivityById" resultType="com.huiju.estateagents.entity.TaShareActivity">
4
     <select id="selectTaShareActivityById" resultType="com.huiju.estateagents.entity.TaShareActivity">
5
         select
5
         select
6
-        t.group_acticity_id,
6
+        t.group_activity_id,
7
         t.building_id,
7
         t.building_id,
8
         t.activity_name,
8
         t.activity_name,
9
         t.main_img,
9
         t.main_img,