产业供地 当咨询时 同时填写问题和打钩时只显示填写的2.0

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

@@ -3391,15 +3391,15 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
     }
 
     /**
+     * @return
      * @Author: huZhiHao
      * @Description: 保存反馈
      * @Date: 2020/3/10
      * @Params: [industrialLandSupplyConsultationList]
      * @Return: void
-     *
-     * @return*/
+     */
     @Transactional
-    public String saveFeedbackAppend(IndustrialLandSupplyDetail apply) {
+    public String saveFeedbackAppend(IndustrialLandSupplyDetail apply) throws Exception {
 
         //保存咨询列表
         String dateTime = DateUtil.getTimeString(new Date());
@@ -3480,7 +3480,6 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 }
             }
 
-
             //保存默认咨询列表
             List<String> defaultList = apply.getDefaultList();
             if (!CollectionUtils.isEmpty(defaultList)) {
@@ -3543,6 +3542,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 }
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
             }
+            IndustrialLandSupplyDetail entity = this.selectById(apply.getId() + "");
+            entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_FEEDBACK);
+            this.updateSelective(entity);
             Approval approval = approvalService.getLatestApproval(apply.getId(), Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY);
             approval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_FEEDBACK);
             approvalService.updateSelective(approval);

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

@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 产业供地
@@ -303,7 +304,9 @@ public class IndustrialLandSupplyController extends BaseController {
         boolean canAsk = industrialLandSupplyDetailService.canAsk();
         modelMap.addAttribute("canAsk", canAsk);
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
-        entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_FEEDBACK);
+        if(!Objects.equals(entity.getApprove_status(),Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUMMARY)){
+            entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_FEEDBACK);
+        }
         industrialLandSupplyDetailService.updateSelective(entity);
         if (canAsk) {
 //            modelMap.addAttribute("consulDepartmentList", industrialLandSupplyDetailService.consulDepartmentList());
@@ -326,7 +329,7 @@ public class IndustrialLandSupplyController extends BaseController {
     @OperationLog(value = "追加咨询")
     @RequestMapping("/feedback_append")
     @ResponseBody
-    public ResponseMessage feedbackAppend(IndustrialLandSupplyDetail industrialLandSupplyDetail) {
+    public ResponseMessage feedbackAppend(IndustrialLandSupplyDetail industrialLandSupplyDetail) throws Exception {
 
         String message = industrialLandSupplyDetailService.saveFeedbackAppend(industrialLandSupplyDetail);
         if (CommonUtils.isNotNull(message)) {

src/main/resources/application.yml

@@ -286,6 +286,7 @@ password: UEcXQ3aeLYx487dvi4nvfO074GaTay9celB6/OwmtgyRzcVdOsJ2m15U8IZpat+aq9UPAn
 #上传文件配置信息
 #文件仓库地址
 repositoryPath:  /opt/xinqu_pic
+#repositoryPath:  E:\upload
 
 #新区接口地址
 api_url: http://snd.ideatob.com/mp/api/