产业供地 追加咨询添加短信提醒 修改和追加咨询页面添加默认咨询勾选

sql/20200428.sql

@@ -0,0 +1,12 @@
+
+ALTER TABLE `industrial_land_supply_consultation`
+ADD COLUMN `is_default` tinyint(1) DEFAULT '0' COMMENT '是否默认咨询';
+
+UPDATE industrial_land_supply_consultation
+SET is_default = 0
+WHERE
+	consultation != '请反馈明确意见';
+UPDATE industrial_land_supply_consultation
+SET is_default = 1
+WHERE
+	consultation = '请反馈明确意见';

src/main/java/platform/modules/government/dto/DepartmentDto.java

@@ -0,0 +1,58 @@
+package platform.modules.government.dto;
+
+import lombok.Data;
+import platform.common.base.model.BaseEntity;
+
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Data
+public class DepartmentDto extends BaseEntity {
+
+    //部门名称
+    private String name;
+
+    //上级ID
+    private Integer parent_id;
+
+    //上级名称
+    @Transient
+    private String department_name;
+
+    //上级IDs
+    private String parent_ids;
+
+    //部门编号
+    private String department_no;
+
+    //电话
+    private String phone;
+
+    //备注
+    private String remark;
+
+    //地址
+    private String address;
+
+    //传真
+    private String fax;
+
+    //邮件
+    private String email;
+
+    //用户类型
+    private Integer user_type;
+
+    //街道ID
+    private Integer street_id;
+
+    //园区ID
+    private Integer build_id;
+
+    //公司ID
+    private Integer company_id;
+
+    private Integer allow_out_login;    //政府用户：1:可以外网登录，0：不可以外网登录
+
+    private Boolean isDefault;
+}

src/main/java/platform/modules/government/entity/IndustrialLandSupplyConsultation.java

@@ -53,12 +53,15 @@ public class IndustrialLandSupplyConsultation extends BaseEntity {
 
     //反馈文件
     @Transient
-    private FileDown fileDown= new FileDown();
+    private FileDown fileDown = new FileDown();
 
     //可否撤回
     @Transient
     private Boolean canWithdraw;
 
+    //是否默认
+    private Boolean isDefault;
+
 //    public String getRemain_time() {
 //        try {
 //            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/main/java/platform/modules/government/entity/IndustrialLandSupplyDetail.java

@@ -3,6 +3,8 @@ package platform.modules.government.entity;
 
 import lombok.Data;
 import platform.common.base.model.BaseEntity;
+import platform.modules.government.dto.DepartmentDto;
+import platform.modules.sys.entity.Department;
 
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -175,4 +177,7 @@ public class IndustrialLandSupplyDetail extends BaseEntity {
     //默认反馈列表
     @Transient
     private List<String> defaultList;
+
+    @Transient
+    private List<DepartmentDto> consulDepartmentList;
 }

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

@@ -18,6 +18,7 @@ import platform.common.util.*;
 import platform.common.util.word.ExportWord;
 import platform.modules.company.dto.LandSupplyApprovalDto;
 import platform.modules.government.dao.IndustrialLandSupplyDetailDao;
+import platform.modules.government.dto.DepartmentDto;
 import platform.modules.government.dto.IndustrialLandSupplyDto;
 import platform.modules.government.dto.IndustrialLandSupplyParam;
 import platform.modules.government.entity.*;
@@ -478,6 +479,12 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         industrialLandSupplyConsultation.setDel_flag(false);
         List<IndustrialLandSupplyConsultation> industrialLandSupplyConsultationList = industrialLandSupplyConsultationService.findListByWhere(industrialLandSupplyConsultation);
         for (IndustrialLandSupplyConsultation landSupplyConsultation : industrialLandSupplyConsultationList) {
+
+           /* if (Objects.equals(landSupplyConsultation.getConsultation(), CONSULTATION_MESSAGE)) {
+                landSupplyConsultation.setIsDefault(true);
+            } else */if (landSupplyConsultation.getIsDefault() == null) {
+                landSupplyConsultation.setIsDefault(false);
+            }
             //文件
             List<Attachment> feedbackAttachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_FEEDBACK, landSupplyConsultation.getId(), null);
             if (null != feedbackAttachments && feedbackAttachments.size() > 0) {
@@ -631,7 +638,24 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
             entity.setSummary_remain_time(DateUtil.getTimeDiff(industrialLandSupplyConsultation.getConsultation_time(), dealTime, days));
         }
-
+        List<DepartmentDto> consulDepartmentList = new ArrayList<>();
+        List<Department> departmentList = consulDepartmentList();
+        if (!CollectionUtils.isEmpty(departmentList)) {
+            for (Department department : departmentList) {
+                DepartmentDto departmentDto = new DepartmentDto();
+                BeanUtils.copyProperties(department, departmentDto);
+                departmentDto.setIsDefault(false);
+                for (IndustrialLandSupplyConsultation landSupplyConsultation : industrialLandSupplyConsultationList) {
+                    if (Objects.equals(departmentDto.getId() + "", landSupplyConsultation.getDepartment_id())
+                            && landSupplyConsultation.getIsDefault()) {
+                        departmentDto.setIsDefault(true);
+                        break;
+                    }
+                }
+                consulDepartmentList.add(departmentDto);
+            }
+        }
+        entity.setConsulDepartmentList(consulDepartmentList);
         //获取商务和商务分管领导审批意见
 //        Group group = null;
 //        List<Approval> approvals = null;
@@ -1070,10 +1094,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         }
         //保存默认咨询列表
         List<String> defaultList = apply.getDefaultList();
