跳过MP处理器

src/main/java/com/ydtech/handler/CreateAndUpdateMetaObjectHandler.java

@@ -1,6 +1,5 @@
 package com.ydtech.handler;
 
-import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;
@@ -22,8 +21,24 @@ import java.util.Date;
 @Slf4j
 public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
 
+    // 标志变量，用来控制是否跳过填充逻辑
+    private static final ThreadLocal<Boolean> SKIP_FILL = ThreadLocal.withInitial(() -> false);
+
+    // 设置是否跳过填充
+    public static void setSkipFill(boolean skip) {
+        SKIP_FILL.set(skip);
+    }
+
+    // 清除标志变量
+    public static void clearSkipFlag() {
+        SKIP_FILL.remove();
+    }
+
     @Override
     public void insertFill(MetaObject metaObject) {
+        if (SKIP_FILL.get()) {
+            return; // 跳过插入填充
+        }
         try {
             if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
                 BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
@@ -46,6 +61,9 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
 
     @Override
     public void updateFill(MetaObject metaObject) {
+        if (SKIP_FILL.get()) {
+            return; // 跳过更新填充
+        }
         try {
             if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
                 BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();

src/main/java/com/ydtech/modules/admin/controller/SysAgencyLeaderController.java

@@ -256,21 +256,10 @@ public class SysAgencyLeaderController extends BaseController {
         return HttpResult.ok("success", this.sysAgencyLeaderService.queryAgencyUser(deptId));
     }
 
-//    @PostMapping("/queryAgencyUserInsAreaPage")
-//    @ApiOperation(value = "查询机构下的单个员工的子订单费用")
-//    public HttpResult<IPage<AgencyUserInsAreaVo>> queryAgencyUserInsAreaPage(@RequestBody AgencyUserInsAreaDto agencyUserInsAreaDto){
-//        if (agencyUserInsAreaDto.getPageNum() == 0) {
-//            agencyUserInsAreaDto.setPageNum(1);
-//        }
-//        if (agencyUserInsAreaDto.getPageSize() == 0) {
-//            agencyUserInsAreaDto.setPageSize(10);
-//        }
-//        return HttpResult.ok("success", this.sysAgencyLeaderService.queryAgencyUserInsAreaPage(agencyUserInsAreaDto));
-//    }
 
     @PostMapping("/queryInsAreaPageById")
     @ApiOperation(value = "查询机构下的单个员工的子订单费用")
-    public HttpResult<IPage<AgencyUserInsAreaVo>> queryInsAreaPageById(@RequestBody AgencyUserInsAreaDto agencyUserInsAreaDto){
+    public HttpResult<BasePageResult<AgencyUserInsAreaVo>> queryInsAreaPageById(@RequestBody AgencyUserInsAreaDto agencyUserInsAreaDto){
         if (agencyUserInsAreaDto.getPageNum() == 0) {
             agencyUserInsAreaDto.setPageNum(1);
         }

src/main/java/com/ydtech/modules/admin/model/vo/AgencyUserInsAreaVo.java

@@ -25,6 +25,9 @@ public class AgencyUserInsAreaVo {
     @ApiModelProperty(value = "车牌号")
     private String licenseno;
 
+    @ApiModelProperty(value = "订单号")
+    private String orderno;
+
     @ExcelProperty(value = "子订单编号",index = 3)
     @ApiModelProperty(value = "子订单id")
     private String companyId;
@@ -52,7 +55,7 @@ public class AgencyUserInsAreaVo {
     @ExcelProperty(value = "创建时间",index = 9)
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @ApiModelProperty(value = "子订单创建时间")
-    private Date createtime;
+    private Date createTime;
 
 
 

src/main/java/com/ydtech/modules/admin/service/SysAgencyLeaderService.java

@@ -62,8 +62,7 @@ public interface SysAgencyLeaderService extends IService<SysAgencyLeader> {
 
     List<SysUser> queryAgencyUser(String deptId);
 
-    IPage<AgencyUserInsAreaVo> queryAgencyUserInsAreaPage(AgencyUserInsAreaDto agencyUserInsAreaDto);
-    IPage<AgencyUserInsAreaVo> queryInsAreaPageById(AgencyUserInsAreaDto agencyUserInsAreaDto);
+    BasePageResult<AgencyUserInsAreaVo> queryInsAreaPageById(AgencyUserInsAreaDto agencyUserInsAreaDto);
 
     HttpResult queryUserInsAreaExcel(AgencyUserInsAreaDto agencyUserInsAreaDto);
 

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

@@ -14,10 +14,7 @@ import com.ydtech.modules.admin.dao.*;
 import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.vo.*;
-import com.ydtech.modules.admin.service.SysAgencyLeaderService;
-import com.ydtech.modules.admin.service.SysDeptService;
-import com.ydtech.modules.admin.service.SysPartnerService;
-import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
 import com.ydtech.modules.order.dao.InsAreaCompanyMapper;
@@ -82,6 +79,8 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
     @Resource
     private SysPartnerAccountMapper sysPartnerAccountMapper;
 
+    @Resource
+    private SysPremiumDetailsService sysPremiumDetailsService;
     @Resource
     private SysPremiumDetailsMapper sysPremiumDetailsMapper;
 
@@ -1030,30 +1029,42 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                 .likeRight(StringUtils.isNotEmpty(deptId), SysUser::getId, deptId));
     }
 
-    @Override
-    public IPage<AgencyUserInsAreaVo> queryAgencyUserInsAreaPage(AgencyUserInsAreaDto agencyUserInsAreaDto) {
-        Page page = new Page(agencyUserInsAreaDto.getPageNum(), agencyUserInsAreaDto.getPageSize());
-
-        IPage<AgencyUserInsAreaVo> agencyUserInsAreaVoIPage = insAreaCompanyMapper.queryAgencyUserInsAreaPage(page, agencyUserInsAreaDto);
-        List<AgencyUserInsAreaVo> records = agencyUserInsAreaVoIPage.getRecords();
-        if (records.size() > 0) {
-            for (AgencyUserInsAreaVo record : records) {
-                record.setSumpremium(record.getJqpremium().add(record.getJypremium()).add(record.getSypremium()));
-            }
-        }
-
-        return agencyUserInsAreaVoIPage;
-    }
 
     @Override
-    public IPage<AgencyUserInsAreaVo> queryInsAreaPageById(AgencyUserInsAreaDto agencyUserInsAreaDto) {
-        Page page = new Page(agencyUserInsAreaDto.getPageNum(), agencyUserInsAreaDto.getPageSize());
+    public BasePageResult<AgencyUserInsAreaVo> queryInsAreaPageById(AgencyUserInsAreaDto agencyUserInsAreaDto) {
+//        Page page = new Page(agencyUserInsAreaDto.getPageNum(), agencyUserInsAreaDto.getPageSize());
+        List<AgencyUserInsAreaVo> agencyUserInsAreaVoList = new ArrayList<>();
+        Page<SysPremiumDetails> page = new Page(agencyUserInsAreaDto.getPageNum(), agencyUserInsAreaDto.getPageSize());
         String userId = agencyUserInsAreaDto.getUserId();
         if (StringUtils.isNotEmpty(userId)) {
             agencyUserInsAreaDto.setDeptId(null);
         }
-        IPage<AgencyUserInsAreaVo> agencyUserInsAreaVoIPage = sysPremiumDetailsMapper.queryInsAreaPageById(page, agencyUserInsAreaDto);
-        return agencyUserInsAreaVoIPage;
+//        IPage<AgencyUserInsAreaVo> agencyUserInsAreaVoIPage = sysPremiumDetailsMapper.queryInsAreaPageById(page, agencyUserInsAreaDto);
+        LambdaQueryWrapper<SysPremiumDetails> wrapper = new LambdaQueryWrapper<>();
+        wrapper.likeRight(StringUtils.isNotEmpty(agencyUserInsAreaDto.getDeptId()),SysPremiumDetails::getUserId, agencyUserInsAreaDto.getDeptId());
+        wrapper.eq(StringUtils.isNotEmpty(userId),SysPremiumDetails::getUserId, userId);
+        wrapper.eq(SysPremiumDetails::getStatus, 1);
+        wrapper.eq(SysPremiumDetails::getType, 1);
+        wrapper.orderByDesc(SysPremiumDetails::getCreateTime);
+
+        Page<SysPremiumDetails> insOrdersPage = sysPremiumDetailsService.page(page, wrapper);
+        List<SysPremiumDetails> records = insOrdersPage.getRecords();
+        if (records.size() > 0) {
+            agencyUserInsAreaVoList = BeanUtil.copyToList(records, AgencyUserInsAreaVo.class);
+            for (AgencyUserInsAreaVo agencyUserInsAreaVo : agencyUserInsAreaVoList) {
+                agencyUserInsAreaVo.setOrderstatus("3");
+                InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getOrderno, agencyUserInsAreaVo.getOrderno()));
+                if (insOrders != null) {
+                    agencyUserInsAreaVo.setLicenseno(insOrders.getLicenseno());
+                }
+            }
+
+        }
+
+
+        return new BasePageResult<>(agencyUserInsAreaDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
+                agencyUserInsAreaVoList);
+//        return agencyUserInsAreaVoIPage;
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package com.ydtech.modules.admin.service.impl;
 
+import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -16,6 +18,7 @@ import com.ydtech.constants.sys.SysPasswordEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.handler.CreateAndUpdateMetaObjectHandler;
 import com.ydtech.modules.admin.constants.QuMarks;
 import com.ydtech.modules.admin.constants.RoleConstants;
 import com.ydtech.modules.admin.constants.UserWorkStatus;
@@ -1194,9 +1197,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public HttpResult updateUserInfo1(String userId, SysUser2Vo sysUserVo) {
         SysUser sysUser = sysUserVo.getSysUser();
+        String token = StpUtil.createLoginSession(sysUser.getId());
+        StpUtil.getSessionByLoginId(sysUser.getId()).set(SaSession.USER, sysUser);
         int beStatus = sysUser.getStatus();
         //如果审核驳回则 重新修改为 审核状态
         if (sysUserVo.getSysUser().getStatus().equals(UserWorkStatus.UWS_3.getCode())) {
@@ -1267,7 +1272,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserInfoService.saveOrUpdate(sysUserInfo);
         } else {
             sysUser.setStatus(sysUserVo.getSysUser().getStatus());
+            // 设置跳过填充
+            CreateAndUpdateMetaObjectHandler.setSkipFill(true);
             updateById(sysUser);
+            // 清理跳过标志
+            CreateAndUpdateMetaObjectHandler.clearSkipFlag();
 
             //角色配置
             SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
@@ -1315,7 +1324,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserTrack.setApproveTime(new Date());
             sysUserTrackService.save(sysUserTrack);
         }
-        SpringUtil.getBean(RecordUserUtils.class).recordUser(sysUserVo, null);
+        SpringUtil.getBean(RecordUserUtils.class).recordUser(sysUserVo, userId);
 
         return HttpResult.ok("修改成功");
     }

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

@@ -37,10 +37,10 @@
         <where>
             apd.status = 1 and apd.type = 1
             <if test="dto.userId !=null  and  dto.userId !=''">
-                and apd.userid = #{dto.userId}
+                and apd.user_id = #{dto.userId}
             </if>
             <if test="dto.deptId !=null  and  dto.deptId !=''">
-                and io.deptid like concat( #{dto.deptId}, '%')
+                and apd.user_id like concat( #{dto.deptId}, '%')
             </if>
         </where>
         ORDER BY apd.create_time desc