物资消耗，广告通知模块代码编写

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

+package cn.wise.sc.acquisition.business.controller;
+
+
+import cn.wise.sc.acquisition.business.model.query.TAnnouncementQuery;
+import cn.wise.sc.acquisition.business.service.ITAnnouncementService;
+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;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-05-06
+ */
+@RestController
+@RequestMapping("/business/t-announcement")
+@Api(tags = "广告通知接口")
+public class TAnnouncementController {
+
+    @Autowired
+    private ITAnnouncementService itAnnouncementService;
+
+    /**
+     * 根据条件查询送验单 分页
+     *
+     * @return
+     */
+    @ApiOperation(value = "获取送验单列表 可分页模糊查询")
+    @RequestMapping(value = "/getPage", method = RequestMethod.GET)
+    public R getPage(Query query ) {
+        TAnnouncementQuery param = new TAnnouncementQuery();
+        return itAnnouncementService.getPage(param, query);
+    }
+
+
+    /**
+     * 根据条件查询送验单 分页
+     *
+     * @return
+     */
+    @ApiOperation(value = "获取送验单列表 可分页模糊查询")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "uid", value = "uid", paramType = "query", dataType = "String")
+    })
+    @RequestMapping(value = "/getByUid", method = RequestMethod.GET)
+    public R getByUid(String uid) {
+        TAnnouncementQuery param = new TAnnouncementQuery();
+        param.setUid(uid);
+        return itAnnouncementService.getByUid(param);
+    }
+
+}
+

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

@@ -7,17 +7,19 @@ import cn.wise.sc.acquisition.business.model.query.TEquipmentAccountQuery;
 import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
 import cn.wise.sc.acquisition.business.service.ITEquipmentAccountService;
 import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
+import cn.wise.sc.acquisition.business.util.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author renchao
@@ -29,39 +31,51 @@ import org.springframework.web.bind.annotation.*;
 @Validated
 public class TMaterialOutController {
 
-	@Autowired
-	private ITMaterialOutService materialOutService;
-
-
-	@ApiOperation(value = "出库分页列表")
-	@GetMapping("/getPage")
-	public R getPage(PageQuery pageQuery) {
-		return materialOutService.getPage(pageQuery);
-	}
-
-	@ApiOperation(value = "领用出库")
-	@PostMapping("/delivery")
-	public R delivery(@RequestBody TMaterialOutQuery query) {
-		return materialOutService.delivery(query);
-	}
-
-
-	@ApiOperation(value = "修改领用出库")
-	@PostMapping("/update")
-	public R update(@RequestBody TMaterialOutQuery query) {
-		return materialOutService.update(query);
-	}
-
-
-	@ApiOperation(value = "领用出库详情")
-	@GetMapping("/getDetail/{Uid}")
-	public R getDetail(@PathVariable String Uid) {
-		return materialOutService.getDetail(Uid);
-	}
-
-
-
-
+    @Autowired
+    private ITMaterialOutService materialOutService;
+
+
+    @ApiOperation(value = "出库分页列表")
+    @GetMapping("/getPage")
+    public R getPage(PageQuery pageQuery) {
+        return materialOutService.getPage(pageQuery);
+    }
+
+    @ApiOperation(value = "领用出库")
+    @PostMapping("/delivery")
+    public R delivery(@RequestBody TMaterialOutQuery query) {
+        return materialOutService.delivery(query);
+    }
+
+
+    @ApiOperation(value = "修改领用出库")
+    @PostMapping("/update")
+    public R update(@RequestBody TMaterialOutQuery query) {
+        return materialOutService.update(query);
+    }
+
+
+    @ApiOperation(value = "领用出库详情")
+    @GetMapping("/getDetail/{Uid}")
+    public R getDetail(@PathVariable String Uid) {
+        return materialOutService.getDetail(Uid);
+    }
+
+
+    @ApiOperation(value = "根据条件查询物资消耗 可分页模糊查询")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "processesName", value = "工序名称", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "consumeDate", value = "消耗日期", paramType = "query", dataType = "String")
+    })
+    @GetMapping("/getConsumePage")
+    public R getConsumePage(PageQuery pageQuery, String processesName, String consumeDate) {
+        TMaterialOutQuery tMaterialOutQuery = new TMaterialOutQuery();
+        tMaterialOutQuery.setProcessesName(processesName);
+        if (StringUtils.isNotBlank(consumeDate)) {
+            tMaterialOutQuery.setConsumeDate(DateUtil.strToTime(consumeDate));
+        }
+        return materialOutService.getConsumePage(tMaterialOutQuery, pageQuery);
+    }
 
 
 }

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

