From 752e00503f672ddfe2066afb6c235721a3a912b5 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 19 十一月 2024 10:25:55 +0800
Subject: [PATCH] 2024.11.19 各项修正
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/CommitmentServiceImpl.kt | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/CommitmentServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/CommitmentServiceImpl.kt
index d79dee2..a52c293 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/CommitmentServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/CommitmentServiceImpl.kt
@@ -2,10 +2,9 @@
import cn.flightfeather.supervision.common.pdf.DynamicParam
import cn.flightfeather.supervision.common.pdf.GeneratePdfUtil
-import cn.flightfeather.supervision.common.pdf.PdfUtil
import cn.flightfeather.supervision.domain.entity.Commitment
+import cn.flightfeather.supervision.domain.entity.CommitmentTemplate
import cn.flightfeather.supervision.domain.enumeration.SceneType
-import cn.flightfeather.supervision.domain.enumeration.UserType
import cn.flightfeather.supervision.domain.mapper.CommitmentMapper
import cn.flightfeather.supervision.domain.mapper.UserinfoMapper
import cn.flightfeather.supervision.infrastructure.utils.DateUtil
@@ -18,18 +17,13 @@
import com.fasterxml.jackson.module.kotlin.readValue
import com.github.pagehelper.PageHelper
import com.google.gson.Gson
-import net.coobird.thumbnailator.tasks.io.InputStreamImageSource
import org.springframework.beans.factory.annotation.Value
import org.springframework.stereotype.Service
import org.springframework.web.multipart.MultipartFile
import tk.mybatis.mapper.entity.Example
-import java.awt.Image
-import java.io.File
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import java.util.*
-import javax.imageio.ImageReader
-import javax.imageio.stream.ImageInputStream
import javax.servlet.http.HttpServletResponse
/**
@@ -53,6 +47,10 @@
response.setIntHeader("totalPage", p.pages)
response.setIntHeader("currentPage", p.pageNum)
return result
+ }
+
+ override fun getTemplateOfCommitment(userId: String): BaseResponse<CommitmentTemplate> {
+ TODO("Not yet implemented")
}
override fun uploadLetterOfCommitment(userId: String, commitmentVoList: String, files: Array<MultipartFile>): Boolean {
@@ -123,15 +121,22 @@
SceneType.Construction.value,
SceneType.Wharf.value,
SceneType.StorageYard.value,
- SceneType.MixingPlant.value,
- SceneType.Industrial.value -> {
+ SceneType.MixingPlant.value -> {
templateName = "commitment-construction.ftl"
contractName = "commitment-construction-${now.time}.pdf"
+ }
+ SceneType.Industrial.value->{
+ templateName = "commitment-industrial.ftl"
+ contractName = "commitment-industrial-${now.time}.pdf"
}
SceneType.VehicleRepair.value -> {
templateName = "commitment-vehicle.ftl"
contractName = "commitment-vehicle-${now.time}.pdf"
}
+ SceneType.Laboratory.value -> {
+ templateName = "commitment-laboratory.ftl"
+ contractName = "commitment-laboratory-${now.time}.pdf"
+ }
}
// val picName = contractName.replace("pdf", "jpg")
--
Gitblit v1.9.3