Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -91,6 +91,7 @@
                      jfi.IMPORTED                                                           as imported,
                      jfi.PRODUCE_LICENSE_NUM                                                as produceLicenseNum,
                      jfi.PRODUCE_COUNTRY                                                    as produceCountry,
+                     jfi.produce_unit_credit_code                                           as produceUnitCreditCode,
                      jci.USC_UNIT_NAME                                                      as uscUnitName,
                      jci.USC_UNIT_CREDIT_CODE                                               as uscUnitCreditCode
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -52,8 +52,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -148,11 +146,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Value("classpath:/json/urlInfo.json")
     public Resource bizTypeInfo;
 
-    @Autowired
-    private TransactionDefinition transactionDefinition;
-
-    @Autowired
-    private PlatformTransactionManager platformTransactionManager;
+    @Value("${tzs.domain}")
+    String TZSDOMAIN ;
 
     @Autowired
     AmosRequestContext amosRequestContext;
@@ -452,9 +447,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
         // 组装模板变量
         Map<String, Object> placeholders = new HashMap<>();
-        placeholders.put("sequenceNbr", getValue.apply("sequenceNbr"));
+        placeholders.put("doMain", TZSDOMAIN);
         placeholders.put("installUnitName", getValue.apply("installUnitName"));
-        placeholders.put("informNumber", Objects.toString(getValue.apply("informNumber"), getValue.apply("applyNo")));
+        placeholders.put("informNumber", "".equals(getValue.apply("informNumber")) ?  getValue.apply("applyNo") : getValue.apply("informNumber"));
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
@@ -478,7 +473,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         placeholders.put("installLicenseExpirationDateList", installLicenseExpirationDateList);
 
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(getValue.apply("informNumber"), 300, 300);
+        String qrCode = ImageUtils.generateQRCode(placeholders.get("informNumber")+"", 300, 300);
         placeholders.put("qrCode", qrCode);
 
 //        String url = WordTemplateUtils.templateToPdf("installation-notification-report.ftl", placeholders);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/application-dev.properties

@@ -79,8 +79,9 @@ rule.definition.default-agency=tzs
 rule.definition.local-ip=172.16.10.243
 # ??????????
 minio.url.path=http://172.16.10.243:9000/
-## \uFFFD\uFFFD\uFFFD\u027C\uFFFD\uFFFD\uFFFD\uFFFD\u01F0\u05FA\uFFFD\uFFFD\uFFFD\uFFFD
-regulatory_code_prefix=https://sxtzsb.sxsei.com:19435/tzs?code=
+## \u7279\u79CD\u8BBE\u5907\u57DF\u540D
+tzs.domain=http://sxtzsb.sxsei.com
+
 outSystem.user.password=a1234560
 amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=STUDIO_APP_WEB
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/installation-notification-report.ftl

@@ -88,37 +88,7 @@
                                 <w:rFonts w:hint="eastAsia"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t>ID: ${sequenceNbr}</w:t>
-                        </w:r>
-                    </w:p>
-                    <w:p>
-                        <w:pPr>
-                            <w:keepNext w:val="0"/>
-                            <w:keepLines w:val="0"/>
-                            <w:pageBreakBefore w:val="0"/>
-                            <w:widowControl w:val="0"/>
-                            <w:kinsoku/>
-                            <w:wordWrap/>
-                            <w:overflowPunct/>
-                            <w:topLinePunct w:val="0"/>
-                            <w:autoSpaceDE/>
-                            <w:autoSpaceDN/>
-                            <w:bidi w:val="0"/>
-                            <w:adjustRightInd/>
-                            <w:snapToGrid/>
-                            <w:spacing w:line="300" w:lineRule="auto"/>
-                            <w:textAlignment w:val="auto"/>
-                            <w:rPr>
-                                <w:rFonts w:hint="default"/>
-                                <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
-                            </w:rPr>
-                        </w:pPr>
-                        <w:r>
-                            <w:rPr>
-                                <w:rFonts w:hint="eastAsia"/>
-                                <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
-                            </w:rPr>
-                            <w:t>附件</w:t>
+                            <w:t>${doMain}</w:t>
                         </w:r>
                     </w:p>
                     <w:p>