@@ -40,13 +40,13 @@ public class TProcessesBlastController {
      */
     @ApiOperation(value = "根据条件查询爆破工序 可分页模糊查询")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "BlastDate", value = "搜索关键字,爆破时间", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "blastDate", value = "搜索关键字,爆破时间", paramType = "query", dataType = "String")
     })
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
-    public R getPage(Query query, String BlastDate) {
+    public R getPage(Query query, String blastDate) {
         TProcessesBlastQuery param = new TProcessesBlastQuery();
-        if (StringUtils.isNotBlank(BlastDate)){
-            param.setBlastDate(DateUtil.strToTime(BlastDate));
+        if (StringUtils.isNotBlank(blastDate)){
+            param.setBlastDate(DateUtil.strToTime(blastDate));
         }
         return itProcessesBlastService.getPage(param, query);
     }

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

@@ -100,12 +100,12 @@ public class TProcessesBlastdesignHoleController {
      */
     @ApiOperation(value = "根据uid查询炮孔设计")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "Uid", value = "uid", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "uid", value = "uid", paramType = "query", dataType = "String")
     })
     @RequestMapping(value = "/getByUid", method = RequestMethod.GET)
-    public R getByUid(String Uid) {
+    public R getByUid(String uid) {
         TProcessesBlastdesignHoleQuery param = new TProcessesBlastdesignHoleQuery();
-        param.setUid(Uid);
+        param.setUid(uid);
         return itProcessesBlastdesignHoleService.getByUid(param);
     }
 }

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

@@ -39,12 +39,12 @@ public class TProcessesCrusherController {
      */
     @ApiOperation(value = "根据条件查询破碎工序 可分页模糊查询")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "EquipmentID", value = "搜索关键字 设备编号", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "equipmentID", value = "搜索关键字 设备编号", paramType = "query", dataType = "String")
     })
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
-    public R getPage(Query query, String EquipmentID) {
+    public R getPage(Query query, String equipmentID) {
         TProcessesCrusherQuery param = new TProcessesCrusherQuery();
-        param.setEquipmentID(EquipmentID);
+        param.setEquipmentID(equipmentID);
         return itProcessesCrusherService.getPage(param, query);
     }
 

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

@@ -40,13 +40,13 @@ public class TProcessesDrillingController {
      */
     @ApiOperation(value = "根据条件查询穿孔工序 可分页模糊查询")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "DrillingDate", value = "搜索关键字,设计日期", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "drillingDate", value = "搜索关键字,设计日期", paramType = "query", dataType = "String")
     })
     @RequestMapping(value = "/getPage", method = RequestMethod.GET)
