FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yuezhihang
2021-11-18 10:23:39 +08:00
parent f1175010f7 925512269f
commit 96c6202d61
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java
+4 -4
View File
@@ -49,15 +49,15 @@ public class WaterMarkUtil {
// set Transparency
PdfGState gs = new PdfGState();
// 设置透明度为0.2
gs.setFillOpacity(0.4f);
gs.setFillOpacity(0.25f);
under.setGState(gs);
under.restoreState();
under.beginText();
under.setFontAndSize(base, 56);
under.setFontAndSize(base, 50);
under.setTextMatrix(30, 30);
under.setColorFill(BaseColor.LIGHT_GRAY);
for (int y = 0; y < 10; y++) {
for (int x = 0; x < 8; x++) {
for (int y = 0; y < 5; y++) {
for (int x = 0; x < 10; x++) {
// 水印文字成45度角倾斜
under.showTextAligned(Element.ALIGN_LEFT
, waterMarkName, 100 + 300 * x, 300 * y, 40);
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+3 -3
View File
@@ -603,7 +603,7 @@
when 'HJ' THEN 7
ELSE 8
END,
sar_standards_info.stand_sort ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
</if>
<if test='page.standType != null and page.standType == "FOREIGN"'>
CASE sar_standards_info.stand_sort
@@ -633,7 +633,7 @@
when 'ADR' THEN 23
ELSE 24
END,
sar_standards_info.stand_sort ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
</if>
</sql>
<sql id="standSort_out">
@@ -1143,7 +1143,7 @@
${orderByA} ${order1},
</if>
<include refid="standSort_out"/>
a.STAND_YEAR DESC,a.id
a.STAND_NUMBER ASC,a.STAND_YEAR DESC,a.id
</select>
<select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">