From c0b7623acb2821212d1eab2f355ec9d560b7f17b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 15 一月 2024 15:21:22 +0800
Subject: [PATCH] 调整

---
 /dev/null |  187 ----------------------------------------------
 1 files changed, 0 insertions(+), 187 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/SolutionsBaseController.java b/server/company/src/main/java/com/doumee/api/business/SolutionsBaseController.java
deleted file mode 100644
index a572288..0000000
--- a/server/company/src/main/java/com/doumee/api/business/SolutionsBaseController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.SolutionsBase;
-import com.doumee.service.business.SolutionsBaseService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
- */
-@Api(tags = "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�")
-@RestController
-@RequestMapping("/business/solutionsBase")
-public class SolutionsBaseController extends BaseController {
-
-    @Autowired
-    private SolutionsBaseService solutionsBaseService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:solutionsbase:create")
-    public ApiResponse create(@RequestBody SolutionsBase solutionsBase) {
-        return ApiResponse.success(solutionsBaseService.create(solutionsBase));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:solutionsbase:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        solutionsBaseService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:solutionsbase:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        solutionsBaseService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:solutionsbase:update")
-    public ApiResponse updateById(@RequestBody SolutionsBase solutionsBase) {
-        solutionsBaseService.updateById(solutionsBase);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:solutionsbase:query")
-    public ApiResponse<PageData<SolutionsBase>> findPage (@RequestBody PageWrap<SolutionsBase> pageWrap) {
-        return ApiResponse.success(solutionsBaseService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:solutionsbase:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<SolutionsBase> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(SolutionsBase.class).export(solutionsBaseService.findPage(pageWrap).getRecords(), "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:solutionsbase:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(solutionsBaseService.findById(id));
-    }
-}
diff --git a/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java b/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java
deleted file mode 100644
index a572288..0000000
--- a/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.SolutionsBase;
-import com.doumee.service.business.SolutionsBaseService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
- */
-@Api(tags = "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�")
-@RestController
-@RequestMapping("/business/solutionsBase")
-public class SolutionsBaseController extends BaseController {
-
-    @Autowired
-    private SolutionsBaseService solutionsBaseService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:solutionsbase:create")
-    public ApiResponse create(@RequestBody SolutionsBase solutionsBase) {
-        return ApiResponse.success(solutionsBaseService.create(solutionsBase));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:solutionsbase:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        solutionsBaseService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:solutionsbase:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        solutionsBaseService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:solutionsbase:update")
-    public ApiResponse updateById(@RequestBody SolutionsBase solutionsBase) {
-        solutionsBaseService.updateById(solutionsBase);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:solutionsbase:query")
-    public ApiResponse<PageData<SolutionsBase>> findPage (@RequestBody PageWrap<SolutionsBase> pageWrap) {
-        return ApiResponse.success(solutionsBaseService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:solutionsbase:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<SolutionsBase> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(SolutionsBase.class).export(solutionsBaseService.findPage(pageWrap).getRecords(), "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:solutionsbase:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(solutionsBaseService.findById(id));
-    }
-}
diff --git a/server/service/src/main/java/com/doumee/dao/business/SolutionsBaseMapper.java b/server/service/src/main/java/com/doumee/dao/business/SolutionsBaseMapper.java
deleted file mode 100644
index a3cb4fa..0000000
--- a/server/service/src/main/java/com/doumee/dao/business/SolutionsBaseMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.doumee.dao.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.doumee.dao.business.model.SolutionsBase;
-
-/**
- * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
- */
-public interface SolutionsBaseMapper extends BaseMapper<SolutionsBase> {
-
-}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java b/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
deleted file mode 100644
index aede154..0000000
--- a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.doumee.dao.business.model;
-
-import com.doumee.core.annotation.excel.ExcelColumn;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * 淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�
- * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
- */
-@Data
-@ApiModel("淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�")
-@TableName("`solutions_base`")
-public class SolutionsBase {
-
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "涓婚敭", example = "1")
-    @ExcelColumn(name="涓婚敭")
-    private Integer id;
-
-    @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
-    @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
-    private Integer creator;
-
-    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date createDate;
-
-    @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
-    @ExcelColumn(name="鏇存柊浜虹紪鐮�")
-    private Integer editor;
-
-    @ApiModelProperty(value = "鏇存柊鏃堕棿")
-    @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date editDate;
-
-    @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
-    @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
-    private Integer isdeleted;
-
-    @ApiModelProperty(value = "鍚嶇О")
-    @ExcelColumn(name="鍚嶇О")
-    private String name;
-
-    @ApiModelProperty(value = "澶囨敞")
-    @ExcelColumn(name="澶囨敞")
-    private String remark;
-
-    @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
-    @ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
-    private Integer status;
-
-    @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
-    @ExcelColumn(name="鎺掑簭鐮�")
-    private Integer sortnum;
-
-    @ApiModelProperty(value = "鎵�灞炰繚闄╁叕鍙哥紪鐮侊紙insurance锛�", example = "1")
-    @ExcelColumn(name="鎵�灞炰繚闄╁叕鍙哥紪鐮侊紙insurance锛�")
-    private Integer insuranceId;
-
-    @ApiModelProperty(value = "鐢熸晥鏃堕棿鏂瑰紡 0鏃ュ悗鐢熸晥 1娆℃湀鐢熸晥", example = "1")
-    @ExcelColumn(name="鐢熸晥鏃堕棿鏂瑰紡 0鏃ュ悗鐢熸晥 1娆℃湀鐢熸晥")
-    private Integer validType;
-
-    @ApiModelProperty(value = "绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚", example = "1")
-    @ExcelColumn(name="绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
-    private Integer type;
-
-    @ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
-    @ExcelColumn(name="鏈�浣庡勾榫�")
-    private Integer minAge;
-
-    @ApiModelProperty(value = "鏈�楂樺勾榫�", example = "1")
-    @ExcelColumn(name="鏈�楂樺勾榫�")
-    private Integer maxAge;
-
-    @ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
-    @ExcelColumn(name="淇濋櫓璐圭敤(浜�/澶╋級")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
-    @ExcelColumn(name="淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�")
-    private Integer timeUnit;
-
-    @ApiModelProperty(value = "寮�鎴疯")
-    @ExcelColumn(name="寮�鎴疯")
-    private String insureCycle;
-
-    @ApiModelProperty(value = "鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
-    @ExcelColumn(name="鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣�0澶� 1鍗婃湀 2鏈� 3骞�")
-    private Integer insureCycleUnit;
-
-    @ApiModelProperty(value = "鏈�灏忚璐瑰懆鏈熸椂闂村崟浣� 0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
-    @ExcelColumn(name="鏈�灏忚璐瑰懆鏈熸椂闂村崟浣� 0澶� 1鍗婃湀 2鏈� 3骞�")
-    private Integer priceCycleUnit;
-
-    @ApiModelProperty(value = "鏄惁鍗曠嫭鎸囨淳宸ョ 0鍚� 1鍥�", example = "1")
-    @ExcelColumn(name="鏄惁鍗曠嫭鎸囨淳宸ョ 0鍚� 1鍥�")
-    private Integer singleWorktype;
-
-    @ApiModelProperty(value = "鎺ユ敹鏂囦欢閭")
-    @ExcelColumn(name="鎺ユ敹鏂囦欢閭")
-    private String email;
-
-    @ApiModelProperty(value = "鐗瑰埆绾﹀畾")
-    @ExcelColumn(name="鐗瑰埆绾﹀畾")
-    private String specialAgreement;
-
-    @ApiModelProperty(value = "鐗瑰埆璇存槑")
-    @ExcelColumn(name="鐗瑰埆璇存槑")
-    private String specialInfo;
-
-    @ApiModelProperty(value = "鍏朵粬璇存槑")
-    @ExcelColumn(name="鍏朵粬璇存槑")
-    private String ortherInfo;
-
-    @ApiModelProperty(value = "鐗堟湰鍙�")
-    @ExcelColumn(name="鐗堟湰鍙�")
-    private String version;
-
-}
diff --git a/server/service/src/main/java/com/doumee/service/business/SolutionsBaseService.java b/server/service/src/main/java/com/doumee/service/business/SolutionsBaseService.java
deleted file mode 100644
index dfaae01..0000000
--- a/server/service/src/main/java/com/doumee/service/business/SolutionsBaseService.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.doumee.service.business;
-
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.model.SolutionsBase;
-import java.util.List;
-
-/**
- * 淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛塖ervice瀹氫箟
- * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
- */
-public interface SolutionsBaseService {
-
-    /**
-     * 鍒涘缓
-     * 
-     * @param solutionsBase 瀹炰綋瀵硅薄
-     * @return Integer
-     */
-    Integer create(SolutionsBase solutionsBase);
-
-    /**
-     * 涓婚敭鍒犻櫎
-     *
-     * @param id 涓婚敭
-     */
-    void deleteById(Integer id);
-
-    /**
-     * 鍒犻櫎
-     *
-     * @param solutionsBase 瀹炰綋瀵硅薄
-     */
-    void delete(SolutionsBase solutionsBase);
-
-    /**
-     * 鎵归噺涓婚敭鍒犻櫎
-     *
-     * @param ids 涓婚敭闆�
-     */
-    void deleteByIdInBatch(List<Integer> ids);
-
-    /**
-     * 涓婚敭鏇存柊
-     *
-     * @param solutionsBase 瀹炰綋瀵硅薄
-     */
-    void updateById(SolutionsBase solutionsBase);
-
-    /**
-     * 鎵归噺涓婚敭鏇存柊
-     *
-     * @param solutionsBases 瀹炰綋闆�
-     */
-    void updateByIdInBatch(List<SolutionsBase> solutionsBases);
-
-    /**
-     * 涓婚敭鏌ヨ
-     *
-     * @param id 涓婚敭
-     * @return SolutionsBase
-     */
-    SolutionsBase findById(Integer id);
-
-    /**
-     * 鏉′欢鏌ヨ鍗曟潯璁板綍
-     *
-     * @param solutionsBase 瀹炰綋瀵硅薄
-     * @return SolutionsBase
-     */
-    SolutionsBase findOne(SolutionsBase solutionsBase);
-
-    /**
-     * 鏉′欢鏌ヨ
-     *
-     * @param solutionsBase 瀹炰綋瀵硅薄
-     * @return List<SolutionsBase>
-     */
-    List<SolutionsBase> findList(SolutionsBase solutionsBase);
-  
-    /**
-     * 鍒嗛〉鏌ヨ
-     *
-     * @param pageWrap 鍒嗛〉瀵硅薄
-     * @return PageData<SolutionsBase>
-     */
-    PageData<SolutionsBase> findPage(PageWrap<SolutionsBase> pageWrap);
-
-    /**
-     * 鏉′欢缁熻
-     *
-     * @param solutionsBase 瀹炰綋瀵硅薄
-     * @return long
-     */
-    long count(SolutionsBase solutionsBase);
-}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
deleted file mode 100644
index 3851ebd..0000000
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.doumee.service.business.impl;
-
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.SolutionsBaseMapper;
-import com.doumee.dao.business.model.SolutionsBase;
-import com.doumee.service.business.SolutionsBaseService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
-/**
- * 淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛塖ervice瀹炵幇
- * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
- */
-@Service
-public class SolutionsBaseServiceImpl implements SolutionsBaseService {
-
-    @Autowired
-    private SolutionsBaseMapper solutionsBaseMapper;
-
-    @Override
-    public Integer create(SolutionsBase solutionsBase) {
-        solutionsBaseMapper.insert(solutionsBase);
-        return solutionsBase.getId();
-    }
-
-    @Override
-    public void deleteById(Integer id) {
-        solutionsBaseMapper.deleteById(id);
-    }
-
-    @Override
-    public void delete(SolutionsBase solutionsBase) {
-        UpdateWrapper<SolutionsBase> deleteWrapper = new UpdateWrapper<>(solutionsBase);
-        solutionsBaseMapper.delete(deleteWrapper);
-    }
-
-    @Override
-    public void deleteByIdInBatch(List<Integer> ids) {
-        if (CollectionUtils.isEmpty(ids)) {
-            return;
-        }
-        solutionsBaseMapper.deleteBatchIds(ids);
-    }
-
-    @Override
-    public void updateById(SolutionsBase solutionsBase) {
-        solutionsBaseMapper.updateById(solutionsBase);
-    }
-
-    @Override
-    public void updateByIdInBatch(List<SolutionsBase> solutionsBases) {
-        if (CollectionUtils.isEmpty(solutionsBases)) {
-            return;
-        }
-        for (SolutionsBase solutionsBase: solutionsBases) {
-            this.updateById(solutionsBase);
-        }
-    }
-
-    @Override
-    public SolutionsBase findById(Integer id) {
-        return solutionsBaseMapper.selectById(id);
-    }
-
-    @Override
-    public SolutionsBase findOne(SolutionsBase solutionsBase) {
-        QueryWrapper<SolutionsBase> wrapper = new QueryWrapper<>(solutionsBase);
-        return solutionsBaseMapper.selectOne(wrapper);
-    }
-
-    @Override
-    public List<SolutionsBase> findList(SolutionsBase solutionsBase) {
-        QueryWrapper<SolutionsBase> wrapper = new QueryWrapper<>(solutionsBase);
-        return solutionsBaseMapper.selectList(wrapper);
-    }
-  
-    @Override
-    public PageData<SolutionsBase> findPage(PageWrap<SolutionsBase> pageWrap) {
-        IPage<SolutionsBase> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
-        QueryWrapper<SolutionsBase> queryWrapper = new QueryWrapper<>();
-        Utils.MP.blankToNull(pageWrap.getModel());
-        if (pageWrap.getModel().getId() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getId, pageWrap.getModel().getId());
-        }
-        if (pageWrap.getModel().getCreator() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getCreator, pageWrap.getModel().getCreator());
-        }
-        if (pageWrap.getModel().getCreateDate() != null) {
-            queryWrapper.lambda().ge(SolutionsBase::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
-            queryWrapper.lambda().le(SolutionsBase::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
-        }
-        if (pageWrap.getModel().getEditor() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getEditor, pageWrap.getModel().getEditor());
-        }
-        if (pageWrap.getModel().getEditDate() != null) {
-            queryWrapper.lambda().ge(SolutionsBase::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
-            queryWrapper.lambda().le(SolutionsBase::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
-        }
-        if (pageWrap.getModel().getIsdeleted() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getIsdeleted, pageWrap.getModel().getIsdeleted());
-        }
-        if (pageWrap.getModel().getName() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getName, pageWrap.getModel().getName());
-        }
-        if (pageWrap.getModel().getRemark() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getRemark, pageWrap.getModel().getRemark());
-        }
-        if (pageWrap.getModel().getStatus() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getStatus, pageWrap.getModel().getStatus());
-        }
-        if (pageWrap.getModel().getSortnum() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getSortnum, pageWrap.getModel().getSortnum());
-        }
-        if (pageWrap.getModel().getInsuranceId() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getInsuranceId, pageWrap.getModel().getInsuranceId());
-        }
-        if (pageWrap.getModel().getValidType() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getValidType, pageWrap.getModel().getValidType());
-        }
-        if (pageWrap.getModel().getType() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getType, pageWrap.getModel().getType());
-        }
-        if (pageWrap.getModel().getMinAge() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getMinAge, pageWrap.getModel().getMinAge());
-        }
-        if (pageWrap.getModel().getMaxAge() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getMaxAge, pageWrap.getModel().getMaxAge());
-        }
-        if (pageWrap.getModel().getPrice() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getPrice, pageWrap.getModel().getPrice());
-        }
-        if (pageWrap.getModel().getTimeUnit() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getTimeUnit, pageWrap.getModel().getTimeUnit());
-        }
-        if (pageWrap.getModel().getInsureCycle() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getInsureCycle, pageWrap.getModel().getInsureCycle());
-        }
-        if (pageWrap.getModel().getInsureCycleUnit() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getInsureCycleUnit, pageWrap.getModel().getInsureCycleUnit());
-        }
-        if (pageWrap.getModel().getPriceCycleUnit() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getPriceCycleUnit, pageWrap.getModel().getPriceCycleUnit());
-        }
-        if (pageWrap.getModel().getSingleWorktype() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getSingleWorktype, pageWrap.getModel().getSingleWorktype());
-        }
-        if (pageWrap.getModel().getEmail() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getEmail, pageWrap.getModel().getEmail());
-        }
-        if (pageWrap.getModel().getSpecialAgreement() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getSpecialAgreement, pageWrap.getModel().getSpecialAgreement());
-        }
-        if (pageWrap.getModel().getSpecialInfo() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getSpecialInfo, pageWrap.getModel().getSpecialInfo());
-        }
-        if (pageWrap.getModel().getOrtherInfo() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getOrtherInfo, pageWrap.getModel().getOrtherInfo());
-        }
-        if (pageWrap.getModel().getVersion() != null) {
-            queryWrapper.lambda().eq(SolutionsBase::getVersion, pageWrap.getModel().getVersion());
-        }
-        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
-            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-                queryWrapper.orderByDesc(sortData.getProperty());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
-            }
-        }
-        return PageData.from(solutionsBaseMapper.selectPage(page, queryWrapper));
-    }
-
-    @Override
-    public long count(SolutionsBase solutionsBase) {
-        QueryWrapper<SolutionsBase> wrapper = new QueryWrapper<>(solutionsBase);
-        return solutionsBaseMapper.selectCount(wrapper);
-    }
-}

--
Gitblit v1.9.3