|
@@ -30,7 +30,6 @@ import com.spire.xls.ExcelPicture;
|
|
|
import com.spire.xls.Workbook;
|
|
|
import com.spire.xls.Worksheet;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
-import lombok.Data;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.jsoup.Jsoup;
|
|
|
import org.jsoup.nodes.Document;
|
|
@@ -48,7 +47,6 @@ import org.springblade.core.tool.api.R;
|
|
|
import org.springblade.core.tool.node.ForestNodeMerger;
|
|
|
import org.springblade.core.tool.utils.*;
|
|
|
import org.springblade.manager.bean.TableInfo;
|
|
|
-import org.springblade.manager.dto.FormData;
|
|
|
import org.springblade.manager.entity.*;
|
|
|
import org.springblade.manager.formula.KeyMapper;
|
|
|
import org.springblade.manager.formula.impl.TableElementConverter;
|
|
@@ -108,6 +106,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
// 表单附件信息
|
|
|
private final ITableFileService tableFileService;
|
|
|
|
|
|
+ // 合同端信息
|
|
|
+ private final IContractInfoService contractInfoService;
|
|
|
+
|
|
|
@Override
|
|
|
public IPage<ExcelTabVO> selectExcelTabPage(IPage<ExcelTabVO> page, ExcelTabVO excelTab) {
|
|
|
return page.setRecords(baseMapper.selectExcelTabPage(page, excelTab));
|
|
@@ -794,7 +795,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
BladeFile bladeFile = newIOSSClient.uploadFile(pkeyId + ".pdf", pdfPath);
|
|
|
//
|
|
|
TableFile tableFile1 = tableFileService.getBaseMapper().selectOne(Wrappers.<TableFile>query().lambda()
|
|
|
- .eq(TableFile::getTabId, pkeyId).eq(TableFile::getType, 1));
|
|
|
+ .eq(TableFile::getTabId, pkeyId+"").eq(TableFile::getType, 1));
|
|
|
if (tableFile1 != null) {
|
|
|
tableFile1.setDomainPdfUrl(bladeFile.getLink());
|
|
|
tableFileService.saveOrUpdate(tableFile1);
|
|
@@ -811,7 +812,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
tableFileService.saveOrUpdate(tableFile);
|
|
|
}
|
|
|
|
|
|
- List<TableFile> tableFileList = tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>query().lambda().eq(TableFile::getTabId, pkeyId).eq(TableFile::getIsDeleted, 0));
|
|
|
+ List<TableFile> tableFileList = tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>query().lambda().eq(TableFile::getTabId, pkeyId+"").eq(TableFile::getIsDeleted, 0));
|
|
|
tableFileList.sort(Comparator.comparing(TableFile::getType));
|
|
|
|
|
|
|
|
@@ -828,7 +829,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
BladeFile bladeFile2 = newIOSSClient.uploadFile(pkeyId + "2.pdf", pdfPath2);
|
|
|
|
|
|
UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
|
|
|
- updateWrapper.in("p_key_id", pkeyId);
|
|
|
+ updateWrapper.in("p_key_id", pkeyId+"");
|
|
|
updateWrapper.set("pdf_url", bladeFile2.getLink());
|
|
|
wbsTreeContractService.update(updateWrapper);
|
|
|
wb.dispose();
|
|
@@ -899,6 +900,31 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
String querySql = "select * from " + wbsTreeContract.getInitTableName() + " where p_key_id=" + pkeyId;
|
|
|
List<Map<String, Object>> dataIn = jdbcTemplate.queryForList(querySql);
|
|
|
|
|
|
+
|
|
|
+ // 匹配关联
|
|
|
+
|
|
|
+ try {
|
|
|
+ File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
|
|
|
+ String htmlString = IoUtil.readToString(new FileInputStream(file1));
|
|
|
+ Document doc = Jsoup.parse(htmlString);
|
|
|
+ //解析
|
|
|
+ Elements dwtitle = doc.select("el-input[placeholder~=^承包单位]");
|
|
|
+ Elements htdtitle = doc.select("el-input[placeholder~=^合同段]");
|
|
|
+ Elements jltitle = doc.select("el-input[placeholder~=^监理单位]");
|
|
|
+ Elements bhtitle = doc.select("el-input[placeholder~=^编号]");
|
|
|
+ ContractInfo contractInfo = contractInfoService.getById(wbsTreeContract.getContractId());
|
|
|
+ //
|
|
|
+ reData.put(dwtitle.attr("keyName"),contractInfo.getConstructionUnitName());
|
|
|
+ reData.put(htdtitle.attr("keyName"),contractInfo.getContractName());
|
|
|
+ reData.put(jltitle.attr("keyName"),contractInfo.getSupervisionUnitName());
|
|
|
+ reData.put(bhtitle.attr("keyName"),contractInfo.getContractNumber());
|
|
|
+
|
|
|
+
|
|
|
+ } catch (FileNotFoundException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
if (dataIn != null && dataIn.size() >= 1) {
|
|
|
Map<String, Object> mysqlData = dataIn.get(0);
|
|
|
for (String key : mysqlData.keySet()) {
|
|
@@ -951,13 +977,15 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
for (TextdictInfo textdictInfo : textdictInfos) {
|
|
|
if (reData.containsKey(textdictInfo.getColKey())) {
|
|
|
String keyVal = reData.get(textdictInfo.getColKey()) + "";
|
|
|
-
|
|
|
} else {
|
|
|
reData.put(textdictInfo.getColKey() + "", textdictInfo.getSigRoleName());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 添加4个长量值
|
|
|
+
|
|
|
+
|
|
|
// 移除Id 和 p_key_id
|
|
|
reData.remove("id");
|
|
|
reData.remove("p_key_id");
|
|
@@ -965,6 +993,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
reData.remove("contractId");
|
|
|
reData.remove("pkeyId");
|
|
|
reData.remove("projectId");
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
return R.data(reData);
|
|
|
}
|
|
|
|