Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/constants/enums/dict/insurance/Renewal.java

@@ -22,7 +22,8 @@ public enum Renewal implements IBaseEnum {
 
     R_0("0", "转保", 0, 0),
     R_1("1", "续保", 1, 0),
-    R_2("2", "新保", 2, 0);
+    R_2("2", "新保", 2, 0),
+    R_4("4", "跨续", 2, 0);
 
     // 编号
     private final String code;

src/main/java/com/ydtech/modules/admin/dao/SysDeptMapper.java

@@ -65,6 +65,8 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
     List<SysDept> queryFiveLevelDept(@Param("vo") SysDeptVo sysDeptVo);
 
     List<SysDept> getListByIdsByKzt(@Param("ids") List<String> deptIds);
+
+    String selectMaxId(@Param("parentId") String parentId, @Param("comlevel")String comlevel);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -3841,31 +3841,42 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
          String deptType = sysDeptVo.getDeptType();
          String comlevel = sysDeptVo.getComlevel();
          String parentId = sysDeptVo.getParentId();
+         String max = null;
          if ("C".equals(deptType) && comlevel.equals("5")) {
              sysDeptVo.setDeptType("M");
+             max = sysDeptMapper.selectMaxId(sysDeptVo.getParentId(),comlevel);
          } else if ("D".equals(deptType)) {
              sysDeptVo.setDeptType("D");
              deptType = "M";
          }
-         String number;
-         String maxId = sysDeptMapper.getMaxId(sysDeptVo.getParentId(), deptType, comlevel);
-         if (!maxId.equals("0")) {
-             String substring = maxId.substring(parentId.length() + 1);
-             int i = Integer.parseInt("1" + substring) + 1;
-             number = String.valueOf(i);
-         } else {
-             number = "101";
-         }
-
-         String substring = number.substring(number.length() - 2);
          String serialNumber;
-         if ("M,D".contains(sysDeptVo.getDeptType())) {
-             serialNumber = parentId + sysDeptVo.getDeptType() + substring;
-         } else {
-             serialNumber = parentId + substring;
-         }
+        if (StringUtils.isNotEmpty(max) && Integer.parseInt(max.substring(parentId.length() + 1)) >= 99){
+            serialNumber = incrementString(max);
+        }else {
+            String number;
+            String maxId = sysDeptMapper.getMaxId(sysDeptVo.getParentId(), deptType, comlevel);
+            if (!maxId.equals("0")) {
+                String substring = maxId.substring(parentId.length() + 1);
+                int i = Integer.parseInt("1" + substring) + 1;
+                number = String.valueOf(i);
+            } else {
+                number = "101";
+            }
+            String substring = number.substring(number.length() - 2);
+            if ("M,D".contains(sysDeptVo.getDeptType())) {
+                serialNumber = parentId + sysDeptVo.getDeptType() + substring;
+            } else {
+                serialNumber = parentId + substring;
+            }
+        }
          return serialNumber;
      }
 
 
+    public  String incrementString(String str) {
+        String numberPart = str.replaceAll("[^0-9]$", "").replaceAll("^.*?(\\d+)$", "$1");
+        long num = Long.parseLong(numberPart) + 1;
+        return str.replaceAll("(\\d+)$", String.valueOf(num));
+    }
+
 }

src/main/java/com/ydtech/modules/ins/model/guoren/NonAutoInsOrderReq.java

@@ -275,7 +275,8 @@ public class NonAutoInsOrderReq {
                     this.startDate = start;
                     this.endDate = end;
 
-                    this.businessMode = "1";
+                    // 非车类型 网销类
+                    this.businessMode = "6";
                     this.businessSource = "2";
 
                 }

src/main/java/com/ydtech/modules/order/entity/api/zijin/response/CalculatePremiumResponse.java

@@ -121,6 +121,10 @@ public class CalculatePremiumResponse extends BaseResponse implements Serializab
             carPolicySubInfoList.forEach(x -> map.put(x.getInsureGradeNo(), x));
             return accidentalDrivingVo.stream().map(x -> {
                 CarPolicySubInfoListDTO carPolicySubInfoListDTO = map.get(x.getProjectCode());
+                if(x.getProjectCode().equals("PD-005646%%SP000529%%%1")){
+                    carPolicySubInfoListDTO = map.get("PD-005646");
+                }
+
                 return toAccidentResponseVo(carPolicySubInfoListDTO.getActualPremium(), x);
             }).collect(Collectors.toList());
         }

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

