Skip to content

D
data-acquisition
Commit e48c3685 authored by 竹天卫's avatar 竹天卫
Browse files
Options

穿孔工序 分页上的总数统计 按照当前输入的日期进行统计

parent 639c612d
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 29 deletions
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDrillingController.java
View file @ e48c3685
......@@ -43,11 +43,7 @@ public class TProcessesDrillingController {
})
@RequestMapping(value = "/getPage", method = RequestMethod.GET)
public R getPage(Query query, String drillingDate) {
TProcessesDrillingQuery param = new TProcessesDrillingQuery();
if (StringUtils.isNotBlank(drillingDate)) {
param.setDrillingDate(DateUtil.strToTime(drillingDate));
}
return itProcessesDrillingService.getPage(param, query);
return itProcessesDrillingService.getPage(drillingDate, query);
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.java
View file @ e48c3685
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
import cn.wise.sc.acquisition.business.entity.TProcessesDrilling;
import cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -23,6 +24,8 @@ public interface TProcessesDrillingMapper extends BaseMapper<TProcessesDrilling>
Page<TProcessesDrillingVo> getPage(Page<TProcessesDrilling> page, @Param("ew") QueryWrapper<TProcessesDrilling> queryWrapper);
Page<TProcessesDrillingVo> getPageNew(Page<TProcessesDrillingVo> page, @Param("params") Map<String, Object> params);
TProcessesDrillingVo getByQuery(@Param("ew") QueryWrapper<TProcessesDrilling> queryWrapper);
Double getSumByCondition(@Param("condition") String condition, @Param("ew") QueryWrapper<TProcessesDrilling> queryWrapper);
......@@ -31,6 +34,8 @@ public interface TProcessesDrillingMapper extends BaseMapper<TProcessesDrilling>
List<String> getUidList(@Param("blastDate") String blastDate);
Double getSumDepth(@Param("params") Map<String, Object> params);
Double getSumDay(@Param("params") Map<String, Object> params);
Double getSumMonth(@Param("params") Map<String, Object> params);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDrillingMapper.xml
View file @ e48c3685
......@@ -82,17 +82,39 @@
select tpd.Uid from T_Processes_Drilling tpd where tpd.BlastDate=#{blastDate}
</select>
<select id="getPageNew" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
SELECT
a.Uid,
a.Depth,
a.RowSpace,
a.HoleSpace,
a.HoleBlastVolume,
a.BlastDate,
b.BlastHoleID AS HoleId,
b.Depth AS DesignDepth,
b.RowSpace AS DesignRowSpace,
b.HoleSpace AS DesignHoleSpace,
b.StepHeight
FROM T_Processes_Drilling a
left join T_Processes_BlastDesign_Hole b on a.Uid = b.Uid
left join T_Processes_BlastDesign_Volume d on b.StopeName=d.StopeName and b.StepName=d.StepName and b.BlastAreaName=d.BlastAreaName
where 1=1
<if test="params.drillingDate != null and params.drillingDate != ''">
and Convert(varchar(10),b.DrillingDate,120) <![CDATA[ = ]]> #{params.drillingDate}
</if>
</select>
<select id="getSumDepth" resultType="Double">
SELECT
sum(a.Depth)
FROM T_Processes_Drilling a
left join T_Processes_BlastDesign_Hole b on a.Uid = b.Uid
left join T_Processes_BlastDesign_Volume d on b.StopeName=d.StopeName and b.StepName=d.StepName and b.BlastAreaName=d.BlastAreaName
where 1=1
<if test="params.drillingDate != null and params.drillingDate != ''">
and Convert(varchar(10),b.DrillingDate,120) <![CDATA[ = ]]> #{params.drillingDate}
</if>
</select>
<!-- 获取所有getPage列表 -->
<select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
......@@ -143,4 +165,33 @@
</select>
<select id="getSumDay" resultType="Double">
SELECT
sum(a.Depth)
FROM T_Processes_Drilling a
left join T_Processes_BlastDesign_Hole b on a.Uid = b.Uid
where 1=1
<if test="params.drillingDate != null and params.drillingDate != ''">
and Convert(varchar(10),b.DrillingDate,120) <![CDATA[ = ]]> #{params.drillingDate}
</if>
</select>
<select id="getSumMonth" resultType="Double">
SELECT
sum(a.Depth)
FROM T_Processes_Drilling a
left join T_Processes_BlastDesign_Hole b on a.Uid = b.Uid
where 1=1
<if test="params.drillingMonth != null and params.drillingMonth != ''">
and a.Tag = #{params.drillingMonth}
</if>
</select>
</mapper>
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDrillingService.java
View file @ e48c3685
......@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ITProcessesDrillingService extends IService<TProcessesDrilling> {
R getPage(TProcessesDrillingQuery tProcessesDrillingQuery, Query query);
R getPage(String drillingDate, Query query);
R insertTProcessesDrilling(TProcessesDrillingQuery query);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
View file @ e48c3685
......@@ -3,6 +3,7 @@ package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TProcessesBlast;
import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
import cn.wise.sc.acquisition.business.entity.TProcessesDrilling;
import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
import cn.wise.sc.acquisition.business.mapper.TProcessesDrillingMapper;
......@@ -26,7 +27,9 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
/**
......@@ -58,9 +61,8 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
private ITProcessesBlastService itProcessesBlastService;
@Override
public R getPage(TProcessesDrillingQuery tProcessesDrillingQuery, Query query) {
log.info(JSON.toJSONString(tProcessesDrillingQuery));
//参数校验
public R getPage(String drillingDate, Query query) {
/* //参数校验
//分页
Page<TProcessesDrilling> page = new Page<>(query.getPageNum(), query.getPageSize());
//条件封装
......@@ -80,26 +82,45 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
Page<TProcessesDrillingVo> data = baseMapper.getPage(page, queryWrapper);
StringBuffer depth = new StringBuffer()
.append(ProjectEnum.TableAlias.A.getLabel())
.append(ProjectEnum.TProcessesDrilling.DEPTH.getLabel());
.append(ProjectEnum.TProcessesDrilling.DEPTH.getLabel());*/
Page<TProcessesDrillingVo> page = new Page<>(query.getPageNum(), query.getPageSize());
Map<String, Object> params = new HashMap<>();
if(StringUtils.isNotBlank(drillingDate)){
LocalDateTime drillingLocalDate = DateUtil.strToTime(drillingDate);
Date d = Date.from(drillingLocalDate.atZone( ZoneId.systemDefault()).toInstant());
String pat2 = "yyyy年MM月";
SimpleDateFormat sdf2 = new SimpleDateFormat(pat2) ;
String drillingMonth = sdf2.format(d);
params.put("drillingDate", drillingDate);
params.put("drillingMonth", drillingMonth);
}
Page<TProcessesDrillingVo> data = baseMapper.getPageNew(page, params);
//查询，合计孔深
Double depthSum = baseMapper.getSumByCondition(depth.toString(), queryWrapper);
Double depthSum = baseMapper.getSumDepth(params);
//查询，今日合计孔深
//初始化QueryWrapper
LocalDateTime now = LocalDateTime.now();
/* LocalDateTime now = LocalDateTime.now();
queryWrapper = new QueryWrapper<>();
queryWrapper
.ge(drillingDate.toString(), DateUtil.getBeginTimeStr(now))
.le(drillingDate.toString(), DateUtil.getEndTimeStr(now));
Double todayDepthSum = baseMapper.getSumByCondition(depth.toString(), queryWrapper);
.le(drillingDate.toString(), DateUtil.getEndTimeStr(now));*/
Double todayDepthSum = baseMapper.getSumDay(params);
//查询，本月合计孔深
//本字段需要查询字典表SysDict的id为6的数据的name字段，
//例如查询出来name字段是26：上月26日到当前日期的实测孔深相加
//查询字典id为6的name字段
TSysDictQuery tSysDictQuery = new TSysDictQuery();
/* TSysDictQuery tSysDictQuery = new TSysDictQuery();
tSysDictQuery.setId(ProjectEnum.TSysDict.TAG_DATE.getId());
R<String> name = itSysDictService.getNameByQuery(tSysDictQuery);
if (name.getCode() != 0) {
......@@ -118,9 +139,9 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
queryWrapper = new QueryWrapper<>();
queryWrapper
.ge(drillingDate.toString(), DateUtil.getBeginTimeStr(LocalDateTime.now().minusMonths(1).withDayOfMonth(date)))
.le(drillingDate.toString(), DateUtil.getEndTimeStr(LocalDateTime.now()));
.le(drillingDate.toString(), DateUtil.getEndTimeStr(LocalDateTime.now()));*/
Double monthDepthSum = baseMapper.getSumByCondition(depth.toString(), queryWrapper);
Double monthDepthSum = baseMapper.getSumMonth(params);
return R.ok(new TProcessesProductVo<>(data, depthSum, todayDepthSum, monthDepthSum));
}
......
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