no message

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

@@ -142,7 +142,7 @@ public class BizArchiveInput extends BaseEntity {
     /**
      * 合同审核状态
      */
-    @Excel(name = "合同审核状态")
+    @Excel(name = "合同审核状态", readConverterExp = "1=已审核,0=未审核")
     @ApiModelProperty(value = "合同审核状态")
     private Integer verifyStatus;
     @Excel(name = "客户标签")

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

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.workOrder.controller;
 
+import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
@@ -37,6 +38,7 @@ import cn.ezhizao.project.business.socialSecurity.service.*;
 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.SysDictData;
 import cn.ezhizao.project.system.domain.SysFileStorage;
 import cn.ezhizao.project.system.service.ISysDictDataService;
 import cn.ezhizao.project.system.service.ISysFileStorageService;
@@ -222,19 +224,26 @@ public class WorkOrderServiceController extends BaseController {
         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());
-         }
+            Integer style = v.getAddressStyle();
+            if(style ==null){
+                return;
+            }
+            if (v.getTaskTypeId() == 5L && style == 1 && StringUtils.isNotEmpty(v.getInputProvince()) ){
+                //自有地址
+                v.setExplain("自有地址:"+v.getInputProvince()+v.getInputCity()+v.getInputDistrict());
+            }else if (v.getTaskTypeId() == 5L && style == 2 && v.getFictionAddressId() != null){
+                //虚拟地址
+                SysDictData sysDictData = sysDictDataService.selectDictDataById(v.getFictionAddressId());
+                if(sysDictData == null){
+                    return;
+                }
+                v.setExplain("虚拟地址:"+sysDictData.getDictLabel());
+            }else {
+                if (StringUtils.isEmpty(v.getInputProvince())){
+                    return;
+                }
+                v.setExplain("办理地区:"+v.getInputProvince()+v.getInputCity()+v.getInputDistrict());
+            }
 
         });
         BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();

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

@@ -110,7 +110,6 @@
         SELECT
         t1.*,
         t2.name as company_name,
-        t1.boss,
         t2.customer_label_id as customerLabelId,
         t5.lable as customerLabelName,
         t2.social_credit_code as social_credit_code,
@@ -126,7 +125,7 @@
             t1.deleted = 0
             <if test="fromId != null">AND (t1.from_id = #{fromId} or t1.id = #{fromId})</if>
             <if test="id != null  and id != ''">AND t1.id = #{id}</if>
-            <if test="contactNo!=null and contactNo != '' ">AND t1.contract_no like concat("%",#{contractNo}, "%")</if>
+            <if test="contractNo!=null and contractNo != '' ">AND t1.contract_no like concat("%",#{contractNo}, "%")</if>
             <if test="companyName != null  and companyName != ''">AND t2.name like concat("%", #{companyName}, "%")</if>
             <if test="archiveTypeId != null">and archive_type_id = #{archiveTypeId}</if>
             <if test="companyId != null  and companyId != ''">AND t1.company_id = #{companyId}</if>
@@ -134,7 +133,7 @@
             <if test="startMonth != null ">AND t1.start_month = #{startMonth}</if>
             <if test="endMonth != null ">AND t1.end_month = #{endMonth}</if>
             <if test="proofUrl != null  and proofUrl != ''">AND t1.proof_url = #{proofUrl}</if>
-            <if test="contractNo != null  and contractNo != ''">AND t1.contract_no = #{contractNo}</if>
+            <if test="boss != null  and boss != ''">AND  t1.boss like concat("%",#{boss}, "%")</if>
             <if test="formDate!= null and formDate.size() ">
                 AND (
                 DATE_FORMAT(t1.form_date,'%Y-%m-%d') &gt;= #{formDate[0]}