no message

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.collection.controller;
 
 import cn.ezhizao.common.exception.ServiceException;
 import cn.ezhizao.common.utils.SecurityUtils;
+import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.common.utils.uuid.SnowflakeIdWorker;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
@@ -27,13 +28,13 @@ import cn.ezhizao.project.business.order.service.IBizArchiveInputDetailService;
 import cn.ezhizao.project.business.order.service.IBizArchiveInputService;
 import cn.ezhizao.project.business.taskType.domain.BizTaskType;
 import cn.ezhizao.project.business.taskType.service.IBizTaskTypeService;
+import cn.ezhizao.project.system.domain.SysDictData;
 import cn.ezhizao.project.system.domain.SysFileStorage;
 import cn.ezhizao.project.system.domain.SysUser;
+import cn.ezhizao.project.system.service.ISysDictDataService;
 import cn.ezhizao.project.system.service.ISysFileStorageService;
 import cn.ezhizao.project.system.service.ISysUserService;
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,21 +42,20 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
 @RestController
 @Api(tags = "收票 数据接口")
@@ -84,6 +84,9 @@ public class BizCollectionController extends BaseController {
 
     @Resource
     IBizTaskTypeService taskTypeService;
+
+    @Resource
+    ISysDictDataService sysDictDataService;
     @PreAuthorize("@ss.hasPermi('business:collection:query')")
     @GetMapping(value = "/{id}")
     @ResponseBody
@@ -272,6 +275,23 @@ public class BizCollectionController extends BaseController {
             detail.setTaskTypeId(l.getTaskTypeId());
             detail.setAmount(l.getAmount());
             detail.setArrived(l.getArrived());
+            detail.setAddressStyle(l.getAddressStyle());
+            detail.setFictionAddressId(l.getFictionAddressId());
+            detail.setProvince(l.getProvince());
+            detail.setCity(l.getCity());
+            detail.setDistrict(l.getDistrict());
+            detail.setBelongRegion(l.getBelongRegion());
+            detail.setRegionName(l.getRegionName());
+            detail.setInputRemark(l.getRemark());
+            if (!ObjectUtils.isEmpty(l.getAddressStyle()) && l.getAddressStyle() == 1 ){
+                detail.setExplain(l.getProvince() + l.getCity() + l.getDistrict());
+            }else {
+                SysDictData sysDictData = sysDictDataService.selectDictDataById(l.getFictionAddressId());
+                detail.setExplain(sysDictData.getDictLabel());
+            }
+            if(StringUtils.isNotEmpty(l.getRemark())) {
+                detail.setExplain(detail.getExplain().concat("," + l.getRemark()));
+            }
             bizCollection.getDetails().add(detail);
         });
         return success(bizCollection);

src/main/java/cn/ezhizao/project/business/collection/domain/BizCollectionDetail.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.collection.domain;
 
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -84,4 +85,36 @@ public class BizCollectionDetail extends BaseEntity implements Serializable {
     private List<Long> ids;
     @TableField(exist = false)
     private Integer verifyStatus;
+
+    @TableField(exist = false)
+    @ApiModelProperty("地址类型")
+    private Integer addressStyle;
+    @TableField(exist = false)
+    @ApiModelProperty("虚拟地址外键")
+    private Long fictionAddressId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "市")
+    private String city;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "区")
+    private String district;
+    @ApiModelProperty("所属区")
+    private Integer belongRegion;
+    @ApiModelProperty("所属区")
+    @TableField(exist = false)
+    private String regionName;
+    @TableField(exist = false)
+    private String fictionAddressName;
+    @TableField(exist = false)
+    private String explain;
+
+    @TableField(exist = false)
+    private String inputRemark;
 }

src/main/java/cn/ezhizao/project/business/order/domain/BizArchiveInputDetail.java

@@ -124,5 +124,9 @@ public class BizArchiveInputDetail extends BaseEntity
     private BigDecimal payment;
     @TableField(exist = false)
     private BigDecimal reallyAmount;
-
+    @ApiModelProperty("所属区")
+    private Integer belongRegion;
+    @ApiModelProperty("所属区")
+    @TableField(exist = false)
+    private String regionName;
 }

src/main/resources/mybatis/business/BizArchiveInputDetailMapper.xml

@@ -16,9 +16,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getList" parameterType="BizArchiveInputDetail" resultMap="BizArchiveInputDetailResult">
-        SELECT t1.*, t2.name as task_type_name, t2.pay_address
+        SELECT t1.*, t2.name as task_type_name, t2.pay_address,t3.dict_label as regionName
         FROM biz_archive_input_detail t1
         left join biz_task_type t2 on t2.id = t1.task_type_id
+        left join sys_dict_data t3 on t1.belong_region = t3.dict_code
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="id != null "> AND t1.id = #{id}</if>