tianwu.sun před 9 měsíci
rodič
revize
cb225fdf61

+ 4 - 4
src/main/java/com/bootdo/datas/controller/DataController.java

@@ -69,11 +69,11 @@ public class DataController {
     @RequiresPermissions("datas:data:data")
     public PageUtils list(@RequestParam Map<String, Object> params) {
         // 查询列表数据
+
         Query query = new Query(params);
-        String dataStatus = (String) params.get("dataStatus");
-        if(StringUtils.isNotEmpty(dataStatus)) {
-            query.put("dataStatusArrs", Lists.newArrayList((dataStatus)));
-        }
+        query.put("dataStatusArrs", Lists.newArrayList(3));
+        query.put("auditStageMenu", "2");
+        query.put("neqDataStatus", "4");
 
         List<GyDataImportDTO> dataList = gyDataService.list(query);
         int total = gyDataService.countTotal(query);

+ 3 - 2
src/main/java/com/bootdo/datas/controller/DataExpertController.java

@@ -262,9 +262,10 @@ public class DataExpertController {
             data = gyDataService.get(id);
             log.info("status:" + data.getDataStatus());
             if ("2".equals(data.getDataStatus())) {
-                // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回 5:联合审批 6:终审
+                // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
                 data.setId(id);
-                data.setDataStatus("5");
+                data.setDataStatus("2");
+                data.setSendVerify("3");
                 data.setNextVerifyDept(deptId);
                 gyDataService.updateStatus(data);
             }

+ 149 - 11
src/main/java/com/bootdo/datas/controller/DataSendProvinceController.java

@@ -1,15 +1,15 @@
 package com.bootdo.datas.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.bootdo.common.annotation.Log;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import com.bootdo.common.utils.R;
+import com.bootdo.common.utils.*;
 
-import com.bootdo.common.utils.StringUtils;
+import com.bootdo.datas.domain.GyDataExcelDO;
 import com.bootdo.datas.dto.GyDataImportDTO;
 import com.bootdo.datas.service.GyDataService;
 
+import com.bootdo.datas.tools.ExcelUtils;
 import com.google.common.collect.Lists;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
@@ -17,8 +17,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -32,7 +36,7 @@ public class DataSendProvinceController {
     private GyDataService gyDataService;
 
     @GetMapping()
-    @Log("访问送审省级")
+    @Log("访问上报到省级")
     @RequiresPermissions("datas:dataSendProvince:data")
     String Data() {
         return "datas/dataSendProvince/data";
@@ -65,15 +69,15 @@ public class DataSendProvinceController {
 
 
     /**
-     * @Description: 送审
+     * @Description: 上报到省级
      */
-    @PostMapping("/sendVerify")
+    @PostMapping("/sendProvince")
     @ResponseBody
-    @RequiresPermissions("datas:dataSendProvince:sendVerify")
-    public R sendVerify(@RequestParam("ids[]") Long[] ids) {
-        log.info("送审 ids:" + ids.toString());
+    @RequiresPermissions("datas:dataSendProvince:sendProvince")
+    public R sendProvince(@RequestParam("ids[]") Long[] ids) {
+        log.info("上报到省级 ids:" + ids.toString());
         for (Long id : ids) {
-            log.info("送审 id:" + id);
+            log.info("上报到省级 id:" + id);
             GyDataImportDTO data = new GyDataImportDTO();
             // 判断是否已审核过
             data = gyDataService.get(id);
@@ -93,6 +97,140 @@ public class DataSendProvinceController {
         return R.ok();
     }
 
+    /**
+     * @Description: 加密导出
+     */
+    @GetMapping("/encryptExports")
+    @RequiresPermissions("datas:dataSendProvince:encryptExports")
+    public void encryptExports(HttpServletResponse responses, String idValue) throws Exception {
+        log.info("批量导出 备案主键 idvalue:" + idValue);
+        // 导出xlsx操作
+        try {
+            gyDataService.encryptExports(responses,idValue);
+        } catch (Exception e) {
+            log.error("export error", e);
+        }
+    }
+
+
+    /**
+     * @Description: 批量导出
+     * @Author: wangp
+     * @Date: 2022/3/16 10:46
+     * @param idValue
+     * @Return: R
+     */
+    @GetMapping("/batchExports")
+    @RequiresPermissions("datas:dataSendProvince:export")
+    public void batchExports(HttpServletResponse responses, String idValue) {
+        log.info("批量导出 备案主键 idvalue:" + idValue);
+        List<GyDataExcelDO> list = new ArrayList<>();
+        JSONArray json = (JSONArray)JSONArray.parse(idValue);
+        for (int i = 0; i < json.size(); i++) {
+            String id = String.valueOf(json.get(i));
+            log.info("批量导出 id:" + json.get(i));
+            GyDataExcelDO data = new GyDataExcelDO();
+            data = gyDataService.getDataExcel(Long.parseLong(id));
+            data.setNo(i + 1); //序号
+            list.add(data);
+        }
+        log.info("list size:" + list.size());
+        // 导出xlsx操作
+        try {
+            ExcelUtils.export(responses, GyDataExcelDO.class, list, "上报到省级备案导出信息");
+        } catch (Exception e) {
+            log.error("export error", e);
+        }
+    }
+
+    /**
+     * @Description: 跳转批量导入页面
+     * @Author: wangp
+     * @Date: 2022/3/21 10:06
+     * @param
+     * @Return: String
+     */
+    @GetMapping("/dataImport")
+    @RequiresPermissions("datas:dataSendProvince:plainTextImport")
+    String dataImport() {
+        return "datas/dataSendProvince/dataImport";
+    }
+
+    /**
+     * @Description: 明文导入
+     * @Author: wangp
+     * @Date: 2022/6/10 15:01
+     * @param file
+     * @Return: R
+     */
+    @ResponseBody
+    @PostMapping("/plainTextImport")
+    @RequiresPermissions("datas:dataSendProvince:plainTextImport")
+    public R plainTextImport(@RequestParam("data_file") MultipartFile file) {
+        try {
+            String fileName = file.getOriginalFilename();
+            log.info("fileName:" + fileName);
+            String type = fileName.substring(fileName.lastIndexOf(".") + 1);
+            // 根据excel类型取数据
+            if ("xlsx".equals(type) || "xlsx".equals(type)) {
+                String reault = gyDataService.plainTextImport(file, 3);
+                if (!ObjectUtils.isEmpty(reault)) {
+                    return R.ok(fileName + ":" + reault);
+                }
+            } else {
+                return R.error("请使用excel导入!");
+            }
+            return R.ok();
+        } catch (BDException e){
+            return R.error(e.getMessage());
+        }
+    }
+
+    /**
+     * @Description: 跳转批量导入页面
+     * @Author: wangp
+     * @Date: 2022/3/21 10:06
+     * @param
+     * @Return: String
+     */
+    @GetMapping("/batchAdd")
+    @RequiresPermissions("datas:dataSendProvince:add")
+    String batchAdd() {
+        return "datas/dataSendProvince/batchAdd";
+    }
 
+    /**
+     * 密文导入
+     */
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("datas:dataSendProvince:add")
+    public R save(@RequestParam("data_file") MultipartFile file) {
+        try {
+            String fileName = file.getOriginalFilename();
+            log.info("fileName:" + fileName);
+            String type = fileName.substring(fileName.lastIndexOf(".") + 1);
+            // 根据excel类型取数据
+            if ("xlsx".equals(type) || "xlsx".equals(type)) {
+                // dataService.save(file);
+                // 文件解密
+                String decFlg = gyDataService.dec(file);
+                log.info("decFlg:" + decFlg);
+                if (StringUtils.isNotBlank(decFlg)) {
+                    String reault = gyDataService.cipherTextImport(decFlg, 3);
+                    if (!ObjectUtils.isEmpty(reault)) {
+                        return R.ok(fileName + ":" + reault);
+                    }
+                } else {
+                    return R.error("文件解密异常!");
+                }
+            } else {
+                return R.error("请使用excel导入!");
+            }
+            return R.ok();
+        } catch (BDException e){
+            return R.error(e.getMessage());
+        }
+    }
 
 }

+ 4 - 5
src/main/java/com/bootdo/datas/controller/DataUnionController.java

@@ -6,7 +6,6 @@ import com.bootdo.common.utils.*;
 import com.bootdo.datas.domain.GyDataExcelDO;
 import com.bootdo.datas.dto.ExamineLogDTO;
 import com.bootdo.datas.dto.GyDataImportDTO;
-import com.bootdo.datas.service.DataService;
 import com.bootdo.datas.service.ExamineLogService;
 import com.bootdo.datas.service.GyDataService;
 import com.bootdo.datas.tools.ExcelUtils;
@@ -143,8 +142,8 @@ public class DataUnionController {
             // 判断是否已审核过
             data = gyDataService.get(id);
             log.info("status:" + data.getDataStatus());
-            if ("5".equals(data.getDataStatus())) {
-                // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回 5:联合审批 6:终审
+            if ("2".equals(data.getDataStatus())) {
+                // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
                 data.setId(id);
                 data.setDataStatus("3");
                 gyDataService.updateStatus(data);
@@ -191,8 +190,8 @@ public class DataUnionController {
             // 判断是否已审核过
             data = gyDataService.get(id);
             log.info("status:" + data.getDataStatus());
-            if ("5".equals(data.getDataStatus())) {
-                // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回 5:联合审批 6:终审
+            if ("2".equals(data.getDataStatus())) {
+                // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
                 data.setId(id);
                 data.setDataStatus("4");
                 gyDataService.updateStatus(data);

+ 3 - 2
src/main/java/com/bootdo/datas/controller/DataVerifyController.java

@@ -268,9 +268,10 @@ public class DataVerifyController {
             data = gyDataService.get(id);
             log.info("status:" + data.getDataStatus());
             if ("2".equals(data.getDataStatus())) {
-                // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回 5:联合审批 6:终审
+                // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
                 data.setId(id);
-                data.setDataStatus("5");
+                data.setDataStatus("2");
+                data.setSendVerify("3");
                 data.setNextVerifyDept(deptId);
                 gyDataService.updateStatus(data);
             }

+ 1 - 1
src/main/java/com/bootdo/datas/dto/GyDataImportDTO.java

@@ -366,7 +366,7 @@ public class GyDataImportDTO {
     private Long nextVerifyDept;
 
     /**
-     * 送审状态:默认未送审 0 已送审:1 专家审核:2
+     * 送审状态: 0未送审, 1已送审, 2专家审核,3联合审核
      */
     private String sendVerify;
 

+ 24 - 3
src/main/java/com/bootdo/datas/service/impl/GyDataServiceImpl.java

@@ -378,21 +378,42 @@ public class GyDataServiceImpl implements GyDataService {
                 }  else if("3".equals(deployType)){ //省市一体部署
                     gyDataDO.setAuditStage("1");
                 }
-            } else { //数据目录导入
+            } else if(type == 2){ //数据目录导入
                 gyDataDO.setSendVerify("1");// 送审状态 0:未送审 1:已送审
                 gyDataDO.setDataStatus("3"); // 状态 0:待审核 1:删除 2:已上报 3:通过审核 4:驳回
                 gyDataDO.setDeleteStatus("0"); // 状态 0:正常 1:删除
                 if("1".equals(deployType)){ //市级单独部署
-                    gyDataDO.setAuditStage("1");
+                    throw new BDException("不支持该操作,请到“报送到省级”列表操作");
                 } else if("2".equals(deployType)){ //省级单独部署
                     gyDataDO.setAuditStage("2");
                 }  else if("3".equals(deployType)){ //省市一体部署
                     if(StringUtils.isNotEmpty(currUser.getCity())){ //市级人员操作
-                        gyDataDO.setAuditStage("1");
+                        throw new BDException("市级人员无权操作");
                     } else {
                         gyDataDO.setAuditStage("2");
                     }
 
+                }
+            } else { //上报到省级导入
+                gyDataDO.setSendVerify("1");// 送审状态 0:未送审 1:已送审
+                gyDataDO.setDataStatus("3"); // 状态 0:待审核 1:删除 2:已上报 3:通过审核 4:驳回
+                gyDataDO.setDeleteStatus("0"); // 状态 0:正常 1:删除
+                if("1".equals(deployType)){ //市级单独部署
+                    gyDataDO.setAuditStage("1");
+                } else if("2".equals(deployType)){ //省级单独部署
+                    throw new BDException("不支持该操作,请到“数据目录”列表操作");
+                }  else if("3".equals(deployType)){ //省市一体部署
+                    if(StringUtils.isNotEmpty(currUser.getCity())){ //市级人员操作
+                        gyDataDO.setAuditStage("1");
+                    } else {
+                        if (managerValue.contains(currUser.getDeptId().toString())) { //机构是管理员
+                            gyDataDO.setAuditStage("1");
+                        } else { //一般省级人员
+                            throw new BDException("省级人员无权操作");
+                        }
+
+                    }
+
                 }
             }
             gyDataDO.setUploadTime(new Date());

+ 4 - 4
src/main/java/com/bootdo/datas/service/impl/SmsServiceimpl.java

@@ -28,16 +28,16 @@ public class SmsServiceimpl implements SmsService {
     @Autowired
     private LogInfoService logService;
 
-    @Value("${sms.cpcode}")
+    //@Value("${sms.cpcode}")
     public String cpcode;
 
-    @Value("${sms.key}")
+    //@Value("${sms.key}")
     public String key;
 
-    @Value("${sms.templetid}")
+    //@Value("${sms.templetid}")
     public String templetid;
 
-    @Value("${sms.smsUrl}")
+   // @Value("${sms.smsUrl}")
     public String smsUrl;
 
     /**

+ 0 - 7
src/main/resources/static/js/appjs/datas/data/data.js

@@ -17,7 +17,6 @@ $(function () {
     //地市
     loadCity();
 
-    loadAuditStage();
 });
 
 $('.dropdown-toggle').dropdown();
@@ -73,10 +72,6 @@ myColumns.push(
                 return '<span class="label  label-success">通过审核</span>';
             } else if (item == '4') {
                 return '<span class="label  label-danger">驳回</span>';
-            } else if (item == '5') {
-                return '<span class="label  label-danger">联合审核</span>';
-            } else if (item == '6') {
-                return '<span class="label  label-danger">终审</span>';
             }
         },
         width: 120,
@@ -157,7 +152,6 @@ function load() {
                         industryTypeOne: $('#industryTypeOne').val(),
                         // dataStatus: $('#status').val(),
                         dataLevel: $('#dataLevel').val(),
-                        auditStage: $('#auditStage').val(),
                         unitProvince: $('#unitProvince').val(), //省
                         unitCity: $('#unitCity').val(), //市区
                         dataStatus: '3',//已审批
@@ -243,7 +237,6 @@ function reset() {
     $("#unitProvince").val("").trigger("chosen:updated");
     $("#unitCity").val("").trigger("chosen:updated");
     $("#dataLevel").val("").trigger("chosen:updated");
-    $("#auditStage").val("").trigger("chosen:updated");
 }
 
 function batchRemove() {

+ 73 - 4
src/main/resources/static/js/appjs/datas/dataSendProvince/data.js

@@ -226,15 +226,62 @@ function DoOnMsoNumberFormat(cell, row, col) {
     return result;
 }
 
+//明文导出
+function batchExports() {
+    var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行,当没有选择的记录时,返回一个空数组
+    if (rows.length == 0) {
+        layer.msg("请选择要导出的备案数据");
+        return;
+    }
+    layer.confirm("确认要导出选中的'" + rows.length + "'条备案数据吗?", {
+        btn: ['确定', '取消']
+        // 按钮
+    }, function () {
+        var ids = new Array();
+        // 遍历所有选择的行数据,取每条数据对应的ID
+        $.each(rows, function (i, row) {
+            ids[i] = row['id'];
+        });
+        layer.close(layer.index);
+        location.href = prefix + "/batchExports?idValue=" + JSON.stringify(ids).replace('[', '%5B').replace(']', '%5D');
+        // location.href = prefix + "/batchExports?idValue=" + JSON.stringify(ids);
+    }, function () {
+
+    });
+}
 
-//送审 sendVerify
-function sendVerifyBatch() {
+//加密导出
+function encryptExports() {
     var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行,当没有选择的记录时,返回一个空数组
     if (rows.length == 0) {
-        layer.msg("请选择要送审的备案数据");
+        layer.msg("请选择要导出的备案数据");
         return;
     }
-    layer.confirm("确认要送审选中的'" + rows.length + "'条备案数据吗?", {
+    layer.confirm("确认要导出选中的'" + rows.length + "'条备案数据吗?", {
+        btn: ['确定', '取消']
+        // 按钮
+    }, function () {
+        var ids = new Array();
+        // 遍历所有选择的行数据,取每条数据对应的ID
+        $.each(rows, function (i, row) {
+            ids[i] = row['id'];
+        });
+        layer.close(layer.index);
+        location.href = prefix + "/encryptExports?idValue=" + JSON.stringify(ids).replace('[', '%5B').replace(']', '%5D');
+        // location.href = prefix + "/batchExports?idValue=" + JSON.stringify(ids);
+    }, function () {
+
+    });
+}
+
+//上报到省级 sendBatch
+function sendBatch() {
+    var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行,当没有选择的记录时,返回一个空数组
+    if (rows.length == 0) {
+        layer.msg("请选择要上报到省级的备案数据");
+        return;
+    }
+    layer.confirm("确认要上报到省级选中的'" + rows.length + "'条备案数据吗?", {
         btn: ['确定', '取消']
         // 按钮
     }, function () {
@@ -262,4 +309,26 @@ function sendVerifyBatch() {
 
     });
 }
+//密文导入
+function add() {
+    layer.open({
+        type: 2,
+        title: '数据导入',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '500px'],
+        content: prefix + '/batchAdd' // iframe的url
+    });
+}
+//明文导入
+function dataImport() {
+    layer.open({
+        type: 2,
+        title: '明文导入',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '500px'],
+        content: prefix + '/dataImport' // iframe的url
+    });
+}
 

+ 2 - 2
src/main/resources/static/js/appjs/datas/dataVerify/data.js

@@ -403,10 +403,10 @@ function nextVerify(deptId, name) {
     console.log("deptId:" + deptId)
     var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行,当没有选择的记录时,返回一个空数组
     if (rows.length == 0) {
-        layer.msg("请选择要联合审的备案数据");
+        layer.msg("请选择要联合审的备案数据");
         return;
     }
-    layer.confirm("确认要联合审的'" + rows.length + "'条备案数据吗?", {
+    layer.confirm("确认要联合审的'" + rows.length + "'条备案数据吗?", {
         btn: ['确定', '取消']
         // 按钮
     }, function () {

+ 2 - 6
src/main/resources/static/js/appjs/datas/expertVerify/data.js

@@ -77,7 +77,7 @@ myColumns.push(
         align: "center",
     },
     {
-        // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回 5:联合审批  6:终审
+        // 0:正常 1:删除 2:已上报 3:通过审核 4:驳回
         field: 'dataStatus',
         title: '状态',
         titleTooltip: "状态",
@@ -88,10 +88,6 @@ myColumns.push(
                 return '<span class="label  label-success">通过审核</span>';
             } else if (item == '4') {
                 return '<span class="label  label-danger">驳回</span>';
-            } else if (item == '5') {
-                return '<span class="label  label-danger">联合审核</span>';
-            } else if (item == '6') {
-                return '<span class="label  label-danger">终审</span>';
             }
 
         },
@@ -175,7 +171,7 @@ function load() {
                         unitCity: $('#unitCity').val(), //市区
                         sendVerify: '2',//送审状态
                         unitProvince: $('#unitProvince').val(),
-                        // dataStatus: '3',//已审批
+
                     };
                 },
                 onLoadSuccess: function () {

+ 4 - 6
src/main/resources/static/js/appjs/datas/unionVerify/data.js

@@ -5,6 +5,8 @@ var selected = "#333";
 
 $(function () {
     $("#unitProvince").val('');
+    //初始化 默认审核中
+    $('#status').val('2');
     load();
     //数据级别
     loadLevel();
@@ -92,10 +94,6 @@ myColumns.push(
                 return '<span class="label  label-success">通过审核</span>';
             } else if (item == '4') {
                 return '<span class="label  label-danger">驳回</span>';
-            } else if (item == '5') {
-                return '<span class="label  label-danger">联合审核</span>';
-            } else if (item == '6') {
-                return '<span class="label  label-danger">终审</span>';
             }
 
         },
@@ -180,8 +178,8 @@ function load() {
                         dataLevel: $('#dataLevel').val(),
                         auditStage: $('#auditStage').val(),
                         unitCity: $('#unitCity').val(), //市区
-                        sendVerify: '1' ,//送审状态
-                        // dataStatus: '3',//已审批
+                        sendVerify: '3' ,//送审状态
+
                     };
                 },
                 onLoadSuccess: function () {

+ 0 - 4
src/main/resources/templates/datas/data/data.html

@@ -9,10 +9,6 @@
             <div class="ibox-body">
                 <div class="form-inline m-t" role="form">
                     <div class="form-group">
-                        <select data-placeholder="--审核阶段--" name="auditStage" id="auditStage"
-                                style="width: 130px;"  class="form-control chosen-select-auditStage" tabindex="2" required >
-                            <option value="">--审核阶段--</option>
-                        </select>
 
                         <select data-placeholder="--选择行业--" name="industryTypeOne" id="industryTypeOne"
                                 class="form-control chosen-select-industryType" tabindex="2" required

+ 25 - 5
src/main/resources/templates/datas/dataSendProvince/data.html

@@ -38,9 +38,29 @@
                 </div>
                 <div class="fixed-table-toolbar">
                     <div class="columns pull-left">
-                        <button shiro:hasPermission="datas:dataSendProvince:sendVerify" type="button" class="btn  btn-primary"
-                                onclick="sendVerifyBatch()">
-                            <i class="fa fa-share" aria-hidden="true"></i> 送审
+                        <button shiro:hasPermission="datas:dataSendProvince:add" type="button" class="btn  btn-warning"
+                                onclick="add()">
+                            <i class="fa fa-plus" aria-hidden="true"></i> 密文导入
+                        </button>
+
+                        <button shiro:hasPermission="datas:dataSendProvince:plainTextImport" type="button" class="btn  btn-primary"
+                                onclick="dataImport()">
+                            <i class="fa fa-plus" aria-hidden="true"></i> 明文导入
+                        </button>
+
+                        <button shiro:hasPermission="datas:dataSendProvince:encryptExports" type="button" class="btn  btn-warning"
+                                onclick="encryptExports()">
+                            <i class="fa fa-sign-out" aria-hidden="true"></i> 加密导出
+                        </button>
+
+                        <button shiro:hasPermission="datas:dataSendProvince:export" type="button" class="btn  btn-primary"
+                                onclick="batchExports()">
+                            <i class="fa fa-sign-out" aria-hidden="true"></i> 明文导出
+                        </button>
+
+                        <button shiro:hasPermission="datas:dataSendProvince:sendProvince" type="button" class="btn  btn-primary"
+                                onclick="sendBatch()">
+                            <i class="fa fa-share" aria-hidden="true"></i> 上报到省级
                         </button>
 
                     </div>
@@ -66,8 +86,8 @@
     </script>
 </div>
 
-<!--送审-->
-<div shiro:hasPermission="datas:dataSendProvince:sendVerify">
+<!--上报到省级-->
+<div shiro:hasPermission="datas:dataSendProvince:sendProvince">
     <script type="text/javascript">
         s_sendVerify_h = '';
     </script>

+ 1 - 0
src/main/resources/templates/datas/unionVerify/data.html

@@ -35,6 +35,7 @@
                         <select data-placeholder="--选择状态--" name="status" id="status"
                                 class="form-control" tabindex="2" required style="font-size: 14px;color: #9b9ea3;">
                             <option value="">选择状态</option>
+                            <option value="2">审核中</option>
                             <option value="3">审核通过</option>
                             <option value="4">驳回</option>
 <!--                            <option value="5">&#45;&#45;联合审批中&#45;&#45;</option>-->