修改全系统文本名称

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/LawEnforcementWarningList.html

@@ -211,7 +211,7 @@
                     },
                     {
                         field : 'bureauDeptName',
-                        title : '执法部门'
+                        title : '执法单位'
                     },
                     {
                         field : 'lawEnforcementItemText',

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html

@@ -12,7 +12,7 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <p>执法部门：</p>
+                            <p>执法单位：</p>
                             <input type="text" name="bureauDeptName"/>
 <!--                            <input type="hidden" th:value="${time}" name="dateSearch"/>-->
                             <input type="hidden" th:value="${enterpriseNumber}" name="enterpriseNumber"/>
@@ -106,7 +106,7 @@
                 },
                 {
                     field : 'bureauDeptName',
-                    title : '执法部门',
+                    title : '执法单位',
                     /!*formatter:function (value,row,index) {
                         if(row.uniteType==1){
                             return "<div style='text-align: left'>"+ value +"(牵头单位)</div>";
@@ -162,7 +162,7 @@
                 },
                 {
                     field : 'bureauDeptName',
-                    title : '执法部门',
+                    title : '执法单位',
                     formatter:function (value,row,index) {
                         if(row.uniteType==1){
                             return "<div style='text-align: left'>"+ value +"(牵头单位)</div>";
@@ -372,7 +372,7 @@
                 },
                 {
                     field : 'bureauDeptName',
-                    title : '执法部门'
+                    title : '执法单位'
                 },
                 {
                     field : 'enterpriseName',

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html

@@ -14,7 +14,7 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <p>执法部门：</p>
+                            <p>执法单位：</p>
                             <input type="text" name="zfdw"/>
                         </li>
                         <li>
@@ -34,14 +34,14 @@
                     </ul>
                     <!--<ul>
                         <li id="b" th:fragment="b">
-                            <p th:text="|全市:执法部门 ${deptNumber}  执法人员 ${lawNumber}|"></p>
+                            <p th:text="|全市:执法单位 ${deptNumber}  执法人员 ${lawNumber}|"></p>
                         </li>
                     </ul>-->
                     <div class="static-content">
                         <ul>
                             <li id="b" th:fragment="b">
                                 <p>全市:</p>
-                                <p><label th:text="执法部门"></label><b th:text="${deptNumber}"></b></p>
+                                <p><label th:text="执法单位"></label><b th:text="${deptNumber}"></b></p>
                                 <p></i><label th:text="执法人员"></label><b th:text="${lawNumber}"></b></p>
                             </li>
                         </ul>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <li th:fragment="b">
         <p>全市:</p>
-        <p><label th:text="执法部门"></label><b th:text="${deptNumber}"></b></p>
+        <p><label th:text="执法单位"></label><b th:text="${deptNumber}"></b></p>
         <p></i><label th:text="执法人员"></label><b th:text="${lawNumber}"></b></p>
     </li>
 </head>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/add.html

@@ -8,7 +8,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-registration-add">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">执法部门：</label>
+                <label class="col-sm-3 control-label">执法单位：</label>
                 <div class="col-sm-8">
                     <input name="lawEnforcement" class="form-control" type="text">
                 </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/detail.html

@@ -13,7 +13,7 @@
             <div class="col-sm-4">
                 <input name="lawEnforcementCode" th:field="*{lawEnforcementCode}" class="form-control" type="text">
             </div>
-            <label class="col-sm-2 control-label">执法部门：</label>
+            <label class="col-sm-2 control-label">执法单位：</label>
             <div class="col-sm-4">
                 <input name="lawEnforcement" th:field="*{lawEnforcement}" class="form-control" type="text">
             </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html

@@ -9,7 +9,7 @@
         <form class="form-horizontal m" id="form-registration-edit" th:object="${enforcementRegistration}">
             <input name="id" th:field="*{id}" type="hidden">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">执法部门：</label>
+                <label class="col-sm-3 control-label">执法单位：</label>
                 <div class="col-sm-8">
                     <input name="lawEnforcement" th:field="*{lawEnforcement}" class="form-control" type="text">
                 </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html

@@ -215,7 +215,7 @@
                     },
                     {
                         field : 'bureauDeptName',
-                        title : '执法部门'
+                        title : '执法单位'
                     },
                     {
                         field : 'lawEnforcementItemText',

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@@ -22,8 +22,8 @@
         <div class="row">
             <div class="col-sm-12 search-collapse">
                 <div class="statit">
-                    <span id="one1" class="actit" onclick="setTab('one',1,2)">执法执法统计</span>
-                    <span id="one2" onclick="setTab('one',2,2)">执法执法排行</span>
+                    <span id="one1" class="actit" onclick="setTab('one',1,2)">涉企执法统计</span>
+                    <span id="one2" onclick="setTab('one',2,2)">涉企执法排行</span>
                 </div>
                 <div id="one-tab1" class="tab-content active">
                     <form id="formId">
@@ -183,7 +183,7 @@
                 <div id="one-tab2" class="tab-content">
                     <div class="cont-box">
                         <div class="chart-box">
-                            <h3 class="chart-title">执法执法类别数量及占比</h3>
+                            <h3 class="chart-title">执法类别数量及占比</h3>
                                 <form id="formId2">
                                 <div class="select-list">
                                     <ul>
@@ -242,15 +242,15 @@
                         <div class="chart-box" id="container3" style="width: 500px; height: 500px;"></div>
                         <div class="chart-box" id="container4" style="width: 500px; height: 500px;"></div>-->
                         <div class="chart-box">
-                            <h3 class="chart-title"><span id="echarts2-title" class="chart-title"></span>执法执法排行（TOP10）</h3>
+                            <h3 class="chart-title"><span id="echarts2-title" class="chart-title"></span>执法数量排行（TOP10）</h3>
                             <div class="echarts" id="echarts2" style="width: 800px; height: 300px;"></div>
                         </div>
                         <div class="chart-box">
-                            <h3 class="chart-title"><span id="echarts3-title" class="chart-title"></span>执法执法排行（TOP10）</h3>
+                            <h3 class="chart-title"><span id="echarts3-title" class="chart-title"></span>执法数量排行（TOP10）</h3>
                             <div class="echarts" id="echarts3" style="width: 600px; height: 300px;"></div>
                         </div>
                         <div class="chart-box">
-                            <h3 class="chart-title"><span id="echarts4-title" class="chart-title"></span>执法执法排行（TOP10）</h3>
+                            <h3 class="chart-title"><span id="echarts4-title" class="chart-title"></span>执法数量排行（TOP10）</h3>
                             <div class="echarts" id="echarts4" style="width: 800px; height: 300px;"></div>
                         </div>
                     </div>
@@ -858,7 +858,7 @@
                         },*/
                         series:[
                             {
-                                name: currentYear + '年' + currentQuarter + '执法执法排行(TOP10)',
+                                name: currentYear + '年' + currentQuarter + '执法数量排行(TOP10)',
                                 data: ydata,
                                 type: 'bar',
                                 barWidth: 15,

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html

@@ -13,7 +13,7 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <p>执法部门：</p>
+                                <p>执法单位：</p>
                                 <input type="text" id="bureauDeptName" name="bureauDeptName"/>
                             </li>
                             <li>
@@ -109,7 +109,7 @@
                 <table>
                     <thead>
                         <tr>
-                            <th>执法部门</th>
+                            <th>执法单位</th>
                             <th>执法人员</th>
                             <th>执法事项</th>
                             <th>数量</th>
@@ -174,7 +174,7 @@
                     },
                     {
                         field : 'bureauDeptName',
-                        title : '执法部门',
+                        title : '执法单位',
                         formatter:function (value) {
                             return "<div style='text-align: left'>"+ value +"</div>";
                         }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html

@@ -34,7 +34,7 @@
                             <div class="select-list">
                                 <ul>
                                     <li>
-                                        <p>执法部门：</p>
+                                        <p>执法单位：</p>
                                         <input type="text" name="bureauDeptName"/>
                                     </li>
                                     <li>
@@ -378,7 +378,7 @@
                 },*/
                 {
                     field : 'bureauDeptName',
-                    title : '执法部门',
+                    title : '执法单位',
                 },
                 {
                     field : 'total',
@@ -432,7 +432,7 @@
                 },
                 {
                     field : 'bureauDeptName',
-                    title : '执法部门',
+                    title : '执法单位',
                     align : 'center'
                 },
                 {

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html

@@ -14,7 +14,7 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <p>执法部门：</p>
+                            <p>执法单位：</p>
                             <input type="text" name="bureauDeptId"/>
                         </li>
                         <!--<li>
@@ -102,7 +102,7 @@
             columns: [
                 {
                     field : 'enforcementDepartment',
-                    title : '执法部门',
+                    title : '执法单位',
                     formatter:function (value) {
                         return "<div style='text-align: left'>"+ value +"</div>";
                     }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java

@@ -175,7 +175,7 @@ public class EnforcementInspectionProgramController extends BaseController
         styleRow2.setBorderLeft(BorderStyle.THIN);
         styleRow2.setFont(font2);
         //设置表头
-        String[] headerList = {"执法部门","总数", "年度计划", "季度计划", "月度计划"};
+        String[] headerList = {"执法单位","总数", "年度计划", "季度计划", "月度计划"};
         HSSFRow headerRow = sheet.createRow(0);
         for (int i = 0; i < headerList.length; i++) {
             HSSFCell cell = headerRow.createCell(i);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@@ -736,7 +736,7 @@ public class EnforcementRegistrationController extends BaseController
         styleRow2.setBorderLeft(BorderStyle.THIN);
         styleRow2.setFont(font2);
         //设置表头
-        String[] headerList = {"区域", "街道", "企业名称","执法部门", "执法人员", "检查事项","检查时间","检查次数", "2次及以下", "3至4次（黄色）", "5至6次（橙色）" ,"7次及以上（红色）"};
+        String[] headerList = {"区域", "街道", "企业名称","执法单位", "执法人员", "执法事项","执法时间","执法次数", "2次及以下", "3至4次（黄色）", "5至6次（橙色）" ,"7次及以上（红色）"};
         HSSFRow headerRow = sheet.createRow(0);
         for (int i = 0; i < headerList.length; i++) {
             HSSFCell cell = headerRow.createCell(i);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java

@@ -134,7 +134,7 @@ public class StatisticsWarningController extends BaseController {
         styleRow2.setBorderLeft(BorderStyle.THIN);
         styleRow2.setFont(font2);
         //设置表头
-        String[] headerList = {"执法部门", "预警时段", "预警次数"};
+        String[] headerList = {"执法单位", "预警时段", "预警次数"};
         HSSFRow headerRow = sheet.createRow(0);
         for (int i = 0; i < headerList.length; i++) {
             HSSFCell cell = headerRow.createCell(i);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java

@@ -45,7 +45,7 @@ public class EnforceRegCount
 
 
     /**
-     * 执法部门
+     * 执法单位
      */
     private String enforcementDepartment;
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java

@@ -25,7 +25,7 @@ public class EnforcementInspectionProgram extends BaseDomain
     /** 计划名称 */
     private String planName;
 
-    /** 执法部门 */
+    /** 执法单位 */
     private String enforcementDepartment;
 
     /** 执法部门ID */

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -21,7 +21,7 @@ public class EnforcementRegistration extends BaseDomain
     /** 主键ID */
     private String id;
 
-    /** 执法部门 */
+    /** 执法单位 */
     private String lawEnforcement;
 
     /** 执法部门ID */

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java

@@ -39,7 +39,7 @@ public class EnterpriseLawEnforcement extends BaseDomain
     /** 检查要求 */
     private String checkRequire;
     private String checkRequireText;
-    /** 执法部门 */
+    /** 执法单位 */
     private String lawEnforcement;
     /** 执法部门ID */
     private String lawEnforcementId;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementEnterprise.java

@@ -23,7 +23,7 @@ public class LawEnforcementEnterprise extends BaseDomain
     /** 企业纳税识别号 */
     private String enterpriseNumber;
 
-    /** 执法部门 */
+    /** 执法单位 */
     private String lawEnforcement;
 
     /** 执法部门ID */

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementEnterpriseExport.java

@@ -14,8 +14,8 @@ public class LawEnforcementEnterpriseExport {
     @ExcelImport("统一信用代码")
     private String enterpriseNumber;
 
-    /** 执法部门 */
-    @ExcelImport("执法部门")
+    /** 执法单位 */
+    @ExcelImport("执法单位")
     private String lawEnforcement;
 
     /** 执法部门ID */

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java

@@ -48,7 +48,7 @@ public class LawEnforcementWarningList extends BaseDomain
     private String searchDate;
 
     /**
-     * 执法部门
+     * 执法单位
      */
     private String enforcementDepartment;
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java

@@ -6,7 +6,7 @@ public class StatisticalVo extends BaseDomain {
 
 
     /**
-     * 执法部门
+     * 执法单位
      */
     private String  lawEnforcement;
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java

@@ -314,7 +314,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         //创建HSSFWorkbook对象（excel文档对象）
         HSSFWorkbook wb=new HSSFWorkbook();
         //建立新的sheet对象（sheet：表单）
-        HSSFSheet sheet= wb.createSheet("行政执法检查统计");
+        HSSFSheet sheet= wb.createSheet("行政执法统计");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         sheet.setColumnWidth(0,2500);//某列
@@ -378,7 +378,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         String strStart=sMonther.format(simpleDateFormat.parse(enforcementCheckStatistics.getStartTime()))+"月"+sDay.format(simpleDateFormat.parse(enforcementCheckStatistics.getStartTime()))+"日";
         String strEnd=sMonther.format(simpleDateFormat.parse(enforcementCheckStatistics.getEndTime()))+"月"+sDay.format(simpleDateFormat.parse(enforcementCheckStatistics.getEndTime()))+"日";
         String strNow=sYear.format(enforcementCheckStatistics.getNowTime())+"年"+sMonther.format(enforcementCheckStatistics.getNowTime())+"月"+sDay.format(enforcementCheckStatistics.getNowTime())+"日 "+enforcementCheckStatistics.getNowTime().getHours()+"时"+enforcementCheckStatistics.getNowTime().getMinutes()+"分";
-        cell1.setCellValue("深圳市涉企行政检查登记情况\n(统计范围："+strStart+"至"+strEnd+"     统计时间："+strNow+")");
+        cell1.setCellValue("深圳市涉企行政登记情况\n(统计范围："+strStart+"至"+strEnd+"     统计时间："+strNow+")");
         //将单元格样式应用到该单元格
         cell1.setCellStyle(styleRow1);
         //合并单元格--CellRangeAddress(起始行，结束行，起始列，结束列)
@@ -387,7 +387,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         HSSFRow row2=sheet.createRow(1);
 
         List<String> headRow2List=new ArrayList<>();
-        Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","检查事项","检查时间","执法检查次数",
+        Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","执法事项","执法时间","执法次数",
                 "2次及以下","3至4次","5至6次","7次及以上","备注");
         setStyle(headRow2List,row2,styleRow2);
         int rowNum=1;
@@ -2216,7 +2216,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         //创建HSSFWorkbook对象（excel文档对象）
         HSSFWorkbook wb=new HSSFWorkbook();
         //建立新的sheet对象（sheet：表单）
-        HSSFSheet sheet= wb.createSheet("行政执法检查统计");
+        HSSFSheet sheet= wb.createSheet("行政执法统计");
         //自适应列宽
         sheet.setColumnWidth(0,1442);//某列
         sheet.setColumnWidth(1,2256);
@@ -2329,7 +2329,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
             System.out.println(localDate1.getMonth());
         }
         String strNow=sYear.format(enforcementCheckStatistics.getNowTime())+"年"+sMonther.format(enforcementCheckStatistics.getNowTime())+"月"+sDay.format(enforcementCheckStatistics.getNowTime())+"日 "+enforcementCheckStatistics.getNowTime().getHours()+"时"+enforcementCheckStatistics.getNowTime().getMinutes()+"分";
-        cell1.setCellValue("深圳市涉企行政检查登记情况\n(统计范围："+strStart+"至"+strEnd+"     统计时间："+strNow+")");
+        cell1.setCellValue("深圳市涉企行政登记情况\n(统计范围："+strStart+"至"+strEnd+"     统计时间："+strNow+")");
         //将单元格样式应用到该单元格
         cell1.setCellStyle(styleRow1);
         //合并单元格--CellRangeAddress(起始行，结束行，起始列，结束列)
@@ -2338,7 +2338,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
         HSSFRow row2=sheet.createRow(1);
 
         List<String> headRow2List=new ArrayList<>();
-        Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","检查事项","检查时间","检查次数",
+        Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","执法事项","执法时间","执法次数",
                 "2次及以下","3至4次","5至6次","7次及以上","备注");
         setStyle(headRow2List,row2,styleRow2);
         int rowNum=1;
@@ -2544,8 +2544,8 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                 setStyle(cellList,row,styleRow3);
             }
         }
-        //表名：深圳市涉企行政检查登记情况（xxxx年xx月xx日至xxxx年xx月xx日）
-        String fileName="深圳市涉企行政检查登记情况("+strStart+"至"+strEnd+").xls";
+        //表名：深圳市涉企行政登记情况（xxxx年xx月xx日至xxxx年xx月xx日）
+        String fileName="深圳市涉企行政登记情况("+strStart+"至"+strEnd+").xls";
         fileName = URLEncoder.encode(fileName, "UTF-8");
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/vnd.ms-excel");

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -864,9 +864,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         List<DictData> dictDataList2=iDictDataService.selectDictDataByType("no-scan-reason");
         Map<String,DictData> dictDataMap2=dictDataList2.stream().collect(Collectors.toMap(DictData::getDictValue, Function.identity()));
         HSSFWorkbook workbook = new HSSFWorkbook();
-        HSSFSheet sheet = workbook.createSheet("执法检查统计");
+        HSSFSheet sheet = workbook.createSheet("涉企执法情况");
         //设置文件名称
-        String fileName = "执法检查统计.xls";
+        String fileName = "涉企执法情况.xls";
         fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
@@ -887,7 +887,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         styleRow2.setBorderLeft(BorderStyle.THIN);
         styleRow2.setFont(font2);
         //设置表头
-        String[] headerList = {"被检查企业名称","企业所属区域", "企业所属街道", "执法部门", "执法人员","检查事项","检查时间","联合检查","行政检查类别","是否扫码","未扫码原因","是否投诉"};
+        String[] headerList = {"被执法企业名称","企业所属区域", "企业所属街道", "执法单位", "执法人员","执法事项","执法时间","联合执法","行政执法类别","是否扫码","未扫码原因","是否投诉"};
         HSSFRow headerRow = sheet.createRow(0);
         for (int i = 0; i < headerList.length; i++) {
             HSSFCell cell = headerRow.createCell(i);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java

@@ -251,7 +251,7 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
             styleRow2.setBorderLeft(BorderStyle.THIN);
             styleRow2.setFont(font2);
             HSSFRow headerRow = sheet.createRow(0);
-            String[] header = {"被检查企业名称","企业所属区域", "企业所属街道", "执法部门", "执法人员","检查时间","入企类别","入企事项","活动依据"};
+            String[] header = {"被执法企业名称","企业所属区域", "企业所属街道", "执法单位", "执法人员","执法时间","入企事由","入企事项","活动依据"};
             for (int i = 0; i < header.length; i++) {
                 HSSFCell cell = headerRow.createCell(i);
                 HSSFRichTextString text = new HSSFRichTextString(header[i]);