-    public R getPage(Query query, String DrillingDate) {
+    public R getPage(Query query, String drillingDate) {
         TProcessesDrillingQuery param = new TProcessesDrillingQuery();
-        if (StringUtils.isNotBlank(DrillingDate)){
-            param.setDrillingDate(DateUtil.strToTime(DrillingDate));
+        if (StringUtils.isNotBlank(drillingDate)){
+            param.setDrillingDate(DateUtil.strToTime(drillingDate));
         }
         return itProcessesDrillingService.getPage(param, query);
     }

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

@@ -42,7 +42,7 @@ public class TSampleLaboratorysheetController {
     @ApiOperation(value = "根据样号查看分析结果")
     @RequestMapping(value = "/getByYh", method = RequestMethod.GET)
     @ApiImplicitParam(
-            name = "Yh", value = "样号", required = true, dataType="String"
+            name = "yh", value = "样号", required = true, dataType="String"
     )
     public R getByYh(String yh) {
         TSampleLaboratorysheetQuery param = new TSampleLaboratorysheetQuery();

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TAnnouncement.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 renchao
+ * @since 2021-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Announcement")
+public class TAnnouncement implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("Uid")
+    private String Uid;
+
+    /**
+     * 标题
+     */
+    @TableField("Title")
+    private String Title;
+
+    /**
+     * 通知内容
+     */
+    @TableField("Tznr")
+    private String Tznr;
+
+    /**
+     * 通知录入时间
+     */
+    @TableField("Tzsj")
+    private LocalDateTime Tzsj;
+
+    /**
+     * 通知录入人
+     */
+    @TableField("Tztxr")
+    private String Tztxr;
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java

@@ -8,6 +8,64 @@ import org.apache.commons.lang3.StringUtils;
  */
 public class ProjectEnum {
 
+
+
+    /**
+     * 很多项目都会共用的字段
+     */
+    public enum TMaterialOut {
+
+
+        CONSUME_DATE(1, "ConsumeDate","材料消耗日期");
+
+
+        // 成员变量
+        private int value;
+        private String label;
+        private String explain;
+
+        // 构造方法
+        TMaterialOut(int value, String label, String explain) {
+            this.value = value;
+            this.label = label;
+            this.explain = explain;
+        }
+
+        /**
+         * 根据value,获取label
+         */
+        public static String getLabel(int value) {
+            for (TMaterialOut c : TMaterialOut.values()) {
+                if (c.value == value) {
+                    return c.label;
+                }
+            }
+            return TMaterialOut.CONSUME_DATE.label;
+        }
+
+        /**
+         * 根据label,获取value
+         */
+        public static int getValue(String label) {
+            for (TMaterialOut c : TMaterialOut.values()) {
+                if (StringUtils.equalsIgnoreCase(label, c.label)) {
+                    return c.value;
+                }
+            }
+            return TMaterialOut.CONSUME_DATE.value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+    }
+
+
+
     /**
      * 保存图片类型判断 1.记录形式 2.二维码
      */

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

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

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

 package cn.wise.sc.acquisition.business.mapper;
 
 import cn.wise.sc.acquisition.business.entity.TProcessesCrusher;
+import cn.wise.sc.acquisition.business.model.vo.TProcessesCrusherVo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TProcessesCrusherMapper extends BaseMapper<TProcessesCrusher> {
 
+    Page<TProcessesCrusherVo> getPage(Page<TProcessesCrusher> page, @Param("ew") QueryWrapper<TProcessesCrusher> queryWrapper);
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TAnnouncementMapper.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.TAnnouncementMapper">
+
+</mapper>

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

@@ -2,4 +2,45 @@
 <!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.TProcessesCrusherMapper">
 
+
+    <!-- 表和实体字段对照关系, 类似RestultMap -->
+    <sql id="TProcessesCrusherColumns">
+        a.Uid,
+        a.CrusherStationID,
+        a.CrushDate,
+        a.Manager,
+        a.Supervisor,
+        a.TechDepart,
+        a.Tabulator,
+        a.EquipmentID,
+        a.WorkType,
+        a.WorkTime,
+        a.Wcdw,
+        a.Price,
+        a.TotalMoney,
+        a.Bz,
+        a.Tag
+	</sql>
+
+    <sql id="TWeightColumns">
+        b.Jz,
+	</sql>
+
+
+    <sql id="TProcessesCrusherJoins">
+        left join T_Weight b on a.EquipmentID=b.TruckID
+    </sql>
+
+    <!-- 获取所有getPage列表 -->
+    <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
+        SELECT
+        <include refid="TWeightColumns"/>
+        <include refid="TProcessesCrusherColumns"/>
+        FROM T_Processes_Crusher a
+        <include refid="TProcessesCrusherJoins"/>
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
 </mapper>

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

+package cn.wise.sc.acquisition.business.model.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-05-06
+ */
+@Data
+@ApiModel("广告通知")
+public class TAnnouncementQuery  {
+
+
+    @ApiModelProperty("Uid")
+    private String Uid;
+
+    /**
+     * 标题
+     */
+   @ApiModelProperty("Title")
+    private String Title;
+
+    /**
+     * 通知内容
+     */
+   @ApiModelProperty("Tznr")
+    private String Tznr;
+
+    /**
+     * 通知录入时间
+     */
+   @ApiModelProperty("Tzsj")
+    private LocalDateTime Tzsj;
+
+    /**
+     * 通知录入人
+     */
+   @ApiModelProperty("Tztxr")
+    private String Tztxr;
+
+
+}

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

 package cn.wise.sc.acquisition.business.model.query;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

+package cn.wise.sc.acquisition.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-26
+ */
+@Data
+@ApiModel("地磅称重表")
+public class TWeightQuery {
+
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty("Uid")
+    private String Uid;
+
+    /**
+     * 日期
+     */
+    @ApiModelProperty("Rq")
+    private String Rq;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty("Sj")
+    private String Sj;
+
+    /**
+     * 矿车编号
+     */
+    @ApiModelProperty("TruckID")
+    private String TruckID;
+
+    /**
+     * 总毛重
+     */
+    @ApiModelProperty("Mz")
+    private Float Mz;
+
+    /**
+     * 总皮重
+     */
+    @ApiModelProperty("Pz")
+    private Float Pz;
+
+    /**
+     * 总净重
+     */
+    @ApiModelProperty("Jz")
+    private Float Jz;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @ApiModelProperty("Tag")
+    private String Tag;
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TAnnouncementVo.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 renchao
+ * @since 2021-05-06
+ */
+@Data
+@ApiModel("广告通知")
+public class TAnnouncementVo {
+
+
+    @ApiModelProperty("Uid")
+    private String Uid;
+
+    /**
+     * 标题
+     */
+   @ApiModelProperty("Title")
+    private String Title;
+
+    /**
+     * 通知内容
+     */
+   @ApiModelProperty("Tznr")
+    private String Tznr;
+
+    /**
+     * 通知录入时间
+     */
+   @ApiModelProperty("Tzsj")
+    private LocalDateTime Tzsj;
+
+    /**
+     * 通知录入人
+     */
+   @ApiModelProperty("Tztxr")
+    private String Tztxr;
+
+
+}

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

+package cn.wise.sc.acquisition.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-26
+ */
+@Data
+@ApiModel("地磅称重表")
+public class TWeightVo {
+
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty("Uid")
+    private String Uid;
+
+    /**
+     * 日期
+     */
+    @ApiModelProperty("Rq")
+    private String Rq;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty("Sj")
+    private String Sj;
+
+    /**
+     * 矿车编号
+     */
+    @ApiModelProperty("TruckID")
+    private String TruckID;
+
+    /**
+     * 总毛重
+     */
+    @ApiModelProperty("Mz")
+    private Float Mz;
+
+    /**
+     * 总皮重
+     */
+    @ApiModelProperty("Pz")
+    private Float Pz;
+
+    /**
+     * 总净重
+     */
+    @ApiModelProperty("Jz")
+    private Float Jz;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @ApiModelProperty("Tag")
+    private String Tag;
+
+
+}

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

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.sc.acquisition.business.entity.TAnnouncement;
+import cn.wise.sc.acquisition.business.model.query.TAnnouncementQuery;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-05-06
+ */
+public interface ITAnnouncementService extends IService<TAnnouncement> {
+
+
+    R getPage(TAnnouncementQuery tAnnouncementQuery, Query query);
+
+    R getByUid(TAnnouncementQuery tAnnouncementQuery);
+
+}

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

@@ -25,5 +25,6 @@ public interface ITMaterialOutService extends IService<TMaterialOut> {
 
 	R<TMaterialOut> getDetail(String Uid);
 
+	R<IPage<TMaterialOut>> getConsumePage(TMaterialOutQuery tMaterialOutQuery,PageQuery pageQuery);
 
 }

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.query.TWeightQuery;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -12,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2021-04-26
  */
 public interface ITWeightService extends IService<TWeight> {
-
+    R getByQuery(TWeightQuery query);
 }

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

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TAnnouncement;
+import cn.wise.sc.acquisition.business.mapper.TAnnouncementMapper;
+import cn.wise.sc.acquisition.business.model.query.TAnnouncementQuery;
+import cn.wise.sc.acquisition.business.service.ITAnnouncementService;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-05-06
+ */
+@Service
+@Transactional
+@Slf4j
+public class TAnnouncementServiceImpl extends ServiceImpl<TAnnouncementMapper, TAnnouncement> implements ITAnnouncementService {
+
+    @Override
+    public R getPage(TAnnouncementQuery tAnnouncementQuery, Query query) {
+        log.info(JSON.toJSONString(tAnnouncementQuery));
+        //参数校验
+        //分页
+        Page<TAnnouncement> page = new Page<>(query.getPageNum(), query.getPageSize());
+        //条件封装
+        QueryWrapper<TAnnouncement> queryWrapper = new QueryWrapper<>();
+        //查询
+        Page<TAnnouncement> tSampleListPage = baseMapper.selectPage(page, queryWrapper);
+        return R.ok(tSampleListPage);
+    }
+
+    @Override
+    public R getByUid(TAnnouncementQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
+        //查询
+        TAnnouncement tAnnouncement = baseMapper.selectById(query.getUid());
+        return R.ok(tAnnouncement);
+    }
+}

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

@@ -2,29 +2,24 @@ package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.im.common.http.R;
 import cn.wise.sc.acquisition.business.constant.Rcode;
-import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
 import cn.wise.sc.acquisition.business.entity.TMaterialOut;
-import cn.wise.sc.acquisition.business.entity.TSafeTrouble;
-import cn.wise.sc.acquisition.business.entity.TSafeTroubleImg;
+import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper;
 import cn.wise.sc.acquisition.business.model.PageQuery;
-import cn.wise.sc.acquisition.business.model.query.TEquipmentAccountQuery;
 import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
-import cn.wise.sc.acquisition.business.model.vo.TSafeTroubleVo;
 import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
+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.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -36,6 +31,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Transactional
+@Slf4j
 public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMaterialOut> implements ITMaterialOutService {
 
 	@Resource
@@ -101,4 +97,30 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
 		return R.ok(out);
 	}
 
+
+	/**
+	 * 物资消耗列表查询 分页列表
+	 * @param tMaterialOutQuery
+	 * @return
+	 */
+	@Override
+	public R<IPage<TMaterialOut>> getConsumePage(TMaterialOutQuery tMaterialOutQuery,PageQuery query) {
+		log.info(JSON.toJSONString(tMaterialOutQuery));
+		//参数校验
+		//分页
+		Page<TMaterialOut> page = new Page<>(query.getPageNo(), query.getPageSize());
+		//条件封装
+		QueryWrapper<TMaterialOut> queryWrapper = new QueryWrapper<>();
+		//如果设计时间不为空  条件查询
+		if (tMaterialOutQuery.getConsumeDate() != null) {
+			//前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
+			queryWrapper
+					.ge(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getBeginTimeStr(tMaterialOutQuery.getConsumeDate()))
+					.le(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getEndTimeStr(tMaterialOutQuery.getConsumeDate()));
+		}
+		//查询
+		Page<TMaterialOut> tMaterialOutPage = baseMapper.selectPage(page, queryWrapper);
+		return R.ok(tMaterialOutPage);
+	}
+
 }

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

@@ -5,6 +5,7 @@ import cn.wise.sc.acquisition.business.entity.TProcessesCrusher;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesCrusherMapper;
 import cn.wise.sc.acquisition.business.model.query.TProcessesCrusherQuery;
+import cn.wise.sc.acquisition.business.model.vo.TProcessesCrusherVo;
 import cn.wise.sc.acquisition.business.service.ITProcessesCrusherService;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.alibaba.fastjson.JSON;
@@ -41,7 +42,7 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
         queryWrapper.eq(StringUtils.isNotBlank(tProcessesCrusherQuery.getEquipmentID()),
                 ProjectEnum.TProcessesCrusher.EQUIPMENT_ID.getLabel(),tProcessesCrusherQuery.getEquipmentID());
         //查询
-        Page<TProcessesCrusher> tSampleListPage = baseMapper.selectPage(page, queryWrapper);
+        Page<TProcessesCrusherVo> tSampleListPage = baseMapper.getPage(page, queryWrapper);
         return R.ok(tSampleListPage);
     }
 

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

@@ -2,7 +2,9 @@ package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.sc.acquisition.business.entity.TWeight;
 import cn.wise.sc.acquisition.business.mapper.TWeightMapper;
+import cn.wise.sc.acquisition.business.model.query.TWeightQuery;
 import cn.wise.sc.acquisition.business.service.ITWeightService;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -17,4 +19,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TWeightServiceImpl extends ServiceImpl<TWeightMapper, TWeight> implements ITWeightService {
 
+
+    @Override
+    public R getByQuery(TWeightQuery query) {
+        return null;
+    }
+
+
 }

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TAnnouncementMapper.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.TAnnouncementMapper">
+
+</mapper>

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

@@ -2,4 +2,45 @@
 <!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.TProcessesCrusherMapper">
 
+
+    <!-- 表和实体字段对照关系, 类似RestultMap -->
+    <sql id="TProcessesCrusherColumns">
+        a.Uid,
+        a.CrusherStationID,
+        a.CrushDate,
+        a.Manager,
+        a.Supervisor,
+        a.TechDepart,
+        a.Tabulator,
+        a.EquipmentID,
+        a.WorkType,
+        a.WorkTime,
+        a.Wcdw,
+        a.Price,
+        a.TotalMoney,
+        a.Bz,
+        a.Tag
+	</sql>
+
+    <sql id="TWeightColumns">
+        b.Jz,
+	</sql>
+
+
+    <sql id="TProcessesCrusherJoins">
+        left join T_Weight b on a.EquipmentID=b.TruckID
+    </sql>
+
+    <!-- 获取所有getPage列表 -->
+    <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
+        SELECT
+        <include refid="TWeightColumns"/>
+        <include refid="TProcessesCrusherColumns"/>
+        FROM T_Processes_Crusher a
+        <include refid="TProcessesCrusherJoins"/>
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
 </mapper>