修改bug

commons/src/main/java/com/jzg/commons/aop/aspect/OperatorTrajectoryAspect.java

@@ -141,6 +141,8 @@ public class OperatorTrajectoryAspect {
                 argStrBuilrder.append(s).append(",");
             }
             return argStrBuilrder.substring(0, argStrBuilrder.length() - 1);
+        } else if (arg instanceof Long){
+            return arg.toString();
         }else if (arg != null) {
             JSONObject jsonObject = (JSONObject) JSON.toJSON(arg);
             return jsonObject.getString(key);

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

@@ -32,6 +32,12 @@ public class CardUserInfo {
     private String approvedPassengersCapacity;
     private String backOcrID;
     private String motorTypeCode;
+    private String address;
+    // 总质量
+    private String totalTonCount;
+
+    //外廓只存
+    private String overallDimensions;
 
     private String motorUsageTypeCode;
 

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

@@ -394,8 +394,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     private CustomerInfoVo mapCarUserInfoToCustomerInfo(InsOrdersCarUserInfo carUserInfo) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         CustomerInfoVo customerInfoVo = BeanUtil.copyProperties(carUserInfo, CustomerInfoVo.class);
-        customerInfoVo.setIdentifyValidDate(carUserInfo.getIdentifyValidDate().format(formatter));
-        customerInfoVo.setIdentifyValidEndDate(carUserInfo.getIdentifyValidEndDate().format(formatter));
+        if(Objects.nonNull(carUserInfo.getIdentifyValidDate())) {
+            customerInfoVo.setIdentifyValidDate(carUserInfo.getIdentifyValidDate().format(formatter));
+        }
+        if(Objects.nonNull(carUserInfo.getIdentifyValidEndDate())) {
+            customerInfoVo.setIdentifyValidEndDate(carUserInfo.getIdentifyValidEndDate().format(formatter));
+        }
         customerInfoVo.setProperty(customerInfoVo.getPersonType());
         return customerInfoVo;
     }

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

@@ -308,8 +308,15 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
     @Override
     public List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo){
+        //如果用户租户code为App  则使用参数传来的租户code
+        String systemCode = "";
+        if("APP".equals(baseController.getUserSystemCode())){
+            systemCode = baseController.getAppSystemCode();
+        }else{
+            systemCode = baseController.getUserSystemCode();
+        }
         //根据权限获取所有保司
-        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(baseController.getUserSystemCode());
+        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode);
         AssertionUtils.isFail(companyListResult.getCode()!=200,companyListResult.getMsg());
         List<EsmInsCompany> companyList = companyListResult.getData();
         //根据基本规则 能源、车辆类型、使用性质获取方案

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

@@ -243,7 +243,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 .eq(SysUserJzgInfo::getIsEnable,0)
         ;
 
-        queryWrapper1.eq(SysUserJzgInfo::getStatus,4); // 未审核
+        queryWrapper1.eq(SysUserJzgInfo::getStatus, UserState.UserStateEnum.COMPANY_REVIEW_ING.getValue()); // 未审核
         Long noCount = sysUserJzgInfoService.count(queryWrapper1);
 
         LambdaQueryWrapper<SysUserJzgInfo> queryWrapper2 = new LambdaQueryWrapper<>();
@@ -253,7 +253,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 .eq(SysUserJzgInfo::getIsEnable,0)
         ;
 
-        queryWrapper2.eq(SysUserJzgInfo::getStatus,6); // 审核失败
+        queryWrapper2.eq(SysUserJzgInfo::getStatus,UserState.UserStateEnum.COMPANY_REVIEW_FAILED.getValue()); // 审核失败
         Long failCount = sysUserJzgInfoService.count(queryWrapper2);
         auditCountVo.setNoAuditCount(noCount);
         auditCountVo.setFailAuditCount(failCount);
@@ -309,8 +309,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
             sysUserJzgInfo.setId(IdGenerate.nextId());
             sysUserJzgInfo.setUserId(sysUser1.getId());
-            sysUserJzgInfoId = sysUserJzgInfo.getId();
             sysUserId = sysUser1.getId();
+            sysUserJzgInfo.setStatus(UserState.UserStateEnum.ALREADY_EMPLOYEE.getValue());
             sysUserJzgInfoService.save(sysUserJzgInfo);
             if (sysUserVo.getOrganizationId() != null && !sysUserVo.getOrganizationId().equals("")) {
                 saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getUserId());

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

@@ -24,7 +24,7 @@
             sujif.file_url as cardFile
         from
             sys_user_jzg_info_bank_card sujibc
-        left join sys_user_jzg_info suji on suji.id = sujibc.user_jzg_info_id
+        left join sys_user_jzg_info suji on suji.id = sujibc.user_id
         left join sys_user_jzg_info_file sujif on sujif.id = sujibc.file_id
         where
             1=1

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

@@ -74,7 +74,7 @@
             and suji.dept_id = #{sysUserInfoListVo.deptId}
         </if>
         <if test="sysUserInfoListVo.deptName != null and sysUserInfoListVo.deptName != ''">
-            and sd.name like concat('%',#{sysUserInfoListVo.deptName},'%')
+            and so.name like concat('%',#{sysUserInfoListVo.deptName},'%')
         </if>
 
         <if test="sysUserInfoListVo.typeAttr != null and sysUserInfoListVo.typeAttr != ''">