@@ -16,9 +16,10 @@ public class CrawlerPolicyPrintRequest extends CrawlerBaseRequest{
     @JsonProperty(value = "idCard")
     private String idCard;
 
-    public CrawlerPolicyPrintRequest(String orderNo, String username,String idCard){
+    public CrawlerPolicyPrintRequest(String orderNo, String username, String idCard, String agreementId){
         this.setOrderNo(orderNo);
         this.setUsername(username);
+        this.setAgreementId(agreementId);
         this.idCard = idCard;
     }
 }

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

@@ -828,7 +828,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
         //组装参数
         CrawlerPolicyPrintRequest crawlerBaseRequest = new CrawlerPolicyPrintRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername()
-                ,insOrders.getApplyinfo().getString("identifyNumber"));
+                ,insOrders.getApplyinfo().getString("identifyNumber"), agreementId);
 
         CrawlerAuditResponse crawlerAuditResponse = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
                 PtlCrawlerApiType.API_8.getDesc(), crawlerBaseRequest, CrawlerAuditResponse.class);
@@ -958,7 +958,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
 
         //组装参数
-        CrawlerPolicyPrintRequest crawlerBaseRequest = new CrawlerPolicyPrintRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername(),insOrders.getApplyinfo().getString("identifyNumber"));
+        CrawlerPolicyPrintRequest crawlerBaseRequest = new CrawlerPolicyPrintRequest(insAreaCompany.getInsOrderNo(), ptlAgreementAttribution.getUsername(),insOrders.getApplyinfo().getString("identifyNumber"), insAreaCompany.getAgreementId());
         CrawlerPolicyPrintResponse response = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(), PtlCrawlerApiType.API_6.getDesc(), crawlerBaseRequest, CrawlerPolicyPrintResponse.class);
         if (response.getCode() == 200) {
             //交强险标志地址

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

@@ -169,7 +169,12 @@ public class InsUploadFilesServiceImpl extends ServiceImpl<InsUploadFilesMapper,
                 qws.eq(InsOrderReadPdf::getType, fileType);
                 List<InsOrderReadPdf> list = insOrderReadPdfService.list(qws);
                 HashMap<String, LocalDateTime> map = new HashMap<>();
-                String pdfText = PDFUtil.getPdfText(insUploadFiles.getFilePath());
+                String pdfText = "";
+                try {
+                    pdfText = PDFUtil.getPdfText(insUploadFiles.getFilePath());
+                }catch (Exception e){
+
+                }
                 if (StringUtils.isNotBlank(pdfText)) {
                     if (list != null && list.size() > 0) {
                         for (InsOrderReadPdf insOrderReadPdf : list) {

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductQueryVo.java

@@ -81,6 +81,9 @@ public class AgreementProductQueryVo extends PageRequest {
     @ApiModelProperty("审核人id")
     private String auditPerson;
 
+    @ApiModelProperty("审核人id")
+    private String auditingUserName;
+
     @ApiModelProperty("审核开始时间")
     private String auditStartTime;
 

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

@@ -328,6 +328,9 @@
             <if test="vo.source !=null  and vo.source != ''">
                 and sd.management_source=#{source}
             </if>
+            <if test="vo.auditingUserName != null and vo.auditingUserName != ''">
+                and a.auditing_user_id = #{vo.auditingUserName}
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -195,4 +195,9 @@
         </where>
     </select>
 
+    <select id="selectMaxId" resultType="java.lang.String">
+        SELECT id FROM sys_dept WHERE parent_id = #{parentId} and comlevel = #{comlevel}
+        ORDER BY CAST(SUBSTRING_INDEX(id, 'M', 1) AS UNSIGNED) DESC, CAST(SUBSTRING_INDEX(id, 'M', -1) AS UNSIGNED) DESC LIMIT 1
+    </select>
+
 </mapper>

src/main/resources/mapper/modules/protocols/PtlAgreementProductCostsNewMapper.xml

@@ -58,6 +58,10 @@
         <if test="params.auditPerson != null and params.auditPerson!= ''">
             AND papcn.audit_person = #{params.auditPerson}
         </if>
+        <if test="params.auditingUserName != null and params.auditingUserName!= ''">
+            AND papcn.audit_person = #{params.auditingUserName}
+        </if>
+
         <if test="params.auditStartTime != null and params.auditStartTime != ''">
             AND papcn.audit_time BETWEEN #{params.auditStartTime} and #{params.auditEndTime}
         </if>