Merge remote-tracking branch 'origin/master'

ims-service/ims-eval/pom.xml

@@ -75,31 +75,6 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.17-beta1</version>
         </dependency>
-        <dependency>
-            <groupId>com.documents4j</groupId>
-            <artifactId>documents4j-api</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.documents4j</groupId>
-            <artifactId>documents4j-transformer</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.documents4j</groupId>
-            <artifactId>documents4j-local</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4.14</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DeptAssessmentDeclarationController.java

@@ -197,9 +197,9 @@ public class DeptAssessmentDeclarationController {
 					DeptAssessmentDeclarationContent deptAssessmentDeclarationContent = new DeptAssessmentDeclarationContent();
 					deptAssessmentDeclarationContent.setId(str[0]);
 					deptAssessmentDeclarationContent.setAssessmentDeclarationId(str[1]);
-					deptAssessmentDeclarationContent.setSerialNumber(str[2]);
-					deptAssessmentDeclarationContent.setEmployeeId(str[3]);
-					deptAssessmentDeclarationContent.setEmployeeName(str[4]);
+					deptAssessmentDeclarationContent.setEmployeeId(str[2]);
+					deptAssessmentDeclarationContent.setEmployeeName(str[3]);
+					deptAssessmentDeclarationContent.setSerialNumber(str[4]);
 					deptAssessmentDeclarationContent.setSuggestedValue(str[5]);
 					deptAssessmentDeclarationContentList.add(deptAssessmentDeclarationContent);
 				}

ims-service/ims-eval/src/main/java/com/ims/eval/controller/NoticeManagementController.java

@@ -2,9 +2,6 @@ package com.ims.eval.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.documents4j.api.DocumentType;
-import com.documents4j.api.IConverter;
-import com.documents4j.job.LocalConverter;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.DataDictionary;
@@ -15,20 +12,12 @@ import com.ims.eval.service.IDataDictionaryService;
 import com.ims.eval.service.IEvaluationNoticeService;
 import com.ims.eval.util.FileUploadUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.net.URL;
-import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -262,23 +251,25 @@ public class NoticeManagementController {
 	 * @throws IOException 异常
 	 */
 	@GetMapping(value = "/filePreview")
-	public ResponseEntity<Resource> convertToHtml(@RequestParam("url") String url) throws IOException {
-		url = Path.getNoticePath() + url;
-		InputStream inputStream = new URL(url).openStream();
-		File sourceFile = File.createTempFile("source", ".docx");
-		FileUtils.copyInputStreamToFile(inputStream, sourceFile);
-		File htmlFile = new File(sourceFile.getParent(), FilenameUtils.getBaseName(sourceFile.getName()) + ".html");
-		try (InputStream fis = new FileInputStream(sourceFile); OutputStream fos = new FileOutputStream(htmlFile)) {
-			IConverter converter = LocalConverter.builder().build();
-			converter.convert(fis).as(DocumentType.MS_WORD).to(fos).as(DocumentType.MHTML).execute();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
+	public void convertToHtml(@RequestParam("url") String url, HttpServletResponse response) throws IOException {
+		String prefix = url.substring(0, url.lastIndexOf(".") - 1);
+		String suffix = ".pdf";
+		String filePath = Path.getNoticePath() + prefix + suffix;
+		boolean b = false;
+		if (b) {
+			File file = new File(filePath);
+			BufferedInputStream br = new BufferedInputStream(new FileInputStream(file));
+			byte[] buf = new byte[1024];
+			int len = 0;
+			response.reset();
+			response.setContentType("application/pdf");
+			response.setHeader("Content-Disposition", "inline; filename=" + java.net.URLEncoder.encode(file.getName(), "UTF-8"));
+			OutputStream out = response.getOutputStream();
+			while ((len = br.read(buf)) > 0) {
+				out.write(buf, 0, len);
+			}
+			br.close();
+			out.close();
 		}
-		ByteArrayResource resource = new ByteArrayResource(Files.readAllBytes(htmlFile.toPath()));
-		return ResponseEntity.ok()
-			.header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + htmlFile.getName())
-			.contentType(MediaType.TEXT_HTML)
-			.contentLength(htmlFile.length())
-			.body(resource);
 	}
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptAssessmentDeclarationServiceImpl.java

@@ -39,9 +39,6 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 	@Override
 	public boolean save(DeptAssessmentDeclaration deptAssessmentDeclaration) {
 		QueryWrapper<DeptAssessmentDeclaration> qw = new QueryWrapper<>();
-		if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {
-			qw.lambda().eq(DeptAssessmentDeclaration::getDeptId, deptAssessmentDeclaration.getDeptId());
-		}
 		if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getAnnual())) {
 			qw.lambda().like(DeptAssessmentDeclaration::getAnnual, deptAssessmentDeclaration.getAnnual());
 		}
@@ -49,7 +46,7 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 			qw.lambda().eq(DeptAssessmentDeclaration::getDeclarationMonth, deptAssessmentDeclaration.getDeclarationMonth());
 		}
 		int count = super.count(qw);
-		deptAssessmentDeclaration.setOrderNumber("KHSB_GDDL_" + deptAssessmentDeclaration.getAnnual() + "_" + deptAssessmentDeclaration.getDeclarationMonth() + StringUtils.addZeroForStr(String.valueOf(count + 1), 2, "l"));
+		deptAssessmentDeclaration.setOrderNumber("KHSB_GDDL_" + deptAssessmentDeclaration.getAnnual() + "_" + StringUtils.addZeroForStr(String.valueOf(Integer.parseInt(deptAssessmentDeclaration.getDeclarationMonth())), 2, "l") + StringUtils.addZeroForStr(String.valueOf(count + 1), 2, "l"));
 		deptAssessmentDeclaration.setStage("流程未启动");
 		deptAssessmentDeclaration.setCreateTime(DateUtil.date());
 		return super.save(deptAssessmentDeclaration);
@@ -62,7 +59,9 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 			DeptAssessmentDeclaration deptAssessmentDeclaration = super.getById(id);
 			if ("流程未启动".equals(deptAssessmentDeclaration.getStage()) || "流程已结束".equals(deptAssessmentDeclaration.getStage())) {
 				b = super.removeById(id);
-				b = deptAssessmentDeclarationContentService.removeByAssessmentDeclarationId(id);
+				if (b) {
+					deptAssessmentDeclarationContentService.removeByAssessmentDeclarationId(id);
+				}
 			} else {
 				return b;
 			}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationDeptBusinessPlanServiceImpl.java

@@ -139,8 +139,10 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 			EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = super.getById(id);
 			if ("流程未启动".equals(evaluationDeptBusinessPlan.getStage()) || "流程已结束".equals(evaluationDeptBusinessPlan.getStage())) {
 				b = super.removeById(id);
-				b = evaluationDeptBusinessAssessmentService.removeById(id);
-				b = evaluationDeptBusinessContentService.removeByBusinessPlanId(id);
+				if (b) {
+					evaluationDeptBusinessAssessmentService.removeById(id);
+					evaluationDeptBusinessContentService.removeByBusinessPlanId(id);
+				}
 			} else {
 				return b;
 			}