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

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

@@ -1262,6 +1262,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
                     if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                         for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                            industrialLandSupplyConsultation.setIsDefault(false);
                             if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                 industrialLandSupplyConsultation.setIsDefault(true);
                                 flag = false;
@@ -1283,10 +1284,10 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
         }
         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
-            for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+            /*for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                 industrialLandSupplyConsultation.setIsDefault(false);
                 //industrialLandSupplyConsultation.setIsAgree(true);
-            }
+            }*/
             industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
         }
         //如果是发布，进提交流程
@@ -1380,6 +1381,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                         //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
                         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                                industrialLandSupplyConsultation.setIsDefault(false);
                                 if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                     industrialLandSupplyConsultation.setIsDefault(true);
                                     flag = false;
@@ -1400,9 +1402,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 }
             }
             if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
-                for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                /*for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                     industrialLandSupplyConsultation.setIsDefault(false);
-                }
+                }*/
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
             }
         }
@@ -3385,8 +3387,8 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                         //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
                         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                                if (industrialLandSupplyConsultation.getIsDefault() &&
-                                        Objects.equals(industrialLandSupplyConsultation.getDepartment_id(), departmentId)) {
+                                industrialLandSupplyConsultation.setIsDefault(false);
+                                if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                     industrialLandSupplyConsultation.setIsDefault(true);
                                     flag = false;
                                 }
@@ -3405,9 +3407,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 }
             }
             if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
-                for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                    industrialLandSupplyConsultation.setIsDefault(false);
-                }
+//                for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+//                    industrialLandSupplyConsultation.setIsDefault(false);
+//                }
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
             }
             Approval approval = approvalService.getLatestApproval(apply.getId(), Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY);
@@ -3647,6 +3649,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
                     if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                         for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                            industrialLandSupplyConsultation.setIsDefault(false);
                             if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
                                 industrialLandSupplyConsultation.setIsDefault(true);
                                 flag = false;
@@ -3667,9 +3670,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
         }
         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
-            for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+            /*for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                 industrialLandSupplyConsultation.setIsDefault(false);
-            }
+            }*/
             industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
         }
         //直接提交申请，添加流程信息

src/main/resources/templates/admin/government/industrial_land_supply/edit.html

@@ -125,7 +125,8 @@
                         </tr>
                         </thead>
                         <tbody class="add_file_line" th:id="'tbody_department'+${item.id}">
-                        <tr class="text-c" th:unless="${landSupplyCons.isDefault}"
+<!--                        <tr class="text-c" th:unless="${landSupplyCons.isDefault}"-->
+                        <tr class="text-c"
                             th:each="landSupplyCons,landSupplyConsStat: ${industrialLandSupplyConsultationList}"
                             th:if="*{item.id+''==landSupplyCons.department_id}">
                             <td class="td_material">

src/main/resources/templates/admin/government/industrial_land_supply/feedback_append.html

@@ -124,7 +124,8 @@
                         </tr>
                         </thead>
                         <tbody class="add_file_line" th:id="'tbody_department'+${item.id}">
-                        <tr class="text-c" th:unless="${landSupplyCons.isDefault}"
+                        <!--                        <tr class="text-c" th:unless="${landSupplyCons.isDefault}"-->
+                        <tr class="text-c"
                             th:each="landSupplyCons,landSupplyConsStat: ${industrialLandSupplyConsultationList}"
                             th:if="*{item.id+''==landSupplyCons.department_id}">
                             <td class="td_material">