-        if(!CollectionUtils.isEmpty(defaultList)){
+        if (!CollectionUtils.isEmpty(defaultList)) {
             for (String departmentId : defaultList) {
                 if (departmentId != null && departmentId != "") {
                     IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
+                    industrialLandSupplyConsultation.setIsDefault(true);
                     industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
                     industrialLandSupplyConsultation.setConsultation_time(dateTime);
                     industrialLandSupplyConsultation.setDepartment_id(departmentId);
@@ -1094,6 +1119,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
 
+                industrialLandSupplyConsultation.setIsDefault(false);
                 industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
                 industrialLandSupplyConsultation.setConsultation_time(dateTime);
             }
@@ -1155,7 +1181,8 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         //保存咨询列表
         String dateTime = DateUtil.getTimeString(new Date());
         List<IndustrialLandSupplyConsultation> industrialLandSupplyConsultationList = apply.getConsultationList();
-        if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
+        List<String> defaultList = apply.getDefaultList();
+        if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList) && !CollectionUtils.isEmpty(defaultList)) {
             //过滤空的
             Iterator<IndustrialLandSupplyConsultation> it = industrialLandSupplyConsultationList.iterator();
             while (it.hasNext()) {
@@ -1165,6 +1192,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
 
+                industrialLandSupplyConsultation.setIsDefault(false);
                 industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
                 if (industrialLandSupplyConsultation.getId() != null) {
                     IndustrialLandSupplyConsultation industrialLandSupplyConsultation1 = industrialLandSupplyConsultationService.findById(industrialLandSupplyConsultation.getId());
@@ -1184,6 +1212,20 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
             }
+            //保存默认咨询列表
+            if (!CollectionUtils.isEmpty(defaultList)) {
+                for (String departmentId : defaultList) {
+                    if (departmentId != null && departmentId != "") {
+                        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 (Constant.PublishStatus.RELEASE.equals(status)) {
@@ -1836,13 +1878,14 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                             templateCode = Constant.SMS_TemplateCode.INDUSTRIAL_LAND_SUPPLY_COMMERCE_SUMMARY;
                             int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(DISTRIBUTE_TIME));
                             params.put("days", days + "");
-                        try {
-                            AlibabaSMSUtil.sendSMSMessage(
-                                    user.getPhone(), templateCode, Constant.SINGNAMW, JSONObject.toJSONString(params)
-                            );
-                        } catch (ClientException e) {
-                            e.printStackTrace();
-                        }}
+                            try {
+                                AlibabaSMSUtil.sendSMSMessage(
+                                        user.getPhone(), templateCode, Constant.SINGNAMW, JSONObject.toJSONString(params)
+                                );
+                            } catch (ClientException e) {
+                                e.printStackTrace();
+                            }
+                        }
                     }
                 }
             }
@@ -2958,10 +3001,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
      * @Return: void
      **/
     @Transactional
-    public void saveFeedbackAppend(String applyId, List<IndustrialLandSupplyConsultation> industrialLandSupplyConsultationList) {
+    public void saveFeedbackAppend(IndustrialLandSupplyDetail apply) {
 
         //保存咨询列表
         String dateTime = DateUtil.getTimeString(new Date());
+        List<IndustrialLandSupplyConsultation> industrialLandSupplyConsultationList = apply.getConsultationList();
         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
 
             Iterator<IndustrialLandSupplyConsultation> it = industrialLandSupplyConsultationList.iterator();
@@ -2973,15 +3017,90 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
 
-                industrialLandSupplyConsultation.setIndustrial_land_supply_id(applyId);
+                industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
+                industrialLandSupplyConsultation.setIsDefault(false);
                 if (CommonUtils.isNull(industrialLandSupplyConsultation.getConsultation_time())) {
                     industrialLandSupplyConsultation.setConsultation_time(dateTime);
                 }
             }
 
+            //短信参数
+            Map<String, String> params = new HashMap<>();
+            IndustrialLandSupplyDetail detail = null;
+            try {
+                detail = this.selectById(apply.getId() + "");
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            params.put("title", detail.getTitle());
+            params.put("no", detail.getNo());
+            String templateCode = Constant.SMS_TemplateCode.INDUSTRIAL_LAND_SUPPLY;
+
+            Group group = null;
+            group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_2);
+            if (null == group) {
+                throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_2 + "没有该项目责任单位的人员，请联系管理员配置");
+            }
+
+            List<UserGroup> userGroups = userGroupService.findByGroupId(group.getId());
+            List<User> users = userService.findListByWhere(new User());
+            StringBuffer sb = new StringBuffer("");
+            for (UserGroup userGroup : userGroups) {
+                for (User user : users) {
+                    if (Objects.equals(user.getId(), userGroup.getUser_id())) {
+                        List<IndustrialLandSupplyConsultation> ids = industrialLandSupplyConsultationList;
+                        for (IndustrialLandSupplyConsultation ilsc : ids) {
+                            if (Objects.equals(user.getDepartment_id() + "", ilsc.getDepartment_id())) {
+                                sb.append(userGroup.getUser_id() + ",");
+                                //发送短信
+                                templateCode = Constant.SMS_TemplateCode.INDUSTRIAL_LAND_SUPPLY_CONSUL;
+                                int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(FEEDBACK_TIME));
+                                params.put("days", days + "");
+                                try {
+                                    AlibabaSMSUtil.sendSMSMessage(
+                                            user.getPhone(), templateCode, Constant.SINGNAMW, JSONObject.toJSONString(params)
+                                    );
+                                } catch (ClientException e) {
+                                    e.printStackTrace();
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
             if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);
             }
+            //保存默认咨询列表
+            List<String> defaultList = apply.getDefaultList();
+            if (!CollectionUtils.isEmpty(defaultList)) {
+                IndustrialLandSupplyConsultation query = new IndustrialLandSupplyConsultation();
+                query.setIndustrial_land_supply_id(apply.getId() + "");
+                query.setDel_flag(false);
+                List<IndustrialLandSupplyConsultation> oldList = industrialLandSupplyConsultationService.findListByWhere(query);
+                for (String departmentId : defaultList) {
+                    if(departmentId!=null){
+                        boolean flag = true;
+                        for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : oldList) {
+                            if (industrialLandSupplyConsultation.getIsDefault() &&
+                                    Objects.equals(industrialLandSupplyConsultation.getDepartment_id(), departmentId)) {
+                                flag = false;
+                            }
+                        }
+                        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);
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -3182,6 +3301,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
             for (IndustrialLandSupplyConsultation industrialLandSupplyConsultation : industrialLandSupplyConsultationList) {
 
+                industrialLandSupplyConsultation.setIsDefault(false);
                 industrialLandSupplyConsultation.setIndustrial_land_supply_id(id + "");
                 if (industrialLandSupplyConsultation.getId() != null) {
                     IndustrialLandSupplyConsultation industrialLandSupplyConsultation1 = industrialLandSupplyConsultationService.findById(industrialLandSupplyConsultation.getId());
@@ -3204,10 +3324,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         }
         //保存默认咨询列表
         List<String> defaultList = apply.getDefaultList();
-        if(!CollectionUtils.isEmpty(defaultList)){
+        if (!CollectionUtils.isEmpty(defaultList)) {
             for (String departmentId : defaultList) {
                 if (departmentId != null && departmentId != "") {
                     IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
+                    industrialLandSupplyConsultation.setIsDefault(true);
                     industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
                     industrialLandSupplyConsultation.setConsultation_time(dateTime);
                     industrialLandSupplyConsultation.setDepartment_id(departmentId);

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

@@ -148,15 +148,17 @@ public class IndustrialLandSupplyController extends BaseController {
 
     @OperationLog(value = "编辑跳转")
     @RequestMapping("/edit/{id}")
-    public String edit(@PathVariable("id") String id, ModelMap modelMap)throws Exception  {
+    public String edit(@PathVariable("id") String id, ModelMap modelMap) throws Exception {
 
         log.info("编辑跳转");
         boolean canAsk = industrialLandSupplyDetailService.canAsk();
         modelMap.addAttribute("canAsk", canAsk);
-        if (canAsk)
-            modelMap.addAttribute("consulDepartmentList", industrialLandSupplyDetailService.consulDepartmentList());
-
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
+        if (canAsk){
+//            modelMap.addAttribute("consulDepartmentList", industrialLandSupplyDetailService.consulDepartmentList());
+            modelMap.addAttribute("consulDepartmentList", entity.getConsulDepartmentList());
+        }
+
         modelMap.put("data", entity);
         modelMap.put("fileUrl", setFileUrl());
         //审批列表
@@ -276,7 +278,7 @@ public class IndustrialLandSupplyController extends BaseController {
 
     @OperationLog(value = "预审审核页面")
     @RequestMapping("/pre_approve/{id}")
-    public String preApprovePage(@PathVariable("id") String id, ModelMap modelMap)throws Exception  {
+    public String preApprovePage(@PathVariable("id") String id, ModelMap modelMap) throws Exception {
 
         log.info("预审审核页面");
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
@@ -289,15 +291,16 @@ public class IndustrialLandSupplyController extends BaseController {
 
     @OperationLog(value = "追加咨询页面")
     @RequestMapping("/feedback_append/{id}")
-    public String feedbackAppendPage(@PathVariable("id") String id, ModelMap modelMap)throws Exception  {
+    public String feedbackAppendPage(@PathVariable("id") String id, ModelMap modelMap) throws Exception {
 
         log.info("追加咨询页面");
         boolean canAsk = industrialLandSupplyDetailService.canAsk();
         modelMap.addAttribute("canAsk", canAsk);
-        if (canAsk)
-            modelMap.addAttribute("consulDepartmentList", industrialLandSupplyDetailService.consulDepartmentList());
-
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
+        if (canAsk){
+//            modelMap.addAttribute("consulDepartmentList", industrialLandSupplyDetailService.consulDepartmentList());
+            modelMap.addAttribute("consulDepartmentList", entity.getConsulDepartmentList());
+        }
         modelMap.put("data", entity);
         modelMap.put("fileUrl", setFileUrl());
         //审批列表
@@ -315,11 +318,9 @@ public class IndustrialLandSupplyController extends BaseController {
     @OperationLog(value = "追加咨询")
     @RequestMapping("/feedback_append")
     @ResponseBody
-    public ResponseMessage feedbackAppend(IndustrialLandSupplyDetail industrialLandSupplyDetail) throws Exception {
+    public ResponseMessage feedbackAppend(IndustrialLandSupplyDetail industrialLandSupplyDetail) {
 
-        if (CommonUtils.isNotNull(industrialLandSupplyDetail) && CommonUtils.isNotNull(industrialLandSupplyDetail.getConsultationList())) {
-            industrialLandSupplyDetailService.saveFeedbackAppend(industrialLandSupplyDetail.getId() + "", industrialLandSupplyDetail.getConsultationList());
-        }
+        industrialLandSupplyDetailService.saveFeedbackAppend(industrialLandSupplyDetail);
 
         return ResponseMessage.success("保存成功！");
     }
@@ -407,7 +408,7 @@ public class IndustrialLandSupplyController extends BaseController {
 
     @OperationLog(value = "跳转分发页面")
     @RequestMapping("/distribute/{id}")
-    public String distributePage(@PathVariable("id") String id, ModelMap modelMap)throws Exception  {
+    public String distributePage(@PathVariable("id") String id, ModelMap modelMap) throws Exception {
 
         log.info("跳转分发页面");
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
@@ -468,7 +469,7 @@ public class IndustrialLandSupplyController extends BaseController {
 
     @OperationLog(value = "跳转分发汇总")
     @RequestMapping("/distribute_summary/{id}")
-    public String distributeSummaryPage(@PathVariable("id") String id, ModelMap modelMap)throws Exception  {
+    public String distributeSummaryPage(@PathVariable("id") String id, ModelMap modelMap) throws Exception {
 
         log.info("跳转分发汇总");
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
@@ -497,7 +498,7 @@ public class IndustrialLandSupplyController extends BaseController {
 
     @OperationLog(value = "跳转供地审核")
     @RequestMapping("/land_approve/{id}")
-    public String landApprovePage(@PathVariable("id") String id, ModelMap modelMap)throws Exception  {
+    public String landApprovePage(@PathVariable("id") String id, ModelMap modelMap) throws Exception {
 
         log.info("跳转供地审核");
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
@@ -510,7 +511,7 @@ public class IndustrialLandSupplyController extends BaseController {
 
     @OperationLog(value = "跳转行政反馈")
     @RequestMapping("/xingzheng_feedback/{id}")
-    public String gsFeedbackPage(@PathVariable("id") String id, ModelMap modelMap)throws Exception  {
+    public String gsFeedbackPage(@PathVariable("id") String id, ModelMap modelMap) throws Exception {
 
         log.info("跳转行政反馈");
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");
@@ -539,7 +540,7 @@ public class IndustrialLandSupplyController extends BaseController {
 
     @OperationLog(value = "跳转行政反馈")
     @RequestMapping("/xingzheng_feedback_view/{id}")
-    public String gsFeedbackViewPage(@PathVariable("id") String id, ModelMap modelMap)throws Exception  {
+    public String gsFeedbackViewPage(@PathVariable("id") String id, ModelMap modelMap) throws Exception {
 
         log.info("跳转行政反馈");
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailService.selectById(id + "");

src/main/java/platform/modules/sys/entity/Department.java

@@ -9,25 +9,32 @@ import javax.persistence.Transient;
 /**
  * Created by luohaifeng on 2018/3/15.
  */
-@Table(name="sys_department")
+@Table(name = "sys_department")
 @Data
 public class Department extends BaseEntity {
-//部门名称
+
+    //部门名称
     private String name;
+
     //上级ID
     private Integer parent_id;
 
     //上级名称
     @Transient
     private String department_name;
+
     //上级IDs
     private String parent_ids;
+
     //部门编号
     private String department_no;
+
     //电话
     private String phone;
+
     //备注
     private String remark;
+
     //地址
     private String address;
 
@@ -48,6 +55,6 @@ public class Department extends BaseEntity {
 
     //公司ID
     private Integer company_id;
-    
-    private Integer allow_out_login;	//政府用户：1:可以外网登录，0：不可以外网登录
+
+    private Integer allow_out_login;    //政府用户：1:可以外网登录，0：不可以外网登录
 }

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

@@ -269,11 +269,10 @@
                 //return false;
             }
 
-            var ids = [];
-            $("input[name='defaultList']:checked").each(function(i){
-                ids.push($(this).val())
-            })
-            console.log(ids)
+            // var ids = [];
+            // $("input[name='defaultList']:checked").each(function(i){
+            //     ids.push($(this).val())
+            // })
 
             $(form).ajaxSubmit({
                 type: 'post',
@@ -281,8 +280,8 @@
                 dataType: "json",
                 data: {
                     state: state,
-                    content_text: editor.text(),
-                    defaultList: ids
+                    content_text: editor.text()/*,
+                    defaultList: ids*/
                 },
                 success: function (result) {
                     if (result.success) {

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

@@ -105,6 +105,12 @@
         </div>
         <div th:if="*{canAsk}" th:each="item,itemStat: ${consulDepartmentList}">
             <div class="line">[[${item.name}]]</div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <input th:checked="${item.isDefault}" type="checkbox" th:name="'defaultList['+${itemStat.index}+']'" th:value="${item.id}">要求反馈意见
+                </div>
+            </div>
             <div class="row cl" th:id=" 'department'+${item.id}">
                 <label class="form-label col-xs-4 col-sm-2"></label>
                 <div class="formControls col-xs-8 col-sm-9">
@@ -119,7 +125,7 @@
                         </tr>
                         </thead>
                         <tbody class="add_file_line" th:id="'tbody_department'+${item.id}">
-                        <tr class="text-c"
+                        <tr class="text-c" th:unless="${landSupplyCons.isDefault}"
                             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

@@ -105,6 +105,12 @@
         <input hidden th:name="id" th:value="${data.id}"/>
         <div th:if="*{canAsk}" th:each="item,itemStat: ${consulDepartmentList}">
             <div class="line">[[${item.name}]]</div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"></label>
+                <div class="formControls col-xs-8 col-sm-9">
+                    <input th:checked="${item.isDefault}" th:disabled="${item.isDefault}" type="checkbox" th:name="'defaultList['+${itemStat.index}+']'" th:value="${item.id}">要求反馈意见
+                </div>
+            </div>
             <div class="row cl" th:id=" 'department'+${item.id}">
                 <label class="form-label col-xs-4 col-sm-2"></label>
                 <div class="formControls col-xs-8 col-sm-9">
@@ -118,7 +124,7 @@
                         </tr>
                         </thead>
                         <tbody class="add_file_line" th:id="'tbody_department'+${item.id}">
-                        <tr class="text-c"
+                        <tr class="text-c" th:unless="${landSupplyCons.isDefault}"
                             th:each="landSupplyCons,landSupplyConsStat: ${industrialLandSupplyConsultationList}"
                             th:if="*{item.id+''==landSupplyCons.department_id}">
                             <td class="td_material">
@@ -162,6 +168,7 @@
     }
 
     function save() {
+
         state = "0";
         $("#form-add").ajaxSubmit({
             type: 'post',