2.1需求

yujian

2020-05-09 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64

 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java

@@ -21,6 +21,7 @@
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;

import com.yeshi.fanli.entity.bus.homemodule.Special;

import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;

import com.yeshi.fanli.entity.bus.homemodule.SpecialExtra;

import com.yeshi.fanli.exception.homemodule.SpecialCardException;

import com.yeshi.fanli.exception.homemodule.SpecialException;

import com.yeshi.fanli.service.inter.config.AppVersionService;

@@ -30,6 +31,7 @@
import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.vo.homemodule.SpecialVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -164,16 +166,16 @@
    * @param out

    */

   @RequestMapping(value = "saveSpecial")

   public void saveSpecial(String callback, Special record, String jumpType, HttpServletRequest request,

   public void saveSpecial(String callback, Special record, String jumpType, SpecialExtra extra, HttpServletRequest request,

         PrintWriter out) {

      try {

         // 1. 先判断httpRequest 是否含有文件类型

         if (request instanceof MultipartHttpServletRequest) {

            MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;

            specialService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"),

                  fileRequest.getFile("file3"), record, jumpType);

                  fileRequest.getFile("file3"), record, jumpType, extra);

         } else {

            specialService.saveObject(null, null, null, record, jumpType);

            specialService.saveObject(null, null, null, record, jumpType, extra);

         }



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

@@ -281,20 +283,18 @@


      try {



         List<Special> list = specialService.listQueryByCard((pageIndex - 1) * pageSize, pageSize, cardId, key, sex);

         long count = specialService.countlistQueryByCard(cardId, key, sex);

         // 获取有效的专题



         List<SpecialVO> list = specialService.listQueryByCard((pageIndex - 1) * pageSize, pageSize, cardId, key, sex);

         if (list == null || list.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

            return;

         }



         long count = specialService.countlistQueryByCard(cardId, key, sex);

         // 过滤

         if (versionList != null) {

            if (versionList.size() > 0) {

               List<Long> sourceIdList = new ArrayList<>();

               for (Special special : list) {

               for (SpecialVO special : list) {

                  sourceIdList.add(special.getId());

               }

               List<Long> versionIdList = new ArrayList<>();

@@ -324,9 +324,7 @@
         JSONObject data = new JSONObject();

         data.put("pe", pe);

         data.put("result_list", gson.toJson(list));



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();