Эх сурвалжийг харах

Merge remote-tracking branch 'origin/master' into master

yangyj 2 жил өмнө
parent
commit
7ea323f87f

+ 11 - 2
blade-service/blade-business/src/main/java/org/springblade/business/controller/ContractLogController.java

@@ -116,8 +116,17 @@ public class ContractLogController extends BladeController {
 	@ApiImplicitParam(name = "ids", value = "删除的数据ID", required = true)
 	public R<Boolean> removeByIds(@RequestBody JSONObject json){
 		if(json.containsKey("ids")){
-			List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(json.get("ids")), Long.class);
-			return R.status(this.contractLogService.deleteLogic(ids));
+			Object ids = json.get("ids");
+			List<Long> idList;
+			if(ids instanceof List){
+				//如果是集合,按集合处理
+				idList = JSONArray.parseArray(JSONObject.toJSONString(ids), Long.class);
+			} else {
+				//否则均按字符串处理
+				idList = Func.toLongList(ids.toString());
+			}
+
+			return R.status(this.contractLogService.deleteLogic(idList));
 		}
 		return R.data(300, false, "未找到具体数据");
 	}

+ 11 - 23
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -1349,9 +1349,13 @@ public class ExcelTabController extends BladeController {
     @ApiOperation(value = "附件上传", notes = "附件上传")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "file", value = "file", required = true),
-            @ApiImplicitParam(name = "pkeyId", value = "pkeyId", required = true)
+            @ApiImplicitParam(name = "pkeyId", value = "pkeyId", required = true),
+            @ApiImplicitParam(name = "nodeId", value = "nodeId", required = true),
+            @ApiImplicitParam(name = "contractId", value = "contractId", required = true),
+            @ApiImplicitParam(name = "classify", value = "classify", required = true),
+            @ApiImplicitParam(name = "projectId", value = "projectId", required = true)
     })
-    public R addBussFile(@RequestParam("file") MultipartFile file, Long pkeyId) {
+    public R addBussFile(@RequestParam("file") MultipartFile file, Long pkeyId,String nodeId, String contractId,String projectId,String classify) {
 
         String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
 
@@ -1387,33 +1391,17 @@ public class ExcelTabController extends BladeController {
         tableFile.setStatus("finished");
         tableFileService.save(tableFile);
 
-        WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
-                .eq(WbsTreeContract::getPKeyId, pkeyId));
-
-
-        //生成pdf
-        List<TableFile> tableFileList = tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>query().lambda().eq(TableFile::getTabId, pkeyId));
-        tableFileList.sort(Comparator.comparing(TableFile::getType));
-
-        //
-        List<String> dataListPdf = tableFileList.stream().filter(tableFile1 -> tableFile1.getDomainPdfUrl() != null && (tableFile1.getType() == 1 || tableFile1.getType() == 2)).map(TableFile::getDomainPdfUrl).collect(Collectors.toList());
-
-        String pdfPath2 = file_path + "/pdf//" + pkeyId + "_2.pdf";
-        File tabpdf2 = ResourceUtil.getFile(pdfPath2);
-        if (tabpdf2.exists()) {
-            tabpdf2.delete();
-        }
-
-        FileUtils.mergePdfPublicMethods(dataListPdf, pdfPath2);
-
-        BladeFile bladeFile2 = newIOSSClient.uploadFile(pkeyId + "2.pdf", pdfPath2);
+        // 生成单个pdf
+        excelTabService.getBussPdfInfo(pkeyId);
 
         UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("p_key_id", pkeyId);
         updateWrapper.set("tab_file_type", 2);
         updateWrapper.set("is_tab_pdf", 2);
-        updateWrapper.set("pdf_url", bladeFile2.getLink());
         wbsTreeContractService.update(updateWrapper);
+        // 合并后
+
+        excelTabService.getBussPdfs(nodeId,classify,contractId,projectId);
 
         return R.data(tableFile.getId());
     }

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TableFileController.java

@@ -66,7 +66,7 @@ public class TableFileController extends BladeController {
 		TableFile tableFile = tableFileService.getById(ids);
 
 		// 删除数据
-		tableFileService.removeByIds(Func.toLongList(ids));
+		tableFileService.delDataById(ids);
 
 		List<TableFileVO> fileVOList = tableFileService.selectTableFileList(Long.parseLong(tableFile.getTabId()));
 		// 该文本无附件
@@ -88,7 +88,7 @@ public class TableFileController extends BladeController {
 				.eq(WbsTreeContract::getId, wbsTreeContract.getParentId())
 		);
 
-		//excelTabService.getBussPdfs(wbsTreeContractP.getPKeyId(),wbsTreeContract.get);
+		excelTabService.getBussPdfs(wbsTreeContractP.getPKeyId()+"",wbsTreeContract.getTableOwner(),wbsTreeContract.getContractId(),wbsTreeContract.getProjectId());
 		return R.status(true);
 	}
 

+ 2 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TableFileMapper.java

@@ -41,4 +41,6 @@ public interface TableFileMapper extends BaseMapper<TableFile> {
 
 	List<TableFileVO> selectTableFileList(String pkid);
 
+	void delDataById(String id);
+
 }

+ 3 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TableFileMapper.xml

@@ -35,4 +35,7 @@
         select *,domain_url as url from m_table_file where is_deleted = 0 and type=2 and tab_id =#{pkid}
     </select>
 
+    <delete id="delDataById" >
+        delete  from m_table_file where id=#{id}
+    </delete>
 </mapper>

+ 2 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/ITableFileService.java

@@ -43,4 +43,6 @@ public interface ITableFileService extends IService<TableFile> {
 
 	List<TableFileVO> selectTableFileList(long pkid);
 
+	void delDataById(String pkid);
+
 }

+ 37 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -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);
     }
 

+ 5 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/TableFileServiceImpl.java

@@ -47,4 +47,9 @@ public class TableFileServiceImpl extends ServiceImpl<TableFileMapper, TableFile
 		return baseMapper.selectTableFileList(pkid+"");
 	}
 
+	@Override
+	public void delDataById(String pkid) {
+		 baseMapper.delDataById(pkid);
+	}
+
 }