Преглед изворни кода

产业供地添加默认咨询勾选

huZhiHao пре 5 година
родитељ
комит
1fee87065e

+ 3 - 0
src/main/java/platform/modules/government/entity/IndustrialLandSupplyDetail.java

@@ -172,4 +172,7 @@ public class IndustrialLandSupplyDetail extends BaseEntity {
     @Transient
     private String joint_trial_remain_time;
 
+    //默认反馈列表
+    @Transient
+    private List<String> defaultList;
 }

+ 25 - 1
src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -1066,6 +1066,18 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 }
             }
         }
+        //保存默认咨询列表
+        List<String> defaultList = apply.getDefaultList();
+        for (String departmentId : defaultList) {
+            if (departmentId != null && departmentId != "") {
+                IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
+                industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
+                industrialLandSupplyConsultation.setConsultation_time(dateTime);
+                industrialLandSupplyConsultation.setDepartment_id(departmentId);
+                industrialLandSupplyConsultation.setConsultation("请反馈明确意见");
+                industrialLandSupplyConsultationService.save(industrialLandSupplyConsultation);
+            }
+        }
         //保存咨询列表
         List<IndustrialLandSupplyConsultation> industrialLandSupplyConsultationList = apply.getConsultationList();
         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
@@ -3000,8 +3012,20 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             attachmentService.deleteByBusiness(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_COMMERCE_SUPPLEMENT, id);
             attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_COMMERCE_SUPPLEMENT, id, apply.getFileDown().getFile_id());
         }
-        //保存咨询列表
+        //保存默认咨询列表
         String dateTime = DateUtil.getTimeString(new Date());
+        List<String> defaultList = apply.getDefaultList();
+        for (String departmentId : defaultList) {
+            if (departmentId != null && departmentId != "") {
+                IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
+                industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
+                industrialLandSupplyConsultation.setConsultation_time(dateTime);
+                industrialLandSupplyConsultation.setDepartment_id(departmentId);
+                industrialLandSupplyConsultation.setConsultation("请反馈明确意见");
+                industrialLandSupplyConsultationService.save(industrialLandSupplyConsultation);
+            }
+        }
+        //保存咨询列表
         List<IndustrialLandSupplyConsultation> industrialLandSupplyConsultationList = apply.getConsultationList();
         if (!CollectionUtils.isEmpty(industrialLandSupplyConsultationList)) {
 

+ 14 - 1
src/main/resources/templates/admin/government/industrial_land_supply/add.html

@@ -90,6 +90,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 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">
@@ -263,13 +269,20 @@
                 //return false;
             }
 
+            var ids = [];
+            $("input[name='defaultList']:checked").each(function(i){
+                ids.push($(this).val())
+            })
+            console.log(ids)
+
             $(form).ajaxSubmit({
                 type: 'post',
                 url: pagePath + "/land_supply/save",
                 dataType: "json",
                 data: {
                     state: state,
-                    content_text: editor.text()
+                    content_text: editor.text(),
+                    defaultList: ids
                 },
                 success: function (result) {
                     if (result.success) {

+ 6 - 0
src/main/resources/templates/admin/government/industrial_land_supply/commerce_approve.html

@@ -110,6 +110,12 @@
 
         <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 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">

+ 5 - 2
src/main/resources/templates/admin/government/industrial_land_supply/edit.html

@@ -146,8 +146,11 @@
         <input id="status" type="hidden" name="status"/>
         <input id="apply_id" type="hidden" name="apply_id" th:value="${data.id}"/>
 
-        <div th:if="*{data.approve_status=='2' || data.approve_status=='4' || data.approve_status=='12'}" class="line">流程信息</div>
-        <div th:if="*{data.approve_status=='2' || data.approve_status=='4' || data.approve_status=='12'}" class="row cl">
+        <div th:if="*{data.approve_status=='2' || data.approve_status=='4' || data.approve_status=='12'}" class="line">
+            流程信息
+        </div>
+        <div th:if="*{data.approve_status=='2' || data.approve_status=='4' || data.approve_status=='12'}"
+             class="row cl">
             <label class="form-label col-xs-4 col-sm-2"></label>
             <div class="formControls col-xs-8 col-sm-9">
                 <table class="table table-border table-bordered table-bg table-hover processTb">