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

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/JgReformNoticeServiceImpl.java

@@ -32,6 +32,7 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,6 +64,7 @@ import java.util.stream.Collectors;
  * @date 2023-12-19
  */
 @Service
+@Slf4j
 public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, JgReformNotice, JgReformNoticeMapper> implements IJgReformNoticeService {
 
     private static final String SUBMIT_TYPE_FLOW = "1";
@@ -318,25 +320,29 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         placeholders.put("produceCode", getValue.apply("produceCode")); // TODO: 制造编号 - 设备出厂编号
         placeholders.put("produceUnitName", getValue.apply("produceUnitName"));
         placeholders.put("produceLicenseNum", getValue.apply("produceLicenseNum"));
-        placeholders.put("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("address"));
+        placeholders.put("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") +
+                getValue.apply("countyName") + getValue.apply("streetName") + getValue.apply("address"));
         placeholders.put("installStartDate", getValue.apply("installStartDate"));
         placeholders.put("installType", "改造告知"); // TODO: 施工类别
         placeholders.put("installLicenseNo", getValue.apply("installLicenseNo"));
         placeholders.put("installLicenseExpirationDate", getValue.apply("installLicenseExpirationDate"));
         placeholders.put("installLeaderName", getValue.apply("installLeaderName"));// 施工负责人
         placeholders.put("installLeaderPhone", getValue.apply("installLeaderPhone"));// 施工负责人手机
-        placeholders.put("installUnitAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("address")); // TODO: 施工单位地址
+        placeholders.put("installUnitAddress", getValue.apply("provinceName") + getValue.apply("cityName") +
+                getValue.apply("countyName") + getValue.apply("streetName") + getValue.apply("address")); // TODO: 施工单位地址
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
-        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitAddress"));
+        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitProvinceName") + getValue.apply("useUnitCityName") +
+                getValue.apply("useUnitCountyName") + getValue.apply("streetName") + getValue.apply("useUnitAddress"));
+
         // 生成二维码
         String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
         placeholders.put("qrCode", qrCode);
 
         placeholders.put("installLicenseNoList", installLicenseNoList);
         placeholders.put("installLicenseExpirationDateList", installLicenseExpirationDateList);
-
+        log.info("改造告知单 => {}", JSON.toJSONString(placeholders));
         String url = WordTemplateUtils.templateToPdf("installation-notification-report.ftl", placeholders);
 
         // 更新到数据库

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsElevator.java

@@ -450,4 +450,10 @@ public class IdxBizJgTechParamsElevator extends TzsBaseEntity {
 	@TableField("\"KZG_OPERATION_MODE\"")
     private String kzgOperationMode;
 
+    /**
+     * 轿门位置
+     */
+    @TableField("\"JMWZ\"")
+    private String jmwz;
+
 }