代码备份

pro
anthonywj 2 years ago
parent bd15235a99
commit 5619aa362c

@ -145,17 +145,17 @@ public class InvProductController extends BaseController {
}); });
} }
//根据单据日期排序 // //根据单据日期排序
list.sort((o1, o2) -> { // list.sort((o1, o2) -> {
long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime(); // long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime();
long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime(); // long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime();
if (o1OrderTime > o2OrderTime) { // if (o1OrderTime > o2OrderTime) {
return 1; // return 1;
} else if (o1OrderTime < o2OrderTime) { // } else if (o1OrderTime < o2OrderTime) {
return -1; // return -1;
} // }
return 0; // return 0;
}); // });
PageSimpleResponse<InvProductDetailResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<InvProductDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());

@ -3,6 +3,7 @@ package com.glxp.api.service.thrsys.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
@ -185,6 +186,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
BeanUtil.copyProperties(item, thrProductsEntity); BeanUtil.copyProperties(item, thrProductsEntity);
thrProductsEntity.setCreateTime(new Date()); thrProductsEntity.setCreateTime(new Date());
thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setUpdateTime(new Date());
thrProductsEntity.setId(IdUtil.getSnowflakeNextId());
thrProductsDao.insertThrProducts(thrProductsEntity);
} else { } else {
boolean isChange = verifyDataChange(thrProductsEntity, item); boolean isChange = verifyDataChange(thrProductsEntity, item);
if (isChange) { if (isChange) {

@ -51,8 +51,6 @@
basic_udirel.overStockNum, basic_udirel.overStockNum,
basic_udirel.recentDateTime, basic_udirel.recentDateTime,
basic_udirel.isDateBy, basic_udirel.isDateBy,
bht.name classifyName, bht.name classifyName,
basic_products.id as PRId, basic_products.id as PRId,
basic_products.originUuid, basic_products.originUuid,

Loading…
Cancel
Save