Commit aeb90102 by lijingjing

sql脚本提交;

parent 337d86fe
...@@ -20,6 +20,7 @@ import com.patzn.cloud.service.lims.hmhj.mapper.StatisticsMapper; ...@@ -20,6 +20,7 @@ import com.patzn.cloud.service.lims.hmhj.mapper.StatisticsMapper;
import com.patzn.cloud.service.lims.hmhj.service.IStatisticsService; import com.patzn.cloud.service.lims.hmhj.service.IStatisticsService;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -51,6 +52,13 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta ...@@ -51,6 +52,13 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
@Resource @Resource
private ServiceProperties serviceProperties; private ServiceProperties serviceProperties;
@Value("${spring.profiles.active}")
private String env;
private boolean isProd() {
return Objects.equals(env, "hmhj");
}
private void handleQueryTime(QueryDTO queryDTO) { private void handleQueryTime(QueryDTO queryDTO) {
RestAssert.fail(null == queryDTO.getTimeS(), "起始时间不为空"); RestAssert.fail(null == queryDTO.getTimeS(), "起始时间不为空");
// 截至时间若为空,默认当前时间 // 截至时间若为空,默认当前时间
...@@ -266,7 +274,22 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta ...@@ -266,7 +274,22 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
@Override @Override
public CenterCost getCenterCost(StatsQueryDTO queryDTO) { public CenterCost getCenterCost(StatsQueryDTO queryDTO) {
return baseMapper.selectCenterCost(queryDTO); CenterCost centerCost = baseMapper.selectCenterCost(queryDTO);
if (Objects.isNull(centerCost)) {
centerCost = new CenterCost();
}
// 跨服务查询出库信息
WmsInventoryDTO dto = new WmsInventoryDTO();
dto.setType("年入库");
List<WmsInventory> inventoryList = getInventoryList(dto);
if (CollectionUtils.isNotEmpty(inventoryList)) {
BigDecimal consume = inventoryList.stream()
.map(WmsInventory::getSumPrice)
.reduce(BigDecimal.ZERO, BigDecimal::add);
consume = consume.divide(new BigDecimal(10000));
centerCost.setConsume(consume);
}
return centerCost;
} }
@Override @Override
...@@ -292,22 +315,20 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta ...@@ -292,22 +315,20 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
map.put("Unit", dto.getUnit()); map.put("Unit", dto.getUnit());
} }
dataList = getMockData(); // 若为开发环境,模拟测试数据
if (true) { if (!isProd()) {
dataList = getMockData();
return dataList.stream().filter(d -> { return dataList.stream().filter(d -> {
boolean f = true; boolean f = true;
if (StringUtils.isNotBlank(dto.getType())) { if (StringUtils.isNotBlank(dto.getType())) {
f = d.getType().equals(dto.getType()); f = d.getType().equals(dto.getType());
} }
if (StringUtils.isNotBlank(dto.getMaterialName())) { if (StringUtils.isNotBlank(dto.getMaterialName())) {
f = f && d.getMaterialName().contains(dto.getMaterialName()); f = f && d.getMaterialName().contains(dto.getMaterialName());
} }
if (StringUtils.isNotBlank(dto.getSpecification())) { if (StringUtils.isNotBlank(dto.getSpecification())) {
f = f && d.getSpecification().contains(dto.getSpecification()); f = f && d.getSpecification().contains(dto.getSpecification());
} }
if (StringUtils.isNotBlank(dto.getUnit())) { if (StringUtils.isNotBlank(dto.getUnit())) {
f = f && d.getUnit().contains(dto.getUnit()); f = f && d.getUnit().contains(dto.getUnit());
} }
......
/** meazty created 【库存及出入库】 at 2023/4/20 14:55 **/
/** meazty created 【库存及出入库】 at 2023/4/20 14:55 **/
INSERT INTO public.sys_resource (id,system_id,pid,"name","type",code,uri,icon,remark,status,sort,ctime,ename,ltime,uid,lid) VALUES
(1648882720316813313,1356148880450674689,1406411303447314433,'出库信息查询',0,'out_stock_info','/hmhj/statistics_manage/out_stock_info','pt-config',NULL,1,1,'2023-04-20 10:54:09.942',NULL,NULL,0,NULL),
(1648882326043848705,1356148880450674689,1406411303447314433,'库存信息查询',0,'inventory_info','/hmhj/statistics_manage/inventory_info','pt-config',NULL,1,1,'2023-04-20 10:52:35.941',NULL,'2023-04-20 10:54:17.205',0,0);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment