Merge remote-tracking branch 'origin/master'

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

 package cn.wise.sc.acquisition.business.controller;
 
 
+import cn.wise.sc.acquisition.business.model.query.TMineStopeQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
 import cn.wise.sc.acquisition.business.service.ITMineStopeService;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.baomidou.mybatisplus.extension.api.R;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -49,5 +53,25 @@ public class TMineStopeController {
         return itMineStopeService.getStopeName();
     }
 
+    /**
+     * 根据条件查询矿山爆区表
+     *
+     * @return
+     */
+    @ApiOperation(value = "根据条件查询设计爆区爆破量")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "blastAreaName", value = "爆区名称", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "stepName", value = "平台名称", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "stopeName", value = "采区名称", paramType = "query", dataType = "String")
+    })
+    @RequestMapping(value = "/getByQuery", method = RequestMethod.GET)
+    public R getByQuery(String blastAreaName, String stepName, String stopeName) {
+        //封装query
+        TMineStopeQuery param= new TMineStopeQuery();
+        param.setBlastAreaName(blastAreaName);
+        param.setStopeName(stopeName);
+        param.setStepName(stepName);
+        return itMineStopeService.getByQuery(param);
+    }
 }
 

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

@@ -72,8 +72,8 @@ public class TProcessesDrillingController {
      */
     @ApiOperation(value = "修改所有爆破日期")
     @RequestMapping(value = "/updateAllBlastDate", method = RequestMethod.POST)
-    public R updateAllBlastDate(@RequestBody TProcessesDrillingQuery tProcessesDrillingQuery) {
-        return itProcessesDrillingService.updateAllBlastDate(tProcessesDrillingQuery);
+    public R updateAllBlastDate(@RequestBody TProcessesDrillingQuery tProcessesDrillingQuery,String DrillingDate) {
+        return itProcessesDrillingService.updateAllBlastDate(tProcessesDrillingQuery,DrillingDate);
     }
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentTrouble.java

@@ -74,11 +74,6 @@ public class TEquipmentTrouble implements Serializable {
     @TableField("Clrq")
     private LocalDateTime Clrq;
 
-    /**
-     * 是否已修好：1是，0否
-     */
-    private String clr;
-
     /**
      * 填报人
      */
@@ -96,6 +91,11 @@ public class TEquipmentTrouble implements Serializable {
      */
     @TableField("Clzt")
     private String Clzt;
+    /**
+     * 日期标记,如:2020年11月
+     */
+    @TableField("Tag")
+    private String Tag;
 
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineWorkemployees.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -67,7 +69,16 @@ public class TMineWorkemployees implements Serializable {
      */
     @TableField("Fzrs")
     private Integer Fzrs;
-
+    /**
+     * 后勤人数
+     */
+    @ApiModelProperty("Hqrs")
+    private Integer Hqrs;
+    /**
+     * 管理人数
+     */
+    @ApiModelProperty("Glrs")
+    private Integer Glrs;
     /**
      * 上班总人数
      */

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 /**
  * <p>
  *  Mapper 接口
@@ -24,4 +26,5 @@ public interface TProcessesDrillingMapper extends BaseMapper<TProcessesDrilling>
 
     Double getSumByCondition(@Param("condition") String condition, @Param("ew") QueryWrapper<TProcessesDrilling> queryWrapper);
 
+    int updateByDrillingDate(@Param("params") Map<String, Object> params);
 }

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

@@ -4,7 +4,7 @@
 
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo">
         select tea.EquipmentID,tea.EquipmentName,
-        tet.Uid,tet.Fxr,tet.Fxrq,tet.Yhms,tet.Clcs,tet.Clrq,tet.clr,tet.Txr,tet.Txrq,tet.Clzt
+        tet.Uid,tet.Fxr,tet.Fxrq,tet.Yhms,tet.Clcs,tet.Clrq,tet.Txr,tet.Txrq,tet.Clzt
         from T_Equipment_Account tea
         left join T_Equipment_Trouble tet on tet.EquipmentID = tea.EquipmentID
         <include refid="where"/>

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

@@ -21,12 +21,14 @@
         a.z,
         a.StepHeight,
         a.HoleBlastVolume,
+        a.DrillingDate,
+        a.DesignDate,
         a.Tag
 	</sql>
 
     <sql id="TProcessesBlastdesignVolumeColumns">
         b.BlastVolume,
-        b.DesignDate,
+
 	</sql>
 
 
@@ -48,7 +50,9 @@
         a.x,
         a.y,
         a.z,
-        a.StepHeight
+        a.StepHeight,
+        a.DrillingDate,
+        a.DesignDate
         FROM T_Processes_BlastDesign_Hole a
         where 1=1
         <if test="params.designDate != null and params.designDate != ''">

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

@@ -62,6 +62,21 @@
         left join T_Processes_BlastDesign_Volume d on b.StopeName=d.StopeName and b.StepName=d.StepName and b.BlastAreaName=d.BlastAreaName
     </sql>
 
+    <update id="updateByDrillingDate">
+        UPDATE a
+        set
+        <if test="params.BlastDate != null">
+            a.BlastDate= #{params.BlastDate}
+        </if>
+        from T_Processes_Drilling a
+        INNER JOIN T_Processes_BlastDesign_Hole b
+        on a.Uid=b.Uid
+        <where>
+           b.DrillingDate=#{params.DrillingDate}
+        </where>
+
+    </update>
+
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
         SELECT
@@ -70,10 +85,11 @@
         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.HoleSpace AS DesignHoleSpace,
         b.StepHeight
         FROM T_Processes_Drilling a
         <include refid="TProcessesBlastDesignHoleJoins"/>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TEquipmentTroubleQuery.java

 package cn.wise.sc.acquisition.business.model.query;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -69,12 +70,6 @@ public class TEquipmentTroubleQuery {
     @ApiModelProperty("隐患处理日期")
     private LocalDateTime clrq;
 
-    /**
-     * 是否已修好：1是，0否
-     */
-    @ApiModelProperty("是否已修好：1是，0否")
-    private String clr;
-
     /**
      * 填报人
      */
@@ -93,7 +88,11 @@ public class TEquipmentTroubleQuery {
     @ApiModelProperty("隐患处理状态：已处理和未处理")
     private String clzt;
 
-
+    /**
+     * 日期标记,如:2020年11月
+     */
+    @TableField("Tag")
+    private String Tag;
 
 
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TMineWorkemployeesQuery.java

@@ -62,7 +62,16 @@ public class TMineWorkemployeesQuery implements Serializable {
      */
     @ApiModelProperty("Fzrs")
     private Integer Fzrs;
-
+    /**
+     * 后勤人数
+     */
+    @ApiModelProperty("Hqrs")
+    private Integer Hqrs;
+    /**
+     * 管理人数
+     */
+    @ApiModelProperty("Glrs")
+    private Integer Glrs;
     /**
      * 上班总人数
      */

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesDiggingQuery.java

 package cn.wise.sc.acquisition.business.model.query;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -76,7 +77,11 @@ public class TProcessesDiggingQuery {
      */
     @ApiModelProperty("司机")
     private String driver;
-
+    /**
+     * 装车日期
+     */
+    @TableField("DigDate")
+    private LocalDateTime DigDate;
     /**
      * 工作内容
      */

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TEquipmentTroubleVo.java

@@ -62,12 +62,6 @@ public class TEquipmentTroubleVo {
 	@ApiModelProperty("隐患处理日期")
 	private LocalDateTime Clrq;
 
-	/**
-	 * 是否已修好：1是，0否
-	 */
-	@ApiModelProperty("是否已修好：1是，0否")
-	private String clr;
-
 	/**
 	 * 填报人
 	 */

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

@@ -24,7 +24,7 @@ public interface ITProcessesDrillingService extends IService<TProcessesDrilling>
 
     R updateHoleBlastVolume(TProcessesDrillingQuery query);
 
-    R updateAllBlastDate(TProcessesDrillingQuery query);
+    R updateAllBlastDate(TProcessesDrillingQuery query,String DrillingDate);
 
     R getByUid(TProcessesDrillingQuery query);
 

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

@@ -10,14 +10,15 @@ import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TEquipmentTroubleQuery;
 import cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo;
 import cn.wise.sc.acquisition.business.service.ITEquipmentTroubleService;
+import cn.wise.sc.acquisition.business.service.ITSysDictService;
 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 org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
@@ -38,8 +39,8 @@ public class TEquipmentTroubleServiceImpl extends ServiceImpl<TEquipmentTroubleM
 	private TEquipmentTroubleMapper equipmentTroubleMapper;
 	@Resource
 	private TEquipmentAccountMapper equipmentAccountMapper;
-
-
+	@Autowired
+	private ITSysDictService itSysDictService;
 
 	/**
 	 * 设备隐患分页
@@ -92,6 +93,12 @@ public class TEquipmentTroubleServiceImpl extends ServiceImpl<TEquipmentTroubleM
 		Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
 		Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
 		TEquipmentTrouble trouble = new TEquipmentTrouble();
+		//设置tag
+		com.baomidou.mybatisplus.extension.api.R<String> tagDate = itSysDictService.getTagDate(null);
+		if (tagDate.getCode() != 0) {
+			return R.fail(-1,tagDate.getMsg());
+		}
+		query.setTag(tagDate.getData());
 		BeanUtils.copyProperties(query, trouble);
 		//Uid=null新增，Uid！=null 修改
 		if(StringUtils.isNoneBlank(query.getUid())){

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

@@ -90,20 +90,20 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
         //条件封装
         BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
         //判断是否需要修改关联的 矿山爆区表
-        if (StringUtils.isNotBlank(query.getStepName())
-                || StringUtils.isNotBlank(query.getBlastAreaName())
-                || StringUtils.isNotBlank(query.getStopeName())) {
-            return R.failed("爆破设计中->请到炮孔设计中修改爆区名称，采区名称，平台名称");
-            //判断矿山爆区表是否存在数据 不存在不能修改
-            //query里不一定StopeName,StepName,BlastAreaName都有，需要从temp中拿query没有的，
-            // 所以将query有的更新到temp中，再把temp中的复制到tMineStopeQuery
-//            TMineStopeQuery tMineStopeQuery = new TMineStopeQuery();
+//        if (StringUtils.isNotBlank(query.getStepName())
+//                || StringUtils.isNotBlank(query.getBlastAreaName())
+//                || StringUtils.isNotBlank(query.getStopeName())) {
+//            return R.failed("爆破设计中->请到炮孔设计中修改爆区名称，采区名称，平台名称");
+//            //判断矿山爆区表是否存在数据 不存在不能修改
+//            //query里不一定StopeName,StepName,BlastAreaName都有，需要从temp中拿query没有的，
+//            // 所以将query有的更新到temp中，再把temp中的复制到tMineStopeQuery
+//           TMineStopeQuery tMineStopeQuery = new TMineStopeQuery();
 //            BeanUtils.copyProperties(temp, tMineStopeQuery);
 //            R volume = itMineStopeService.getByQuery(tMineStopeQuery);
 //            if (volume.getData() == null) {
-//                return R.failed("爆破设计中->矿山爆区表数据不存在，StopeName,StepName,BlastAreaName");
-//            }
-        }
+//               return R.failed("爆破设计中->矿山爆区表数据不存在，StopeName,StepName,BlastAreaName");
+//           }
+//        }
         //判断是否修改设计孔深 和 单孔爆破量
         if (query.getDesignDepth() != null || query.getHoleBlastVolume() != null) {
             return R.failed("爆破设计中->请到炮孔设计中修改设计孔深和单孔爆破量");

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

@@ -6,10 +6,7 @@ import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignVolume;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignHoleMapper;
 import cn.wise.sc.acquisition.business.model.LoginUser;
-import cn.wise.sc.acquisition.business.model.query.TProcessesBlastQuery;
-import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
-import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery;
-import cn.wise.sc.acquisition.business.model.query.TProcessesDrillingQuery;
+import cn.wise.sc.acquisition.business.model.query.*;
 import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo;
 import cn.wise.sc.acquisition.business.model.vo.TProcessesProductVo;
 import cn.wise.sc.acquisition.business.service.*;
@@ -53,6 +50,9 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
     @Autowired
     private ITProcessesBlastService itProcessesBlastService;
 
+    @Autowired
+    ITMineStopeService itMineStopeService;
+
     @Autowired
     private ITSysDictService itSysDictService;
 
@@ -118,15 +118,15 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         if (StringUtils.isNotBlank(query.getStepName())
                 || StringUtils.isNotBlank(query.getBlastAreaName())
                 || StringUtils.isNotBlank(query.getStopeName())) {
-            //判断设计爆区爆破量是否存在数据 不存在不能修改
+            //判断矿山爆区表是否存在数据 不存在不能修改
             //query里不一定StopeName,StepName,BlastAreaName都有，需要从temp中拿query没有的，
             // 所以将query有的更新到temp中，再把temp中的复制到tMineStopeQuery
             BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
-            TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery = new TProcessesBlastdesignHoleQuery();
-            BeanUtils.copyProperties(temp, tProcessesBlastdesignVolumeQuery);
-            R volume = itProcessesBlastdesignVolumeService.getByQuery(tProcessesBlastdesignVolumeQuery);
+            TMineStopeQuery tMineStopeQuery = new TMineStopeQuery();
+            BeanUtils.copyProperties(temp, tMineStopeQuery);
+            R volume = itMineStopeService.getByQuery(tMineStopeQuery);
             if (volume.getData() == null) {
-                return R.failed("炮孔设计中->设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
+                return R.failed("炮孔设计中->矿山爆区表数据不存在，StopeName,StepName,BlastAreaName");
             }
         }
         //条件封装
@@ -134,19 +134,19 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         //所以直接copy上面根据uid查出来的数据 copy ->非空值<- 将query的值更新到查出来的对象上 进行计算并更新到数据库即可
         BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
         //判断是否修改设计爆区爆破量 的设计日期，或者设计爆区爆破量(m3)  TAT
-        if (query.getDesignDate() != null || query.getBlastVolume() != null) {
-            TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery = new TProcessesBlastdesignHoleQuery();
-            tProcessesBlastdesignVolumeQuery.setStopeName(temp.getStopeName());
-            tProcessesBlastdesignVolumeQuery.setStepName(temp.getStepName());
-            tProcessesBlastdesignVolumeQuery.setBlastAreaName(temp.getBlastAreaName());
-            tProcessesBlastdesignVolumeQuery.setDesignDate(query.getDesignDate());
-            tProcessesBlastdesignVolumeQuery.setBlastVolume(query.getBlastVolume());
-            R r = itProcessesBlastdesignVolumeService.updateByQuery(tProcessesBlastdesignVolumeQuery);
-            if (r.getCode() != 0) {
-                log.error("炮孔设计中->修改设计爆区爆破量失败:" + JSON.toJSONString(tProcessesBlastdesignVolumeQuery));
-                return R.failed(r.getMsg());
-            }
-        }
+//        if (query.getDesignDate() != null || query.getBlastVolume() != null) {
+//            TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery = new TProcessesBlastdesignHoleQuery();
+//            tProcessesBlastdesignVolumeQuery.setStopeName(temp.getStopeName());
+//            tProcessesBlastdesignVolumeQuery.setStepName(temp.getStepName());
+//            tProcessesBlastdesignVolumeQuery.setBlastAreaName(temp.getBlastAreaName());
+//            tProcessesBlastdesignVolumeQuery.setDesignDate(query.getDesignDate());
+//            tProcessesBlastdesignVolumeQuery.setBlastVolume(query.getBlastVolume());
+//            R r = itProcessesBlastdesignVolumeService.updateByQuery(tProcessesBlastdesignVolumeQuery);
+//            if (r.getCode() != 0) {
+//                log.error("炮孔设计中->修改设计爆区爆破量失败:" + JSON.toJSONString(tProcessesBlastdesignVolumeQuery));
+//                return R.failed(r.getMsg());
+//            }
+//        }
         //判断是否需要重新计算爆破量
         if (query.getHoleSpace() != null
                 || query.getRowSpace() != null

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

@@ -126,7 +126,7 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
         }
         TProcessesDigging digging = new TProcessesDigging();
         BeanUtils.copyProperties(query, digging);
-        digging.setDigDate(LocalDateTime.now()); //装车日期  系统自动生成
+//        digging.setDigDate(LocalDateTime.now()); //装车日期  系统自动生成
         //设置tag
         com.baomidou.mybatisplus.extension.api.R<String> r = itSysDictService.getTagDate(null);
         if (r.getCode() != 0) {

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

@@ -25,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Stack;
 
 /**
@@ -300,17 +302,19 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
 
 
     @Override
-    public R updateAllBlastDate(TProcessesDrillingQuery query) {
+    public R updateAllBlastDate(TProcessesDrillingQuery query,String DrillingDate) {
         log.info(JSON.toJSONString(query));
         //参数校验
         Rcode.NOT_PARAM.assertNotNull(query);
         Rcode.NOT_PARAM.assertNotNull(query.getBlastDate());
         //封装条件
-        QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
+        Map<String, Object> params = new HashMap<>();
+        params.put("DrillingDate",DrillingDate);
         //封装实体
         TProcessesDrilling tProcessesDrilling = new TProcessesDrilling();
         tProcessesDrilling.setBlastDate(query.getBlastDate());
-        int update = baseMapper.update(tProcessesDrilling, queryWrapper);
+        params.put("BlastDate",query.getBlastDate());
+        int update = baseMapper.updateByDrillingDate(params);
         if (update > 0) {
             return R.ok("穿孔工序中->修改爆破日期成功");
         } else {

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

@@ -210,10 +210,9 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         //分页
         Page<TSampleLaboratorysheet> page = new Page<>();
         LambdaQueryWrapper<TSampleLaboratorysheet> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(TSampleLaboratorysheet::getSysj,TSampleLaboratorysheet::getYh);
-        queryWrapper.like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getSysj,tSampleLaboratorysheetQuery.getSearch())
-                    .or()
-                    .like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getYh,tSampleLaboratorysheetQuery.getSearch());
+        //TODO 根据收样时间筛选
+        queryWrapper.select(TSampleLaboratorysheet::getYh);
+        queryWrapper.like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getYh,tSampleLaboratorysheetQuery.getSearch());
         //查询
         Page<TSampleLaboratorysheet> tSampleLaboratorysheetPage = baseMapper.selectPage(page, queryWrapper);
         return R.ok(tSampleLaboratorysheetPage);

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

@@ -9,6 +9,7 @@ import cn.wise.sc.acquisition.business.model.query.TSampleListQuery;
 import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
 import cn.wise.sc.acquisition.business.service.ITSampleLaboratorysheetService;
 import cn.wise.sc.acquisition.business.service.ITSampleListService;
+import cn.wise.sc.acquisition.business.util.DateUtil;
 import cn.wise.sc.acquisition.business.util.ImageUtil;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.alibaba.fastjson.JSON;
@@ -62,12 +63,18 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
                 ProjectEnum.TSampleListType.SYR.getLabel(),
                 ProjectEnum.TSampleListType.SYRQ.getLabel()
         );
+//        String startDate = tSampleListQuery.getSearch() + "00:00:00";
+//        String endDate = tSampleListQuery.getSearch() + "23:59:59";
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TSampleListType.SYRQ.getLabel());
         queryWrapper
                 .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.YH.getLabel(), tSampleListQuery.getSearch())
                 .or()
-                .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.HOLES_ID.getLabel(), tSampleListQuery.getSearch())
-                .or()
-                .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.SYRQ.getLabel(), tSampleListQuery.getSearch());
+                .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.HOLES_ID.getLabel(), tSampleListQuery.getSearch());
+//TODO 根据时间筛选
+    //                .or()
+//                .ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(DateUtil.strToTime(startDate)))
+//                .le(stringBuilder.toString(), DateUtil.getEndTimeStr(DateUtil.strToTime(endDate)));
         //查询
         Page<TSampleList> tSampleListPage = baseMapper.selectPage(page, queryWrapper);
         return R.ok(tSampleListPage);

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TEquipmentTroubleMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo">
         select tea.EquipmentID,tea.EquipmentName,
-        tet.Uid,tet.Fxr,tet.Fxrq,tet.Yhms,tet.Clcs,tet.Clrq,tet.clr,tet.Txr,tet.Txrq,tet.Clzt
+        tet.Uid,tet.Fxr,tet.Fxrq,tet.Yhms,tet.Clcs,tet.Clrq,tet.Txr,tet.Txrq,tet.Clzt
         from T_Equipment_Account tea
         left join T_Equipment_Trouble tet on tet.EquipmentID = tea.EquipmentID
         <include refid="where"/>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.xml

@@ -21,12 +21,14 @@
         a.z,
         a.StepHeight,
         a.HoleBlastVolume,
+        a.DrillingDate,
+        a.DesignDate,
         a.Tag
 	</sql>
 
     <sql id="TProcessesBlastdesignVolumeColumns">
         b.BlastVolume,
-        b.DesignDate,
+
 	</sql>
 
 
@@ -48,7 +50,9 @@
         a.x,
         a.y,
         a.z,
-        a.StepHeight
+        a.StepHeight,
+        a.DrillingDate,
+        a.DesignDate
         FROM T_Processes_BlastDesign_Hole a
         where 1=1
         <if test="params.designDate != null and params.designDate != ''">

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.xml

@@ -62,6 +62,21 @@
         left join T_Processes_BlastDesign_Volume d on b.StopeName=d.StopeName and b.StepName=d.StepName and b.BlastAreaName=d.BlastAreaName
     </sql>
 
+    <update id="updateByDrillingDate">
+        UPDATE a
+        set
+        <if test="params.BlastDate != null">
+            a.BlastDate= #{params.BlastDate}
+        </if>
+        from T_Processes_Drilling a
+        INNER JOIN T_Processes_BlastDesign_Hole b
+        on a.Uid=b.Uid
+        <where>
+           b.DrillingDate=#{params.DrillingDate}
+        </where>
+
+    </update>
+
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
         SELECT
@@ -70,10 +85,11 @@
         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.HoleSpace AS DesignHoleSpace,
         b.StepHeight
         FROM T_Processes_Drilling a
         <include refid="TProcessesBlastDesignHoleJoins"/>