产业供地bug修改

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

@@ -52,7 +52,7 @@ public class IndustrialLandSupplyDetail extends BaseEntity {
 
     //项目提交来源
     @Transient
-    private String recource;
+    private String resource;
 
     //项目附件
     @Transient

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

@@ -299,13 +299,13 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 
         User user = userService.getUser(entity.getCreate_by());
         if (CommonUtils.isNotNull(user) && Constant.UserType.STREET.equals(user.getUser_type())) {
-            if (CommonUtils.isNotNull(user.getDepartment_name())) {
-                entity.setRecource(user.getDepartment_name());
+            if (CommonUtils.isNotNull(user.getDepartment_name()) && Objects.equals(user.getDepartment_name(), "招商中心")) {
+                entity.setResource(user.getDepartment_name());
             } else {
-                entity.setRecource(user.getStreet_name());
+                entity.setResource(user.getStreet_name());
             }
         } else if (CommonUtils.isNotNull(user) && Constant.UserType.GOVERNMENT.equals(user.getUser_type())) {
-            entity.setRecource(user.getDepartment_name());
+            entity.setResource(user.getDepartment_name());
         }
         //咨询列表
         IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
@@ -412,9 +412,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 
         User user = userService.getUser(entity.getCreate_by());
         if (CommonUtils.isNotNull(user) && Constant.UserType.STREET.equals(user.getUser_type())) {
-            entity.setRecource(user.getStreet_name());
+            entity.setResource(user.getStreet_name());
         } else if (CommonUtils.isNotNull(user) && Constant.UserType.GOVERNMENT.equals(user.getUser_type())) {
-            entity.setRecource(user.getDepartment_name());
+            entity.setResource(user.getDepartment_name());
         }
 
         IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
@@ -487,7 +487,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         if (Constant.UserType.STREET.equals(ShiroUtils.getUserType())) {
 
             apply_status_list.add(Constant.LandSupplyApproveStatus.PLATE_PENDING_SUBMIT);
-//            apply_status_list.add(Constant.LandSupplyApproveStatus.PLATE_WITHDRAW);
+            apply_status_list.add(Constant.LandSupplyApproveStatus.PLATE_WITHDRAW);
             apply_status_list.add(Constant.LandSupplyApproveStatus.COMMERCE_RETURN);
         } else if (Constant.UserType.GOVERNMENT.equals(ShiroUtils.getUserType())) {
 
@@ -924,7 +924,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 //        params.put("apply_name", Constant.ProjectType.PROJECT_INTELLIGENT);
 //        String templateCode = Constant.SMS_TemplateCode.RPOJECT_APPROVAL_REMIND;
 
-        if (CommonUtils.isNull(approval)) {
+        if (CommonUtils.isNull(approval) || Objects.equals(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUBMIT, approval.getAfter_approvalstatus())) {
             //待属地提交  或  商务局受理员待提交--》待商务局受理员审核 或 待咨询反馈
 
             IndustrialLandSupplyConsultation industrialLandSupplyConsultation = new IndustrialLandSupplyConsultation();
@@ -2133,7 +2133,15 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 newApproval.setOper_type(Constant.OperType.SUBMIT);
                 newApproval.setBefore_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_FEEDBACK);
                 if (backToSubmit) {
-                    newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUBMIT);
+                    IndustrialLandSupplyDetail industrialLandSupplyDetail = this.findById(applyId);
+                    if (industrialLandSupplyDetail != null && industrialLandSupplyDetail.getCreate_by() != null) {
+                        User user = userService.getUser(industrialLandSupplyDetail.getCreate_by());
+                        if (Objects.equals(Constant.UserType.STREET, user.getUser_type())) {
+                            newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_HANDLE);
+                        } else {
+                            newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUBMIT);
+                        }
+                    }
                 } else if (sumbitToSummary) {
                     newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUMMARY);
                 }
@@ -2158,7 +2166,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 IndustrialLandSupplyDetail entity = new IndustrialLandSupplyDetail();
                 entity.setId(applyId);
                 if (backToSubmit) {
-                    entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUBMIT);
+                    entity.setApprove_status(newApproval.getAfter_approvalstatus());
                 } else if (sumbitToSummary) {
                     entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUMMARY);
                 }

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

