Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/dto/InsOrdersParam.java

@@ -44,5 +44,8 @@ public class InsOrdersParam extends PageRequest {
     @Schema(description = "批改状态")
     private String adjustStatus;
 
+    @Schema(description = "租户code")
+    private String systemCode;
+
 
 }

commons/src/main/java/com/jzg/commons/entity/po/EsmInsCompanyTenantSort.java

@@ -0,0 +1,27 @@
+package com.jzg.commons.entity.po;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jzg.commons.core.base.BaseModel;
+import lombok.Data;
+
+
+@TableName(value = "esm_ins_company_tenant_sort")
+@Data
+public class EsmInsCompanyTenantSort extends BaseModel {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    private String companyId;
+
+    private int orderNum;
+
+    private String systemCode;
+
+}
+
+
+

commons/src/main/java/com/jzg/commons/entity/vo/SysVersionVo.java

@@ -32,5 +32,6 @@ public class SysVersionVo extends PageRequest {
 
     private String issueFlag;
 
+    private String  packageType;
 
 }

platform/src/main/java/com/jzg/controller/EsmInsCompanyController.java

@@ -55,6 +55,12 @@ public class EsmInsCompanyController extends BaseController {
     @Autowired
     private SysUploadFilesMapper sysUploadFilesMapper;
 
+    @Autowired
+    private SysSystemService sysSystemService;
+
+    @Autowired
+    private BaseController baseController;
+
     @Value("${minio.bucket-name}")
     private String bucketName;
 
@@ -304,10 +310,6 @@ public class EsmInsCompanyController extends BaseController {
 //
 //    }
 
-
-    @Autowired
-    SysSystemService sysSystemService;
-
     @Operation(summary = "获取顶级保险公司列表")
     @GetMapping(value = "/gainTopList")
     public HttpResult<List<EsmInsCompanyResVo>> gainTopList(@RequestParam String type,@RequestParam(required = false) String systemCode) {
@@ -417,4 +419,19 @@ public class EsmInsCompanyController extends BaseController {
         List<EsmInsCompany> esmInsCompanyList = esmInsCompanyService.getCompanyByIds(companyList);
         return HttpResult.ok(esmInsCompanyList);
     }
+
+    @Operation(summary = "获取保司排序信息")
+    @GetMapping(value = "getCompanySort")
+    public HttpResult<List<EsmInsCompany>> getCompanySort(){
+        List<EsmInsCompany> companyByIds = esmInsCompanyService.getCompanySort(baseController.getUserSystemCode());
+        return HttpResult.ok(companyByIds);
+    }
+
+    @Operation(summary = "更新保司排序信息")
+    @PostMapping(value = "updateCompanySort")
+    public HttpResult<String> updateCompanySort(@RequestBody List<EsmInsCompany> esmInsCompanyList){
+        boolean result = esmInsCompanyService.updateCompanySort(esmInsCompanyList,baseController.getUserSystemCode());
+        return result ?  HttpResult.ok("更新保司排序成功") : HttpResult.error("更新保司排序失败");
+    }
+
 }

platform/src/main/java/com/jzg/mapper/EsmInsCompanyTenantSortMapper.java

@@ -0,0 +1,10 @@
+package com.jzg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.EsmInsCompanyTenantSort;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EsmInsCompanyTenantSortMapper extends BaseMapper<EsmInsCompanyTenantSort> {
+
+}

platform/src/main/java/com/jzg/service/EsmInsCompanyService.java

@@ -115,6 +115,20 @@ public interface EsmInsCompanyService extends IService<EsmInsCompany> {
     List<EsmInsCompany> getAllBaseList();
     
     List<EsmInsCompany> getCompanyByIds(List<String> ids);
+
+    /**
+     * 获取保司排序
+     * @param systemCode
+     * @return
+     */
+    List<EsmInsCompany> getCompanySort(String systemCode);
+
+    /**
+     * 更新保司排序
+     * @param systemCode
+     * @return
+     */
+    boolean updateCompanySort(List<EsmInsCompany> companyList, String systemCode);
 }
 
 

platform/src/main/java/com/jzg/service/impl/EsmInsCompanyServiceImpl.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.jzg.commons.annotation.IgnoreTenant;
 import com.jzg.commons.entity.po.EsmInsCompany;
+import com.jzg.commons.entity.po.EsmInsCompanyTenantSort;
 import com.jzg.commons.entity.po.SysUploadFiles;
-import com.jzg.commons.entity.system.po.SysSystemBusPerms;
 import com.jzg.commons.entity.system.vo.SysSystemBusPermsVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyReq;
 import com.jzg.commons.entity.vo.EsmInsCompanyResVo;
@@ -15,20 +15,19 @@ import com.jzg.commons.entity.vo.EsmInsCompanyVo;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
+import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.mapper.EsmInsCompanyMapper;
-import com.jzg.mapper.SysSystemBusPermsMapper;
+import com.jzg.mapper.EsmInsCompanyTenantSortMapper;
 import com.jzg.service.EsmInsCompanyService;
 import com.jzg.service.SysSystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 
@@ -52,6 +51,9 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
     @Autowired
     SysSystemService sysSystemService;
 
+    @Autowired
+    EsmInsCompanyTenantSortMapper esmInsCompanyTenantSortMapper;
+
     @Override
     public List<EsmInsCompanyVo> findTree(EsmInsCompanyReq req) {
         List<EsmInsCompanyVo> allList  = baseMapper.findTree(req);
@@ -283,6 +285,55 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
         List<EsmInsCompany> esmInsCompanies = baseMapper.selectList(new LambdaQueryWrapper<EsmInsCompany>().in(EsmInsCompany::getId,ids));
         return esmInsCompanies;
     }
+
+    /**
+     * 获取保司排序
+     * @param systemCode
+     * @return
+     */
+    @Override
+    public List<EsmInsCompany> getCompanySort(String systemCode) {
+        List<EsmInsCompany> esmInsCompanies = sysSystemService.getUserCompany(systemCode);
+        List<EsmInsCompanyTenantSort> esmInsCompanyTenantSorts = esmInsCompanyTenantSortMapper.selectList(new LambdaQueryWrapper<>());
+        Map<String, Integer> sortMap = esmInsCompanyTenantSorts.stream()
+                .collect(Collectors.toMap(EsmInsCompanyTenantSort::getCompanyId, EsmInsCompanyTenantSort::getOrderNum));
+
+        esmInsCompanies.sort((c1, c2) -> {
+            Integer order1 = sortMap.get(c1.getId());
+            Integer order2 = sortMap.get(c2.getId());
+            if (order1 != null && order2 != null) {
+                return order1.compareTo(order2);
+            } else if (order1 != null) {
+                return -1;
+            } else if (order2 != null) {
+                return 1;
+            } else {
+                return 0;
+            }
+        });
+
+        return esmInsCompanies;
+    }
+
+    @Override
+    @Transactional
+    public boolean updateCompanySort(List<EsmInsCompany> companyList, String systemCode) {
+        esmInsCompanyTenantSortMapper.delete(new LambdaQueryWrapper<EsmInsCompanyTenantSort>()
+                .eq(EsmInsCompanyTenantSort::getSystemCode, systemCode));
+
+        List<EsmInsCompanyTenantSort> companyTenantSorts = new ArrayList<>();
+        AtomicInteger orderNum = new AtomicInteger(1);
+        companyList.forEach(item->{
+            EsmInsCompanyTenantSort tenantSort = new EsmInsCompanyTenantSort();
+            tenantSort.setId(IdGenerate.nextId());
+            tenantSort.setCompanyId(item.getId());
+            tenantSort.setOrderNum(orderNum.get());
+            orderNum.getAndIncrement();
+            companyTenantSorts.add(tenantSort);
+        });
+        esmInsCompanyTenantSortMapper.insert(companyTenantSorts);
+        return true;
+    }
 }
 
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/OrgClient.java

@@ -31,6 +31,7 @@ public interface OrgClient {
 
     @GetMapping(value = "/agreement/getByCompanyId")
     public HttpResult<List<PtlAgreement>> getByCompanyId(@RequestParam("companyId") String companyId,
+                                                         @RequestParam("systemCode") String code,
                                                          @RequestHeader("Authorization") String authToken,
                                                          @RequestHeader("system_code")String systemCode);
     @GetMapping(value = "/agreement/getByAgreementId")

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrdersController.java

@@ -2,6 +2,7 @@ package com.jzg.quotation.summary.controller;
 
 
 import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.po.InsFeeOrders;
@@ -17,10 +18,13 @@ import com.jzg.quotation.summary.service.InsTaskImagesService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.validation.constraints.NotNull;
 
@@ -29,7 +33,7 @@ import javax.validation.constraints.NotNull;
 @Tag(name = "补录订单录入")
 @Validated
 @RequiredArgsConstructor
-public class InsOrdersController {
+public class InsOrdersController extends BaseController {
 
     @Resource
     private InsOrdersService insOrdersService;
@@ -40,6 +44,9 @@ public class InsOrdersController {
     @Autowired
     private InsOrdersCarInfoService insOrdersCarInfoService;
 
+    @Autowired
+    private BaseController baseController;
+
     @Resource
     private InsFeeOrdersService insFeeOrdersService;
 
@@ -80,6 +87,15 @@ public class InsOrdersController {
     @PostMapping("queryList")
     @Operation(summary = "查询订单列表")
     public HttpResult queryList(@RequestBody InsOrdersParam insOrdersParam) {
+        String systemCode = "";
+        //如果是APP登录的话 则传递SystemCode的头部字段
+        if (baseController.getUserSystemCode().equals("APP")) {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            systemCode = request.getHeader("system_code");
+        } else {
+            systemCode =  baseController.getUserSystemCode();
+        }
+        insOrdersParam.setSystemCode(systemCode);
         return HttpResult.ok(insOrdersService.queryList(insOrdersParam));
     }
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -218,7 +218,7 @@ public class UnifyOrderManager {
 
         //先默认第一个协议
         HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(esmInsCompanyHttpResult.getData()
-                .getId(), baseController.getToken(), systemCode);
+                .getId(),systemCode, baseController.getToken(), systemCode);
         if (byCompanyId.getData().isEmpty()) {
             AssertionUtils.isFail(true, "保司未配置协议");
         }
@@ -406,7 +406,7 @@ public class UnifyOrderManager {
         String systemCode = getSystemCode();
 
         //先默认第一个协议
-        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(insOrders.getCompanyId(), baseController.getToken(), systemCode);
+        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(insOrders.getCompanyId(),systemCode, baseController.getToken(), systemCode);
         if (byCompanyId.getData().isEmpty()) {
             AssertionUtils.isFail(true, "保司未配置协议");
         }

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -545,7 +545,7 @@
                 left join
             sys_user su on su.mobile = io.real_quote_user_id
                 left join
-            sys_user_jzg_info suji on suji.user_id = su.id
+            sys_user_jzg_info suji on suji.user_id = su.id and suji.system_code = #{insOrdersParam.systemCode}
                 left join
             sys_dept sd on sd.id = suji.dept_id
                 left join

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/entity/request/QuoteRequest.java

@@ -577,6 +577,9 @@ public class QuoteRequest {
              */
             @JacksonXmlProperty(localName = "NPoWeight")
             private String NPoWeight;
+
+            @JacksonXmlProperty(localName = "WholeWeight")
+            private String WholeWeight;
             /**
              * 折旧价
              */
@@ -698,6 +701,7 @@ public class QuoteRequest {
                 vhl.setCBusType("0");
                 vhl.setCMortgageMrk("0");
                 vhl.setNPoWeight(carInfo.getCompleteKerbMass());
+                vhl.setWholeWeight(carInfo.getCompleteKerbMass());
                 //305005001：未验 305005002：已验车 305005003：免验车 305005004：需验车
                 vhl.setCInspectionCde("305005003");
                 vhl.setCDevice8Mrk("0");

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/service/impl/YongChengApiRequestImpl.java

@@ -131,7 +131,7 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
     public QuoteResultsVo quote(QuoteVo quoteVo) throws JsonProcessingException {
         OrderBase order = quoteVo.getOrder();
         AttributionInformationVo attributionInformationVo = order.getAttributionInformationVo();
-        String url = getApiUrl(order.getInsuranceCompanyId());
+        String url = getApiUrl(order.getInsuranceCompanyCode());
         //1.车型获取
         YcApiConfigurationProperties configurationProperties = ConfigureParametersConversion.conversionEntity(YcApiConfigurationProperties.class, attributionInformationVo.getConfigInfo());
         ModelsQueryResponse.VehicleInfo vehicleInfo = gainVehicleModel(configurationProperties, quoteVo.getCarInfoVo(),url);

tenant/organization/src/main/java/com/jzg/organization/client/EsmInsCompanyClient.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name="jzg-platform",url = "http://localhost:8001/")
+@FeignClient(name="jzg-platform",url = "${feign.client.jzg-platform.url}")
 public interface EsmInsCompanyClient {
 
 

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

@@ -234,8 +234,8 @@ public class AgreementController extends BaseController {
 
     @Operation(summary = "根据保险公司查找协议")
     @GetMapping("/getByCompanyId")
-    public HttpResult getByCompanyCode(String companyId) {
-        return HttpResult.ok(agreementService.getByCompanyId(companyId));
+    public HttpResult getByCompanyCode(String companyId, String systemCode) {
+        return HttpResult.ok(agreementService.getByCompanyId(companyId, systemCode));
     }
 
     @Operation(summary = "根据协议id查找协议")

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

@@ -132,5 +132,5 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
      */
     void contactEdit(AgreementContactEditParam param);
 
-    List<PtlAgreement> getByCompanyId(String companyId);
+    List<PtlAgreement> getByCompanyId(String companyId,String systemCode);
 }

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

@@ -502,9 +502,10 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     }
 
     @Override
-    public List<PtlAgreement> getByCompanyId(String companyId) {
+    public List<PtlAgreement> getByCompanyId(String companyId,String systemCode) {
         List<PtlAgreement> ptlAgreements = baseMapper.selectList(new LambdaQueryWrapper<PtlAgreement>()
-                .eq(PtlAgreement::getCompanyId, companyId));
+                .eq(PtlAgreement::getCompanyId, companyId)
+                .eq(PtlAgreement::getSystemCode, systemCode));
         return ptlAgreements;
     }
 

tenant/organization/src/main/resources/application.yml

@@ -93,6 +93,8 @@ tenant:
     - ins_fee_audit
     - sys_user_jzg_info_bank_card_record
     - sys_app_manage
+    - ptl_agreement_dispatch_rules_attr_link
+    - ptl_agreement_dispatch_action
 
 
   ignoreLoginNames:

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

@@ -20,6 +20,9 @@
         <if test="sysVersionVo.appName != null and sysVersionVo.appName != ''">
             and sv.appname = #{sysVersionVo.appName}
         </if>
+        <if test="sysVersionVo.packageType != null and sysVersionVo.packageType != ''">
+            and sv.package_type = #{sysVersionVo.packageType}
+        </if>
         <if test="sysVersionVo.appId != null and sysVersionVo.appId != ''">
             and sv.appid = #{sysVersionVo.appId}
         </if>