Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, #50742

See merge request LiuChao/foton-slrs-system-rest!219

adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java

@@ -53,7 +53,7 @@ public class WaterMarkUtil {
                 under.setGState(gs);
                 under.restoreState();
                 under.beginText();
-                under.setFontAndSize(base, 20);
+                under.setFontAndSize(base, 25);
                 under.setTextMatrix(30, 30);
                 under.setColorFill(BaseColor.LIGHT_GRAY);
                 for (int y = 0; y < 10; y++) {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -220,7 +220,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
             if (StringUtils.isNotBlank(sarBussionessStandEO.getStandYear())) {
                 number += "-" + sarBussionessStandEO.getStandYear();
             }
-            String content = "新增" + number + " 《" + sarBussionessStandEO.getStandName() + "》";
+            String content = "入库" + number + " 《" + sarBussionessStandEO.getStandName() + "》";
             sarUpdLogEOService.createBaseLog(sarBussionessStandEO.getId(),"BUSINESS",content);
             if(elasflag) {
                 attrInfoShowSearchDetails(sarBussionessStandEO,"add");
@@ -724,6 +724,57 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     }
 
     public void attrInfoShowDetails(List<SarBussionessStand> sarlist) throws Exception {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         for (SarBussionessStand row : sarlist) {
             attrInfoDetails(row);
             Map<String, Object> getAttrMap = row.getAttrInfoMap();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java

@@ -888,7 +888,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
             if (StringUtils.isNotBlank(sarLawsStandInfo.getLawsNumber())) {
                 number = sarLawsStandInfo.getLawsNumber();
             }
-            String content = "新增" + number + " 《" + sarLawsStandInfo.getLawsName() + "》";
+            String content = "入库" + number + " 《" + sarLawsStandInfo.getLawsName() + "》";
             sarUpdLogEOService.createBaseLog(sarLawsStandInfo.getId(), sarLawsStandInfo.getLawsType() + "_Laws", content);
             if(elasflag) {
                 // 消息队列

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -655,7 +655,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
                 number += "-" + sarStandardsInfoEO.getStandYear();
             }
-            String content = "新增" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
+            String content = "入库" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
             sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
             if(elasflag) {
                 // 消息队列