炮孔设计分页 日期筛选优化

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignHoleController.java

@@ -44,11 +44,11 @@ public class TProcessesBlastdesignHoleController {
     })
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
     public R getPage(String designDate, Query query) {
-        TProcessesBlastdesignHoleQuery param = new TProcessesBlastdesignHoleQuery();
+        /*TProcessesBlastdesignHoleQuery param = new TProcessesBlastdesignHoleQuery();
         if (StringUtils.isNotBlank(designDate)) {
             param.setDesignDate(DateUtil.strToTime(designDate));
-        }
-        return itProcessesBlastdesignHoleService.getPage(param, query);
+        }*/
+        return itProcessesBlastdesignHoleService.getPage(designDate, query);
     }
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+import java.util.Map;
 
 /**
  * <p>
@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface TProcessesBlastdesignHoleMapper extends BaseMapper<TProcessesBlastdesignHole> {
 
-    Page<TProcessesBlastdesignHoleVo> getPage(Page<TProcessesBlastdesignHole> page, @Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
+    Page<TProcessesBlastdesignHoleVo> getPage(Page<TProcessesBlastdesignHole> page, @Param("params") Map<String, Object> params);
 
     List<TProcessesBlastdesignHoleVo> getByQuery(@Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml

@@ -48,13 +48,12 @@
         a.x,
         a.y,
         a.z,
-        a.StepHeight,
-        b.BlastVolume
+        a.StepHeight
         FROM T_Processes_BlastDesign_Hole a
-        <include refid="TProcessesBlastdesignHoleJoins"/>
-        <where>
-            ${ew.sqlSegment}
-        </where>
+        where 1=1
+        <if test="params.designDate != null and params.designDate != ''">
+            and Convert(varchar(10),a.DesignDate,120) <![CDATA[ = ]]> #{params.designDate}
+        </if>
     </select>
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignHoleService.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITProcessesBlastdesignHoleService extends IService<TProcessesBlastdesignHole> {
 
-    R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query);
+    R getPage(String designDate,  Query query);
 
     R updateByUid(TProcessesBlastdesignHoleQuery query);
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java

@@ -30,7 +30,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -60,24 +62,29 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
     private ITSysUserService itSysUserService;
 
     @Override
-    public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) {
-        log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery));
+    public R getPage(String designDate, Query query) {
+//        log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery));
         //参数校验
         //分页
         Page<TProcessesBlastdesignHole> page = new Page<>(query.getPageNum(), query.getPageSize());
+
         //条件封装
         QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
+        Map<String, Object> params = new HashMap<>();
         //如果设计时间不为空 因为涉及到表连接，需要创建字段别名
-        if (tProcessesBlastdesignHoleQuery.getDesignDate() != null) {
-            StringBuilder stringBuilder = new StringBuilder();
-            stringBuilder.append(ProjectEnum.TableAlias.B.getLabel()).append(ProjectEnum.TProcessesBlastdesignVolume.DESIGN_DATE.getLabel());
+        if (StringUtils.isNotBlank(designDate)) {
+         /*   String startDate = tProcessesBlastdesignHoleQuery.getDesignDate() + " 00:00:00";
+            String endDate = tProcessesBlastdesignHoleQuery.getDesignDate() + " 23:59:59";*/
+            params.put("designDate", designDate);
+            /*StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignVolume.DESIGN_DATE.getLabel());
             //前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
             queryWrapper
                     .ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(tProcessesBlastdesignHoleQuery.getDesignDate()))
-                    .le(stringBuilder.toString(), DateUtil.getEndTimeStr(tProcessesBlastdesignHoleQuery.getDesignDate()));
+                    .le(stringBuilder.toString(), DateUtil.getEndTimeStr(tProcessesBlastdesignHoleQuery.getDesignDate()));*/
         }
         //查询分页数据
-        Page<TProcessesBlastdesignHoleVo> data = baseMapper.getPage(page, queryWrapper);
+        Page<TProcessesBlastdesignHoleVo> data = baseMapper.getPage(page, params);
         //查询，根据筛选条件的总条数的孔深合计，不分页 孔深合计 表连接sql需要 a.字段
         Double depthSum = baseMapper.getSumByCondition(new StringBuffer()
                 .append(ProjectEnum.TableAlias.A.getLabel())