维修告知bug修改

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -12,7 +11,6 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
@@ -28,7 +26,6 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -38,20 +35,14 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.text.ParseException;
 import java.util.*;
 import java.util.function.Function;
@@ -311,18 +302,21 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         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", "");
         placeholders.put("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("useUnitProvinceName") + getValue.apply("useUnitCityName") + getValue.apply("useUnitCountyName") + 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);