解决组织架构-成员管理-编辑时，身份证相关信息没有被修改的问题

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

@@ -3,12 +3,14 @@ package com.jzg.quotation.summary.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.dto.InsOrdersParamVO;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
+import com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
@@ -138,7 +140,7 @@ public class InsOrdersController extends BaseController {
 
     @Operation(summary = "获取历史报价列表")
     @PostMapping("/getHistoryQuoteList")
-    public HttpResult getHistoryQuoteList(@RequestBody HistoryQuoteQueryVo historyQuoteQueryVo){
+    public HttpResult<Page<HistoryQuoteResultVo>> getHistoryQuoteList(@RequestBody HistoryQuoteQueryVo historyQuoteQueryVo){
         return HttpResult.ok(insOrdersService.getHistoryQuoteList(historyQuoteQueryVo));
     }
 

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

@@ -141,7 +141,7 @@ public interface InsOrdersService extends IService<InsOrders> {
     /**
      * 获取历史报价列表
      *
-     * @return
+     * @return Page<HistoryQuoteResultVo>
      */
     Page<HistoryQuoteResultVo> getHistoryQuoteList(HistoryQuoteQueryVo historyQuoteQueryVo);
 

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

@@ -2,6 +2,7 @@ package com.jzg.organization.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,6 +46,8 @@ import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -867,8 +870,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult<Boolean> updateUserInfo(SysUserVo sysUserVo) {
+        log.info("修改人员信息：sysUserVo=[{}]", JSONUtil.toJsonStr(sysUserVo));
         SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(sysUserVo.getId());
         if (Objects.isNull(sysUserJzgInfo)) {
+            log.info("id=[{}]的人员不存在", sysUserVo.getId());
             throw new SystemException("该业务员不存在");
         }
 //        if (sysUserJzgInfo.getIsEnable() == 0) {
@@ -885,6 +890,24 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
 
         }
+        // modify by lipf， 解决身份证信息没有更新的问题
+        SysUser originSysUser = sysUserService.getById(sysUserVo.getUserId());
+        if(originSysUser != null){
+            log.info("更新身份证等信息。原信息originSysUser=[{}]",JSONUtil.toJsonStr(originSysUser));
+            originSysUser.setIdentity(sysUserVo.getIdentity());
+            if(StrUtil.isEmpty(sysUserVo.getIdentityTimeStart())){
+                originSysUser.setIdentityTimeStart(null);
+            }else{
+                originSysUser.setIdentityTimeStart(LocalDate.parse(sysUserVo.getIdentityTimeStart(), DateTimeFormatter.ISO_DATE));
+            }
+
+            if(StrUtil.isEmpty(sysUserVo.getIdentityTimeEnd())){
+                originSysUser.setIdentityTimeEnd(null);
+            }else{
+                originSysUser.setIdentityTimeEnd(LocalDate.parse(sysUserVo.getIdentityTimeEnd(), DateTimeFormatter.ISO_DATE));
+            }
+            sysUserService.updateById(originSysUser);
+        }
         sysUserJzgInfoService.updateById(sysUserJzgInfo);
 
         //用户角色处理
@@ -919,10 +942,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public HttpResult getUserInfoByUserId(String id) {
         SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getUserByUserId(id);
+        log.info("根据id=[{}]查询用户信息sysUserJzgInfo=[{}]",id, JSONUtil.toJsonStr(sysUserJzgInfo));
         if (sysUserJzgInfo == null) {
             throw new SystemException("该用户不存在");
         }
         SysUser sysUser = sysUserService.getById(sysUserJzgInfo.getUserId());
+        log.info("sysUser=[{}]", JSONUtil.toJsonStr(sysUser));
         if (sysUser == null) {
             throw new SystemException("该用户不存在");
         }