修复问题，设备隐患

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/entity/TEquipmentTrouble.java

@@ -91,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/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;
@@ -87,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/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/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