选择穿孔日期下的炮孔 统一修改 其他穿孔日期的不要改

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/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>
 
 

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,6 +85,7 @@
         a.RowSpace,
         a.HoleSpace,
         a.HoleBlastVolume,
+        b.BlastDate,
         b.BlastHoleID AS HoleId,
         b.Depth AS DesignDepth,
         b.RowSpace AS DesignRowSpace,

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/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/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 != ''">