Merge branch 'master' into hlx

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/dto/AccountCardAddParam.java

@@ -33,7 +33,7 @@ public class AccountCardAddParam {
      */
     @Schema(description = "所属企业id")
     @NotNull(message = "请选择所属企业")
-    private Long accountId;
+    private String accountId;
 
     /**
      * 账户类型(0公户 1私户)

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

@@ -36,7 +36,7 @@ public class AccountCardEditParam {
      */
     @Schema(description = "所属企业id")
     @NotNull(message = "请选择所属企业")
-    private Long accountId;
+    private String accountId;
 
     /**
      * 账户类型(0公户 1私户)

commons/src/main/java/com/jzg/commons/entity/account/po/InvAccount.java

@@ -20,7 +20,7 @@ public class InvAccount extends BaseModel {
      * 账户id
      */
     @Schema(description = "主键")
-    private Long id;
+    private String id;
 
     /**
      * 户名

commons/src/main/java/com/jzg/commons/entity/account/po/InvAccountCard.java

@@ -20,7 +20,7 @@ public class InvAccountCard extends BaseModel {
      * 账户id
      */
     @Schema(description = "主键")
-    private Long id;
+    private String id;
 
     /**
      * 账户简称
@@ -38,7 +38,7 @@ public class InvAccountCard extends BaseModel {
      * 账户id
      */
     @Schema(description = "账户id")
-    private Long accountId;
+    private String accountId;
 
     /**
      * 账户性质(0公户 1私户)

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

@@ -15,7 +15,7 @@ public class AccountCardVo extends BaseModel {
      * 账户id
      */
     @Schema(description = "主键")
-    private Long id;
+    private String id;
 
     /**
      * 账户简称
@@ -33,7 +33,7 @@ public class AccountCardVo extends BaseModel {
      * 账户id
      */
     @Schema(description = "账户id")
-    private Long accountId;
+    private String accountId;
 
     /**
      * 账户性质(0公户 1私户)

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

@@ -15,7 +15,7 @@ public class AccountVo extends BaseModel {
      * 企业id
      */
     @Schema(description = "主键")
-    private Long id;
+    private String id;
 
     /**
      * 户名
@@ -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/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/component/HengBangCrawlerRequestComponent.java

@@ -73,7 +73,7 @@ public class HengBangCrawlerRequestComponent {
      * @param loginsNumber 登录次数
      * @return token
      */
-    public String authenticate(String username, String password, int loginsNumber) {
+    public String  authenticate(String username, String password, int loginsNumber) {
         // 登录验证码获取
         HbCrawlerCaptchaResponse captchaResponse = captcha(RequestConstant.REQUEST_NUMBER);
         // 登录存入缓存当中

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/component/ZmCrawlerRequestComponent.java

@@ -24,14 +24,11 @@ import com.jzg.quotation.zhongmei.crawler.properties.ZmCrawlerProperties;
 import com.jzg.quotation.zhongmei.crawler.util.Base64Tool;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.*;
-import org.apache.http.HttpResponse;
 import org.redisson.api.RBucket;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.springframework.http.*;
 import org.springframework.http.MediaType;
-import org.springframework.http.client.MultipartBodyBuilder;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -45,11 +42,9 @@ import org.w3c.dom.NodeList;
 import reactor.core.publisher.Mono;
 
 import java.io.*;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;

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;
@@ -14,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Tag(name="来往企业管理接口")
 @RestController
@@ -27,13 +32,24 @@ public class AccountController extends BaseController {
      * 企业管理列表分页
      * @return
      */
-    @PostMapping("/accountList")
+    @PostMapping("/accountPage")
     @Operation(summary = "企业管理列表分页")
-    public HttpResult accountList(@RequestBody AccountParam param){
+    public HttpResult accountPage(@RequestBody AccountParam param){
         Page<AccountVo> result = accountService.queryPage(param);
         return HttpResult.ok(result);
     }
 
+    /**
+     * 企业管理列表分页
+     * @return
+     */
+    @PostMapping("/accountList")
+    @Operation(summary = "企业管理列表")
+    public HttpResult accountList(@RequestBody AccountParam param){
+        List<AccountVo> result = accountService.queryList(param);
+        return HttpResult.ok(result);
+    }
+
     /**
      * 来往企业信息查询
      * @param id
@@ -69,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/java/com/jzg/organization/mapper/InvAccountMapper.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.account.vo.AccountVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * @author dongxin
 * @description 针对表【inv_account(来往企业表)】的数据库操作Mapper
@@ -23,6 +25,13 @@ public interface InvAccountMapper extends BaseMapper<InvAccount> {
      */
     Page<AccountVo> queryPage( Page page, @Param("param") AccountParam param);
 
+    /**
+     * 企业管理列表
+     * @param param
+     * @return
+     */
+    List<AccountVo> queryList(@Param("param")AccountParam param);
+
     /**
      * 根据id获取企业信息
      * @param id

tenant/organization/src/main/java/com/jzg/organization/service/InvAccountService.java

@@ -8,6 +8,8 @@ import com.jzg.commons.entity.account.po.InvAccount;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.account.vo.AccountVo;
 
+import java.util.List;
+
 /**
 * @author dongxin
 * @description 针对表【inv_account(来往企业表)】的数据库操作Service
@@ -22,6 +24,13 @@ public interface InvAccountService extends IService<InvAccount> {
      */
     Page<AccountVo> queryPage(AccountParam param);
 
+    /**
+     * 企业管理列表
+     * @param param
+     * @return
+     */
+    List<AccountVo> queryList(AccountParam param);
+
     /**
      * 来往企业信息查询
      * @param id
@@ -47,4 +56,6 @@ public interface InvAccountService extends IService<InvAccount> {
      * @param param
      */
     void accountEdit(AccountEditParam param);
+
+
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/InvAccountServiceImpl.java

@@ -14,6 +14,8 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author dongxin
 * @description 针对表【inv_account(来往企业表)】的数据库操作Service实现
@@ -29,6 +31,12 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
         return page;
     }
 
+    @Override
+    public List<AccountVo> queryList(AccountParam param) {
+        List<AccountVo> list = baseMapper.queryList(param);
+        return list;
+    }
+
     @Override
     public AccountVo queryById(String id) {
         AccountVo accountVo = this.isExistById(id);

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

@@ -76,7 +76,7 @@
         <where>
             iac.is_delete = 0
             <if test="id != null and id != ''">
-                and pa.id = #{id}
+                and iac.id = #{id}
             </if>
         </where>
     </select>

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

@@ -34,6 +34,21 @@
         update_by,update_time,is_delete
     </sql>
     <select id="queryPage" resultType="com.jzg.commons.entity.account.vo.AccountVo">
+        select <include refid="Base_Column_List"/>
+        FROM inv_account ia
+        <where>
+            ia.is_delete = 0
+            <if test="param.outerFlag != null ">
+                and ia.outer_flag = #{param.outerFlag}
+            </if>
+            <if test="param.accountName != null and param.accountName != ''">
+                and ia.account_name like CONCAT('%',#{param.accountName}, '%')
+            </if>
+        </where>
+        ORDER BY ia.create_time DESC
+    </select>
+
+    <select id="queryList" resultType="com.jzg.commons.entity.account.vo.AccountVo">
         select <include refid="Base_Column_List"/>
         FROM inv_account ia
         <where>
@@ -47,6 +62,7 @@
         </where>
         ORDER BY ia.create_time DESC
     </select>
+
     <select id="queryById" resultType="com.jzg.commons.entity.account.vo.AccountVo">
         select <include refid="Base_Column_List"/>
         FROM inv_account ia
@@ -57,4 +73,5 @@
             </if>
         </where>
     </select>
+
 </mapper>