穿孔工序 添加爆破日期后需要在爆破表中插入数据

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,4 +28,9 @@ 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);
+
+    List<String> getUidList(@Param("blastDate") String blastDate);
+
+
+
 }

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

@@ -77,6 +77,23 @@
 
     </update>
 
+
+    <select id="getUidList" resultType="java.lang.String">
+        select tpd.Uid from T_Processes_Drilling tpd where tpd.BlastDate=#{blastDate}
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
         SELECT

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

 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.TProcessesDrilling;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
@@ -20,14 +21,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 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;
+import java.util.*;
 
 /**
  * <p>
@@ -315,6 +315,28 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         tProcessesDrilling.setBlastDate(query.getBlastDate());
         params.put("BlastDate",query.getBlastDate());
         int update = baseMapper.updateByDrillingDate(params);
+
+        //向穿孔表中插入数据
+
+        QueryWrapper<TProcessesDrilling> tpdWrapper = new QueryWrapper<>();
+        tpdWrapper.eq("BlastDate",query.getBlastDate());
+        List<TProcessesDrilling> drillintList =  baseMapper.selectList(tpdWrapper);
+
+        //设置tag
+        R<String> r1 = itSysDictService.getTagDate(null);
+        if (r1.getCode() != 0) {
+            return R.failed(r1.getMsg());
+        }
+        List<TProcessesBlast> tpbList = new ArrayList<>();
+        if(drillintList != null && drillintList.size()>0){
+            for(TProcessesDrilling drillint : drillintList){
+                TProcessesBlast blast = new TProcessesBlast();
+                blast.setUid(drillint.getUid());
+                blast.setTag(r1.getData());
+                tpbList.add(blast);
+            }
+            itProcessesBlastService.saveOrUpdateBatch(tpbList);
+        }
         if (update > 0) {
             return R.ok("穿孔工序中->修改爆破日期成功");
         } else {

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

@@ -2,12 +2,33 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesBlastMapper">
 
+    <select id="getNewPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo">
+        select
+        a.Uid,
+        a.BlastPeople,
+        a.CheckHoleDate,
+        a.CheckHolePeople,
+        a.Manager,
+        a.Supervisor,
+        a.TechDepart,
+        a.Tabulator,
+        a.Bz,
+        a.Tag,
+        c.BlastDate,
+        c.Depth
+        from T_Processes_Blast a
+        left join T_Processes_Drilling c on c.Uid = a.Uid
+        where 1=1
+        <if test="params.blastDate != null and params.blastDate != ''">
+            and Convert(varchar(10),c.BlastDate,120) <![CDATA[ = ]]> #{params.blastDate}
+        </if>
+    </select>
+
+
 
     <!-- 表和实体字段对照关系, 类似RestultMap -->
     <sql id="TProcessesBlastColumns">
         a.Uid,
-
-
         a.BlastPeople,
         a.CheckHoleDate,
         a.CheckHolePeople,

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

@@ -77,6 +77,23 @@
 
     </update>
 
+
+    <select id="getUidList" resultType="java.lang.String">
+        select tpd.Uid from T_Processes_Drilling tpd where tpd.BlastDate=#{blastDate}
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
     <!-- 获取所有getPage列表 -->
     <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
         SELECT

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

@@ -5,4 +5,10 @@
     <select id="getList" resultType="cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet">
         select * from T_Sample_LaboratorySheet
     </select>
+    <select id="pageByYhOrSysj" resultType="cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet">
+        select a.* from T_Sample_LaboratorySheet a
+        where
+            a.Yh=#{param.Yh}
+            or a.Sysj= #{param.Sysj}
+    </select>
 </mapper>

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

@@ -20,5 +20,12 @@
 
     <sql id="TSampleListJoins">
     </sql>
+    <select id="pageByYhOrSyrq" resultType="cn.wise.sc.acquisition.business.entity.TSampleList">
+        select a.* from T_Sample_List a
+        where
+            a.Yh=#{param.Yh}
+            or a.Syrq= #{param.Syrq}
+
+    </select>
 
 </mapper>