yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善基础数据排序与模糊查询

Browse Source
product
chuang 2 years ago
parent 310f6c8412
commit 1951be783c
8 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/entity/Jg_naturalMobileEntity.java
Unescape View File

@ -78,7 +78,9 @@ public class Jg_naturalMobileEntity {
@TableField("PHOTOS")
private String photos;
//运输总量
@TableField("naturalSum")
private Integer naturalSum;
// 总次数
@TableField("naturalCount")
private Integer naturalCount;
}

5
SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPagination.java
Unescape View File

@ -26,6 +26,11 @@ public class Jg_naturalPagination extends Pagination {
* 银行账户
*/
private String bankAccount;
/**
* 身份证
*/
private String identity;
/**
* 菜单id
*/

12
SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java
Unescape View File

@ -90,6 +90,14 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
jg_naturalNum++;
jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getContact, jg_naturalPagination.getContact());
}
if (StringUtil.isNotEmpty(jg_naturalPagination.getBankAccount())) {
jg_naturalNum++;
jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getBankAccount, jg_naturalPagination.getBankAccount());
}
if (StringUtil.isNotEmpty(jg_naturalPagination.getIdentity())) {
jg_naturalNum++;
jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getIdentity, jg_naturalPagination.getIdentity());
}
if (AllIdList.size() > 0) {
jg_naturalQueryWrapper.lambda().in(Jg_naturalEntity::getId, AllIdList);
@ -100,8 +108,8 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
} else {
try {
String sidx = jg_naturalPagination.getSidx();
Jg_naturalEntity jg_naturalEntity = new Jg_naturalEntity();
Field declaredField = jg_naturalEntity.getClass().getDeclaredField(sidx);
Jg_naturalMobileEntity naturalMobileEntity = new Jg_naturalMobileEntity();
Field declaredField = naturalMobileEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
jg_naturalQueryWrapper = "asc".equals(jg_naturalPagination.getSort().toLowerCase()) ? jg_naturalQueryWrapper.orderByAsc(value) : jg_naturalQueryWrapper.orderByDesc(value);

2
SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobilePagination.java
Unescape View File

@ -17,6 +17,8 @@ public class ContractMobilePagination extends Pagination {
private String supperName;
private String name;
}

4
SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java
Unescape View File

@ -154,6 +154,10 @@ public class ContractMobileServiceImpl extends ServiceImpl<ContractMobileMapper,
contractMNum++;
contractMobileQueryWrapper.lambda().like(ContractMobileEntity::getName, contractMobilePagination.getSupperName());
}
if (StringUtil.isNotEmpty(contractMobilePagination.getName())) {
contractMNum++;
contractMobileQueryWrapper.lambda().like(ContractMobileEntity::getName, contractMobilePagination.getName());
}
if(AllIdList.size()>0){
contractMobileQueryWrapper.lambda().in(ContractMobileEntity::getId, AllIdList);

22
SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/MobileReservoirareaLIstVo.java
Unescape View File

@ -1,5 +1,6 @@
package jnpf.reservoirarea.model.reservoirarea;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@ -19,34 +20,43 @@ public class MobileReservoirareaLIstVo {
* 主键
**/
@JsonProperty("id")
@TableField("id")
private String id;
/**
* 库区编码
**/
@JsonProperty("areacode")
@TableField("areacode")
private String areacode;
/** 创建时间 **/
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
/**
* 创建时间
**/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonProperty("creatorTime")
@TableField("creator_time")
private Date creatorTime;
/**
* 库区名称
**/
@JsonProperty("areaname")
@TableField("areaname")
private String areaname;
/**
* 所属仓库
**/
@JsonProperty("warehouseName")
@TableField("warehouseName")
private String warehouseName;
/**
* 创建人
**/
@JsonProperty("creatorUserName")
@TableField("creator_user_name")
private String creatorUserName;
@ -54,24 +64,28 @@ public class MobileReservoirareaLIstVo {
* 最高库存
**/
@JsonProperty("maximum")
@TableField("maximum")
private Integer maximum;
/**
* 安全库存
**/
@JsonProperty("safety")
@TableField("safety")
private Integer safety;
/**
* 最低库存
**/
@JsonProperty("minimum")
@TableField("minimum")
private Integer minimum;
/**
* 计量单位
**/
@JsonProperty("unit")
@TableField("unit")
private String unit;
@ -79,6 +93,7 @@ public class MobileReservoirareaLIstVo {
* 仓库物料种类
**/
@JsonProperty("itemName")
@TableField("itemName")
private String itemName;
@ -86,6 +101,7 @@ public class MobileReservoirareaLIstVo {
* 仓库总量
**/
@JsonProperty("wareHouseSum")
@TableField("wareHouseSum")
private BigDecimal wareHouseSum;
@ -93,6 +109,7 @@ public class MobileReservoirareaLIstVo {
* 出库总量
**/
@JsonProperty("outDeliveryNum")
@TableField("outDeliveryNum")
private BigDecimal outDeliveryNum;
@ -101,5 +118,6 @@ public class MobileReservoirareaLIstVo {
**/
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("inputDeliveryNum")
@TableField("inputDeliveryNum")
private BigDecimal inputDeliveryNum;
}

9
SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/model/reservoirarea/ReservoirareaPagination.java
Unescape View File

@ -1,9 +1,8 @@
package jnpf.reservoirarea.model.reservoirarea;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
import lombok.Data;
/**
*
@ -21,7 +20,11 @@ public class ReservoirareaPagination extends Pagination {
/** 库区名称 */
private String areaname;
/**
/** 所属仓库**/
private String warehouseName;
/**
* 菜单id
*/
private String menuId;

22
SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java
Unescape View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.annotation.JsonProperty;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.permission.service.AuthorizeService;
import jnpf.reservoirarea.entity.ReservoirareaEntity;
@ -257,6 +256,10 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
reservoirareaNum++;
reservoirareaQueryWrapper.lambda().like(ReservoirareaEntity::getAreaname,reservoirareaPagination.getAreaname());
}
if(StringUtil.isNotEmpty(reservoirareaPagination.getWarehouseName())){
reservoirareaNum++;
reservoirareaQueryWrapper.like("warehouseName",reservoirareaPagination.getWarehouseName());
}
if(AllIdList.size()>0){
reservoirareaQueryWrapper.lambda().in(ReservoirareaEntity::getId, AllIdList);
@ -267,22 +270,11 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
}else{
try {
String sidx = reservoirareaPagination.getSidx();
MobileReservoirareaLIstVo istVo = new MobileReservoirareaLIstVo();
Field[] declaredFields = istVo.getClass().getDeclaredFields();
Boolean isValue=false;
for (int i = 0; i < declaredFields.length; i++) {
Field declaredField = declaredFields[i];
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(JsonProperty.class).value();
if (value.equals(sidx)){
isValue=true;
}
}
if (isValue){
if (StringUtil.isEmpty(reservoirareaPagination.getSidx())){
reservoirareaQueryWrapper="asc".equals(reservoirareaPagination.getSort().toLowerCase())?reservoirareaQueryWrapper.orderByAsc(sidx):reservoirareaQueryWrapper.orderByDesc(sidx);
}else {
ReservoirareaEntity reservoirareaEntity = new ReservoirareaEntity();
Field declaredField = reservoirareaEntity.getClass().getDeclaredField(sidx);
MobileReservoirareaLIstVo mobileReservoirareaLIstVo = new MobileReservoirareaLIstVo();
Field declaredField = mobileReservoirareaLIstVo.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
reservoirareaQueryWrapper="asc".equals(reservoirareaPagination.getSort().toLowerCase())?reservoirareaQueryWrapper.orderByAsc(value):reservoirareaQueryWrapper.orderByDesc(value);

Write Preview
Loading…
Cancel
Save