模板剔除mybatis

soc-modules/soc-modules-gen/src/main/resources/vm/java/serviceImpl.java.vm

@@ -9,6 +9,8 @@ import java.util.List;
     #end
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.xunmei.system.service.ISysOrgService;
+import java.util.Arrays;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -34,23 +36,65 @@ import ${packageName}.service.I${ClassName}Service;
 public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;
+    @Autowired
+    private ISysOrgService orgService;
 
     @Override
     public TableDataInfo selectPage(${ClassName} ${className}) {
+
+
+##        Page<${ClassName}> page;
+##        if (${className}.getPageNum() != null &&${className}.getPageSize() != null){
+##            page = new Page<>(${className}.getPageNum(), ${className}.getPageSize());
+##        }else{
+##            page = new Page<>();
+##        }
+##        QueryWrapper<${ClassName}> where = new QueryWrapper<>(${className});
+##        Page<${ClassName}> list = baseMapper.selectPage(page, where);
+##        TableDataInfo rspData = new TableDataInfo();
+##        rspData.setRows(list.getRecords());
+##        rspData.setTotal(list.getTotal());
+##        rspData.setCode(200);
+##        rspData.setMsg("查询成功");
+##        return rspData;
+
+
+        //未删除
+        ${className}.setDeleted(0L);
         Page<${ClassName}> page;
-        if (${className}.getPageNum() != null &&${className}.getPageSize() != null){
+        //分页
+        if (${className}.getPageNum()!=null&&${className}.getPageSize()!=null)
+        {
             page = new Page<>(${className}.getPageNum(), ${className}.getPageSize());
         }else{
             page = new Page<>();
         }
-        QueryWrapper<${ClassName}> where = new QueryWrapper<>(${className});
-        Page<${ClassName}> list = baseMapper.selectPage(page, where);
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setRows(list.getRecords());
-        rspData.setTotal(list.getTotal());
-        rspData.setCode(200);
-        rspData.setMsg("查询成功");
-        return rspData;
+        //查询条件
+        QueryWrapper<${ClassName}> query = new QueryWrapper<>(${className});
+        //下穿
+        if (${className}.getCheckSub()){
+            List<Long> ids = orgService.selectCheckSubOrgIdList(${className}.getOrgId());
+            //清空前端传递的org_id
+            ${className}.setOrgId(null);
+            //添加in条件
+            query.in("org_id",ids);
+        }
+        //时间范围查询
+        if (${className}.getParams().get("beginTime")!=null&&${className}.getParams().get("endTime")!=null){
+            query.between("create_time", ${className}.getParams().get("beginTime"), ${className}.getParams().get("endTime"));
+        }
+        //获取数据
+        page = ${className}Mapper.selectPage(page, query);
+        //抓换为TableDataInfo适配前端
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setMsg("操作成功");
+        tableDataInfo.setCode(200);
+        tableDataInfo.setTotal(page.getTotal());
+        tableDataInfo.setRows(page.getRecords());
+        return tableDataInfo;
+
+
+
 
     }
 
@@ -63,7 +107,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
      */
     @Override
     public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
-        return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        return ${className}Mapper.selectById(${pkColumn.javaField});
     }
 
     /**
@@ -74,7 +118,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
      */
     @Override
     public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
-        return ${className}Mapper.select${ClassName}List(${className});
+        return ${className}Mapper.selectList(new QueryWrapper<>(${className}));
     }
 
     /**
@@ -95,10 +139,10 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
         #end
         #if($table.sub)
             int rows = ${className}Mapper.insert${ClassName}(${className});
-            insert${subClassName}(${className});
+            insert(${className});
             return rows;
         #else
-            return ${className}Mapper.insert${ClassName}(${className});
+            return ${className}Mapper.insert(${className});
         #end
     }
 
@@ -119,11 +163,11 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
             #end
         #end
         #if($table.sub)
-                ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}())
+                ${className}Mapper.deleteById(${className}.get${pkColumn.capJavaField}())
             ;
-            insert${subClassName}(${className});
+            insert(${className});
         #end
-        return ${className}Mapper.update${ClassName}(${className});
+        return ${className}Mapper.updateById(${className});
     }
 
     /**
@@ -138,9 +182,9 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     @Override
     public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
         #if($table.sub)
-                ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
+                ${className}Mapper.deleteBatchIds(Arrays.asList((${pkColumn.javaField}s)));
         #end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
+        return ${className}Mapper.deleteBatchIds(Arrays.asList((${pkColumn.javaField}s)));
     }
 
     /**
@@ -155,9 +199,9 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     @Override
     public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
         #if($table.sub)
-                ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
+                ${className}Mapper.deleteById(${pkColumn.javaField});
         #end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        return ${className}Mapper.deleteById(${pkColumn.javaField});
     }
     #if($table.sub)