账户bug的修复

commons/src/main/java/com/jzg/commons/entity/account/dto/AccountAddParam.java

@@ -49,7 +49,7 @@ public class AccountAddParam {
      * 成立日期
      */
     @Schema(description = "成立日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate establishTime;
 
     /**

commons/src/main/java/com/jzg/commons/entity/account/vo/AccountVo.java

@@ -27,13 +27,13 @@ public class AccountVo extends BaseModel {
      * 企业类型(0内部企业 1外部企业)
      */
     @Schema(description = "企业类型(0内部企业 1外部企业)")
-    private Integer outerFlag;
+    private String outerFlag;
 
     /**
      * 营业性质(3一般纳税 2小规模 1个体户)
      */
     @Schema(description = "营业性质(3一般纳税 2小规模 1个体户)")
-    private Integer businessQuality;
+    private String businessQuality;
 
     /**
      * 所属地

tenant/organization/src/main/java/com/jzg/organization/controller/AccountCardController.java

@@ -91,4 +91,16 @@ public class AccountCardController extends BaseController {
         accountCardService.cardEdit(param);
         return HttpResult.ok("修改成功");
     }
+
+    /**
+     * 批量删除协议
+     *
+     * @param id 主键id
+     */
+    @Operation(summary = "删除账户")
+    @DeleteMapping("/cardDelete")
+    public HttpResult cardDelete(String id) {
+        boolean b = accountCardService.removeById(id);
+        return HttpResult.ok(b ? "删除成功":"删除失败");
+    }
 }

tenant/organization/src/main/java/com/jzg/organization/controller/AccountController.java

@@ -1,11 +1,15 @@
 package com.jzg.organization.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.constants.OperationTypeEnum;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.account.dto.*;
 import com.jzg.commons.entity.account.vo.AccountVo;
+import com.jzg.commons.entity.dto.AgreementAddParam;
 import com.jzg.commons.util.AssertionUtils;
+import com.jzg.organization.mapper.PtlAgreementMapper;
 import com.jzg.organization.service.InvAccountService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -81,4 +85,16 @@ public class AccountController extends BaseController {
         accountService.accountEdit(param);
         return HttpResult.ok("修改成功");
     }
+
+    /**
+     * 批量删除协议
+     *
+     * @param id 主键串
+     */
+    @Operation(summary = "删除来往企业")
+    @DeleteMapping("/accountDelete")
+    public HttpResult accountDelete(String id) {
+        boolean b = accountService.removeById(id);
+        return HttpResult.ok(b ? "删除成功":"删除失败");
+    }
 }

tenant/organization/src/main/resources/mapper/InvAccountMapper.xml

@@ -42,7 +42,7 @@
                 and ia.outer_flag = #{param.outerFlag}
             </if>
             <if test="param.accountName != null and param.accountName != ''">
-                and ia.account_name = #{param.accountName}
+                and ia.account_name like CONCAT('%',#{param.accountName}, '%')
             </if>
         </where>
         ORDER BY ia.create_time DESC