no message

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

@@ -18,6 +18,7 @@ import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
+import cn.ezhizao.project.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -42,7 +43,8 @@ public class OnceWorkOrderProductionController extends BaseController {
     @Resource
     private SysUserMapper sysUserMapper;
 
-
+    @Resource
+    private ISysDictDataService sysDictDataService;
     @ApiOperation(value = "带条件List 分页查询",notes= "带条件List 分页查询")
     @GetMapping("/list")
     @PreAuthorize("@ss.hasPermi('business:production:onceWork:list')")
@@ -52,6 +54,22 @@ public class OnceWorkOrderProductionController extends BaseController {
         startPage();
         startOrderBy();
         List<BizWorkOrder> list = workOrderService.getList(conditions);
+        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());
+            }
+
+        });
 //        .stream().filter(s -> s.getCompanyName().contains(companyName)).collect(Collectors.toList())
         return getDataTable(list);
     }

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

@@ -180,4 +180,18 @@ public class BizWorkOrder extends BaseEntity
     //是否为自己负责(当前登陆人Id)
     @TableField(exist = false)
     private Long principal;
+    @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

@@ -20,12 +20,13 @@
 
     <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
+        task_type_detail_name, t5.nick_name as service_name,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
         left join biz_task_type_detail t4 on t4.id = t1.task_type_detail_id
         left join sys_user t5 on t5.user_id = t1.service_id
+        LEFT JOIN biz_archive_input_detail t6 ON t6.id = t1.contract_detail_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="id != null "> AND t1.id = #{id}</if>