Merge branch 'xjchen' into 'develop'

支持连表查询20230804

See merge request !25

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/IndexController.java

 package com.censoft.censoftrongtong.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.censoft.censoftrongtong.domain.LedgerBuilding;
+import com.censoft.censoftrongtong.domain.LedgerProject;
+import com.censoft.censoftrongtong.service.ILedgerBuildingService;
+import com.censoft.censoftrongtong.service.ILedgerProjectService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import io.swagger.annotations.Api;
@@ -9,7 +15,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,6 +33,11 @@ import java.util.Map;
 @AllArgsConstructor
 public class IndexController extends BaseController {
 
+    @Resource
+    ILedgerProjectService ledgerProjectService;
+    @Resource
+    ILedgerBuildingService ledgerBuildingService;
+
 
     /**
      * 项目,楼栋,楼层和房间数据统计
@@ -31,7 +45,7 @@ public class IndexController extends BaseController {
 
     @ApiOperation("项目,楼栋,楼层和房间数据统计")
     @GetMapping("/getBaseInfoNum")
-    public R getQygk() {
+    public R getBaseInfoNum() {
 
         int projectCount = 0;//项目数量
         int buildingCount = 0;//楼栋数量
@@ -46,6 +60,50 @@ public class IndexController extends BaseController {
         return R.ok(map_gk);
     }
 
+    /**
+     * 项目按照不同纬度统计
+     */
+
+    @ApiOperation("项目按照不同纬度统计")
+    @GetMapping("/getProjectNumByType")
+    public R getProjectNumByType() {
+
+
+        Map<String, Object> map_rs = new HashMap<>();
+        List<Map<String,String>> list_rs=new ArrayList<>();
+        List<String> legendList=new ArrayList<>();
+        QueryWrapper<LedgerProject> queryWrap=new QueryWrapper<>();
+        queryWrap.select("count(*) 'num'","city").groupBy("city");
+        List<LedgerProject> list=ledgerProjectService.list(queryWrap);
+        if (list!=null&&list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                Map<String,String> map_item=new HashMap<>();
+                LedgerProject ledgerProject=list.get(i);
+                map_item.put("name",ledgerProject.getCity());
+                map_item.put("value",ledgerProject.getNum());
+                list_rs.add(map_item);
+                legendList.add(ledgerProject.getCity());
+            }
+        }
+        map_rs.put("legendData",legendList);
+        map_rs.put("seriesData",list_rs);
+
+        MPJLambdaWrapper<LedgerBuilding> queryWrapper=new MPJLambdaWrapper<>();
+        queryWrapper.selectAll(LedgerBuilding.class).leftJoin(LedgerProject.class,LedgerProject::getId,LedgerBuilding::getProjectId)
+                .eq(LedgerBuilding::getProjectId,1);
+        List<LedgerBuilding> list1=ledgerBuildingService.selectJoinList(LedgerBuilding.class,queryWrapper);
+
+
+
+
+
+
+
+
+
+        return R.ok(map_rs);
+    }
+
 
 
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerProject.java

 package com.censoft.censoftrongtong.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntityClean;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 基础数据-项目对象 ledger_project
@@ -58,6 +55,12 @@ public class LedgerProject extends BaseEntityClean
     @TableField(exist = false)
     private String deptName;
 
