linkage
/
TTXH-MES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
dev
杨世强 2 years ago
parent 7fd7655d88 fb08e4a127
commit d11a170f49
11 changed files with 103048 additions and 70 deletions
Show Stats Download Patch File Download Diff File

6
ant-design-vue/src/views/ttelectricmeter/TtElectricMeterList.vue
Unescape View File

@ -14,9 +14,9 @@
<a-col :xl="10" :lg="11" :md="12" :sm="24"> <a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="开始时间"> <a-form-item label="开始时间">
<j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.createTime"></j-date> <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
<span class="query-group-split-cust"></span> <span class="query-group-split-cust"></span>
<j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.updateTime"></j-date> <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -182,7 +182,7 @@
], ],
url: { url: {
// list: "/ttelectricmeter/ttElectricMeter/list", // list: "/ttelectricmeter/ttElectricMeter/list",
list: "/ttelectricmeter/ttElectricMeter/QueryElectricMeterList", list: "/ttelectricmeter/ttElectricMeter/list",
delete: "/ttelectricmeter/ttElectricMeter/delete", delete: "/ttelectricmeter/ttElectricMeter/delete",
deleteBatch: "/ttelectricmeter/ttElectricMeter/deleteBatch", deleteBatch: "/ttelectricmeter/ttElectricMeter/deleteBatch",
exportXlsUrl: "/ttelectricmeter/ttElectricMeter/exportXls", exportXlsUrl: "/ttelectricmeter/ttElectricMeter/exportXls",

4
ant-design-vue/src/views/ttsulfequip/TtSulfEquipList.vue
Unescape View File

@ -13,9 +13,9 @@
<a-col :xl="10" :lg="11" :md="12" :sm="24"> <a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="开始时间"> <a-form-item label="开始时间">
<j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.createTime"></j-date> <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
<span class="query-group-split-cust"></span> <span class="query-group-split-cust"></span>
<j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.updateTime"></j-date> <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
</a-form-item> </a-form-item>
</a-col> </a-col>

23
ant-design-vue/src/views/ttvirsualsortequip/TtVirsualSortEquipList.vue
Unescape View File

@ -4,21 +4,22 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="创建时间">
<j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.cpdateTime_begin"></j-date>
<span class="query-group-split-cust"></span>
<j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.cpdateTime_end"></j-date>
</a-form-item> <!-- <a-col :xl="10" :lg="11" :md="12" :sm="24">-->
</a-col> <!-- <a-form-item label="开始时间">-->
<!-- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>-->
<!-- <span class="query-group-split-cust"></span>-->
<!-- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.cpdateTime_end"></j-date>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="10" :lg="11" :md="12" :sm="24"> <a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="记录的修改时间"> <a-form-item label="开始时间">
<j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.updateTime_begin"></j-date> <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
<span class="query-group-split-cust"></span> <span class="query-group-split-cust"></span>
<j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.updateTime_end"></j-date> <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@ -208,7 +209,7 @@
], ],
url: { url: {
// list: "/ttvirsualsortequip/ttVirsualSortEquip/list", // list: "/ttvirsualsortequip/ttVirsualSortEquip/list",
list: "/ttvirsualsortequip/ttVirsualSortEquip/QueryTtVirsualSortEquipInfoList", list: "/ttvirsualsortequip/ttVirsualSortEquip/list",
delete: "/ttvirsualsortequip/ttVirsualSortEquip/delete", delete: "/ttvirsualsortequip/ttVirsualSortEquip/delete",
deleteBatch: "/ttvirsualsortequip/ttVirsualSortEquip/deleteBatch", deleteBatch: "/ttvirsualsortequip/ttVirsualSortEquip/deleteBatch",
exportXlsUrl: "/ttvirsualsortequip/ttVirsualSortEquip/exportXls", exportXlsUrl: "/ttvirsualsortequip/ttVirsualSortEquip/exportXls",

15
ant-design-vue/src/views/ttvirsualsortequipsecond/TtVirsualSortEquipSecondList.vue
Unescape View File

@ -6,20 +6,13 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="10" :lg="11" :md="12" :sm="24"> <a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="创建时间"> <a-form-item label="开始时间">
<j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.cpdateTime_begin"></j-date> <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
<span class="query-group-split-cust"></span> <span class="query-group-split-cust"></span>
<j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.cpdateTime_end"></j-date> <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="记录的修改时间">
<j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.updateTime_begin"></j-date>
<span class="query-group-split-cust"></span>
<j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.updateTime_end"></j-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>

16
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/controller/TtElectricMeterController.java
Unescape View File

@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.checkerframework.checker.units.qual.A;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
@ -20,6 +22,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.tteqtbase.entity.TtEqtBase;
import org.jeecg.modules.demo.tteqtbase.service.ITtEqtBaseService;
import org.jeecg.modules.demo.ttfeedingequip.entity.TtFeedingEquip;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
@ -50,7 +55,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class TtElectricMeterController extends JeecgController<TtElectricMeter, ITtElectricMeterService> { public class TtElectricMeterController extends JeecgController<TtElectricMeter, ITtElectricMeterService> {
@Autowired @Autowired
private ITtElectricMeterService ttElectricMeterService; private ITtElectricMeterService ttElectricMeterService;
@Autowired
private ITtEqtBaseService ttEqtBaseService;
@ -86,6 +92,14 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
QueryWrapper<TtElectricMeter> queryWrapper = QueryGenerator.initQueryWrapper(ttElectricMeter, req.getParameterMap()); QueryWrapper<TtElectricMeter> queryWrapper = QueryGenerator.initQueryWrapper(ttElectricMeter, req.getParameterMap());
Page<TtElectricMeter> page = new Page<TtElectricMeter>(pageNo, pageSize); Page<TtElectricMeter> page = new Page<TtElectricMeter>(pageNo, pageSize);
IPage<TtElectricMeter> pageList = ttElectricMeterService.page(page, queryWrapper); IPage<TtElectricMeter> pageList = ttElectricMeterService.page(page, queryWrapper);
List<TtElectricMeter> list=pageList.getRecords();
for (TtElectricMeter meter : list){
QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
eqtBase.eq("eqt_no",meter.getEqtNo());
eqtBase.eq("eqt_type", 6 );
TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
meter.setLocation(ttEqtBase.getLocation());
}
return Result.OK(pageList); return Result.OK(pageList);
} }

9
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/entity/TtElectricMeter.java
Unescape View File

@ -4,10 +4,8 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -66,7 +64,6 @@ public class TtElectricMeter implements Serializable {
private java.lang.String updateBy; private java.lang.String updateBy;
/**设备位置*/ /**设备位置*/
@Excel(name = "设备位置", width = 15) @TableField(exist = false)
@ApiModelProperty(value = "设备位置")
private java.lang.String location; private java.lang.String location;
} }

17
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttsulfequip/controller/TtSulfEquipController.java
Unescape View File

@ -21,6 +21,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.tteqtbase.entity.TtEqtBase;
import org.jeecg.modules.demo.tteqtbase.service.ITtEqtBaseService;
import org.jeecg.modules.demo.ttfeedingequip.entity.TtFeedingEquip;
import org.jeecg.modules.demo.ttsulfequip.entity.TtSulfEquip; import org.jeecg.modules.demo.ttsulfequip.entity.TtSulfEquip;
import org.jeecg.modules.demo.ttsulfequip.service.ITtSulfEquipService; import org.jeecg.modules.demo.ttsulfequip.service.ITtSulfEquipService;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
@ -57,6 +60,8 @@ public class TtSulfEquipController extends JeecgController<TtSulfEquip, ITtSulfE
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
@Autowired
private ITtEqtBaseService ttEqtBaseService;
/** /**
* 硫化机看板列表查询 * 硫化机看板列表查询
@ -169,9 +174,17 @@ public class TtSulfEquipController extends JeecgController<TtSulfEquip, ITtSulfE
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<TtSulfEquip> queryWrapper = QueryGenerator.initQueryWrapper(ttSulfEquip, req.getParameterMap()); QueryWrapper<TtSulfEquip> queryWrapper = QueryGenerator.initQueryWrapper(ttSulfEquip, req.getParameterMap());
Page<TtSulfEquip> page = new Page<TtSulfEquip>(pageNo, pageSize); Page<TtSulfEquip> page = new Page<TtSulfEquip>(pageNo, pageSize);
// IPage<TtSulfEquip> pageList = ttSulfEquipService.page(page, queryWrapper); IPage<TtSulfEquip> pageList = ttSulfEquipService.page(page, queryWrapper);
IPage<TtSulfEquip> pageList = ttSulfEquipService.queryTtSulfEquipInfo(page,ttSulfEquip); // IPage<TtSulfEquip> pageList = ttSulfEquipService.queryTtSulfEquipInfo(page,ttSulfEquip);
// pageList=ttSulfEquipService.queryTtSulfEquipInfo((Page<TtSulfEquip>) pageList,ttSulfEquip.getEqtNo(),ttSulfEquip.getCreateTime(),ttSulfEquip.getUpdateTime()); // pageList=ttSulfEquipService.queryTtSulfEquipInfo((Page<TtSulfEquip>) pageList,ttSulfEquip.getEqtNo(),ttSulfEquip.getCreateTime(),ttSulfEquip.getUpdateTime());
List<TtSulfEquip> list = pageList.getRecords();
for (TtSulfEquip SulfEquip : list){
QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
eqtBase.eq("eqt_no",SulfEquip.getEqtNo());
eqtBase.eq("eqt_type",3);
TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
}
return Result.OK(pageList); return Result.OK(pageList);
} }

10
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttsulfequip/entity/TtSulfEquip.java
Unescape View File

@ -81,18 +81,18 @@ public class TtSulfEquip implements Serializable {
@ApiModelProperty(value = "硫化温度（下模）") @ApiModelProperty(value = "硫化温度（下模）")
private Integer sulfTempLower; private Integer sulfTempLower;
/**记录的创建时间*/ /**记录的创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dds")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "记录的创建时间") @ApiModelProperty(value = "记录的创建时间")
private java.util.Date createTime; private Date createTime;
/**记录的创建人，默认admin*/ /**记录的创建人，默认admin*/
@ApiModelProperty(value = "记录的创建人，默认admin") @ApiModelProperty(value = "记录的创建人，默认admin")
private String createBy; private String createBy;
/**记录的修改时间*/ /**记录的修改时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "记录的修改时间") @ApiModelProperty(value = "记录的修改时间")
private java.util.Date updateTime; private Date updateTime;
/**记录的修改人，修改人员的登录账号*/ /**记录的修改人，修改人员的登录账号*/
@ApiModelProperty(value = "记录的修改人，修改人员的登录账号") @ApiModelProperty(value = "记录的修改人，修改人员的登录账号")
private String updateBy; private String updateBy;

14
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttvirsualsortequip/controller/TtVirsualSortEquipController.java
Unescape View File

@ -52,18 +52,7 @@ public class TtVirsualSortEquipController extends JeecgController<TtVirsualSortE
private ITtVirsualSortEquipService ttVirsualSortEquipService; private ITtVirsualSortEquipService ttVirsualSortEquipService;
//@AutoLog(value = "tt_virsual_sort_equip-分页列表查询询胶塞为2")
@ApiOperation(value="tt_virsual_sort_equip-分页列表查询胶塞为2", notes="tt_virsual_sort_equip-分页列表查询询胶塞为2")
@GetMapping(value = "/QueryTtVirsualSortEquipInfoList")
public Result<IPage<TtVirsualSortEquip>> QueryTtVirsualSortEquipInfoList(TtVirsualSortEquip ttVirsualSortEquip,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TtVirsualSortEquip> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualSortEquip, req.getParameterMap());
Page<TtVirsualSortEquip> page = new Page<TtVirsualSortEquip>(pageNo, pageSize);
IPage<TtVirsualSortEquip> pageList = ttVirsualSortEquipService.QueryTtVirsualSortEquipInfo(page,ttVirsualSortEquip);
return Result.OK(pageList);
}
/** /**
* 分页列表查询 * 分页列表查询
@ -82,6 +71,7 @@ public class TtVirsualSortEquipController extends JeecgController<TtVirsualSortE
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<TtVirsualSortEquip> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualSortEquip, req.getParameterMap()); QueryWrapper<TtVirsualSortEquip> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualSortEquip, req.getParameterMap());
queryWrapper.eq("type_id",2);
Page<TtVirsualSortEquip> page = new Page<TtVirsualSortEquip>(pageNo, pageSize); Page<TtVirsualSortEquip> page = new Page<TtVirsualSortEquip>(pageNo, pageSize);
IPage<TtVirsualSortEquip> pageList = ttVirsualSortEquipService.page(page, queryWrapper); IPage<TtVirsualSortEquip> pageList = ttVirsualSortEquipService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);

35
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttvirsualsortequipsecond/controller/TtVirsualSortEquipSecondController.java
Unescape View File

@ -1,5 +1,6 @@
package org.jeecg.modules.demo.ttvirsualsortequipsecond.controller; package org.jeecg.modules.demo.ttvirsualsortequipsecond.controller;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -55,17 +56,7 @@ public class TtVirsualSortEquipSecondController extends JeecgController<TtVirsua
@ApiOperation(value="tt_virsual_sort_equip_second-分页列表查询底座为1", notes="tt_virsual_sort_equip_second-分页列表查询底座为1")
@GetMapping(value = "/QueryTtVirsualSortEquipSecondInfoList")
public Result<IPage<TtVirsualSortEquipSecond>> QueryTtVirsualSortEquipSecondInfoList(TtVirsualSortEquipSecond ttVirsualSortEquipSecond,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TtVirsualSortEquipSecond> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualSortEquipSecond, req.getParameterMap());
Page<TtVirsualSortEquipSecond> page = new Page<TtVirsualSortEquipSecond>(pageNo, pageSize);
IPage<TtVirsualSortEquipSecond> pageList = ttVirsualSortEquipSecondService.QueryTtVirsualSortEquipSecondInfo(page,ttVirsualSortEquipSecond);
return Result.OK(pageList);
}
/** /**
* 分页列表查询 * 分页列表查询
@ -82,17 +73,25 @@ public class TtVirsualSortEquipSecondController extends JeecgController<TtVirsua
public Result<IPage<TtVirsualSortEquipSecond>> queryPageList(TtVirsualSortEquipSecond ttVirsualSortEquipSecond, public Result<IPage<TtVirsualSortEquipSecond>> queryPageList(TtVirsualSortEquipSecond ttVirsualSortEquipSecond,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) throws Exception {
QueryWrapper<TtVirsualSortEquipSecond> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualSortEquipSecond, req.getParameterMap()); QueryWrapper<TtVirsualSortEquipSecond> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualSortEquipSecond, req.getParameterMap());
queryWrapper.eq("type_id",1);
Page<TtVirsualSortEquipSecond> page = new Page<TtVirsualSortEquipSecond>(pageNo, pageSize); Page<TtVirsualSortEquipSecond> page = new Page<TtVirsualSortEquipSecond>(pageNo, pageSize);
IPage<TtVirsualSortEquipSecond> pageList = ttVirsualSortEquipSecondService.page(page, queryWrapper); IPage<TtVirsualSortEquipSecond> pageList = ttVirsualSortEquipSecondService.page(page, queryWrapper);
List<TtVirsualSortEquipSecond> list =pageList.getRecords(); List<TtVirsualSortEquipSecond> list =pageList.getRecords();
for (TtVirsualSortEquipSecond tt :list ){ // List<TtVirsualSortEquipSecond> listse = new ArrayList();
QueryWrapper<TtVirsualSortEquipSecond> Second = new QueryWrapper<>(); // listse.addAll(list);
Second.eq("type_id",1); // if (list.size()>0){
TtVirsualSortEquipSecond ttVicond1=ttVirsualSortEquipSecondService.getOne(Second); // for (TtVirsualSortEquipSecond tt :list ) {
} //// QueryWrapper<TtVirsualSortEquipSecond> Second = new QueryWrapper<>();
//// Second.eq("type_id",1);
// if (tt.getTypeId() == 2){
// list.remove(tt);
//
// }
// }
// }
return Result.OK(pageList); return Result.OK(pageList);
} }

102971
logs/jeecgboot-2023-02-14.0.html
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save