跳过商务领导审核步骤

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

@@ -106,7 +106,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 entity.setProcess_stage_desc(process_stage_name);
             }
             List<Attachment> attachmentList = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_GS, Integer.valueOf(entity.getId()), null);
-            if (null != entity.getGs_feedback()||!CollectionUtils.isEmpty(attachmentList)) {
+            if (null != entity.getGs_feedback() || !CollectionUtils.isEmpty(attachmentList)) {
                 entity.setGs_feedback("0");
             }
         }
@@ -340,27 +340,27 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         }
         entity.setDistributionList(industrialLandSupplyDistributionList);
         //获取商务和商务分管领导审批意见
-        Group group = null;
-        List<Approval> approvals = null;
-        group = groupService.findByName(Constant.INDUSTRIALLANDSUPPLY_1, null);
-        List<UserGroup> userGroups = userGroupService.findByGroupId(group.getId());
+//        Group group = null;
+//        List<Approval> approvals = null;
+//        group = groupService.findByName(Constant.INDUSTRIALLANDSUPPLY_1, null);
+//        List<UserGroup> userGroups = userGroupService.findByGroupId(group.getId());
         //目前都只有一个人
-        if (!CollectionUtils.isEmpty(userGroups)) {
-
-            Example example = new Example(Approval.class);
-            Example.Criteria criteria = example.createCriteria();
-            criteria.andEqualTo("apply_id", id);
-            criteria.andEqualTo("type", Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY);
-            criteria.andEqualTo("after_approvalstatus", Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
-            criteria.andEqualTo("checker", userGroups.get(0).getUser_id());
-            example.orderBy("create_time").desc();
-            approvals = approvalService.selectByExample(example);
-            if (!CollectionUtils.isEmpty(approvals)) {
-                Approval approval = approvals.get(0);
-                approval.getOper_type();
-                approval.getApproval_comment();
-            }
-        }
+//        if (!CollectionUtils.isEmpty(userGroups)) {
+//
+//            Example example = new Example(Approval.class);
+//            Example.Criteria criteria = example.createCriteria();
+//            criteria.andEqualTo("apply_id", id);
+//            criteria.andEqualTo("type", Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY);
+//            criteria.andEqualTo("after_approvalstatus", Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+//            criteria.andEqualTo("checker", userGroups.get(0).getUser_id());
+//            example.orderBy("create_time").desc();
+//            approvals = approvalService.selectByExample(example);
+//            if (!CollectionUtils.isEmpty(approvals)) {
+//                Approval approval = approvals.get(0);
+//                approval.getOper_type();
+//                approval.getApproval_comment();
+//            }
+//        }
 
         return entity;
     }
@@ -913,10 +913,16 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                         throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_2 + "没有该项目责任单位的人员，请联系管理员配置");
                     }
                 } else {
-                    newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
-                    group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_3);
+                    //newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+                    //临时跳过商务领导审核
+                    newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.MANAGEMENT_COMMITTEE_LEADER_PENDING_HANDLE);
+                    //group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_3);
+                    //临时跳过商务领导审核
+                    group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_4);
                     if (null == group) {
-                        throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                        //throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                        //临时跳过商务领导审核
+                        throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_4 + "没有该项目责任单位的人员，请联系管理员配置");
                     }
                 }
             }
@@ -959,7 +965,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     if (!sumbitToLeader) {
                         throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_2 + "没有该项目责任单位的人员，请联系管理员配置");
                     } else {
-                        throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                        //throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                        //临时跳过商务领导审核
+                        throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_4 + "没有该项目责任单位的人员，请联系管理员配置");
                     }
                 }
             }
@@ -972,7 +980,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 if (!sumbitToLeader) {
                     entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_FEEDBACK);
                 } else {
-                    entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+                    //entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+                    //临时跳过商务领导审核
+                    entity.setApprove_status(Constant.LandSupplyApproveStatus.MANAGEMENT_COMMITTEE_LEADER_PENDING_HANDLE);
                 }
             }
             entity.setProcess_stage(Constant.LandSupplyApproveStage.PRE_AUDIT);
