许鹏程
2023-08-16 7582a36005ab112a80815454985f2bb9ffe17934
xn commit
已修改2个文件
151 ■■■■ 文件已修改
home-server-admin/src/main/java/com/home/xining/service/SendDocumentService.java 135 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
product-server-web/src/main/resources/templates/webOffice.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
home-server-admin/src/main/java/com/home/xining/service/SendDocumentService.java
@@ -24,77 +24,74 @@
@Component
public class SendDocumentService extends AbstractBaseService implements ISendDocumentService {
    @Autowired
    public BaseDao baseDao;
    @Autowired
    PermissionService permissionService;
    @Autowired
    QueryFilterService queryFilterService;
    @Autowired
    public BaseDao baseDao;
    @Autowired
    PermissionService permissionService;
    @Autowired
    QueryFilterService queryFilterService;
    public DataTableEntity getSendDocList(FieldSetEntity fs) throws BaseException {
        String filter=fs.getString("filter");
        String dataFilter = "" ;
        //创建人字段
        String created_by_field = fs.getString(CmnConst.CREATED_BY_FIELD);
        if(!BaseUtil.strIsNull(created_by_field)){
            dataFilter = permissionService.getDataFilter(fs.getTableName(),created_by_field);
        }
        if(!StringUtils.isEmpty(dataFilter)){
            if(!StringUtils.isEmpty(filter)){
                filter += " and "+dataFilter;
            }else {
                filter = dataFilter;
            }
        }
        if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){
            filter    = filter + " and " + queryFilterService.getQueryFilter(fs);
        }
        DataTableEntity dt = baseDao.listTable(CmnConst.FWGZ,filter,null,null,"fw13 desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
        baseDao.loadPromptData(dt);
        return dt;
    }
    public DataTableEntity getSendDocList(FieldSetEntity fs) throws BaseException {
        String filter = fs.getString("filter");
        String dataFilter = "";
        //创建人字段
        String created_by_field = fs.getString(CmnConst.CREATED_BY_FIELD);
        if (!BaseUtil.strIsNull(created_by_field)) {
            dataFilter = permissionService.getDataFilter(fs.getTableName(), created_by_field);
        }
        if (!StringUtils.isEmpty(dataFilter)) {
            if (!StringUtils.isEmpty(filter)) {
                filter += " and " + dataFilter;
            } else {
                filter = dataFilter;
            }
        }
        if (!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))) {
            filter = filter + " and " + queryFilterService.getQueryFilter(fs);
        }
        DataTableEntity dt = baseDao.listTable(CmnConst.FWGZ, filter, null, null, "fw13 desc", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
        baseDao.loadPromptData(dt);
        return dt;
    }
    /**
     * 批量归档
     * @param fs
     * @throws BaseException
     */
    @Override
    @Transactional
    public boolean batchFile(FieldSetEntity fs)throws BaseException{
        String uuids = fs.getString("uuid");
        String[] uuid = uuids.split(",");
        for (int i = 0; i < uuid.length; i++) {
            FieldSetEntity fieldSetEntity = new FieldSetEntity();
            fieldSetEntity.setTableName(fs.getTableName());
            fieldSetEntity.setValue("uuid", uuid[i]);
            fieldSetEntity.setValue("pigeonhole",1);
            baseDao.update(fieldSetEntity);
        }
        return true;
    }
    /**
     * 批量归档
     *
     * @param fs
     * @throws BaseException
     */
    @Override
    @Transactional
    public boolean batchFile(FieldSetEntity fs) throws BaseException {
        String uuids = fs.getString("uuid");
        String[] uuid = uuids.split(",");
        for (int i = 0; i < uuid.length; i++) {
            FieldSetEntity fieldSetEntity = new FieldSetEntity();
            fieldSetEntity.setTableName(fs.getTableName());
            fieldSetEntity.setValue("uuid", uuid[i]);
            fieldSetEntity.setValue("pigeonhole", 1);
            baseDao.update(fieldSetEntity);
        }
        return true;
    }
    /**
     * 人员高级参照解析并保存
     * @param fse
     * @throws BaseException
     */
    @Transactional
    @Override
    public String saveFieldSetEntity(FieldSetEntity fse) throws BaseException {
        String fw09 = fse.getString("fw09");
        String[] fw09s = fw09.split(",");
        DataTableEntity dataTableEntity = baseDao.listTable("product_sys_users", BaseUtil.buildQuestionMarkFilter("user_id",fw09s,true), new String[]{});
        String fw09_value = "";
        for (int i = 0; i < dataTableEntity.getRows(); i++) {
            String user_name = dataTableEntity.getString(i,"user_name");
            fw09_value = fw09_value + user_name + ",";
        }
        fw09_value = fw09_value.substring(0, fw09_value.length() - 1);
        fse.setValue("fw09_value", fw09_value);
        BaseUtil.createCreatorAndCreationTime(fse);
        baseDao.saveFieldSetEntity(fse);
        return fse.getUUID();
    }
    /**
     * 人员高级参照解析并保存
     *
     * @param fse
     * @throws BaseException
     */
    @Transactional
    @Override
    public String saveFieldSetEntity(FieldSetEntity fse) throws BaseException {
        try {
            BaseUtil.createCreatorAndCreationTime(fse);
            baseDao.saveFieldSetEntity(fse);
            return fse.getUUID();
        } catch (Exception e) {
            e.printStackTrace();
            throw e;
        }
    }
}
product-server-web/src/main/resources/templates/webOffice.html
@@ -259,14 +259,17 @@
            var signature = [[${signature}]];
            let data = JSON.parse([[${requestParaTemp}]]);
            var formData = JSON.stringify(data);
            alert(formData)
            WebOffice.HttpAddPostString('signature', signature);
            WebOffice.HttpAddPostString('~table~', 'product_sys_attachments');
            WebOffice.HttpAddPostString('formData', formData);
            WebOffice.HttpAddPostCurrFile("docfile", "");//此句为固定语句,不管是保存word还是excel,ppt等都这样写
            var strResults = WebOffice.HttpPost(strSaveUrl);
            console.log(strResults)
            if (strResults) {
            if (strResults) { //将strResults转换为小写 判断字符串是否包含active 和event
                if (strResults.toLowerCase().indexOf('active') != -1 && strResults.toLowerCase().indexOf('event') != -1) {
                    //保存成功
                    return;
                }
                var res = JSON.parse(strResults);
                if (res && res.code != 200) {
                    if (res.code == "90021" || res.code == '90044') {
@@ -277,14 +280,11 @@
                    }
                    alert(res.msg);
                }
                // alert(strResults)
                // JSON.parse()
            }
            // alert(strResults);//用alert语句可以显示服务器端网页返回的数据
            // strResults;//如果保存成功,编程时让服务器接收代码如upload.jsp,upload.aspx,upload.php等返回空值或OK字串。
        } catch (e) {
            console.error(e);
            alert('发生错误!请使用查阅返回值!');
            //获取错误信息
            alert('发生错误!请使用查阅返回值!' + e.message);
        }
    }