Merge branch 'develop'

src/main/java/cn/ezhizao/project/business/standardCpmpany/controller/BizStandardCompanyController.java

@@ -97,6 +97,9 @@ public class BizStandardCompanyController extends BaseController {
         setTenantId(bizStandardCompany);
         List<BizStandardCompany> list = bizStandardCompanyService.getList(bizStandardCompany);
         list.forEach(l -> {
+            if (l.getZero() == null){
+                throw new RuntimeException("申报不能为空");
+            }
             l.setZero(l.getIsZero() == 1 ? "是" : "否");
         });
         ExcelUtil<BizStandardCompany> util = new ExcelUtil<BizStandardCompany>(BizStandardCompany.class);

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

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.workOrder.controller;
 
 import cn.ezhizao.common.exception.ServiceException;
+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;
@@ -14,7 +15,9 @@ import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderOnce;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderOnceExport;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
 import cn.ezhizao.project.system.domain.SysCurrentMonth;
+import cn.ezhizao.project.system.domain.SysDictData;
 import cn.ezhizao.project.system.service.ISysCurrentMonthService;
+import cn.ezhizao.project.system.service.ISysDictDataService;
 import cn.ezhizao.project.tenant.domain.Tenant;
 import cn.ezhizao.project.tenant.service.ITenantService;
 import cn.hutool.core.date.DateField;
@@ -49,6 +52,8 @@ public class WorkOrderOnceController extends BaseController {
     IBizEntrustService bizEntrustService;
     @Resource
     ITenantService tenantService;
+    @Resource
+    private ISysDictDataService sysDictDataService;
 
     /**
      * 查询工单信息列表
@@ -61,7 +66,29 @@ public class WorkOrderOnceController extends BaseController {
         startOrderBy();
 //        bizWorkOrder.setIsStop(0);
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
+        list.forEach(v ->{
+            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());
+            }
 
+        });
         BizEntrust bizEntrust = new BizEntrust();
         bizEntrust.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         List<BizEntrust> entrusts = bizEntrustService.getList(bizEntrust);

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

@@ -197,7 +197,20 @@ public class BizWorkOrder extends BaseEntity
     @TableField(exist = false)
     private List<Long> taskTypeIds;
 
-
+    @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

@@ -59,13 +59,14 @@
 
     <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, t7.account_name as from_company_name
+        task_type_detail_name, t5.nick_name as service_name, t7.account_name as from_company_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 biz_tenant t7 on t7.id = t1.tenant_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>