Преглед изворни кода

Revert "Update User QR Code printing"

This reverts commit 2377319979.
master
B.E.N.S.O.N пре 3 недеља
родитељ
комит
30dbc794a4
2 измењених фајлова са 1 додато и 8 уклоњено
  1. +0
    -6
      src/main/java/com/ffii/fpsms/modules/user/service/UserQrCodeService.kt
  2. +1
    -2
      src/main/resources/qrCodeHandle/qrCodeHandle.jrxml

+ 0
- 6
src/main/java/com/ffii/fpsms/modules/user/service/UserQrCodeService.kt Прегледај датотеку

@@ -32,10 +32,6 @@ class UserQrCodeService(
val qrCodeHandleReport = JasperCompileManager.compileReport(inputStream) val qrCodeHandleReport = JasperCompileManager.compileReport(inputStream)
val users = userRepository.findAllById(request.userIds) val users = userRepository.findAllById(request.userIds)
if (users.isEmpty()) {
throw IllegalArgumentException("No users found for the provided user IDs: ${request.userIds}")
}
val fields = mutableListOf<MutableMap<String, Any>>() val fields = mutableListOf<MutableMap<String, Any>>()
for (user in users) { for (user in users) {
@@ -43,7 +39,6 @@ class UserQrCodeService(
val staffNo = user.staffNo ?: "" val staffNo = user.staffNo ?: ""
val username = user.username ?: "N/A" val username = user.username ?: "N/A"
val name = user.name ?: ""
val qrContentMap = mapOf("staffNo" to staffNo) val qrContentMap = mapOf("staffNo" to staffNo)
val qrCodeContent = Json.encodeToString(qrContentMap) val qrCodeContent = Json.encodeToString(qrContentMap)
@@ -52,7 +47,6 @@ class UserQrCodeService(
field["username"] = username field["username"] = username
field["staffNo"] = staffNo.ifEmpty { "N/A" } field["staffNo"] = staffNo.ifEmpty { "N/A" }
field["name"] = name
field["qrCode"] = qrCodeImage field["qrCode"] = qrCodeImage
fields.add(field) fields.add(field)


+ 1
- 2
src/main/resources/qrCodeHandle/qrCodeHandle.jrxml Прегледај датотеку

@@ -16,7 +16,6 @@
</queryString> </queryString>
<field name="username" class="java.lang.String"/> <field name="username" class="java.lang.String"/>
<field name="staffNo" class="java.lang.String"/> <field name="staffNo" class="java.lang.String"/>
<field name="name" class="java.lang.String"/>
<field name="qrCode" class="java.awt.Image"/> <field name="qrCode" class="java.awt.Image"/>
<background> <background>
<band splitType="Stretch"/> <band splitType="Stretch"/>
@@ -32,7 +31,7 @@
<textElement textAlignment="Center" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="54" isBold="true" fontName="微軟正黑體" pdfEncoding="Identity-H" isPdfEmbedded="true"/> <font size="54" isBold="true" fontName="微軟正黑體" pdfEncoding="Identity-H" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{name}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{username}]]></textFieldExpression>
</textField> </textField>
<image> <image>
<reportElement x="27" y="120" width="500" height="500" uuid="b1a8ee23-9f0f-4014-9996-e0025222dcd2"/> <reportElement x="27" y="120" width="500" height="500" uuid="b1a8ee23-9f0f-4014-9996-e0025222dcd2"/>


Loading…
Откажи
Сачувај