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

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

@@ -1260,7 +1260,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 if (departmentId != null && departmentId != "") {
                     boolean flag = true;
                     //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
-                    /*if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                    if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                         for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                             industrialLandSupplyConsultation.setIsDefault(false);
                             if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
@@ -1269,7 +1269,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                                 break;
                             }
                         }
-                    }*/
+                    }
                     if (flag) {
                         IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
                         industrialLandSupplyConsultation.setIsDefault(true);
@@ -1284,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);
         }
         //如果是发布，进提交流程
@@ -1379,7 +1379,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     if (departmentId != null && departmentId != "") {
                         boolean flag = true;
                         //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
-                        /*if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                        if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                                 industrialLandSupplyConsultation.setIsDefault(false);
                                 if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
@@ -1388,7 +1388,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                                     break;
                                 }
                             }
-                        }*/
+                        }
                         if (flag) {
                             IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
                             industrialLandSupplyConsultation.setIsDefault(true);
@@ -1402,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,7 +3385,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     if (departmentId != null) {
                         boolean flag = true;
                         //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
-                        /*if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                        if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                                 industrialLandSupplyConsultation.setIsDefault(false);
                                 if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
@@ -3393,7 +3393,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                                     flag = false;
                                 }
                             }
-                        }*/
+                        }
                         if (flag) {
                             IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
                             industrialLandSupplyConsultation.setIsDefault(true);
@@ -3407,9 +3407,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);
             }
             Approval approval = approvalService.getLatestApproval(apply.getId(), Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY);
@@ -3647,7 +3647,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 if (departmentId != null && departmentId != "") {
                     boolean flag = true;
                     //这里的逻辑是  如果勾选就把填写的咨询变为默认 但是现在是勾选单独生成一条咨询
-                    /*if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                    if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                         for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
                             industrialLandSupplyConsultation.setIsDefault(false);
                             if (departmentId.equals(industrialLandSupplyConsultation.getDepartment_id())) {
@@ -3656,7 +3656,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                                 break;
                             }
                         }
-                    }*/
+                    }
                     if (flag) {
                         IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
                         industrialLandSupplyConsultation.setIsDefault(true);
@@ -3670,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,8 +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"-->
+                        <!--<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,8 +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"-->
+                        <!--<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">