6月26日富平对接 优化问题

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

@@ -49,7 +49,7 @@ public class TEquipmentAccountController {
 
 	@ApiOperation(value = "选择设备")
 	@ApiImplicitParams(value = {
-			@ApiImplicitParam(name = "ProcessesName", value = "工序名称:爆破、辅助、运输、破碎、装车、穿孔", paramType = "query", dataType = "ProcessesName")
+			@ApiImplicitParam(name = "ProcessesName", value = "工序名称:爆破、辅助、运输、破碎、铲装、穿孔", paramType = "query", dataType = "ProcessesName")
 	})
 	@GetMapping("/getList")
 	public R getList(String ProcessesName) {

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

@@ -53,6 +53,14 @@ public class TMineStopeController {
         return itMineStopeService.getStopeName();
     }
 
+
+
+    @ApiOperation(value = "矿区下拉框-new")
+    @RequestMapping(value = "/getStopeNewList", method = RequestMethod.GET)
+    public R getStopeNewList(String designDate) {
+        return itMineStopeService.getStopeNewList(designDate);
+    }
+
     /**
      * 根据条件查询矿山爆区表
      *

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

@@ -36,15 +36,12 @@ public class TSysDictController {
 					"每日开始日期、单位类型、物资类型、" +
 					"生产工序、职务管理、装车内容、运输内容、" +
 					"设备性质、设备状态、物资用途、破碎工作内容、" +
-					"破碎站、辅助消耗、点检结果" +
+					"破碎站、辅助消耗、点检结果、样品化验项" +
 					"", paramType = "query", dataType = "Type")
 	})
 	@GetMapping("/getPage")
 	public R choseList(String Type){
 		return dictService.choseList(Type);
-
-
-
 	}
 
 

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

 package cn.wise.sc.acquisition.business.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
 
+import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.service.ITWeightService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.api.R;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -13,9 +22,28 @@ import org.springframework.web.bind.annotation.RestController;
  * @author ztw
  * @since 2021-04-26
  */
+@Api(tags = "地磅数据统计")
 @RestController
 @RequestMapping("/business/t-weight")
 public class TWeightController {
 
+	@Autowired
+	private ITWeightService weightService;
+
+
+	@ApiOperation(value = "地磅数据统计")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "TruckID", value = "矿车编号", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String")
+	})
+	@GetMapping("/getWeightCount")
+	public R getWeightCount(PageQuery pageQuery, String TruckID, String startDate, String endDate) {
+		return weightService.getWeightCount(pageQuery, TruckID, startDate, endDate);
+	}
+
+
+
+
 }
 

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

@@ -139,5 +139,17 @@ public class TEquipmentAccount implements Serializable {
     @TableField("Bz")
     private String Bz;
 
+    /**
+     * 是否主设备
+     */
+    @TableField("Zsb")
+    private Boolean Zsb;
+
+    /**
+     * 设备种类
+     */
+    @TableField("Sbzl")
+    private String Sbzl;
+
 
 }

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

