bug修复

src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -1,11 +1,8 @@
 package platform.modules.government.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.aliyuncs.exceptions.ClientException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xiaoleilu.hutool.util.StrUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +17,6 @@ import platform.common.exception.BaseException;
 import platform.common.util.*;
 import platform.common.util.word.ExportWord;
 import platform.modules.company.dto.LandSupplyApprovalDto;
-import platform.modules.company.entity.ProjectApplication;
 import platform.modules.government.dao.IndustrialLandSupplyDetailDao;
 import platform.modules.government.dto.DepartmentDto;
 import platform.modules.government.dto.IndustrialLandSupplyDto;
@@ -34,7 +30,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.*;
@@ -3401,9 +3396,10 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
      * @Date: 2020/3/10
      * @Params: [industrialLandSupplyConsultationList]
      * @Return: void
-     **/
+     *
+     * @return*/
     @Transactional
-    public void saveFeedbackAppend(IndustrialLandSupplyDetail apply) {
+    public String saveFeedbackAppend(IndustrialLandSupplyDetail apply) {
 
         //保存咨询列表
         String dateTime = DateUtil.getTimeString(new Date());
@@ -3418,7 +3414,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 }
             }
             if (CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
-                return;
+                return "未发现新增咨询";
             }
             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
 
@@ -3551,6 +3547,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             approval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_FEEDBACK);
             approvalService.updateSelective(approval);
         }
+        return null;
     }
 
     /**

src/main/java/platform/modules/government/web/IndustrialLandSupplyController.java

@@ -328,8 +328,10 @@ public class IndustrialLandSupplyController extends BaseController {
     @ResponseBody
     public ResponseMessage feedbackAppend(IndustrialLandSupplyDetail industrialLandSupplyDetail) {
 
-        industrialLandSupplyDetailService.saveFeedbackAppend(industrialLandSupplyDetail);
-
+        String message = industrialLandSupplyDetailService.saveFeedbackAppend(industrialLandSupplyDetail);
+        if (CommonUtils.isNotNull(message)) {
+            return ResponseMessage.error(message);
+        }
         return ResponseMessage.success("保存成功！");
     }
 
@@ -640,12 +642,12 @@ public class IndustrialLandSupplyController extends BaseController {
     /**
      * 由于Spring在接受前台传入的List时，就会出现256的IndexOutOfBoundsException异常
      * 设置setAutoGrowCollectionLimit为1024
+     *
      * @param binder
      * @see [类、类#方法、类#成员]
      */
     @InitBinder
-    public void initListBinder(WebDataBinder binder)
-    {
+    public void initListBinder(WebDataBinder binder) {
         // 设置需要包裹的元素个数，默认为256
         binder.setAutoGrowCollectionLimit(3000);
     }