+    /**
+     * 数量
+     */
+    @TableField(exist = false)
+    private String num;
+
 
 
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LawListMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.LawList;
+import com.github.yulichang.base.MPJBaseMapper;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface LawListMapper 
+public interface LawListMapper extends  MPJBaseMapper<LawList>
 {
     /**
      * 查询法律法规库

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerBuildingMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface LedgerBuildingMapper 
+public interface LedgerBuildingMapper  extends  MPJBaseMapper<LedgerBuilding>
 {
     /**
      * 查询基础数据-楼宇

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerFloorMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.LedgerFloor;
+import com.github.yulichang.base.MPJBaseMapper;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface LedgerFloorMapper 
+public interface LedgerFloorMapper extends  MPJBaseMapper<LedgerFloor>
 {
     /**
      * 查询基础数据-楼层

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerProjectMapper.java

 package com.censoft.censoftrongtong.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.censoft.censoftrongtong.domain.LedgerProject;
-import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.github.yulichang.base.MPJBaseMapper;
 
 import java.util.List;
 
@@ -12,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface LedgerProjectMapper  extends BaseMapper<LedgerProject>
+public interface LedgerProjectMapper  extends  MPJBaseMapper<LedgerProject>
 {
     /**
      * 查询基础数据-项目

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerRoomMapper.java

 package com.censoft.censoftrongtong.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.censoft.censoftrongtong.domain.LedgerFloor;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -13,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface LedgerRoomMapper extends BaseMapper<LedgerRoom>
+public interface LedgerRoomMapper extends MPJBaseMapper<LedgerRoom>
 {
     /**
      * 查询基础数据-房间列表

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskExistingListMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskExistingList;
+import com.github.yulichang.base.MPJBaseMapper;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskExistingListMapper 
+public interface RiskExistingListMapper extends  MPJBaseMapper<RiskExistingList>
 {
     /**
      * 查询现有风险清单库

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskInherentListMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskInherentList;
+import com.github.yulichang.base.MPJBaseMapper;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskInherentListMapper 
+public interface RiskInherentListMapper extends  MPJBaseMapper<RiskInherentList>
 {
     /**
      * 查询固有风险清单库

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanExistingListMapper.java

 package com.censoft.censoftrongtong.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
-import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,7 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskPlanExistingListMapper extends BaseMapper<RiskPlanExistingList> {
+public interface RiskPlanExistingListMapper extends  MPJBaseMapper<RiskPlanExistingList> {
 
     /**
      * 查询现有风险清单库

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanInherentListMapper.java

 package com.censoft.censoftrongtong.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.dto.*;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskPlanInherentListMapper extends BaseMapper<RiskPlanInherentList>
+public interface RiskPlanInherentListMapper extends  MPJBaseMapper<RiskPlanInherentList>
 {
 
     /**

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanMapper.java

 package com.censoft.censoftrongtong.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.dto.*;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskPlanMapper extends BaseMapper<RiskPlan>
+public interface RiskPlanMapper extends MPJBaseMapper<RiskPlan>
 {
     /**
      * 查询风险计划

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanTaskMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskPlanTaskMapper 
+public interface RiskPlanTaskMapper extends  MPJBaseMapper<RiskPlanTask>
 {
     /**
      * 查询风险计划任务

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanUserBuildingMapper.java

 package com.censoft.censoftrongtong.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.censoft.censoftrongtong.domain.LawList;
-import com.censoft.censoftrongtong.domain.LedgerRoom;
 import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,7 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskPlanUserBuildingMapper extends BaseMapper<RiskPlanUserBuilding> {
+public interface RiskPlanUserBuildingMapper extends  MPJBaseMapper<RiskPlanUserBuilding> {
 
     List<RiskPlanAppBuildingListDto> getRiskPlanAppBuildingListDtoByPlanId(@Param("planId") Long planId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILawListService.java

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.LawList;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface ILawListService 
+public interface ILawListService extends MPJBaseService<LawList>
 {
     /**
      * 查询法律法规库

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerBuildingService.java

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface ILedgerBuildingService 
+public interface ILedgerBuildingService extends MPJBaseService<LedgerBuilding>
 {
     /**
      * 查询基础数据-楼宇

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerFloorService.java

@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.LedgerFloor;
 import com.censoft.censoftrongtong.domain.dto.LedgerFloorDto;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface ILedgerFloorService 
+public interface ILedgerFloorService extends MPJBaseService<LedgerFloor>
 {
     /**
      * 查询基础数据-楼层

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerProjectService.java

 package com.censoft.censoftrongtong.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.LedgerProject;
-import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.github.yulichang.base.MPJBaseService;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
 import java.util.List;
@@ -13,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface ILedgerProjectService extends IService<LedgerProject>
+public interface ILedgerProjectService extends MPJBaseService<LedgerProject>
 {
     /**
      * 查询基础数据-项目

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerRoomService.java

 package com.censoft.censoftrongtong.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface ILedgerRoomService extends IService<LedgerRoom>
+public interface ILedgerRoomService extends MPJBaseService<LedgerRoom>
 {
     /**
      * 根据楼层查询该楼层房间列表

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskExistingListService.java

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.RiskExistingList;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface IRiskExistingListService 
+public interface IRiskExistingListService extends MPJBaseService<RiskExistingList>
 {
     /**
      * 查询现有风险清单库

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskInherentListService.java

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.RiskInherentList;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface IRiskInherentListService 
+public interface IRiskInherentListService extends MPJBaseService<RiskInherentList>
 {
     /**
      * 查询固有风险清单库

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanExistingListService.java

 package com.censoft.censoftrongtong.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
-import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
-import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -15,7 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface IRiskPlanExistingListService  extends IService<RiskPlanExistingList>
+public interface IRiskPlanExistingListService  extends MPJBaseService<RiskPlanExistingList>
 {
 
     /**

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanInherentListService.java

 package com.censoft.censoftrongtong.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.dto.*;
+import com.github.yulichang.base.MPJBaseService;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 /**
@@ -15,7 +14,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface IRiskPlanInherentListService extends IService<RiskPlanInherentList>
+public interface IRiskPlanInherentListService extends MPJBaseService<RiskPlanInherentList>
 {
 
     /**

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java

 package com.censoft.censoftrongtong.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveDto;
@@ -8,6 +7,7 @@ import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppTaskDetailsDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface IRiskPlanService extends IService<RiskPlan>
+public interface IRiskPlanService extends MPJBaseService<RiskPlan>
 {
     /**
      * 查询风险计划

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanTaskService.java

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface IRiskPlanTaskService 
+public interface IRiskPlanTaskService extends MPJBaseService<RiskPlanTask>
 {
     /**
      * 查询风险计划任务

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanUserBuildingService.java

 package com.censoft.censoftrongtong.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveBuildingDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
+import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface IRiskPlanUserBuildingService extends IService<RiskPlanUserBuilding> {
+public interface IRiskPlanUserBuildingService extends MPJBaseService<RiskPlanUserBuilding> {
 
     Long countStatusByPlanIdAndStatus(Long planId, String status);
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LawListServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
-import java.util.List;
-
 import com.censoft.censoftrongtong.domain.LawList;
 import com.censoft.censoftrongtong.mapper.LawListMapper;
 import com.censoft.censoftrongtong.service.ILawListService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 法律法规库Service业务层处理
  * 
@@ -16,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-06-26
  */
 @Service
-public class LawListServiceImpl implements ILawListService
+public class LawListServiceImpl extends MPJBaseServiceImpl<LawListMapper, LawList> implements ILawListService
 {
     @Autowired
     private LawListMapper lawListMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerBuildingServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
-import java.util.List;
-
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.mapper.LedgerBuildingMapper;
 import com.censoft.censoftrongtong.service.ILedgerBuildingService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 基础数据-楼宇Service业务层处理
  * 
@@ -16,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-06-26
  */
 @Service
-public class LedgerBuildingServiceImpl implements ILedgerBuildingService
+public class LedgerBuildingServiceImpl extends MPJBaseServiceImpl<LedgerBuildingMapper, LedgerBuilding> implements ILedgerBuildingService
 {
     @Autowired
     private LedgerBuildingMapper ledgerBuildingMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerFloorServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.censoft.censoftrongtong.domain.LedgerFloor;
 import com.censoft.censoftrongtong.domain.dto.LedgerFloorDto;
 import com.censoft.censoftrongtong.mapper.LedgerFloorMapper;
 import com.censoft.censoftrongtong.service.ILedgerFloorService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 基础数据-楼层Service业务层处理
  * 
@@ -18,7 +19,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-06-26
  */
 @Service
-public class LedgerFloorServiceImpl implements ILedgerFloorService
+public class LedgerFloorServiceImpl extends MPJBaseServiceImpl<LedgerFloorMapper, LedgerFloor> implements ILedgerFloorService
 {
     @Autowired
     private LedgerFloorMapper ledgerFloorMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerProjectServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.LedgerProject;
-import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.mapper.LedgerProjectMapper;
-import com.censoft.censoftrongtong.mapper.RiskPlanInherentListMapper;
 import com.censoft.censoftrongtong.service.ILedgerProjectService;
-import com.ruoyi.common.annotation.DataScope;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.service.ISysUserService;
@@ -16,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 基础数据-项目Service业务层处理
@@ -24,7 +20,7 @@ import javax.annotation.Resource;
  * @date 2023-06-26
  */
 @Service
-public class LedgerProjectServiceImpl extends ServiceImpl<LedgerProjectMapper, LedgerProject> implements ILedgerProjectService
+public class LedgerProjectServiceImpl extends MPJBaseServiceImpl<LedgerProjectMapper, LedgerProject> implements ILedgerProjectService
 {
     @Autowired
     private LedgerProjectMapper ledgerProjectMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerRoomServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
-import java.util.List;
-
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
 import com.censoft.censoftrongtong.mapper.LedgerRoomMapper;
 import com.censoft.censoftrongtong.service.ILedgerRoomService;
-import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 基础数据-楼层Service业务层处理
@@ -22,7 +18,7 @@ import javax.annotation.Resource;
  * @date 2023-06-26
  */
 @Service
-public class LedgerRoomServiceImpl extends ServiceImpl<LedgerRoomMapper, LedgerRoom> implements ILedgerRoomService {
+public class LedgerRoomServiceImpl extends MPJBaseServiceImpl<LedgerRoomMapper, LedgerRoom> implements ILedgerRoomService {
 
     @Resource
     private LedgerRoomMapper ledgerRoomMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskExistingListServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
-import java.util.List;
-
 import com.censoft.censoftrongtong.domain.RiskExistingList;
 import com.censoft.censoftrongtong.mapper.RiskExistingListMapper;
 import com.censoft.censoftrongtong.service.IRiskExistingListService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 现有风险清单库Service业务层处理
  * 
@@ -16,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-06-26
  */
 @Service
-public class RiskExistingListServiceImpl implements IRiskExistingListService
+public class RiskExistingListServiceImpl extends MPJBaseServiceImpl<RiskExistingListMapper, RiskExistingList> implements IRiskExistingListService
 {
     @Autowired
     private RiskExistingListMapper riskExistingListMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskInherentListServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
-import java.util.List;
-
 import com.censoft.censoftrongtong.domain.RiskInherentList;
 import com.censoft.censoftrongtong.mapper.RiskInherentListMapper;
 import com.censoft.censoftrongtong.service.IRiskInherentListService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 固有风险清单库Service业务层处理
  * 
@@ -16,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-06-26
  */
 @Service
-public class RiskInherentListServiceImpl implements IRiskInherentListService
+public class RiskInherentListServiceImpl extends MPJBaseServiceImpl<RiskInherentListMapper, RiskInherentList>  implements IRiskInherentListService
 {
     @Autowired
     private RiskInherentListMapper riskInherentListMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanExistingListServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
-import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto;
-import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
 import com.censoft.censoftrongtong.mapper.RiskPlanExistingListMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.service.ISysUploadFileService;
 import org.springframework.beans.BeanUtils;
@@ -29,7 +27,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class RiskPlanExistingListServiceImpl
-        extends ServiceImpl<RiskPlanExistingListMapper, RiskPlanExistingList>
+        extends MPJBaseServiceImpl<RiskPlanExistingListMapper, RiskPlanExistingList>
         implements IRiskPlanExistingListService {
     @Autowired
     private RiskPlanExistingListMapper riskPlanExistingListMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanInherentListServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import cn.hutool.poi.excel.cell.CellUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
@@ -15,6 +14,7 @@ import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
 import com.censoft.censoftrongtong.mapper.RiskPlanTaskMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;
 import com.censoft.censoftrongtong.service.IRiskPlanTaskService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.WordUtil;
 import com.ruoyi.system.service.ISysUploadFileService;
@@ -28,7 +28,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -41,7 +40,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class RiskPlanInherentListServiceImpl
-        extends ServiceImpl<RiskPlanInherentListMapper, RiskPlanInherentList>
+        extends MPJBaseServiceImpl<RiskPlanInherentListMapper, RiskPlanInherentList>
         implements IRiskPlanInherentListService {
     @Autowired
     private RiskPlanInherentListMapper riskPlanInherentListMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
@@ -12,6 +11,7 @@ import com.censoft.censoftrongtong.domain.dto.RiskPlanAppTaskDetailsDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
 import com.censoft.censoftrongtong.service.*;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  * @date 2023-06-26
  */
 @Service
-public class RiskPlanServiceImpl extends ServiceImpl<RiskPlanMapper, RiskPlan> implements IRiskPlanService {
+public class RiskPlanServiceImpl extends MPJBaseServiceImpl<RiskPlanMapper, RiskPlan> implements IRiskPlanService {
     @Autowired
     private RiskPlanMapper riskPlanMapper;
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanTaskServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
-import java.util.List;
-
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
 import com.censoft.censoftrongtong.mapper.RiskPlanTaskMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanTaskService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 风险计划任务Service业务层处理
  * 
@@ -15,7 +16,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-06-26
  */
 @Service
-public class RiskPlanTaskServiceImpl implements IRiskPlanTaskService
+public class RiskPlanTaskServiceImpl extends MPJBaseServiceImpl<RiskPlanTaskMapper, RiskPlanTask> implements IRiskPlanTaskService
 {
     @Autowired
     private RiskPlanTaskMapper riskPlanTaskMapper;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanUserBuildingServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
 import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
@@ -12,6 +11,7 @@ import com.censoft.censoftrongtong.mapper.RiskPlanUserBuildingMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanService;
 import com.censoft.censoftrongtong.service.IRiskPlanTaskService;
 import com.censoft.censoftrongtong.service.IRiskPlanUserBuildingService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,7 +26,7 @@ import java.util.List;
  */
 @Service
 public class RiskPlanUserBuildingServiceImpl
-        extends ServiceImpl<RiskPlanUserBuildingMapper, RiskPlanUserBuilding>
+        extends MPJBaseServiceImpl<RiskPlanUserBuildingMapper, RiskPlanUserBuilding>
         implements IRiskPlanUserBuildingService {
 
     @Resource