修复问题

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,11 @@ public class TMineWorkemployees implements Serializable {
      */
     @TableField("Fzrs")
     private Integer Fzrs;
-
+    /**
+     * 后勤人数
+     */
+    @ApiModelProperty("Hqrs")
+    private Integer Hqrs;
     /**
      * 上班总人数
      */

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

@@ -85,7 +85,7 @@
         a.RowSpace,
         a.HoleSpace,
         a.HoleBlastVolume,
-        b.BlastDate,
+        a.BlastDate,
         b.BlastHoleID AS HoleId,
         b.Depth AS DesignDepth,
         b.RowSpace AS DesignRowSpace,

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

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

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