@@ -995,10 +1005,16 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             newApproval.setBefore_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_HANDLE);
             if (sumbitToLeader) {
                 newApproval.setOper_type(Constant.OperType.SUBMIT);
-                newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
-                group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_3);
+                //newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+                //临时跳过商务领导审核
+                newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.MANAGEMENT_COMMITTEE_LEADER_PENDING_HANDLE);
+                //group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_3);
+                //临时跳过商务领导审核
+                group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_4);
                 if (null == group) {
-                    throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                    //throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                    //临时跳过商务领导审核
+                    throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_4 + "没有该项目责任单位的人员，请联系管理员配置");
                 }
             } else {
                 newApproval.setOper_type(Constant.OperType.DISTRIBUTE);
@@ -1021,7 +1037,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             newApproval.setNextchecker(sb.toString());
             if (sumbitToLeader) {
                 if (sb.length() == 0) {
-                    throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                    //throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                    //临时跳过商务领导审核
+                    throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_4 + "没有该项目责任单位的人员，请联系管理员配置");
                 }
             } else {
                 if (sb.length() == 0) {
@@ -1032,7 +1050,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             IndustrialLandSupplyDetail entity = new IndustrialLandSupplyDetail();
             entity.setId(applyId);
             if (sumbitToLeader) {
-                entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+                //entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+                //临时跳过商务领导审核
+                entity.setApprove_status(Constant.LandSupplyApproveStatus.MANAGEMENT_COMMITTEE_LEADER_PENDING_HANDLE);
             } else {
                 entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_FEEDBACK);
             }
@@ -1111,10 +1131,17 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             //待咨询汇总  --》 待商务局分管领导审批
             Group group = null;
             newApproval.setBefore_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_PENDING_SUMMARY);
-            newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
-            group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_3);
+            //newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+            //临时跳过商务领导审核
+            newApproval.setAfter_approvalstatus(Constant.LandSupplyApproveStatus.MANAGEMENT_COMMITTEE_LEADER_PENDING_HANDLE);
+            //group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_3);
+            //临时跳过商务领导审核
+            group = groupService.findByNameOnly(Constant.INDUSTRIALLANDSUPPLY_4);
+
             if (null == group) {
-                throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                //throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                //临时跳过商务领导审核
+                throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_4 + "没有该项目责任单位的人员，请联系管理员配置");
             }
             List<UserGroup> userGroups = userGroupService.findByGroupId(group.getId());
             List<User> users = userService.findListByWhere(new User());
@@ -1128,11 +1155,15 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
             newApproval.setNextchecker(sb.toString());
             if (sb.length() == 0) {
-                throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                //throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_3 + "没有该项目责任单位的人员，请联系管理员配置");
+                //临时跳过商务领导审核
+                throw new BaseException("操作失败，" + Constant.INDUSTRIALLANDSUPPLY_4 + "没有该项目责任单位的人员，请联系管理员配置");
             }
             IndustrialLandSupplyDetail entity = new IndustrialLandSupplyDetail();
             entity.setId(applyId);
-            entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+            //entity.setApprove_status(Constant.LandSupplyApproveStatus.COMMERCE_LEADER_PENDING_HANDLE);
+            //临时跳过商务领导审核
+            entity.setApprove_status(Constant.LandSupplyApproveStatus.MANAGEMENT_COMMITTEE_LEADER_PENDING_HANDLE);
             entity.setProcess_stage(Constant.LandSupplyApproveStage.PRE_AUDIT);
             industrialLandSupplyDetailDao.updateByPrimaryKeySelective(entity);
             approvalService.insertAndGetId(newApproval);

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

