fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/covenant/BsCovenantController.java

@@ -153,7 +153,7 @@ public class BsCovenantController extends BaseController {
         return toAjax(iBsCovenantService.insertYXTByAddBo(bo) ? 1 : 0);
     }
 
-    @ApiOperation("云学堂新增乙方信息")
+    @ApiOperation("云学堂新增乙方地址信息")
     @Log(title = "企业协议", businessType = BusinessType.INSERT)
     @PostMapping("/insertYiInfo")
     public AjaxResult<Void> insertYiInfo(@RequestBody TenantCovenantInfoAddBo bo) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/covenant/bo/TenantCovenantInfoAddBo.java

@@ -27,6 +27,6 @@ public class TenantCovenantInfoAddBo {
     private String yiCompanyAddress;
     /** 乙方公司名称 */
     @TableField(exist = false)
-    @ApiModelProperty("乙方公司地址")
+    @ApiModelProperty("乙方公司名称")
     private String yiCompanyName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/covenant/service/impl/BsCovenantServiceImpl.java

@@ -220,7 +220,6 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
                 List<TenantCovenantInfoAddBo> tenantCovenantInfoAddBos = JSONArray.parseArray(deliveryAddress, TenantCovenantInfoAddBo.class);
                 if (!tenantCovenantInfoAddBos.isEmpty()) {
                     TenantCovenantInfoAddBo tenantCovenantInfoAddBo = tenantCovenantInfoAddBos.get(0);
-                    tenantCovenantInfoAddBo.setYiCompanyName(tenantId.getTenantName());
                     return tenantCovenantInfoAddBo;
                 }
             }
@@ -500,7 +499,8 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
     public Boolean insertYiInfo(TenantCovenantInfoAddBo bo) {
         SysTenant tenantId = iSysTenantService.getById(ServletUtils.getRequest().getHeader("TenantId"));
         List<TenantCovenantInfoAddBo> tenantCovenantInfoAddBoList = new ArrayList<>();
-        if (ObjectUtils.isNotNull(tenantId.getDeliveryAddress())) {
+        tenantCovenantInfoAddBoList.add(bo);
+    /*    if (ObjectUtils.isNotNull(tenantId.getDeliveryAddress())) {
             String deliveryAddress = tenantId.getDeliveryAddress();
             List<TenantCovenantInfoAddBo> tenantCovenantInfoAddBos = JSONArray.parseArray(deliveryAddress, TenantCovenantInfoAddBo.class);
             tenantCovenantInfoAddBos.forEach(item -> {
@@ -518,7 +518,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
                 }
                 tenantCovenantInfoAddBoList.add(bo);
             }
-        }
+        }*/
         tenantId.setDeliveryAddress(JSON.toJSONString(tenantCovenantInfoAddBoList));
         return iSysTenantService.updateById(tenantId);
 

zhongzheng-system/src/main/resources/mapper/modules/covenant/BsCovenantMapper.xml

@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and bc.jia_company_name=#{searchKey} or bc.covenant_num=#{searchKey} or bc.sale_id=#{searchKey} or bc.sale_name=#{searchKey} or bc.sale_num=#{searchKey}
     </if>
     <if test="listType == 2">
-        and bc.stop_status!=0 
+        and bc.stop_status!=0
     </if>
     <if test="listType ==3">
         and bc.status!=3 and bc.status!=5 and bc.status!=6 and bc.status!=7
@@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and bc.status=#{status}
     </if>
     <if test="uploadStatus != null">
-        and bc.upload_status =#{uploadStatus} and bc.status=2
+        and bc.upload_status =#{uploadStatus} and bc.status in (2,5,6,7)
     </if>
     order by bc.create_time desc
 </select>