@@ -14,6 +14,7 @@ import platform.common.base.model.DictionaryItem;
 import platform.common.base.service.DictionaryItemService;
 import platform.common.exception.BaseException;
 import platform.common.util.CommonUtils;
+import platform.common.util.ShiroUtils;
 import platform.common.util.word.ExportWord;
 import platform.modules.company.dto.LandSupplyApprovalDto;
 import platform.modules.government.dto.IndustrialLandSupplyDto;
@@ -75,6 +76,7 @@ public class IndustrialLandSupplyController extends BaseController {
         modelMap.put("approve_status", param.getApprove_status());
         modelMap.put("process_stage", param.getProcess_stage());
         modelMap.put("type", type);
+        modelMap.put("userType", ShiroUtils.getUserType());
         List<DictionaryItem> statusList = dictionaryItemService.findListByTypeName(Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY_APPROVE_STATUS);
         modelMap.addAttribute("statusList", statusList);
         List<DictionaryItem> stageList = dictionaryItemService.findListByTypeName(Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY_APPROVE_STAGE);

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

@@ -34,7 +34,7 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-add">
         <input type="hidden" name="id" th:value="${data.id}"/>
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">
@@ -67,15 +67,16 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>附件：</span></label>
             <div class="formControls col-xs-8 col-sm-9">
-<!--                <div class="uploader-list">-->
-<!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
-<!--                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.fileDown.file_url}" target="_blank">[[${data.fileDown.file_name}]]</a>-->
-<!--                    </th:block>-->
-<!--                </div>-->
+                <!--                <div class="uploader-list">-->
+                <!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
+                <!--                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.fileDown.file_url}" target="_blank">[[${data.fileDown.file_name}]]</a>-->
+                <!--                    </th:block>-->
+                <!--                </div>-->
                 <div class="uploader-list">
                     <th:block th:unless="${data.fileList==null}"
                               th:each="item,itemStat: ${data.fileList}">
-                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a></p>
+                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a>
+                        </p>
                     </th:block>
                 </div>
             </div>
@@ -176,7 +177,8 @@
         </div>
         <div th:if="*{data.approve_status=='2'}" class="line">审核意见</div>
         <div th:if="*{data.approve_status=='2'}" class="row cl">
-            <div class="col-xs-8 col-sm-9 col-xs-offset-2 col-sm-offset-1">
+            <label class="form-label col-xs-4 col-sm-2"></label>
+            <div class="formControls col-xs-8 col-sm-9">
                 <textarea class="textarea" id="approval_comment" th:name="approval_comment"
                           placeholder="请输入审核意见"></textarea>
             </div>

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

@@ -29,7 +29,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">

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

@@ -29,7 +29,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">

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

@@ -29,7 +29,7 @@
 <article class="page-container">
 
     <form class="form form-horizontal">
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">
@@ -62,16 +62,17 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>附件：</span></label>
             <div class="formControls col-xs-8 col-sm-9">
-<!--                <div class="uploader-list">-->
-<!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
-<!--                        <a th:href="${fileUrl} + ${data.fileDown.file_url}"-->
-<!--                           target="_blank">[[${data.fileDown.file_name}]]</a>-->
-<!--                    </th:block>-->
-<!--                </div>-->
+                <!--                <div class="uploader-list">-->
+                <!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
+                <!--                        <a th:href="${fileUrl} + ${data.fileDown.file_url}"-->
+                <!--                           target="_blank">[[${data.fileDown.file_name}]]</a>-->
+                <!--                    </th:block>-->
+                <!--                </div>-->
                 <div class="uploader-list">
                     <th:block th:unless="${data.fileList==null}"
                               th:each="item,itemStat: ${data.fileList}">
-                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a></p>
+                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a>
+                        </p>
                     </th:block>
                 </div>
             </div>
@@ -168,7 +169,7 @@
                 <label class="form-label col-xs-4 col-sm-2">反馈内容：</label>
                 <div class="formControls col-xs-8 col-sm-9">
                     <textarea th:name="'distributionList['+${itemStat.index}+'].feedback'"