@@ -31,18 +31,6 @@ public class TEquipmentCheckContent implements Serializable {
     @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
     private String Uid;
 
-    /**
-     * 设备编码
-     */
-    @TableField("EquipmentID")
-    private String EquipmentID;
-
-    /**
-     * 设备名称
-     */
-    @TableField("EquipmentName")
-    private String EquipmentName;
-
     /**
      * 点检部位
      */
@@ -74,4 +62,10 @@ public class TEquipmentCheckContent implements Serializable {
     private Boolean IsUsing;
 
 
+    /**
+     * 设备种类
+     */
+    @TableField("Sbzl")
+    private String Sbzl;
+
 }

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

@@ -57,6 +57,11 @@ public class TEquipmentCheckMain implements Serializable {
     @TableField("Tag")
     private String Tag;
 
+    /**
+     * 点检人
+     */
+    @TableField("Djr")
+    private String Djr;
 
 
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.time.LocalDateTime;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -54,5 +56,11 @@ public class TMineStope implements Serializable {
     @TableField("IsUsing")
     private Boolean IsUsing;
 
+    /**
+     * 添加日期
+     */
+    @TableField("AddDate")
+    private LocalDateTime AddDate;
+
 
 }

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

@@ -64,16 +64,16 @@ public class TSampleList implements Serializable {
     private String HolesID;
 
     /**
-     * 从
+     * 选择品位化验项，可以多选
      */
     @TableField("Start")
     private String Start;
 
     /**
-     * 至
+     * 样品袋数
      */
     @TableField("EndTo")
-    private String EndTo;
+    private Integer EndTo;
 
     /**
      * 送样人

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

@@ -61,6 +61,18 @@ public class TSysUser implements Serializable {
     @TableField("DeptID")
     private String DeptID;
 
+    /**
+     * 所属工序
+     */
+    @TableField("ProcessesName")
+    private String ProcessesName;
+
+    /**
+     * 职务
+     */
+    @TableField("Duty")
+    private String Duty;
+
     /**
      * 描述信息
      */

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

@@ -32,18 +32,36 @@ public class TWeight implements Serializable {
     @TableId("ID")
     private String ID;
 
+    /**
+     * 矿车编号
+     */
+    @TableField("TruckID")
+    private String TruckID;
+
+    /**
+     * 矿车名称
+     */
+    @TableField("TruckName")
+    private String TruckName;
+
     /**
      * 日期 日期=日期+时间
      */
     @TableField("Rq")
     private LocalDateTime Rq;
 
+    /**
+     * 毛重时间
+     */
+    @TableField("Mzsj")
+    private LocalDateTime Mzsj;
 
     /**
-     * 矿车编号
+     * 皮重时间
      */
-    @TableField("TruckID")
-    private String TruckID;
+    @TableField("Pzsj")
+    private LocalDateTime Pzsj;
+
 
     /**
      * 总毛重
@@ -63,25 +81,6 @@ public class TWeight implements Serializable {
     @TableField("Jz")
     private Float Jz;
 
-    /**
-     * 日期标记,如:2021年01月
-     */
-    @TableField("Tag")
-    private String Tag;
-
-
-    /**
-     * 毛重时间
-     */
-    @TableField("Mzsj")
-    private LocalDateTime Mzsj;
-
-    /**
-     * 皮重时间
-     */
-    @TableField("Pzsj")
-    private LocalDateTime Pzsj;
-
     /**
      * 操作员
      */
@@ -135,4 +134,34 @@ public class TWeight implements Serializable {
      */
     @TableField("Xh")
     private String Xh;
+
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @TableField("Tag")
+    private String Tag;
+
+    /**
+     * 车数
+     */
+    @TableField("Cs")
+    private Integer Cs;
+
+    /**
+     * 手工1 自动0
+     */
+    @TableField("Flag")
+    private Integer Flag;
+
+
+
+
+
+
+
+
+
+
+
 }

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

+package cn.wise.sc.acquisition.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-06-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Weight_RockTime")
+public class TWeightRocktime implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * Uid号
+     */
+      @TableId("Uid")
+    private String Uid;
+
+    /**
+     * 日期，不包含时分秒
+     */
+    @TableField("Date")
+    private LocalDateTime Date;
+
+    /**
+     * 拉岩石的开始时间
+     */
+    @TableField("FromTime")
+    private LocalDateTime FromTime;
+
+    /**
+     * 拉岩石的结束时间
+     */
+    @TableField("ToTime")
+    private LocalDateTime ToTime;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @TableField("Tag")
+    private String Tag;
+
+
+}

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

@@ -2,8 +2,10 @@ package cn.wise.sc.acquisition.business.mapper;
 
 import cn.wise.sc.acquisition.business.entity.TMineStope;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,4 +18,6 @@ import java.util.List;
 public interface TMineStopeMapper extends BaseMapper<TMineStope> {
 
     List<TMineStope> getStopeName();
+
+    List<TMineStope> getStopeNewList(@Param("designDate") String designDate);
 }

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

 package cn.wise.sc.acquisition.business.mapper;
 
+import cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet;
 import cn.wise.sc.acquisition.business.entity.TWeight;
+import cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo;
+import cn.wise.sc.acquisition.business.model.vo.TWeightCountVo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 /**
  * <p>
  *  Mapper 接口
@@ -17,4 +24,5 @@ public interface TWeightMapper extends BaseMapper<TWeight> {
 
     Double getSumByCondition(@Param("condition") String condition, @Param("ew") QueryWrapper<TWeight> queryWrapper);
 
+    IPage<TWeightCountVo> getWeightCount(@Param("page") Page page, @Param("params") Map<String, Object> params);
 }

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

+package cn.wise.sc.acquisition.business.mapper;
+
+import cn.wise.sc.acquisition.business.entity.TWeightRocktime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-06-26
+ */
+public interface TWeightRocktimeMapper extends BaseMapper<TWeightRocktime> {
+
+}

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

@@ -13,12 +13,17 @@
 
     <sql id="where">
         <where>
+            and tea.Zsb = 1
             <if test="params.Txr != null and params.Txr != ''">
                 and ter.Txr = #{params.Txr}
             </if>
             <if test="params.EquipmentName != null and params.EquipmentName != ''">
                 and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
             </if>
+            <if test="params.ProcessesName != null and params.ProcessesName != ''">
+                and tea.ProcessesName = #{params.ProcessesName}
+            </if>
+
         </where>
     </sql>
 </mapper>

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

@@ -18,6 +18,9 @@
             <if test="params.EquipmentName != null and params.EquipmentName != ''">
                 and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
             </if>
+            <if test="params.ProcessesName != null and params.ProcessesName != ''">
+                and tea.ProcessesName = #{params.ProcessesName}
+            </if>
         </where>
     </sql>
 </mapper>

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

@@ -4,4 +4,25 @@
     <select id="getStopeName" resultType="cn.wise.sc.acquisition.business.entity.TMineStope">
         select StopeName,StepName,BlastAreaName from T_Mine_Stope
     </select>
+
+
+    <select id="getStopeNewList" resultType="cn.wise.sc.acquisition.business.entity.TMineStope">
+        select Uid,StopeName,StepName,BlastAreaName,IsUsing,AddDate FROM T_Mine_Stope a
+        where Isusing =1 and 
+                not exists (
+                select StopeName , StepName , BlastAreaName  from T_Processes_BlastDesign_Hole b
+                where (a.StopeName=b.StopeName and a.StepName=b.StepName and a.BlastAreaName=b.BlastAreaName)
+                <if test="designDate != null and designDate != ''">
+                    and Convert(varchar(100),DesignDate,23) <![CDATA[ <> ]]> #{designDate}
+                </if>
+                group by  StopeName, StepName, BlastAreaName
+                ) 
+        order by AddDate desc
+    </select>
+
+
+
+
+
+
 </mapper>

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

@@ -13,4 +13,31 @@
         </where>
     </select>
 
+
+    <select id="getWeightCount" resultType="cn.wise.sc.acquisition.business.model.vo.TWeightCountVo">
+        SELECT CONVERT(varchar(100), Rq, 23) AS Rq, TruckID, TruckName,
+        SUM(Mz)/1000 AS Zmz, SUM(Pz)/1000 AS Zpz, SUM(Jz)/1000 AS Zjz, SUM(Cs) AS Zcs,
+        SUM( CASE  when Kslx ='黏土' THEN Mz ELSE 0 END)/1000 as Ntmz ,
+        SUM( CASE  when Kslx ='黏土' THEN Pz ELSE 0 END)/1000 as Ntpz ,
+        SUM( CASE  when Kslx ='黏土' THEN Jz ELSE 0 END)/1000 as Ntjz ,
+        SUM( CASE  when Kslx ='黏土' THEN Cs ELSE 0 END) as Ntcs ,
+        SUM( CASE  when Kslx ='矿石' THEN Mz ELSE 0 END)/1000 as Ksmz ,
+        SUM( CASE  when Kslx ='矿石' THEN Pz ELSE 0 END)/1000 as Kspz ,
+        SUM( CASE  when Kslx ='矿石' THEN Jz ELSE 0 END)/1000 as Ksjz ,
+        SUM( CASE  when Kslx ='矿石' THEN Cs ELSE 0 END) as Kscs
+        FROM  V_WeightRock
+        where Jz > 0
+        <if test="params.TruckID != null and params.TruckID != ''">
+            and TruckID like concat('%', #{params.TruckID}, '%')
+        </if>
+        <if test="params.startDate != null and params.startDate != ''">
+            and Rq >= #{params.startDate}
+        </if>
+        <if test="params.endDate != null and params.endDate != ''">
+            and Rq &lt; #{params.endDate}
+        </if>
+        GROUP BY CONVERT(varchar(100), Rq, 23), TruckID, TruckName
+    </select>
+
+
 </mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!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.TWeightRocktimeMapper">
+
+</mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TEquipmentAccountQuery.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;
@@ -130,5 +131,19 @@ public class TEquipmentAccountQuery {
     @ApiModelProperty("备注")
     private String bz;
 
+    /**
+     * 是否主设备
+     */
+    @TableField("Zsb")
+    private Boolean Zsb;
+
+    /**
+     * 设备种类
+     */
+    @TableField("Sbzl")
+    private String Sbzl;
+
+
+
 
 }

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

@@ -67,16 +67,16 @@ public class TSampleListQuery  {
     private String HolesID;
 
     /**
-     * 从
+     * 选择品位化验项，可以多选
      */
-    @ApiModelProperty("从")
+    @ApiModelProperty("选择品位化验项，可以多选 例如：CaO,MgO,Al2O3")
     private String Start;
 
     /**
-     * 至
+     * 样品袋数
      */
-    @ApiModelProperty("至")
-    private String EndTo;
+    @ApiModelProperty("样品袋数")
+    private Integer EndTo;
 
     /**
      * 送样人

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

+package cn.wise.sc.acquisition.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-06-26
+ */
+@Data
+@ApiModel("地磅数据统计表")
+public class TWeightCountVo {
+
+
+    @ApiModelProperty("日期")
+    private String Rq;
+
+    @ApiModelProperty("矿车编号")
+    private String TruckID;
+
+    @ApiModelProperty("矿车名称")
+    private String TruckName;
+
+    @ApiModelProperty("总毛重")
+    private String Zmz;
+
+    @ApiModelProperty("总皮重")
+    private String Zpz;
+
+    @ApiModelProperty("总净重")
+    private String Zjz;
+
+
+    @ApiModelProperty("总车数")
+    private String Zcs;
+
+    @ApiModelProperty("粘土毛重")
+    private String Ntmz;
+
+    @ApiModelProperty("粘土皮重")
+    private String Ntpz;
+
+    @ApiModelProperty("粘土净重")
+    private String Ntjz;
+
+    @ApiModelProperty("粘土车数")
+    private String Ntcs;
+
+    @ApiModelProperty("矿石毛重")
+    private String Ksmz;
+
+    @ApiModelProperty("矿石皮重")
+    private String Kspz;
+
+    @ApiModelProperty("矿石净重")
+    private String Ksjz;
+
+    @ApiModelProperty("矿石车数")
+    private String Kscs;
+}

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

@@ -25,10 +25,11 @@ public class TWeightVo {
      */
     @ApiModelProperty("Uid")
     private String Uid;
+
     /**
      * 日期 日期=日期+时间
      */
-    @ApiModelProperty("Rq")
+    @ApiModelProperty("日期 日期=日期+时间")
     private LocalDateTime Rq;
 
 
@@ -36,97 +37,97 @@ public class TWeightVo {
     /**
      * 矿车编号
      */
-    @ApiModelProperty("TruckID")
+    @ApiModelProperty("矿车编号")
     private String TruckID;
 
     /**
      * 总毛重
      */
-    @ApiModelProperty("Mz")
+    @ApiModelProperty("总毛重")
     private Float Mz;
 
     /**
      * 总皮重
      */
-    @ApiModelProperty("Pz")
+    @ApiModelProperty("总皮重")
     private Float Pz;
 
     /**
      * 总净重
      */
-    @ApiModelProperty("Jz")
+    @ApiModelProperty("总净重")
     private Float Jz;
 
     /**
      * 日期标记,如:2021年01月
      */
-    @ApiModelProperty("Tag")
+    @ApiModelProperty("日期标记,如:2021年01月")
     private String Tag;
 
 
     /**
      * 毛重时间
      */
-    @ApiModelProperty("Mzsj")
+    @ApiModelProperty("毛重时间")
     private LocalDateTime Mzsj;
 
     /**
      * 皮重时间
      */
-    @ApiModelProperty("Pzsj")
+    @ApiModelProperty("皮重时间")
     private LocalDateTime Pzsj;
 
     /**
      * 操作员
      */
-    @ApiModelProperty("Czy")
+    @ApiModelProperty("操作员")
     private String Czy;
 
     /**
      * 台号
      */
-    @ApiModelProperty("Th")
+    @ApiModelProperty("台号")
     private String Th;
 
     /**
      * 出入类型
      */
-    @ApiModelProperty("Crlx")
+    @ApiModelProperty("出入类型")
     private String Crlx;
 
     /**
      * 备用2
      */
-    @ApiModelProperty("BeiY")
+    @ApiModelProperty("备用2")
     private String BeiY;
 
     /**
      * 收货
      */
-    @ApiModelProperty("Sh")
+    @ApiModelProperty("收货")
     private String Sh;
 
     /**
      * 发货
      */
-    @ApiModelProperty("Fh")
+    @ApiModelProperty("发货")
     private String Fh;
 
     /**
      * 货名
      */
-    @ApiModelProperty("Hm")
+    @ApiModelProperty("货名")
     private String Hm;
 
     /**
      * 车号
      */
-    @ApiModelProperty("Ch")
+    @ApiModelProperty("车号")
     private String Ch;
 
     /**
      * 序号
      */
-    @ApiModelProperty("Xh")
+    @ApiModelProperty("序号")
     private String Xh;
 }

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

@@ -23,4 +23,7 @@ public interface ITMineStopeService extends IService<TMineStope> {
     R getByQuery(TMineStopeQuery query);
 
     R getStopeName();
+
+    R getStopeNewList(String designDate);
+
 }

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

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.sc.acquisition.business.entity.TWeightRocktime;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-06-26
+ */
+public interface ITWeightRocktimeService extends IService<TWeightRocktime> {
+
+}

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

 package cn.wise.sc.acquisition.business.service;
 
 import cn.wise.sc.acquisition.business.entity.TWeight;
+import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TWeightQuery;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -18,4 +19,8 @@ public interface ITWeightService extends IService<TWeight> {
     R getByQuery(TWeightQuery query);
 
     R getSumJz(TWeightQuery query);
+
+    R getWeightCount(PageQuery pageQuery,
+                     String TruckID, String startDate, String endDate);
+
 }

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

@@ -3,18 +3,22 @@ package cn.wise.sc.acquisition.business.service.impl;
 import cn.wise.im.common.http.R;
 import cn.wise.im.common.http.ResponseEnum;
 import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
 import cn.wise.sc.acquisition.business.entity.TEquipmentCheckContent;
 import cn.wise.sc.acquisition.business.entity.TEquipmentCheckDetail;
 import cn.wise.sc.acquisition.business.entity.TEquipmentCheckMain;
+import cn.wise.sc.acquisition.business.mapper.TEquipmentAccountMapper;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckContentMapper;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckDetailMapper;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckMapper;
+import cn.wise.sc.acquisition.business.model.LoginUser;
 import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckDetailQuery;
 import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckMainQuery;
 import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo;
 import cn.wise.sc.acquisition.business.service.ITEquipmentCheckService;
 import cn.wise.sc.acquisition.business.service.ITSysDictService;
+import cn.wise.sc.acquisition.business.service.ITSysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -50,6 +54,10 @@ public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMappe
 	private TEquipmentCheckDetailMapper equipmentCheckDetailMapper;
 	@Autowired
 	private ITSysDictService itSysDictService;
+	@Resource
+	private TEquipmentAccountMapper equipmentAccountMapper;
+	@Autowired
+	private ITSysUserService userService;
 
 	/**
 	 * 新增修改-设备点检主表&设备点检详情表
@@ -77,8 +85,12 @@ public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMappe
 		}
 
 		//根据设备id查找点检内容表信息，插入点检详情表
+		TEquipmentAccount equipmentAccount = equipmentAccountMapper.selectById(checkMain.getEquipmentID());
+		if(equipmentAccount == null){
+			return R.fail(ResponseEnum.FAIL, "设备信息不存在");
+		}
 		QueryWrapper<TEquipmentCheckContent> contentWrapper = new QueryWrapper<>();
-		contentWrapper.eq("EquipmentID", checkMain.getEquipmentID());
+		contentWrapper.eq("Sbzl", equipmentAccount.getSbzl());
 		List<TEquipmentCheckContent> checkContentList = equipmentCheckContentMapper.selectList(contentWrapper);
 		if(checkContentList != null && checkContentList.size()>0){
 			for(TEquipmentCheckContent content : checkContentList){

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

@@ -7,11 +7,15 @@ import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
 import cn.wise.sc.acquisition.business.entity.TEquipmentRun;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentAccountMapper;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentRunMapper;
+import cn.wise.sc.acquisition.business.model.LoginUser;
 import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TEquipmentRunQuery;
 import cn.wise.sc.acquisition.business.model.vo.TEquipmentRunVo;
 import cn.wise.sc.acquisition.business.service.ITEquipmentRunService;
 import cn.wise.sc.acquisition.business.service.ITSysDictService;
+import cn.wise.sc.acquisition.business.service.ITSysUserLoginService;
+import cn.wise.sc.acquisition.business.service.ITSysUserService;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -46,6 +50,8 @@ public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, T
 
     @Autowired
     private ITSysDictService itSysDictService;
+    @Autowired
+    private ITSysUserService userService;
 
     /**
      * 设备运行分页
@@ -56,8 +62,17 @@ public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, T
      */
     @Override
     public R<IPage<TEquipmentRunVo>> getPage(PageQuery pageQuery, String EquipmentName) {
+        //设置当前登录人（穿孔的制表人）
+        cn.wise.im.common.http.R str = userService.getLoginUser();
+        if (str.getCode() == 0) {
+            return R.fail(ResponseEnum.USER_NOT_FOUND, "用户未登录");
+        }
+        LoginUser loginUser = (LoginUser) str.getData();
         Map<String, Object> params = new HashMap<>();
         params.put("EquipmentName", EquipmentName);
+        if(loginUser != null && !loginUser.getProcessesName().equals("管理")){
+            params.put("ProcessesName", loginUser.getProcessesName());
+        }
         Page<TEquipmentRunVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
         IPage<TEquipmentRunVo> pages = equipmentRunMapper.getPage(page, params);
         return R.ok(pages);

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

 package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.im.common.http.R;
+import cn.wise.im.common.http.ResponseEnum;
 import cn.wise.sc.acquisition.business.constant.Rcode;
 import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
 import cn.wise.sc.acquisition.business.entity.TEquipmentTrouble;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentAccountMapper;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentTroubleMapper;
+import cn.wise.sc.acquisition.business.model.LoginUser;
 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 cn.wise.sc.acquisition.business.service.ITSysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -41,7 +44,8 @@ public class TEquipmentTroubleServiceImpl extends ServiceImpl<TEquipmentTroubleM
 	private TEquipmentAccountMapper equipmentAccountMapper;
 	@Autowired
 	private ITSysDictService itSysDictService;
-
+	@Autowired
+	private ITSysUserService userService;
 	/**
 	 * 设备隐患分页
 	 * @param pageQuery
@@ -50,8 +54,17 @@ public class TEquipmentTroubleServiceImpl extends ServiceImpl<TEquipmentTroubleM
 	 */
 	@Override
 	public R<IPage<TEquipmentTroubleVo>> getPage(PageQuery pageQuery, String EquipmentName) {
+		//设置当前登录人（穿孔的制表人）
+		cn.wise.im.common.http.R str = userService.getLoginUser();
+		if (str.getCode() == 0) {
+			return R.fail(ResponseEnum.USER_NOT_FOUND, "用户未登录");
+		}
+		LoginUser loginUser = (LoginUser) str.getData();
 		Map<String, Object> params = new HashMap<>();
 		params.put("EquipmentName", EquipmentName);
+		if(loginUser != null && !loginUser.getProcessesName().equals("管理")){
+			params.put("ProcessesName", loginUser.getProcessesName());
+		}
 		Page<TEquipmentTroubleVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
 		IPage<TEquipmentTroubleVo> pages = equipmentTroubleMapper.getPage(page, params);
 		return R.ok(pages);

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

@@ -8,12 +8,14 @@ import cn.wise.sc.acquisition.business.entity.TProcessesAuxiliary;
 import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper;
+import cn.wise.sc.acquisition.business.model.LoginUser;
 import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesAuxiliaryQuery;
 import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
 import cn.wise.sc.acquisition.business.service.ITProcessesAuxiliaryService;
 import cn.wise.sc.acquisition.business.service.ITSysDictService;
+import cn.wise.sc.acquisition.business.service.ITSysUserService;
 import cn.wise.sc.acquisition.business.util.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -32,9 +34,7 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -56,9 +56,8 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
     private ITSysDictService itSysDictService;
     @Autowired
     private ITProcessesAuxiliaryService itProcessesAuxiliaryService;
-
-
-
+    @Autowired
+    private ITSysUserService userService;
 
     /**
      * 分页列表
@@ -68,7 +67,17 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
      */
     @Override
     public R<IPage<TMaterialOut>> getPage(PageQuery pageQuery) {
+        //设置当前登录人（穿孔的制表人）
+        cn.wise.im.common.http.R str = userService.getLoginUser();
+        if (str.getCode() == 0) {
+            return R.fail(ResponseEnum.USER_NOT_FOUND, "用户未登录");
+        }
+        LoginUser loginUser = (LoginUser) str.getData();
+
         QueryWrapper<TMaterialOut> qw = new QueryWrapper<>();
+        if(loginUser != null && !loginUser.getProcessesName().equals("管理")){
+            qw.eq("ProcessesName", loginUser.getProcessesName());
+        }
         qw.orderByDesc("Tag");
         IPage<TMaterialOut> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
         page = materialOutMapper.selectPage(page, qw);

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

@@ -87,4 +87,11 @@ public class TMineStopeServiceImpl extends ServiceImpl<TMineStopeMapper, TMineSt
         return R.ok(stopeName);
     }
 
+    @Override
+    public R getStopeNewList(String designDate) {
+        List<TMineStope> stopeName = baseMapper.getStopeNewList(designDate);
+        return R.ok(stopeName);
+    }
+
+
 }

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

@@ -132,7 +132,8 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         //继续判断参数
         Rcode.NOT_PARAM.assertNotEmpty(query.getHolesID());
         Rcode.NOT_PARAM.assertNotEmpty(query.getStart());
-        Rcode.NOT_PARAM.assertNotEmpty(query.getEndTo());
+//        Rcode.NOT_PARAM.assertNotEmpty(query.getEndTo());
+
         //Rcode.NOT_PARAM.assertNotEmpty(query.getRecordName());
         Rcode.NOT_PARAM.assertNotEmpty(query.getBz());
         Rcode.NOT_PARAM.assertNotEmpty(query.getSyr());

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

@@ -81,8 +81,8 @@ public class TSysDictServiceImpl extends ServiceImpl<TSysDictMapper, TSysDict> i
         String format = "yyyy年MM月";
         if (dayOfMonth >= tagDate) {
             //下一个月
-            now.plusMonths(1);
-            return R.ok(DateUtil.timeToStr(now, format));
+            LocalDateTime nowNext = now.plusMonths(1);
+            return R.ok(DateUtil.timeToStr(nowNext, format));
         } else {
             //本月
             return R.ok(DateUtil.timeToStr(now, format));

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

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.sc.acquisition.business.entity.TWeightRocktime;
+import cn.wise.sc.acquisition.business.mapper.TWeightRocktimeMapper;
+import cn.wise.sc.acquisition.business.service.ITWeightRocktimeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-06-26
+ */
+@Service
+public class TWeightRocktimeServiceImpl extends ServiceImpl<TWeightRocktimeMapper, TWeightRocktime> implements ITWeightRocktimeService {
+
+}

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

 package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
 import cn.wise.sc.acquisition.business.entity.TWeight;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TWeightMapper;
+import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TWeightQuery;
+import cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo;
+import cn.wise.sc.acquisition.business.model.vo.TWeightCountVo;
 import cn.wise.sc.acquisition.business.service.ITWeightService;
 import cn.wise.sc.acquisition.business.util.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.R;
+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.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  * 服务实现类
@@ -27,6 +37,9 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class TWeightServiceImpl extends ServiceImpl<TWeightMapper, TWeight> implements ITWeightService {
 
+    @Resource
+    private TWeightMapper weightMapper;
+
 
     @Override
     public R getByQuery(TWeightQuery query) {
@@ -51,5 +64,29 @@ public class TWeightServiceImpl extends ServiceImpl<TWeightMapper, TWeight> impl
         return R.ok(depthSum);
     }
 
+    /**
+     * 地磅数据统计
+     * @param pageQuery
+     * @param TruckID
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @Override
+    public R getWeightCount(PageQuery pageQuery,
+                                   String TruckID, String startDate, String endDate) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("TruckID", TruckID);
+        params.put("startDate", startDate);
+        params.put("endDate", endDate);
+        Page<TWeightCountVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+        IPage<TWeightCountVo> pages = weightMapper.getWeightCount(page, params);
+
+        return R.ok(pages);
+    }
+
+
+
+
 
 }

mybatis-generator/src/main/java/cn/wise/sc/acquisition/mg/GeneratorApplication.java

@@ -51,13 +51,19 @@ public class GeneratorApplication {
 		dsc.setDriverName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
 		dsc.setUsername("sa");
 		dsc.setPassword("admin!@#123");
+
+//		dsc.setUrl("jdbc:sqlserver://192.168.10.16:1433;DatabaseName=CementMine");
+//		dsc.setDriverName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
+//		dsc.setUsername("sa");
+//		dsc.setPassword("fupingc@556");
+
 		mpg.setDataSource(dsc);
 
 		// 全局配置
 		GlobalConfig gc = new GlobalConfig();
 		String projectPath = System.getProperty("user.dir");
 		gc.setOutputDir(projectPath + "\\acquisition-business\\src\\main\\java");
-		gc.setAuthor("renchao");
+		gc.setAuthor("ztw");
 		gc.setOpen(false);
 		// gc.setSwagger2(true); 实体属性 Swagger2 注解
 		mpg.setGlobalConfig(gc);