@@ -161,21 +161,21 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr class="text-c">
-                            <td>商务局分管领导</td>
-                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
-                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>
-                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
-                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>
-                            <td>
-                                <th:block
-                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
-                                    <a style="color: #0c80fe;"
-                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
-                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
-                                </th:block>
-                            </td>
-                        </tr>
+<!--                        <tr class="text-c">-->
+<!--                            <td>商务局分管领导</td>-->
+<!--                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"-->
+<!--                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>-->
+<!--                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"-->
+<!--                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>-->
+<!--                            <td>-->
+<!--                                <th:block-->
+<!--                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">-->
+<!--                                    <a style="color: #0c80fe;"-->
+<!--                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"-->
+<!--                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>-->
+<!--                                </th:block>-->
+<!--                            </td>-->
+<!--                        </tr>-->
                         <tr class="text-c">
                             <td>管委会分管领导</td>
                             <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"

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

@@ -159,21 +159,21 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr class="text-c">
-                        <td>商务局分管领导</td>
-                        <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
-                            th:data="*{data.commerce_leader_pre_approve_operate}"></td>
-                        <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
-                            th:data="*{data.commerce_leader_pre_approve_comment}"></td>
-                        <td>
-                            <th:block
-                                    th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
-                                <a style="color: #0c80fe;"
-                                   th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
-                                   target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
-                            </th:block>
-                        </td>
-                    </tr>
+<!--                    <tr class="text-c">-->
+<!--                        <td>商务局分管领导</td>-->
+<!--                        <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"-->
+<!--                            th:data="*{data.commerce_leader_pre_approve_operate}"></td>-->
+<!--                        <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"-->
+<!--                            th:data="*{data.commerce_leader_pre_approve_comment}"></td>-->
+<!--                        <td>-->
+<!--                            <th:block-->
+<!--                                    th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">-->
+<!--                                <a style="color: #0c80fe;"-->
+<!--                                   th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"-->
+<!--                                   target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>-->
+<!--                            </th:block>-->
+<!--                        </td>-->
+<!--                    </tr>-->
                     <tr class="text-c">
                         <td>管委会分管领导</td>
                         <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"

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

@@ -159,21 +159,21 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr class="text-c">
-                        <td>商务局分管领导</td>
-                        <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
-                            th:data="*{data.commerce_leader_pre_approve_operate}"></td>
-                        <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
-                            th:data="*{data.commerce_leader_pre_approve_comment}"></td>
-                        <td>
-                            <th:block
-                                    th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
-                                <a style="color: #0c80fe;"
-                                   th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
-                                   target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
-                            </th:block>
-                        </td>
-                    </tr>
+<!--                    <tr class="text-c">-->
+<!--                        <td>商务局分管领导</td>-->
+<!--                        <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"-->
+<!--                            th:data="*{data.commerce_leader_pre_approve_operate}"></td>-->
+<!--                        <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"-->
+<!--                            th:data="*{data.commerce_leader_pre_approve_comment}"></td>-->
+<!--                        <td>-->
+<!--                            <th:block-->
+<!--                                    th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">-->
+<!--                                <a style="color: #0c80fe;"-->
+<!--                                   th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"-->
+<!--                                   target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>-->
+<!--                            </th:block>-->
+<!--                        </td>-->
+<!--                    </tr>-->
                     <tr class="text-c">
                         <td>管委会分管领导</td>
                         <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"

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

@@ -159,21 +159,21 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr class="text-c">
-                        <td>商务局分管领导</td>
-                        <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
-                            th:data="*{data.commerce_leader_pre_approve_operate}"></td>
-                        <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
-                            th:data="*{data.commerce_leader_pre_approve_comment}"></td>
-                        <td>
-                            <th:block
-                                    th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
-                                <a style="color: #0c80fe;"
-                                   th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
-                                   target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
-                            </th:block>
-                        </td>
-                    </tr>
+<!--                    <tr class="text-c">-->
+<!--                        <td>商务局分管领导</td>-->
+<!--                        <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"-->
+<!--                            th:data="*{data.commerce_leader_pre_approve_operate}"></td>-->
+<!--                        <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"-->
+<!--                            th:data="*{data.commerce_leader_pre_approve_comment}"></td>-->
+<!--                        <td>-->
+<!--                            <th:block-->
+<!--                                    th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">-->
+<!--                                <a style="color: #0c80fe;"-->
+<!--                                   th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"-->
+<!--                                   target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>-->
+<!--                            </th:block>-->
+<!--                        </td>-->
+<!--                    </tr>-->
                     <tr class="text-c">
                         <td>管委会分管领导</td>
                         <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"

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

