no message

src/main/java/cn/ezhizao/project/business/order/controller/BizArchiveInputController.java

@@ -107,9 +107,9 @@ public class BizArchiveInputController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:archive:order:export')")
     @Log(title = "档案入库", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BizArchiveInput bizArchiveInput) throws NoSuchFieldException, IllegalAccessException {
+    public void export(HttpServletResponse response, InputVo bizArchiveInput) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizArchiveInput);
-        List<BizArchiveInput> list = bizArchiveInputService.getList(bizArchiveInput);
+        List<BizArchiveInput> list = bizArchiveInputService.getListByInput(bizArchiveInput);
         ExcelUtil<BizArchiveInput> util = new ExcelUtil<BizArchiveInput>(BizArchiveInput.class);
         util.exportExcel(response, list, "档案入库数据");
     }

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

@@ -145,7 +145,9 @@ public class BizArchiveInput extends BaseEntity {
     @Excel(name = "合同审核状态")
     @ApiModelProperty(value = "合同审核状态")
     private Integer verifyStatus;
-
+    @Excel(name = "客户标签")
+    @TableField(exist = false)
+    private String customerLabelName;
     /**
      * 合同类型
      */
@@ -244,6 +246,5 @@ public class BizArchiveInput extends BaseEntity {
     @TableField(exist = false)
     private Long customerLabelId;
     private String boss;
-    @TableField(exist = false)
-    private String customerLabelName;
+
 }

src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderServiceController.java

@@ -38,6 +38,7 @@ import cn.ezhizao.project.business.workOrder.domain.*;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
 import cn.ezhizao.project.system.domain.SysFileStorage;
+import cn.ezhizao.project.system.service.ISysDictDataService;
 import cn.ezhizao.project.system.service.ISysFileStorageService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -105,6 +106,10 @@ public class WorkOrderServiceController extends BaseController {
     @Resource
     private ISysFileStorageService fileStorageService;
 
+    @Resource
+    private ISysDictDataService sysDictDataService;
+    //查询循环工单列表
+
     @PreAuthorize("@ss.hasPermi('business:customer:service:loop:list')")
     @GetMapping("/list")
 
@@ -216,9 +221,26 @@ public class WorkOrderServiceController extends BaseController {
         startPage();
         startOrderBy();
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
+        list.forEach(v ->{
+         Integer style = v.getAddressStyle();
+         if(style ==null){
+             return;
+         }
+         if (v.getTaskTypeId() == 5L && style == 1){
+             //自有地址
+             v.setExplain("自有地址:"+v.getInputProvince()+v.getInputCity()+v.getInputDistrict());
+         }else if (v.getTaskTypeId() == 5L && style == 2){
+             //虚拟地址
+             v.setExplain("虚拟地址:"+sysDictDataService.selectDictDataById(v.getFictionAddressId()).getDictLabel());
+         }else {
+             v.setExplain("办理地区:"+v.getInputProvince()+v.getInputCity()+v.getInputDistrict());
+         }
+
+        });
         BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();
         bizWorkOrderRecord.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         List<BizWorkOrderRecord> records = bizWorkOrderRecordService.getList(bizWorkOrderRecord);
+
         BizEntrust entrustConditions = new BizEntrust();
         entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         List<BizEntrust> entrusts = entrustService.getList(entrustConditions);

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -37,7 +37,7 @@ public class BizWorkOrder extends BaseEntity {
     private Long companyId;
 
     @ApiModelProperty("客户名称")
-    @Excel(name = "客户名称",width = 35, sort = 1)
+    @Excel(name = "客户名称", width = 35, sort = 1)
     @TableField(exist = false)
     private String companyName;
 
@@ -63,7 +63,6 @@ public class BizWorkOrder extends BaseEntity {
     private Integer type;
 
 
-
     /**
      * 无合同
      */
@@ -96,7 +95,7 @@ public class BizWorkOrder extends BaseEntity {
 //    @Excel(name = "任务详情", sort = 6)
     private String taskTypeDetailName;
 
-    @Excel(name = "是否延续", sort = 6,readConverterExp = "0=否,1=是")
+    @Excel(name = "是否延续", sort = 6, readConverterExp = "0=否,1=是")
     @ApiModelProperty(value = "是否延续")
     private Integer isContinue;
 
@@ -232,4 +231,16 @@ public class BizWorkOrder extends BaseEntity {
 
     @TableField(exist = false)
     private String alterType;
+    @TableField(exist = false)
+    private Integer addressStyle;
+    @TableField(exist = false)
+    private Long fictionAddressId;
+    @TableField(exist = false)
+    private String inputProvince;
+    @TableField(exist = false)
+    private String inputCity;
+    @TableField(exist = false)
+    private String inputDistrict;
+    @TableField(exist = false)
+    private String explain;
 }

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

@@ -17,7 +17,7 @@
 
     <select id="getList" parameterType="BizWorkOrder" resultMap="BizWorkOrderResult">
         SELECT t1.*, t2.name as company_name, t2.social_credit_code, t3.name as task_type_name, t4.name as
-        task_type_detail_name, t5.nick_name as service_name, t2.is_zero,t2.tax_type,t6.alter_type
+        task_type_detail_name, t5.nick_name as service_name, t2.is_zero,t2.tax_type,t6.alter_type,t6.address_style,t6.fiction_address_id,t6.province as inputProvince,t6.city as inputCity,t6.district as  inputDistrict
         FROM biz_work_order t1
         left join biz_company t2 on t2.id = t1.company_id
         left join biz_task_type t3 on t3.id = t1.task_type_id