Merge branch 'test' into test-xq2

src/main/java/com/ydtech/modules/equity/model/request/ThreeOrderVo.java

@@ -16,6 +16,7 @@ public class ThreeOrderVo extends BaseRequest {
     private String orderId;
 
     public ThreeOrderVo(String appKey, String orderId) {
+        this.setThreeUserId(appKey);
         this.setAppKey(appKey);
         this.setOrderId(orderId);
     }

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -378,6 +378,11 @@ public class RuleAttrMappingVo {
                 .ifPresent(x -> {
                     ruleAttrMappingVoList.add(new RuleAttrMappingVo("BifeeFloat", x));
                 });
+        // 向阳花评分 阳光
+        Optional.ofNullable(insAreaCompany)
+                .map(InsAreaCompany::getXyhGrade)
+                .map(String::valueOf)
+                .ifPresent(x -> ruleAttrMappingVoList.add(new RuleAttrMappingVo("XyhGrade", x)));
 
         //数值型总评分
         Pattern pattern = Pattern.compile("[0-9]*");

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerBaseRequest.java

@@ -32,6 +32,8 @@ public class CrawlerBaseRequest implements Serializable {
     @JsonProperty(value = "proposalCheckNo")
     private String proposalCheckNo;
 
+
+
     public CrawlerBaseRequest(String orderNo, String username){
         this.orderNo = orderNo;
         this.username = username;

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerPolicyPrintRequest.java

@@ -0,0 +1,24 @@
+package com.ydtech.modules.order.entity.crawler.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+
+/**
+ * 保单下载请求
+ */
+@Data
+public class CrawlerPolicyPrintRequest extends CrawlerBaseRequest{
+
+    /**
+     * 投保人身份证号
+     */
+    @JsonProperty(value = "idCard")
+    private String idCard;
+
+    public CrawlerPolicyPrintRequest(String orderNo, String username,String idCard){
+        this.setOrderNo(orderNo);
+        this.setUsername(username);
+        this.idCard = idCard;
+    }
+}

src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -445,6 +445,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         // 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
         //组装参数
+
         CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername());
         CrawlerPolicyPrintResponse response = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
                 PtlCrawlerApiType.API_6.getDesc(), crawlerBaseRequest, CrawlerPolicyPrintResponse.class);
@@ -737,12 +738,14 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
     @Override
     public HttpResult<Object> auditStatusQuery(String subOrderNo) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(subOrderNo);
+        InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
         String agreementId = insAreaCompany.getAgreementId();
         String apiUrl = ptlCrawlerApiService.getApiUrl(agreementId, PtlCrawlerApiType.API_8);
         // 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
         //组装参数
-        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername());
+        CrawlerPolicyPrintRequest crawlerBaseRequest = new CrawlerPolicyPrintRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername()
+                ,insOrders.getApplyinfo().getString("identifyNumber"));
 
         CrawlerAuditResponse crawlerAuditResponse = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
                 PtlCrawlerApiType.API_8.getDesc(), crawlerBaseRequest, CrawlerAuditResponse.class);
@@ -866,7 +869,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
 
         //组装参数
-        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername());
+        CrawlerPolicyPrintRequest crawlerBaseRequest = new CrawlerPolicyPrintRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername(),insOrders.getApplyinfo().getString("identifyNumber"));
         CrawlerPolicyPrintResponse response = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(), PtlCrawlerApiType.API_6.getDesc(), crawlerBaseRequest, CrawlerPolicyPrintResponse.class);
         if (response.getCode() == 200) {
             //交强险标志地址

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -1604,7 +1604,9 @@
                t.leader_id          leaderId,
                t2.management_source managementSource,
                t.operatorCode,
-               t2.id                deptId
+               t.identity,
+               t2.id                deptId,
+               t2.management_source dept_type
         from sys_user t
                  left join sys_dept t2 on t.dept_id = t2.id
         where t.id = #{id}

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -964,7 +964,8 @@
         iac.pay_date  as payDate,
         iac.update_status AS updateStatus,
         iac.update_status_time AS updateStatusTime,
-        iac.signing_time as signingTime
+        iac.signing_time as signingTime,
+        oou.NAME as operatorName
         from
             ins_area_company iac
         left JOIN
@@ -981,6 +982,7 @@
         LEFT JOIN sys_area d3 ON d3.area_code = pdept.area
         LEFT JOIN
         sys_user u on io.userid = u.id
+        LEFT JOIN sys_user oou ON io.operatorid = oou.id
         <where>
             <if test="agentUserIds != null and agentUserIds.size>0" >
                 AND (
@@ -1125,6 +1127,7 @@
 
             and (iac.del_flag = '1' or io.del_flag IS NULL or io.del_flag = 1)
         </where>
+
         order by io.createtime desc
     </select>
 
@@ -1906,7 +1909,8 @@
         iac.pay_date as payDate,
         iac.update_status AS updateStatus,
         iac.update_status_time AS updateStatusTime,
-        iac.signing_time as signingTime
+        iac.signing_time as signingTime,
+        oou.name as operatorName
         from
         ins_area_company iac
         left JOIN
@@ -1923,6 +1927,8 @@
         LEFT JOIN sys_area d3 ON d3.area_code = pdept.area
         LEFT JOIN
         sys_user u on io.userid = u.id
+        LEFT JOIN
+        sys_user oou on io.operatorid = oou.id
         <where>
             <if test="agentUserIds != null and agentUserIds.size>0">
                 AND (