@@ -161,21 +161,21 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr class="text-c">
-                            <td>商务局分管领导</td>
-                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
-                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>
-                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
-                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>
-                            <td>
-                                <th:block
-                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
-                                    <a style="color: #0c80fe;"
-                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
-                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
-                                </th:block>
-                            </td>
-                        </tr>
+<!--                        <tr class="text-c">-->
+<!--                            <td>商务局分管领导</td>-->
+<!--                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"-->
+<!--                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>-->
+<!--                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"-->
+<!--                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>-->
+<!--                            <td>-->
+<!--                                <th:block-->
+<!--                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">-->
+<!--                                    <a style="color: #0c80fe;"-->
+<!--                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"-->
+<!--                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>-->
+<!--                                </th:block>-->
+<!--                            </td>-->
+<!--                        </tr>-->
                         </tbody>
                     </table>
                 </div>

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

@@ -159,21 +159,21 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr class="text-c">
-                        <td>商务局分管领导</td>
-                        <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
-                            th:data="*{data.commerce_leader_pre_approve_operate}"></td>
-                        <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
-                            th:data="*{data.commerce_leader_pre_approve_comment}"></td>
-                        <td>
-                            <th:block
-                                    th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
-                                <a style="color: #0c80fe;"
-                                   th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
-                                   target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
-                            </th:block>
-                        </td>
-                    </tr>
+<!--                    <tr class="text-c">-->
+<!--                        <td>商务局分管领导</td>-->
+<!--                        <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"-->
+<!--                            th:data="*{data.commerce_leader_pre_approve_operate}"></td>-->
+<!--                        <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"-->
+<!--                            th:data="*{data.commerce_leader_pre_approve_comment}"></td>-->
+<!--                        <td>-->
+<!--                            <th:block-->
+<!--                                    th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">-->
+<!--                                <a style="color: #0c80fe;"-->
+<!--                                   th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"-->
+<!--                                   target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>-->
+<!--                            </th:block>-->
+<!--                        </td>-->
+<!--                    </tr>-->
                     <tr class="text-c">
                         <td>管委会分管领导</td>
                         <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"

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

@@ -160,21 +160,21 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr class="text-c">
-                            <td>商务局分管领导</td>
-                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"
-                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>
-                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"
-                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>
-                            <td>
-                                <th:block
-                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">
-                                    <a style="color: #0c80fe;"
-                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"
-                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>
-                                </th:block>
-                            </td>
-                        </tr>
+<!--                        <tr class="text-c">-->
+<!--                            <td>商务局分管领导</td>-->
+<!--                            <td th:text="${data.commerce_leader_pre_approve_operate}" class="viewComment"-->
+<!--                                th:data="*{data.commerce_leader_pre_approve_operate}"></td>-->
+<!--                            <td th:text="${data.commerce_leader_pre_approve_comment}" class="viewComment"-->
+<!--                                th:data="*{data.commerce_leader_pre_approve_comment}"></td>-->
+<!--                            <td>-->
+<!--                                <th:block-->
+<!--                                        th:unless="${data.commerce_leader_pre_approve_file==null || data.commerce_leader_pre_approve_file.file_url== null}">-->
+<!--                                    <a style="color: #0c80fe;"-->
+<!--                                       th:href="${fileUrl} + ${data.commerce_leader_pre_approve_file.file_url}"-->
+<!--                                       target="_blank">[[${data.commerce_leader_pre_approve_file.file_name}]]</a>-->
+<!--                                </th:block>-->
+<!--                            </td>-->
+<!--                        </tr>-->
                         <tr class="text-c">
                             <td>管委会分管领导</td>
                             <td th:text="${data.committee_leader_pre_approve_operate}" class="viewComment"