修改bug

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

@@ -70,6 +70,18 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
     @Schema(description = "审批意见")
     private String approvalOpinion;
 
+//    @TableField(value = "identity")
+//    @Schema(description = "身份证号")
+//    private String identity;
+//
+//    @TableField(value = "identity_time_start")
+//    @Schema(description = "身份证有效期起期")
+//    private String identityTimeStart;
+//
+//    @TableField(value = "identity_time_end")
+//    @Schema(description = "身份证有效期止期")
+//    private String identityTimeEnd;
+
     @TableField(value = "logout_time")
     @Schema(description = "离职时间")
     private String logoutTime;

commons/src/main/java/com/jzg/commons/entity/system/vo/SysSystemBusPermsVo.java

@@ -29,8 +29,8 @@ public class SysSystemBusPermsVo implements Serializable {
     @TableId
     private String id;
 
-//    @Schema(description = "保司id")
-//    private String companyId;
+    @Schema(description = "保司id")
+    private String companyId;
 
     @Schema(description = "系统编码")
     private String systemCode;

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

@@ -1,5 +1,7 @@
 package com.jzg.commons.entity.vo;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -8,6 +10,8 @@ import java.io.Serializable;
  * @Author
  * @Date 2021/6/25
  **/
+
+@Data
 public class CustomerInfoVO implements Serializable {
     private String identifyValidEndDate;
     private String ocrID;
@@ -18,6 +22,7 @@ public class CustomerInfoVO implements Serializable {
     private String identifyIssuedCom;
     private String addr;
     private String identifyType;
+    private String nation;
 
     public String getIdentifyValidEndDate() {
         return identifyValidEndDate;

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 @Data
 public class IsEnableVo {
-    private List<String> id;
+    private List<String> ids;
 
     private Integer isEnable;
 

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

@@ -29,6 +29,12 @@ public class OrdersListVo {
     @Schema(description = "业务员手归属")
     private String salesmanCompany;
 
+    @Schema(description = "待客录单业务员姓名")
+    private String realQuoteUserName;
+
+    @Schema(description = "待客录单业务员id")
+    private String realQuoteUserId;
+
     @Schema(description = "保险公司")
     private String companyName;
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/utils/Idcard.java

@@ -111,6 +111,7 @@ public class Idcard {
         try {
             JSONObject jb = request(images, "front");
             customerInfo.setName(JSON.parseObject(jb.getString("姓名")).getString("words"));
+            customerInfo.setNation(jb.getJSONObject("民族").getString("words"));
             customerInfo.setIdentifyNumber(JSON.parseObject(jb.getString("公民身份号码")).getString("words"));
             customerInfo.setAddr(JSON.parseObject(jb.getString("住址")).getString("words"));
             customerInfo.setIdentifyType("01");

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -173,6 +173,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             List<KindInfoVo> kindInfoVo = ordersAdd.getKindInfoVo();
             List<InsOrdersKind> insOrdersKinds = BeanUtil.copyToList(kindInfoVo, InsOrdersKind.class);
             for (InsOrdersKind insOrdersKind : insOrdersKinds) {
+                insOrdersKind.setId(IdGenerate.nextId());
                 insOrdersKind.setOrderNo(quoteNo);
             }
             insOrdersKindService.saveBatch(insOrdersKinds);

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

@@ -353,11 +353,18 @@
             s.sy_premium,
             s.jy_premium,
             s.sum_premium,
-            s.tax_premium
+            s.tax_premium,
+            o.real_quote_user_id,
+            suji.name as real_quote_user_name,
+            eic.name_simple as company_name
         FROM
             ins_orders o
-                LEFT JOIN ins_orders_car_info c ON c.order_no = o.quote_no
-                LEFT JOIN ins_orders_costs s ON o.quote_no = s.order_no
+                LEFT JOIN ins_orders_car_info c ON c.order_no = o.id
+                LEFT JOIN ins_orders_costs s ON o.id = s.order_no
+                LEFT JOIN sys_user su ON su.mobile = o.real_quote_user_id
+                LEFT JOIN sys_user_jzg_info suji ON suji.user_id = su.id
+                LEFT JOIN esm_ins_company eic on o.company_id = eic.id
+
         <where>
             o.is_delete = 0
             <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
@@ -378,9 +385,9 @@
             <if test="insOrdersParam.auditStatus != null and insOrdersParam.auditStatus != ''">
                 AND o.audit_status = #{insOrdersParam.auditStatus}
             </if>
-            <if test="insOrdersParam.recordingTime != null and insOrdersParam.recordingTime.size() > 0">
-                AND o.create_time BETWEEN #{insOrdersParam.recordingTime[0]} AND #{insOrdersParam.recordingTime[1]}
-            </if>
+<!--            <if test="insOrdersParam.recordingTime != null and insOrdersParam.recordingTime.size() > 0">-->
+<!--                AND o.create_time BETWEEN #{insOrdersParam.recordingTime[0]} AND #{insOrdersParam.recordingTime[1]}-->
+<!--            </if>-->
         </where>
         order by o.create_time desc
     </select>

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

@@ -310,6 +310,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     public List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo){
         //根据权限获取所有保司
         HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(baseController.getUserSystemCode());
+        AssertionUtils.isFail(companyListResult.getCode()!=200,companyListResult.getMsg());
         List<EsmInsCompany> companyList = companyListResult.getData();
         //根据基本规则 能源、车辆类型、使用性质获取方案
         List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>()

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

@@ -397,7 +397,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
             sysUserJzgInfoService.updateBatchById(sysUserJzgInfoList);
         } else {
-            for (String id : isEnableVo.getId()) {
+            for (String id : isEnableVo.getIds()) {
                 SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getUserByUserId(id);
                 if (sysUserJzgInfo == null) {
                     throw new SystemException("该用户不存在");
@@ -641,7 +641,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     public boolean uploadFile(String fileId,String fileType,String userId){
         List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
-                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId, userId)
+                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, userId)
                         .eq(SysUserJzgInfoFile::getFileType, fileType)));
         if(sysUserJzgInfoFiles.size()>0) {
             sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
@@ -681,7 +681,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     public void verifyFile(SysUserVo sysUserVo,String userId){
         List<SysUserJzgInfoFile> fileList = sysUserJzgInfoFileService.list(new LambdaQueryWrapper<SysUserJzgInfoFile>()
-                .eq(SysUserJzgInfoFile::getUserJzgInfoId, userId));
+                .eq(SysUserJzgInfoFile::getUserId, userId));
         if(checkFileModify(fileList,"sfz1",sysUserVo.getSfz1())){
             uploadFile(sysUserVo.getSfz1(),"sfz1",userId);
         }