-                              style="width: 800px;height: 200px;">[[${item.feedback}]]</textarea>
+                              style="width: 800px;height: 200px;font-size: 14px;">[[${item.feedback}]]</textarea>
                 </div>
             </div>
             <div class="row cl">

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

@@ -29,7 +29,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">

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

@@ -34,7 +34,7 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-add">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <input id="id" name="id" type="hidden" th:value="${data.id}"/>
             <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>项目标题：</label>
@@ -143,8 +143,8 @@
         <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'}" class="line">流程信息</div>
-        <div th:if="*{data.approve_status=='2'}" 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">

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

@@ -29,7 +29,7 @@
 <article class="page-container">
 
     <form class="form form-horizontal">
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">
@@ -62,16 +62,17 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>附件：</span></label>
             <div class="formControls col-xs-8 col-sm-9">
-<!--                <div id="fileListPre" class="uploader-list">-->
-<!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
-<!--                        <a th:href="${fileUrl} + ${data.fileDown.file_url}"-->
-<!--                           target="_blank">[[${data.fileDown.file_name}]]</a>-->
-<!--                    </th:block>-->
-<!--                </div>-->
+                <!--                <div id="fileListPre" class="uploader-list">-->
+                <!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
+                <!--                        <a th:href="${fileUrl} + ${data.fileDown.file_url}"-->
+                <!--                           target="_blank">[[${data.fileDown.file_name}]]</a>-->
+                <!--                    </th:block>-->
+                <!--                </div>-->
                 <div class="uploader-list">
                     <th:block th:unless="${data.fileList==null}"
                               th:each="item,itemStat: ${data.fileList}">
-                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a></p>
+                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a>
+                        </p>
                     </th:block>
                 </div>
             </div>
@@ -118,7 +119,7 @@
                 <label class="form-label col-xs-4 col-sm-2">反馈内容：</label>
                 <div class="formControls col-xs-8 col-sm-9">
                     <textarea th:name="'consultationList['+${itemStat.index}+'].feedback'"
-                              style="width: 800px;height: 200px;">[[${item.feedback}]]</textarea>
+                              style="width: 800px;height: 200px;font-size: 14px;">[[${item.feedback}]]</textarea>
                 </div>
             </div>
             <div class="row cl">

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

@@ -34,7 +34,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">

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

@@ -29,7 +29,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">
@@ -164,7 +164,7 @@
                 success: function (result) {
                     if (result.success) {
                         smileMessage(result.message)
-                        setTime();
+                        setTimeClose();
                     } else {
                         errorMessage(result.message);
                     }

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

@@ -130,7 +130,7 @@
 
                                 <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
                                    th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/edit/'+*{id}+'\');'"
-                                   th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9'}">编辑</a>
+                                   th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9' || approve_status=='12'}">编辑</a>
 
                             </th:block>
 
@@ -138,7 +138,7 @@
 
                                 <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
                                    th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/commerce_approve/'+*{id}+'\');'"
-                                   th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9'}">编辑</a>
+                                   th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9' || approve_status=='12'}">编辑</a>
 
                             </th:block>
 
@@ -228,9 +228,13 @@
 
                         </th:block>
 
-                        <a title="删除" href="javascript:;" class="ml-5" style="text-decoration:none"
-                           th:onclick="'javascript:deleteProject(\''+*{id}+'\');'"
-                           th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5'}">删除</a>
+                        <th:block th:if="${userType}==*{user_type}">
+
+                            <a title="删除" href="javascript:;" class="ml-5" style="text-decoration:none"
+                               th:onclick="'javascript:deleteProject(\''+*{id}+'\');'"
+                               th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5'}">删除</a>
+
+                        </th:block>
 
                     </th:block>
 

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

@@ -29,7 +29,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">

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

@@ -29,7 +29,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">

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

@@ -29,7 +29,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">

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

@@ -29,7 +29,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">

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

@@ -29,7 +29,7 @@
 <article class="page-container">
     <form class="form form-horizontal">
 
-        <div class="line">基本信息 <span style="float:right">来源：[[${data?.recource}]]</span></div>
+        <div class="line">基本信息 <span style="float:right">项目来源：[[${data?.resource}]]</span></div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">项目标题：</label>
             <div class="formControls col-xs-4 col-sm-2">