* 新需求提交

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -12,13 +12,7 @@ import com.huiju.estateagents.sample.service.ITaContactService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -122,7 +116,6 @@ public class TaContactController extends BaseController {
                 newContact.setStatus(CommConstant.STATUS_DELETE);
                 updateList.add(newContact);
             }
-
             responseBean.addSuccess(iTaContactService.updateBatchById(updateList));
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/huiju/estateagents/sample/controller/TaNoticeController.java

@@ -1,25 +1,17 @@
 package com.huiju.estateagents.sample.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.sample.entity.TaH5Sample;
 import com.huiju.estateagents.sample.entity.TaNotice;
+import com.huiju.estateagents.sample.service.ITaH5SampleService;
 import com.huiju.estateagents.sample.service.ITaNoticeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -40,6 +32,9 @@ public class TaNoticeController extends BaseController {
     @Autowired
     public ITaNoticeService iTaNoticeService;
 
+    @Autowired
+    public ITaH5SampleService iTaH5SampleService;
+
     /**
      * 条件查询通知列表
      *
@@ -49,7 +44,7 @@ public class TaNoticeController extends BaseController {
      * @param targetType
      * @param targetName
      * @param status
-     * @param type       类型
+     * @param type       类型 目前默认 sample
      * @return
      */
     @RequestMapping(value = "/channel/listNoticeByCondition", method = RequestMethod.GET)
@@ -147,7 +142,18 @@ public class TaNoticeController extends BaseController {
     public ResponseBean taNoticeGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaNoticeService.getById(id));
+            TaNotice taNotice = iTaNoticeService.getById(id);
+            if (taNotice == null) {
+                responseBean.addError("fail");
+                return responseBean;
+            }
+            if (taNotice.getTargetId() != null) {
+                TaH5Sample taH5Sample = iTaH5SampleService.getById(taNotice.getNoticeId());
+                if(taH5Sample != null){
+                    taNotice.setTargetName(taH5Sample.getSampleName());
+                }
+            }
+            responseBean.addSuccess(taNotice);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taNoticeDelete -=- {}", e.toString());
@@ -161,13 +167,13 @@ public class TaNoticeController extends BaseController {
      *
      * @param pageNum
      * @param pageSize
-     * @param type       类型 目前默认 sample
+     * @param type     类型 目前默认 sample
      * @return
      */
     @RequestMapping(value = "/admin/listNoticeByCondition", method = RequestMethod.GET)
     public ResponseBean listNoticeByConditionForAdmin(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                              String type) {
+                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                      String type) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaNoticeService.listNoticeByConditionForAdmin(pageNum, pageSize, type);

src/main/resources/mapper/sample/TaNoticeMapper.xml

@@ -34,10 +34,11 @@
         FROM
             ta_notice t
             LEFT JOIN ta_h5_sample t2 ON t.target_id = t2.sample_id
-        where
-            t.`status` == 1
-            AND t.invalid_time >= NOW( )
+        WHERE
+            t.`status` = 1
+            AND t.invalid_time >= NOW( )
         ORDER BY
-            t.order_no DESC,t.create_date DESC
+            t.order_no DESC,
+            t.create_date DESC
     </select>
 </mapper>