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

src/main/java/platform/modules/government/dao/IndustrialLandSupplyConsultationDao.java

@@ -1,6 +1,7 @@
 
 package platform.modules.government.dao;
 
+import org.apache.ibatis.annotations.Param;
 import platform.common.base.mapper.BaseMapper;
 import platform.modules.government.entity.IndustrialLandSupplyConsultation;
 
@@ -12,4 +13,5 @@ import platform.modules.government.entity.IndustrialLandSupplyConsultation;
  **/
 public interface IndustrialLandSupplyConsultationDao extends BaseMapper<IndustrialLandSupplyConsultation> {
 
+    int updateDefaultById(@Param("id") String id, @Param("isDefault") boolean isDefault);
 }

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

@@ -2,8 +2,11 @@ package platform.modules.government.service;
 
 import org.springframework.stereotype.Service;
 import platform.common.base.service.BaseService;
+import platform.modules.government.dao.IndustrialLandSupplyConsultationDao;
 import platform.modules.government.entity.IndustrialLandSupplyConsultation;
 
+import javax.annotation.Resource;
+
 /**
  * 功能描述: 产业供地问题
  *
@@ -13,7 +16,11 @@ import platform.modules.government.entity.IndustrialLandSupplyConsultation;
 @Service
 public class IndustrialLandSupplyConsultationService extends BaseService<IndustrialLandSupplyConsultation> {
 
+    @Resource
+    private IndustrialLandSupplyConsultationDao industrialLandSupplyConsultationDao;
 
-
+    public Integer updateDefaultById(String id, boolean isDefault) {
+        return industrialLandSupplyConsultationDao.updateDefaultById(id, isDefault);
+    }
 }
 

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

@@ -204,10 +204,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                                 try {
                                     Date d1 = DateUtil.parseTimeStringToDate(entity.getUpdate_time(), "yyyy-MM-dd hh:mm:ss");
                                     Date d2 = DateUtil.parseTimeStringToDate(dealTime, "yyyy-MM-dd hh:mm:ss");
-                                    if(CommonUtils.isNull(entity.getUpdate_time())){
+                                    if (CommonUtils.isNull(entity.getUpdate_time())) {
                                         dealTime = null;
-                                    }else
-                                    if (d2.before(d1)) {
+                                    } else if (d2.before(d1)) {
                                         dealTime = null;
                                     }
                                 } catch (ParseException e) {
@@ -666,10 +665,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 try {
                     Date d1 = DateUtil.parseTimeStringToDate(entity.getUpdate_time(), "yyyy-MM-dd hh:mm:ss");
                     Date d2 = DateUtil.parseTimeStringToDate(dealTime, "yyyy-MM-dd hh:mm:ss");
-                    if(CommonUtils.isNull(entity.getUpdate_time())){
+                    if (CommonUtils.isNull(entity.getUpdate_time())) {
                         dealTime = null;
-                    }else
-                    if (d2.before(d1)) {
+                    } else if (d2.before(d1)) {
                         dealTime = null;
                     }
                 } catch (ParseException e) {
@@ -1049,7 +1047,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 //                            consulFlag = true;
 //                            break;
                             consulNum1++;
-                            if(CommonUtils.isNotNull(industrialLandSupplyConsultation.getFeedback_time())){
+                            if (CommonUtils.isNotNull(industrialLandSupplyConsultation.getFeedback_time())) {
                                 consulNum2++;
                             }
                         }
@@ -1084,7 +1082,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 //                            distFlag = true;
 //                            break;
                             distNum1++;
-                            if(CommonUtils.isNotNull(industrialLandSupplyDistribution.getUpdate_time())){
+                            if (CommonUtils.isNotNull(industrialLandSupplyDistribution.getUpdate_time())) {
                                 distNum2++;
                             }
                         }
@@ -1284,7 +1282,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         }
         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                if(CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault()||industrialLandSupplyConsultation.getIsDefault())){
+                if (CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault() || industrialLandSupplyConsultation.getIsDefault())) {
                     industrialLandSupplyConsultation.setIsDefault(false);
                 }
             }
@@ -1372,7 +1370,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             IndustrialLandSupplyConsultation query = new IndustrialLandSupplyConsultation();
             query.setIndustrial_land_supply_id(apply.getId() + "");
             industrialLandSupplyConsultationService.deleteByWhere(query);
-
+            if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+                for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
+                    industrialLandSupplyConsultation.setIsDefault(false);
+                }
+            }
             //保存默认咨询列表
             if (!CollectionUtils.isEmpty(defaultList)) {
                 for (String departmentId : defaultList) {
@@ -1402,7 +1404,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
             if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                 for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                    if(CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault()||industrialLandSupplyConsultation.getIsDefault())){
+                    if (CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault() || industrialLandSupplyConsultation.getIsDefault())) {
                         industrialLandSupplyConsultation.setIsDefault(false);
                     }
                 }
@@ -3395,22 +3397,48 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                             }
                         }
                         if (flag) {
-                            IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
-                            industrialLandSupplyConsultation.setIsDefault(true);
-                            industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
-                            industrialLandSupplyConsultation.setConsultation_time(dateTime);
-                            industrialLandSupplyConsultation.setDepartment_id(departmentId);
-                            industrialLandSupplyConsultation.setConsultation(CONSULTATION_MESSAGE);
-                            industrialLandSupplyConsultationService.save(industrialLandSupplyConsultation);
+                            //如果勾选了默认 查询之前的咨询是否有自己填写的 有的话default字段改成默认 新的这条默认不增加
+                            IndustrialLandSupplyConsultation q = new IndustrialLandSupplyConsultation();
+                            q.setDepartment_id(departmentId);
+                            q.setDel_flag(false);
+                            q.setIndustrial_land_supply_id(apply.getId() + "");
+                            List<IndustrialLandSupplyConsultation> list = industrialLandSupplyConsultationService.findListByWhere(q);
+                            if (CommonUtils.isNotNull(list)) {
+                                for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : list) {
+                                    industrialLandSupplyConsultation.setIsDefault(true);
+                                    industrialLandSupplyConsultationService.updateDefaultById(industrialLandSupplyConsultation.getId() + "", industrialLandSupplyConsultation.getIsDefault());
+                                }
+                            } else {
+                                IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
+                                industrialLandSupplyConsultation.setIsDefault(true);
+                                industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
+                                industrialLandSupplyConsultation.setConsultation_time(dateTime);
+                                industrialLandSupplyConsultation.setDepartment_id(departmentId);
+                                industrialLandSupplyConsultation.setConsultation(CONSULTATION_MESSAGE);
+                                industrialLandSupplyConsultationService.save(industrialLandSupplyConsultation);
+                            }
                         }
                     }
                 }
             }
             if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                 for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                    if(CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault()||industrialLandSupplyConsultation.getIsDefault())){
+                    if (CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault() || industrialLandSupplyConsultation.getIsDefault())) {
                         industrialLandSupplyConsultation.setIsDefault(false);
                     }
+                    //如果原本这个部门的咨询有勾选默认 那么新的咨询也加上默认 原本的默认删除
+                    IndustrialLandSupplyConsultation q = new IndustrialLandSupplyConsultation();
+                    q.setDepartment_id(industrialLandSupplyConsultation.getDepartment_id());
+                    q.setDel_flag(false);
+                    q.setIndustrial_land_supply_id(apply.getId() + "");
+                    q.setConsultation(CONSULTATION_MESSAGE);
+                    List<IndustrialLandSupplyConsultation> list = industrialLandSupplyConsultationService.findListByWhere(q);
+                    if (CommonUtils.isNotNull(list)) {
+                        industrialLandSupplyConsultation.setIsDefault(true);
+                        for (IndustrialLandSupplyConsultation landSupplyConsultation : list) {
+                            industrialLandSupplyConsultationService.deleteById(landSupplyConsultation.getId());
+                        }
+                    }
                 }
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
             }
@@ -3672,7 +3700,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         }
         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
-                if(CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault()||industrialLandSupplyConsultation.getIsDefault())){
+                if (CommonUtils.isNull(industrialLandSupplyConsultation.getIsDefault() || industrialLandSupplyConsultation.getIsDefault())) {
                     industrialLandSupplyConsultation.setIsDefault(false);
                 }
             }

src/main/resources/mapper/government/IndustrialLandSupplyConsultationDao.xml

@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="platform.modules.government.dao.IndustrialLandSupplyConsultationDao">
 
+    <update id="updateDefaultById">
+        update industrial_land_supply_consultation set is_default = #{isDefault} where id = #{id}
+    </update>
+
 </mapper>

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

@@ -128,7 +128,9 @@
                         <!--<tr class="text-c" th:unless="${landSupplyCons.isDefault}"-->
                         <tr class="text-c"
                             th:each="landSupplyCons,landSupplyConsStat: ${industrialLandSupplyConsultationList}"
-                            th:if="*{item.id+''==landSupplyCons.department_id}">
+                            th:if="*{item.id+''==landSupplyCons.department_id}"
+                            th:unless="${landSupplyCons.consultation == '请反馈明确意见'}"
+                        >
                             <td class="td_material">
                                 <input type="text" class="input-text consultation" placeholder="请输入咨询的问题"
                                        th:name="'consultationList[1'+${landSupplyConsStat.index}+${itemStat.index}+'].consultation'"

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

@@ -127,7 +127,9 @@
                         <!--<tr class="text-c" th:unless="${landSupplyCons.isDefault}"-->
                         <tr class="text-c"
                             th:each="landSupplyCons,landSupplyConsStat: ${industrialLandSupplyConsultationList}"
-                            th:if="*{item.id+''==landSupplyCons.department_id}">
+                            th:if="*{item.id+''==landSupplyCons.department_id}"
+                            th:unless="${landSupplyCons.consultation == '请反馈明确意见'}"
+                        >
                             <td class="td_material">
                                 <input type="text" class="input-text consultation" placeholder="请输入咨询的问题"
                                        th:name="'consultationList[1'+${landSupplyConsStat.index}+${itemStat.index}+'].consultation'"