Merge remote-tracking branch 'origin/master'

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

+package cn.wise.sc.acquisition.business.controller;
+
+
+import cn.wise.sc.acquisition.business.model.query.TMineWorkemployeesQuery;
+import cn.wise.sc.acquisition.business.service.ITMineWorkemployeesService;
+import cn.wise.sc.acquisition.business.util.DateUtil;
+import cn.wise.sc.acquisition.business.wrapper.page.Query;
+import com.baomidou.mybatisplus.extension.api.R;
+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.web.bind.annotation.RequestBody;
+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-17
+ */
+@RestController
+@RequestMapping("/business/t-mine-workemployees")
+public class TMineWorkemployeesController {
+
+    @Autowired
+    private ITMineWorkemployeesService itMineWorkemployeesService;
+
+
+    /**
+     * 根据条件查询员工上班统计 分页
+     *
+     * @return
+     */
+    @ApiOperation(value = "根据条件查询员工上班统计 分页")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "gzsj", value = "搜索关键字,上班日期", paramType = "query", dataType = "String")
+    })
+    @RequestMapping(value = "/getPage", method = RequestMethod.GET)
+    public R getPage(Query query, String gzsj) {
+        TMineWorkemployeesQuery param = new TMineWorkemployeesQuery();
+        if (StringUtils.isNotBlank(gzsj)) {
+            param.setGzsj(DateUtil.strToTime(gzsj));
+        }
+        return itMineWorkemployeesService.getPage(param, query);
+    }
+
+    /**
+     * 增加员工上班统计
+     *
+     * @param tMineWorkemployeesQuery
+     * @return
+     */
+    @ApiOperation(value = "增加员工上班统计")
+    @RequestMapping(value = "/insertTMineWorkemployees", method = RequestMethod.POST)
+    public R insertTMineWorkemployees(@RequestBody TMineWorkemployeesQuery tMineWorkemployeesQuery) {
+        return itMineWorkemployeesService.insertTMineWorkemployees(tMineWorkemployeesQuery);
+    }
+
+
+    /**
+     * 根据uid员工上班统计
+     *
+     * @param tMineWorkemployeesQuery
+     * @return
+     */
+    @ApiOperation(value = "根据uid员工上班统计")
+    @RequestMapping(value = "/updateByUid", method = RequestMethod.POST)
+    public R updateByUid(@RequestBody TMineWorkemployeesQuery tMineWorkemployeesQuery) {
+        return itMineWorkemployeesService.updateByUid(tMineWorkemployeesQuery);
+    }
+
+}
+

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

+package cn.wise.sc.acquisition.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_Mine_WorkEmployees")
+public class TMineWorkemployees implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * Uid号
+     */
+      @TableId(value = "Uid", type = IdType.ASSIGN_UUID)
+    private String Uid;
+
+    /**
+     * 穿孔工序上班人数
+     */
+    @TableField("Ckrs")
+    private Integer Ckrs;
+
+    /**
+     * 爆破工序上班人数
+     */
+    @TableField("Bprs")
+    private Integer Bprs;
+
+    /**
+     * 装车工序上班人数
+     */
+    @TableField("Zcrs")
+    private Integer Zcrs;
+
+    /**
+     * 运输上班人数
+     */
+    @TableField("Ysrs")
+    private Integer Ysrs;
+
+    /**
+     * 破碎工序上班人数
+     */
+    @TableField("Psrs")
+    private Integer Psrs;
+
+    /**
+     * 辅助工序上班人数
+     */
+    @TableField("Fzrs")
+    private Integer Fzrs;
+
+    /**
+     * 上班总人数
+     */
+    @TableField("Zrs")
+    private Integer Zrs;
+
+    /**
+     * 上班日期
+     */
+    @TableField("Gzsj")
+    private LocalDateTime Gzsj;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @TableField("Tag")
+    private String Tag;
+
+
+}

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

@@ -311,6 +311,64 @@ public class ProjectEnum {
 
 
 
+    /**
+     * 数据库别名字段 例如select * from TProcessesBlastdesignVolume b,会在queryWrapper中用到
+     */
+    public enum TSysDict {
+
+        ID(0, "ID","ID"),
+
+        SIX(6, "6","id为6的数据");
+
+        // 成员变量
+        private int value;
+        private String label;
+        private String explain;
+
+        // 构造方法
+        TSysDict(int value, String label, String explain) {
+            this.value = value;
+            this.label = label;
+            this.explain = explain;
+        }
+
+        /**
+         * 根据value,获取label
+         */
+        public static String getLabel(int value) {
+            for (TSysDict c : TSysDict.values()) {
+                if (c.value == value) {
+                    return c.label;
+                }
+            }
+            return TSysDict.SIX.label;
+        }
+
+        /**
+         * 根据label,获取value
+         */
+        public static int getValue(String label) {
+            for (TSysDict c : TSysDict.values()) {
+                if (StringUtils.equalsIgnoreCase(label, c.label)) {
+                    return c.value;
+                }
+            }
+            return TSysDict.SIX.value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+
+        public String getexplain() {
+            return explain;
+        }
+    }
+
     /**
      * 数据库别名字段 例如select * from TProcessesBlastdesignVolume b,会在queryWrapper中用到
      */
@@ -870,4 +928,62 @@ public class ProjectEnum {
     }
 
 
+    /**
+     * 员工上班统计表
+     */
+    public enum TMineWorkemployees {
+
+        UID(1, "Uid","uid"),
+
+        GZSJ(2, "Gzsj","上班日期");
+
+        // 成员变量
+        private int value;
+        private String label;
+        private String explain;
+
+        // 构造方法
+        TMineWorkemployees(int value, String label, String explain) {
+            this.value = value;
+            this.label = label;
+            this.explain = explain;
+        }
+
+        /**
+         * 根据value,获取label
+         */
+        public static String getLabel(int value) {
+            for (TMineWorkemployees c : TMineWorkemployees.values()) {
+                if (c.value == value) {
+                    return c.label;
+                }
+            }
+            return TMineWorkemployees.GZSJ.label;
+        }
+
+        /**
+         * 根据label,获取value
+         */
+        public static int getValue(String label) {
+            for (TMineWorkemployees c : TMineWorkemployees.values()) {
+                if (StringUtils.equalsIgnoreCase(label, c.label)) {
+                    return c.value;
+                }
+            }
+            return TMineWorkemployees.GZSJ.value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+
+        public String getexplain() {
+            return explain;
+        }
+    }
+
 }

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

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

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

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

+package cn.wise.sc.acquisition.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-05-17
+ */
+@Data
+@ApiModel("员工上班人数统计表")
+public class TMineWorkemployeesQuery implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * Uid号
+     */
+    @ApiModelProperty("Uid")
+    private String Uid;
+
+    /**
+     * 穿孔工序上班人数
+     */
+    @ApiModelProperty("Ckrs")
+    private Integer Ckrs;
+
+    /**
+     * 爆破工序上班人数
+     */
+    @ApiModelProperty("Bprs")
+    private Integer Bprs;
+
+    /**
+     * 装车工序上班人数
+     */
+    @ApiModelProperty("Zcrs")
+    private Integer Zcrs;
+
+    /**
+     * 运输上班人数
+     */
+    @ApiModelProperty("Ysrs")
+    private Integer Ysrs;
+
+    /**
+     * 破碎工序上班人数
+     */
+    @ApiModelProperty("Psrs")
+    private Integer Psrs;
+
+    /**
+     * 辅助工序上班人数
+     */
+    @ApiModelProperty("Fzrs")
+    private Integer Fzrs;
+
+    /**
+     * 上班总人数
+     */
+    @ApiModelProperty("Zrs")
+    private Integer Zrs;
+
+    /**
+     * 上班日期
+     */
+    @ApiModelProperty("Gzsj")
+    private LocalDateTime Gzsj;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @ApiModelProperty("Tag")
+    private String Tag;
+
+
+}

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

+package cn.wise.sc.acquisition.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-23
+ */
+@Data
+@ApiModel("数据字典")
+public class TSysDictQuery implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty("Name")
+    private String Name;
+
+    /**
+     * 是否使用
+     */
+    @ApiModelProperty("IsUsing")
+    private Boolean IsUsing;
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty("Type")
+    private String Type;
+
+    /**
+     * 排序索引
+     */
+    @ApiModelProperty("TIndex")
+    private Integer TIndex;
+
+    //以下为增加字段
+
+
+}

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

+package cn.wise.sc.acquisition.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-05-17
+ */
+@Data
+@ApiModel("员工上班人数统计表")
+public class TMineWorkemployeesVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * Uid号
+     */
+    @ApiModelProperty("Uid")
+    private String Uid;
+
+    /**
+     * 穿孔工序上班人数
+     */
+    @ApiModelProperty("Ckrs")
+    private Integer Ckrs;
+
+    /**
+     * 爆破工序上班人数
+     */
+    @ApiModelProperty("Bprs")
+    private Integer Bprs;
+
+    /**
+     * 装车工序上班人数
+     */
+    @ApiModelProperty("Zcrs")
+    private Integer Zcrs;
+
+    /**
+     * 运输上班人数
+     */
+    @ApiModelProperty("Ysrs")
+    private Integer Ysrs;
+
+    /**
+     * 破碎工序上班人数
+     */
+    @ApiModelProperty("Psrs")
+    private Integer Psrs;
+
+    /**
+     * 辅助工序上班人数
+     */
+    @ApiModelProperty("Fzrs")
+    private Integer Fzrs;
+
+    /**
+     * 上班总人数
+     */
+    @ApiModelProperty("Zrs")
+    private Integer Zrs;
+
+    /**
+     * 上班日期
+     */
+    @ApiModelProperty("Gzsj")
+    private LocalDateTime Gzsj;
+
+    /**
+     * 日期标记,如:2021年01月
+     */
+    @ApiModelProperty("Tag")
+    private String Tag;
+
+
+}

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

+package cn.wise.sc.acquisition.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-04-23
+ */
+@Data
+@ApiModel("数据字典")
+public class TSysDictVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty("Name")
+    private String Name;
+
+    /**
+     * 是否使用
+     */
+    @ApiModelProperty("IsUsing")
+    private Boolean IsUsing;
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty("Type")
+    private String Type;
+
+    /**
+     * 排序索引
+     */
+    @ApiModelProperty("TIndex")
+    private Integer TIndex;
+
+    //以下为增加字段
+
+
+}

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

+package cn.wise.sc.acquisition.business.service;
+
+import cn.wise.sc.acquisition.business.entity.TMineWorkemployees;
+import cn.wise.sc.acquisition.business.model.query.TMineWorkemployeesQuery;
+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-17
+ */
+public interface ITMineWorkemployeesService extends IService<TMineWorkemployees> {
+
+    R getPage(TMineWorkemployeesQuery tMineWorkemployeesQuery, Query query);
+
+    R getByQuery(TMineWorkemployeesQuery tMineWorkemployeesQuery);
+
+    R insertTMineWorkemployees(TMineWorkemployeesQuery query);
+
+    R updateByUid(TMineWorkemployeesQuery query);
+}

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

 package cn.wise.sc.acquisition.business.service;
 
 import cn.wise.sc.acquisition.business.entity.TSysDict;
+import cn.wise.sc.acquisition.business.model.query.TSysDictQuery;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITSysDictService extends IService<TSysDict> {
 
+    R getTagDate(TSysDictQuery tSysDictQuery);
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRunServiceImpl.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.TEquipmentCheck;
@@ -13,12 +14,14 @@ import cn.wise.sc.acquisition.business.model.query.TEquipmentRunQuery;
 import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo;
 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 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 org.springframework.transaction.annotation.Transactional;
 
@@ -44,8 +47,12 @@ public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, T
     @Resource
     private TEquipmentAccountMapper equipmentAccountMapper;
 
+    @Autowired
+    private ITSysDictService itSysDictService;
+
     /**
      * 设备运行分页
+     *
      * @param pageQuery
      * @param EquipmentName
      * @return
@@ -61,6 +68,7 @@ public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, T
 
     /**
      * 设备运行详情
+     *
      * @param EquipmentID
      * @return
      */
@@ -73,9 +81,9 @@ public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, T
         checkWrapper.eq("EquipmentID", account.getEquipmentID());
         List<TEquipmentRun> runList = equipmentRunMapper.selectList(checkWrapper);
         TEquipmentRun run = null;
-		if(runList != null && runList.size()>0){  //已经点检过的
+        if (runList != null && runList.size() > 0) {  //已经点检过的
             run = runList.get(0);
-		}else{
+        } else {
             run = new TEquipmentRun();
             run.setEquipmentID(account.getEquipmentID()).setEquipmentName(account.getEquipmentName());
         }
@@ -85,6 +93,7 @@ public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, T
 
     /**
      * 保存设备运行结果
+     *
      * @param query
      * @return
      */
@@ -93,19 +102,25 @@ public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, T
         Rcode.NOT_PARAM.assertNotNull(query);
         Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
         Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.fail(ResponseEnum.FAIL, "设备运行中，tag不能修改或者添加");
+        }
         TEquipmentRun run = new TEquipmentRun();
         BeanUtils.copyProperties(query, run);
         //Uid=null新增，Uid！=null 修改
-		if(StringUtils.isNoneBlank(run.getUid())){
+        if (StringUtils.isNoneBlank(run.getUid())) {
             equipmentRunMapper.updateById(run);
-		}else{
+        } else {
+            //设置tag
+            com.baomidou.mybatisplus.extension.api.R r = itSysDictService.getTagDate(null);
+            if (r.getCode() != 0) {
+                return R.fail(ResponseEnum.FAIL, r.getMsg());
+            }
+            run.setTag((String) r.getData());
             equipmentRunMapper.insert(run);
         }
         return R.ok();
     }
 
 
-
-
-
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.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.TMaterialOut;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
@@ -8,6 +9,7 @@ import cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper;
 import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
 import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
+import cn.wise.sc.acquisition.business.service.ITSysDictService;
 import cn.wise.sc.acquisition.business.util.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,6 +43,9 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
     @Resource
     private TMaterialOutMapper materialOutMapper;
 
+    @Autowired
+    private ITSysDictService itSysDictService;
+
     /**
      * 分页列表
      *
@@ -66,8 +72,17 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
         Rcode.NOT_PARAM.assertNotNull(query);
         Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
         Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.fail(ResponseEnum.FAIL, "出库单中->tag标注日期不能添加");
+        }
         TMaterialOut out = new TMaterialOut();
         BeanUtils.copyProperties(query, out);
+        //设置标注日期
+        com.baomidou.mybatisplus.extension.api.R r = itSysDictService.getTagDate(null);
+        if (r.getCode() != 0) {
+            return R.fail(ResponseEnum.FAIL, r.getMsg());
+        }
+        out.setTag((String) r.getData());
         materialOutMapper.insert(out);
         return R.ok();
     }
@@ -83,6 +98,9 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
         Rcode.NOT_PARAM.assertNotNull(query);
         Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
         Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.fail(ResponseEnum.FAIL, "出库单中->tag标注日期不能修改");
+        }
         TMaterialOut out = materialOutMapper.selectById(query.getUid());
         Rcode.NOT_FOUND.assertNotNull(out);
         BeanUtils.copyProperties(query, out);

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

+package cn.wise.sc.acquisition.business.service.impl;
+
+import cn.wise.sc.acquisition.business.constant.Rcode;
+import cn.wise.sc.acquisition.business.entity.TMineWorkemployees;
+import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
+import cn.wise.sc.acquisition.business.mapper.TMineWorkemployeesMapper;
+import cn.wise.sc.acquisition.business.model.query.TMineWorkemployeesQuery;
+import cn.wise.sc.acquisition.business.service.ITMineWorkemployeesService;
+import cn.wise.sc.acquisition.business.service.ITSysDictService;
+import cn.wise.sc.acquisition.business.util.BeanUtilsNewCopy;
+import cn.wise.sc.acquisition.business.util.DateUtil;
+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.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author renchao
+ * @since 2021-05-17
+ */
+@Service
+@Slf4j
+public class TMineWorkemployeesServiceImpl extends ServiceImpl<TMineWorkemployeesMapper, TMineWorkemployees> implements ITMineWorkemployeesService {
+
+    @Autowired
+    private ITSysDictService itSysDictService;
+
+    @Override
+    public R getPage(TMineWorkemployeesQuery tMineWorkemployeesQuery, Query query) {
+        log.info(JSON.toJSONString(tMineWorkemployeesQuery));
+        //参数校验
+        //分页
+        Page<TMineWorkemployees> page = new Page<>(query.getPageNum(), query.getPageSize());
+        //条件封装
+        QueryWrapper<TMineWorkemployees> queryWrapper = new QueryWrapper<>();
+        //如果上班日期不为空 因为涉及到表连接，需要创建字段别名
+        if (tMineWorkemployeesQuery.getGzsj() != null) {
+            //前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
+            queryWrapper
+                    .ge(ProjectEnum.TMineWorkemployees.GZSJ.getLabel(), DateUtil.getBeginTimeStr(tMineWorkemployeesQuery.getGzsj()))
+                    .le(ProjectEnum.TMineWorkemployees.GZSJ.getLabel(), DateUtil.getEndTimeStr(tMineWorkemployeesQuery.getGzsj()));
+        }
+        //查询分页数据
+        Page<TMineWorkemployees> data = baseMapper.selectPage(page, queryWrapper);
+        return R.ok(data);
+    }
+
+
+    @Override
+    public R getByQuery(TMineWorkemployeesQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        //封装
+        QueryWrapper<TMineWorkemployees> queryWrapper = new QueryWrapper<>();
+        if (query.getGzsj() != null) {
+            queryWrapper
+                    .ge(ProjectEnum.TMineWorkemployees.GZSJ.getLabel(), DateUtil.getBeginTime(query.getGzsj()))
+                    .le(ProjectEnum.TMineWorkemployees.GZSJ.getLabel(), DateUtil.getEndTime(query.getGzsj()));
+        }
+        //查询并且返回
+        return R.ok(baseMapper.selectOne(queryWrapper));
+    }
+
+    @Override
+    public R insertTMineWorkemployees(TMineWorkemployeesQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        //uid自动生成 不能手动设置
+        if (query.getUid() != null) {
+            return R.failed("员工上班统计中->uid自动生成 不能手动设置");
+        }
+        //tag不能添加
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.failed("员工上班统计中->tag自动生成不能添加");
+        }
+        //上班总人数不能修改
+        if (query.getZrs() != null) {
+            return R.failed("员工上班统计中->上班总人数自动计算");
+        }
+        //上班日期不能重复
+        if (query.getGzsj() != null) {
+            R r1 = getByQuery(query);
+            if (r1.getData() != null) {
+                return R.failed("员工上班统计中->上班日期已存在");
+            }
+        }
+        //封装
+        TMineWorkemployees tMineWorkemployees = new TMineWorkemployees();
+        BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, tMineWorkemployees);
+        //设置tag
+        R r1 = itSysDictService.getTagDate(null);
+        if (r1.getCode() != 0) {
+            return R.failed(r1.getMsg());
+        }
+        tMineWorkemployees.setTag((String) r1.getData());
+        //计算上班总人数
+        tMineWorkemployees.setZrs(calculateZrs(tMineWorkemployees));
+        //保存
+        int insert = baseMapper.insert(tMineWorkemployees);
+        if (insert > 0) {
+            return R.ok("员工上班统计中->添加成功");
+        } else {
+            log.error("员工上班统计中->添加失败:{}", tMineWorkemployees);
+            return R.failed("员工上班统计中->添加失败");
+        }
+    }
+
+    @Override
+    public R updateByUid(TMineWorkemployeesQuery query) {
+        log.info(JSON.toJSONString(query));
+        //参数校验
+        Rcode.NOT_PARAM.assertNotNull(query);
+        Rcode.NOT_PARAM.assertNotNull(query.getUid());
+        if (query.getGzsj() != null) {
+            R r1 = getByQuery(query);
+            if (r1.getData() != null) return R.failed("员工上班统计中->上班日期已存在，不能修改");
+        }
+        //tag不能添加
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.failed("员工上班统计中->tag自动生成不能修改");
+        }
+        //上班总人数不能修改
+        if (query.getZrs() != null) {
+            return R.failed("员工上班统计中->上班总人数自动计算不能修改");
+        }
+        //封装
+        TMineWorkemployees tMineWorkemployees = new TMineWorkemployees();
+        BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, tMineWorkemployees);
+        //重新计算上班总人数
+        tMineWorkemployees.setZrs(calculateZrs(tMineWorkemployees));
+        QueryWrapper<TMineWorkemployees> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel(), query.getUid());
+        //修改
+        int update = baseMapper.update(tMineWorkemployees, queryWrapper);
+        if (update > 0) {
+            return R.ok("员工上班统计中->修改成功");
+        } else {
+            log.error("员工上班统计中->修改失败：{}", tMineWorkemployees);
+            return R.failed("员工上班统计中->修改失败");
+        }
+    }
+
+    /**
+     * 计算上班总人数 私有方法
+     *
+     * @param tMineWorkemployees
+     * @return
+     */
+    private int calculateZrs(TMineWorkemployees tMineWorkemployees) {
+        int zrs = 0;
+        if (tMineWorkemployees != null) {
+            if (tMineWorkemployees.getBprs() != null) zrs += tMineWorkemployees.getBprs();
+            if (tMineWorkemployees.getCkrs() != null) zrs += tMineWorkemployees.getCkrs();
+            if (tMineWorkemployees.getFzrs() != null) zrs += tMineWorkemployees.getFzrs();
+            if (tMineWorkemployees.getPsrs() != null) zrs += tMineWorkemployees.getPsrs();
+            if (tMineWorkemployees.getZcrs() != null) zrs += tMineWorkemployees.getZcrs();
+            if (tMineWorkemployees.getYsrs() != null) zrs += tMineWorkemployees.getYsrs();
+            return zrs;
+        } else {
+            log.error("员工上班统计中->计算上班总人数时 对象为空");
+            return zrs;
+        }
+    }
+}

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

@@ -6,6 +6,7 @@ import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesAuxiliaryMapper;
 import cn.wise.sc.acquisition.business.model.query.TProcessesAuxiliaryQuery;
 import cn.wise.sc.acquisition.business.service.ITProcessesAuxiliaryService;
+import cn.wise.sc.acquisition.business.service.ITSysDictService;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,6 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -29,6 +31,9 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxiliaryMapper, TProcessesAuxiliary> implements ITProcessesAuxiliaryService {
 
+    @Autowired
+    private ITSysDictService itSysDictService;
+
     @Override
     public R getPage(TProcessesAuxiliaryQuery tProcessesAuxiliaryQuery, Query query) {
         log.info(JSON.toJSONString(tProcessesAuxiliaryQuery));
@@ -65,7 +70,11 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
         //判断数据是否存在
         TProcessesAuxiliary temp = baseMapper.selectById(query.getUid());
         if (temp == null) {
-            return R.failed("数据不存在，uid：" + query.getUid());
+            return R.failed("辅助工序中->数据不存在，uid：" + query.getUid());
+        }
+        //tag不能修改
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.failed("辅助工序中->tag为自动生成字段，不能修改");
         }
         //条件封装
         TProcessesAuxiliary tSampleList = new TProcessesAuxiliary();
@@ -76,10 +85,10 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
         //修改
         int update = baseMapper.update(tSampleList, queryWrapper);
         if (update > 0) {
-            return R.ok("修改成功");
+            return R.ok("辅助工序中->修改成功");
         } else {
-            log.info(JSON.toJSONString(tSampleList));
-            return R.failed("修改失败");
+            log.error("辅助工序中->修改失败:{}",JSON.toJSONString(tSampleList));
+            return R.failed("辅助工序中->修改失败");
         }
 
     }
@@ -91,19 +100,29 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
         Rcode.NOT_PARAM.assertNotNull(query);
         //uid自动生成 不能手动设置
         if (query.getUid() != null) {
-            return R.failed("uid自动生成 不能手动设置");
+            return R.failed("辅助工序中->uid自动生成 不能手动设置");
+        }
+        //tag不能修改
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.failed("辅助工序中->tag为自动生成字段，不能添加");
         }
         //条件封装
         TProcessesAuxiliary tProcessesAuxiliary = new TProcessesAuxiliary();
         BeanUtils.copyProperties(query, tProcessesAuxiliary);
+        //设置tag
+        R r1 = itSysDictService.getTagDate(null);
+        if (r1.getCode() != 0) {
+            return R.failed(r1.getMsg());
+        }
+        tProcessesAuxiliary.setTag((String) r1.getData());
         //增加
         log.info(JSON.toJSONString(tProcessesAuxiliary));
         int insert = baseMapper.insert(tProcessesAuxiliary);
         if (insert > 0) {
-            return R.ok("增加成功");
+            return R.ok("辅助工序中->增加成功");
         } else {
-            log.info(JSON.toJSONString(tProcessesAuxiliary));
-            return R.failed("增加失败");
+            log.error("辅助工序中->增加失败: {}",JSON.toJSONString(tProcessesAuxiliary));
+            return R.failed("辅助工序中->增加失败");
         }
     }
 }

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

@@ -4,15 +4,9 @@ import cn.wise.sc.acquisition.business.constant.Rcode;
 import cn.wise.sc.acquisition.business.entity.TProcessesBlast;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TProcessesBlastMapper;
-import cn.wise.sc.acquisition.business.model.query.TMineStopeQuery;
 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.TProcessesDrillingQuery;
 import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo;
-import cn.wise.sc.acquisition.business.service.ITMineStopeService;
-import cn.wise.sc.acquisition.business.service.ITProcessesBlastService;
-import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
-import cn.wise.sc.acquisition.business.service.ITProcessesDrillingService;
+import cn.wise.sc.acquisition.business.service.*;
 import cn.wise.sc.acquisition.business.util.BeanUtilsNewCopy;
 import cn.wise.sc.acquisition.business.util.DateUtil;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
@@ -48,6 +42,9 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
     @Autowired
     private ITProcessesDrillingService itProcessesDrillingService;
 
+    @Autowired
+    private ITSysDictService itSysDictService;
+
     @Override
     public R getPage(TProcessesBlastQuery tProcessesBlastQuery, Query query) {
         log.info(JSON.toJSONString(tProcessesBlastQuery));
@@ -86,6 +83,10 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
         if (StringUtils.isNotBlank(query.getHoleID())) {
             return R.failed("爆破设计中->请到炮孔设计中修改炮孔编号");
         }
+        //不能修改tag
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.failed("爆破设计中->tag自动计算，不能修改");
+        }
         //条件封装
         BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
         //判断是否需要修改关联的 矿山爆区表
@@ -149,15 +150,25 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
         if (query.getUid() != null) {
             return R.failed("爆破设计中->uid自动生成 不能手动设置");
         }
+        //不能修改tag
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.failed("爆破设计中->tag自动计算，不能添加");
+        }
         //条件封装
         TProcessesBlast tProcessesDrilling = new TProcessesBlast();
         BeanUtils.copyProperties(query, tProcessesDrilling);
+        //设置tag
+        R r1 = itSysDictService.getTagDate(null);
+        if (r1.getCode() != 0) {
+            return R.failed(r1.getMsg());
+        }
+        tProcessesDrilling.setTag((String) r1.getData());
         //增加
         int insert = baseMapper.insert(tProcessesDrilling);
         if (insert > 0) {
             return R.ok("爆破设计中->增加成功");
         } else {
-            log.info(JSON.toJSONString(tProcessesDrilling));
+            log.error("爆破设计中->增加失败:{}",JSON.toJSONString(tProcessesDrilling));
             return R.failed("爆破设计中->增加失败");
         }
     }

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

@@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
 
 
 /**
@@ -94,24 +93,24 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             if (r.getData() != null) {
                 return R.failed("炮孔设计中->炮孔编号已存在: BlastHoleID:" + query.getBlastHoleID());
             }
-            //修改穿孔工序炮孔编号
-            TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
-            tProcessesDrillingQuery.setUid(temp.getUid());
-            tProcessesDrillingQuery.setNewHoleID(query.getBlastHoleID());
-            R r1 = itProcessesDrillingService.updateByUid(tProcessesDrillingQuery);
-            if (r1.getCode() != 0) {
-                log.error("炮孔设计中->修改穿孔工序炮孔编号失败：{}", JSON.toJSONString(tProcessesDrillingQuery));
-                return R.failed(r1.getMsg());
-            }
-            //修改爆破设计炮孔编号
-            TProcessesBlastQuery tProcessesBlastQuery = new TProcessesBlastQuery();
-            tProcessesBlastQuery.setUid(temp.getUid());
-            tProcessesBlastQuery.setNewHoleID(query.getBlastHoleID());
-            R r2 = itProcessesBlastService.updateByUid(tProcessesBlastQuery);
-            if (r2.getCode() != 0) {
-                log.error("炮孔设计中->修改爆破设计炮孔编号失败：{}", JSON.toJSONString(tProcessesBlastQuery));
-                return R.failed(r2.getMsg());
-            }
+//            //修改穿孔工序炮孔编号
+//            TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
+//            tProcessesDrillingQuery.setUid(temp.getUid());
+//            tProcessesDrillingQuery.setNewHoleID(query.getBlastHoleID());
+//            R r1 = itProcessesDrillingService.updateByUid(tProcessesDrillingQuery);
+//            if (r1.getCode() != 0) {
+//                log.error("炮孔设计中->修改穿孔工序炮孔编号失败：{}", JSON.toJSONString(tProcessesDrillingQuery));
+//                return R.failed(r1.getMsg());
+//            }
+//            //修改爆破设计炮孔编号
+//            TProcessesBlastQuery tProcessesBlastQuery = new TProcessesBlastQuery();
+//            tProcessesBlastQuery.setUid(temp.getUid());
+//            tProcessesBlastQuery.setNewHoleID(query.getBlastHoleID());
+//            R r2 = itProcessesBlastService.updateByUid(tProcessesBlastQuery);
+//            if (r2.getCode() != 0) {
+//                log.error("炮孔设计中->修改爆破设计炮孔编号失败：{}", JSON.toJSONString(tProcessesBlastQuery));
+//                return R.failed(r2.getMsg());
+//            }
         }
         //判断是否需要修改关联的 设计爆区爆破量
         if (StringUtils.isNotBlank(query.getStepName())
@@ -279,7 +278,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             //增加一条穿孔工序
             TProcessesDrillingQuery tProcessesDrillingQuery = new TProcessesDrillingQuery();
             tProcessesBlastdesignHole.setUid(hole.getUid());
-            tProcessesDrillingQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
+            //tProcessesDrillingQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r1 = itProcessesDrillingService.insertTProcessesDrilling(tProcessesDrillingQuery);
             if (r1.getCode() != 0) {
                 log.error("炮孔设计中->增加一条穿孔工序失败:" + JSON.toJSONString(tProcessesDrillingQuery));
@@ -289,7 +288,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
             //增加一条爆破工序
             TProcessesBlastQuery tProcessesBlastQuery = new TProcessesBlastQuery();
             tProcessesBlastQuery.setUid(hole.getUid());
-            tProcessesBlastQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
+            //tProcessesBlastQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
             R r2 = itProcessesBlastService.insertTProcessesBlast(tProcessesBlastQuery);
             if (r2.getCode() != 0) {
                 log.error("炮孔设计中->增加一条爆破工序失败:" + JSON.toJSONString(tProcessesDrillingQuery));
@@ -328,7 +327,6 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
         QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.BLAST_HOLE_ID.getLabel(), query.getBlastHoleID());
         //查询并且返回
-        baseMapper.selectOne(queryWrapper);
         return R.ok(baseMapper.selectOne(queryWrapper));
     }
 

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

@@ -54,7 +54,7 @@ public class TProcessesBlastdesignVolumeServiceImpl extends ServiceImpl<TProcess
         //判断数据是否存在
         R volume = getByQuery(query);
         if (volume.getData() == null) {
-            return R.failed("设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
+            return R.failed("设计爆区爆破量表中->设计爆区爆破量表数据不存在，StopeName,StepName,BlastAreaName");
         }
         //条件封装
         TProcessesBlastdesignVolume tProcessesBlastdesignVolume = new TProcessesBlastdesignVolume();
@@ -67,10 +67,10 @@ public class TProcessesBlastdesignVolumeServiceImpl extends ServiceImpl<TProcess
         //修改
         int update = baseMapper.update(tProcessesBlastdesignVolume, queryWrapper);
         if (update > 0) {
-            return R.ok("修改成功");
+            return R.ok("设计爆区爆破量表中->修改成功");
         } else {
-            log.info(JSON.toJSONString(tProcessesBlastdesignVolume));
-            return R.failed("修改失败");
+            log.error("设计爆区爆破量表中->修改失败: {}",JSON.toJSONString(tProcessesBlastdesignVolume));
+            return R.failed("设计爆区爆破量表中->修改失败");
         }
     }
 

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

@@ -7,6 +7,7 @@ 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.service.ITSysDictService;
 import cn.wise.sc.acquisition.business.wrapper.page.Query;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -30,6 +32,8 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherMapper, TProcessesCrusher> implements ITProcessesCrusherService {
 
+    @Autowired
+    private ITSysDictService itSysDictService;
 
     @Override
     public R getPage(TProcessesCrusherQuery tProcessesCrusherQuery, Query query) {
@@ -40,7 +44,7 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
         //条件封装
         QueryWrapper<TProcessesCrusher> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(tProcessesCrusherQuery.getEquipmentID()),
-                ProjectEnum.TProcessesCrusher.EQUIPMENT_ID.getLabel(),tProcessesCrusherQuery.getEquipmentID());
+                ProjectEnum.TProcessesCrusher.EQUIPMENT_ID.getLabel(), tProcessesCrusherQuery.getEquipmentID());
         //查询
         Page<TProcessesCrusherVo> tSampleListPage = baseMapper.getPage(page, queryWrapper);
         return R.ok(tSampleListPage);
@@ -71,21 +75,24 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
         //判断数据是否存在
         TProcessesCrusher temp = baseMapper.selectById(query.getUid());
         if (temp == null) {
-            return R.failed("数据不存在，uid：" + query.getUid());
+            return R.failed("破碎工序中->数据不存在，uid：" + query.getUid());
+        }
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.failed("破碎工序中->标注日期为自动生成，tag不能修改");
         }
         //条件封装
         TProcessesCrusher tSampleList = new TProcessesCrusher();
         BeanUtils.copyProperties(query, tSampleList);
 
         QueryWrapper<TProcessesCrusher> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(query.getUid()),ProjectEnum.TProcessesCrusher.UID.getLabel(), query.getUid());
+        queryWrapper.eq(StringUtils.isNotBlank(query.getUid()), ProjectEnum.TProcessesCrusher.UID.getLabel(), query.getUid());
         //修改
         int update = baseMapper.update(tSampleList, queryWrapper);
         if (update > 0) {
-            return R.ok("修改成功");
+            return R.ok("破碎工序中->修改成功");
         } else {
-            log.info(JSON.toJSONString(tSampleList));
-            return R.failed("修改失败");
+            log.error("破碎工序中->修改失败:{}",JSON.toJSONString(tSampleList));
+            return R.failed("破碎工序中->修改失败");
         }
 
     }
@@ -97,22 +104,30 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
         Rcode.NOT_PARAM.assertNotNull(query);
         //uid自动生成 不能手动设置
         if (query.getUid() != null) {
-            return R.failed("uid自动生成 不能手动设置");
+            return R.failed("破碎工序中->uid自动生成 不能手动设置");
+        }
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.failed("破碎工序中->标注日期为自动生成，tag不能修改");
         }
         //条件封装
         TProcessesCrusher tProcessesCrusher = new TProcessesCrusher();
         BeanUtils.copyProperties(query, tProcessesCrusher);
+        //设置标注日期
+        R r1 = itSysDictService.getTagDate(null);
+        if (r1.getCode() != 0) {
+            return R.failed(r1.getMsg());
+        }
+        tProcessesCrusher.setTag((String) r1.getData());
         //增加
         log.info(JSON.toJSONString(tProcessesCrusher));
         int insert = baseMapper.insert(tProcessesCrusher);
         if (insert > 0) {
-            return R.ok("增加成功");
+            return R.ok("破碎工序中->增加成功");
         } else {
-            log.info(JSON.toJSONString(tProcessesCrusher));
-            return R.failed("增加失败");
+            log.error("破碎工序中->增加失败 : {}",JSON.toJSONString(tProcessesCrusher));
+            return R.failed("破碎工序中->增加失败");
         }
     }
 
 
-
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.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.TProcessesDigging;
@@ -9,6 +10,7 @@ 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.TProcessesDiggingQuery;
 import cn.wise.sc.acquisition.business.service.ITProcessesDiggingService;
+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;
@@ -16,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,32 +45,36 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
     @Resource
     private TProcessesDiggingMapper processesDiggingMapper;
 
+    @Autowired
+    private ITSysDictService itSysDictService;
 
     /**
      * 今日数量统计
+     *
      * @param digDate
      * @return
      */
     @Override
-	public R getTodayData(String digDate){
-		Map<String,Object> map = new HashMap<>();
+    public R getTodayData(String digDate) {
+        Map<String, Object> map = new HashMap<>();
         QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
-		if(StringUtils.isNoneBlank(digDate)){
+        if (StringUtils.isNoneBlank(digDate)) {
             qw.apply("DATE(DigDate) = digDate");
-		}else{
+        } else {
             qw.apply("DATE(DigDate) = DATE(now())");
         }
         List<TProcessesDigging> list = processesDiggingMapper.selectList(qw);
         Float workTimes = list.stream().map(p -> p.getWorkTime()).reduce(Float::sum).get();
         Double workLoads = list.stream().mapToDouble(TProcessesDigging::getWorkload).sum();
-		map.put("workTimes",workTimes);
-		map.put("workLoads",workLoads);
+        map.put("workTimes", workTimes);
+        map.put("workLoads", workLoads);
         return R.ok(map);
 
     }
 
     /**
      * 分页列表
+     *
      * @param pageQuery
      * @param digDate
      * @return
@@ -81,7 +88,7 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
                         "yyyy-MM-dd HH:mm:ss");
                 String startDate = digDate + " 00:00:00";
                 String endDate = digDate + " 23:59:59";
-				qw.between("DigDate",formatter.parse(startDate), formatter.parse(endDate));
+                qw.between("DigDate", formatter.parse(startDate), formatter.parse(endDate));
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -94,23 +101,34 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
 
     /**
      * 新增
+     *
      * @param query
      * @return
      */
     @Override
-	public R save(TProcessesDiggingQuery query){
+    public R save(TProcessesDiggingQuery query) {
         Rcode.NOT_PARAM.assertNotNull(query);
         Rcode.NOT_PARAM.assertNotNull(query.getStopeName());
         Rcode.NOT_PARAM.assertNotNull(query.getStepName());
         Rcode.NOT_PARAM.assertNotNull(query.getBlastAreaName());
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.fail(ResponseEnum.FAIL, "装车工序中->tag不能添加");
+        }
         TProcessesDigging digging = new TProcessesDigging();
         BeanUtils.copyProperties(query, digging);
+        //设置tag
+        com.baomidou.mybatisplus.extension.api.R r = itSysDictService.getTagDate(null);
+        if (r.getCode() != 0) {
+            return R.fail(ResponseEnum.FAIL, r.getMsg());
+        }
+        digging.setTag((String) r.getData());
         processesDiggingMapper.insert(digging);
         return R.ok();
     }
 
     /**
      * 修改
+     *
      * @param query
      * @return
      */
@@ -118,6 +136,9 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
     public R update(TProcessesDiggingQuery query) {
         Rcode.NOT_PARAM.assertNotNull(query);
         Rcode.NOT_PARAM.assertNotNull(query.getUid());
+        if (StringUtils.isNotBlank(query.getTag())) {
+            return R.fail(ResponseEnum.FAIL, "装车工序中->tag不能修改");
+        }
         TProcessesDigging digging = processesDiggingMapper.selectById(query.getUid());
         Rcode.NOT_FOUND.assertNotNull(digging);
         BeanUtils.copyProperties(query, digging);
@@ -127,6 +148,7 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
 
     /**
      * 详情
+     *
      * @param Uid
      * @return
      */
@@ -139,12 +161,4 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
     }
 
 
-
-
-
-
-
-
-
-
 }

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

@@ -38,6 +38,9 @@ import java.time.LocalDateTime;
 public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillingMapper, TProcessesDrilling> implements ITProcessesDrillingService {
 
 
+    @Autowired
+    private ITSysDictService itSysDictService;
+
     @Autowired
     private ITMineStopeService itMineStopeService;
 
@@ -104,16 +107,25 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         log.info(JSON.toJSONString(query));
         //参数校验
         Rcode.NOT_PARAM.assertNotNull(query);
-
+        //tag不能添加
+        if (StringUtils.isNotBlank(query.getTag())){
+            return R.failed("穿孔工序中->tag标注日期自动生成，不能添加");
+        }
         //条件封装
         TProcessesDrilling tProcessesDrilling = new TProcessesDrilling();
         BeanUtils.copyProperties(query, tProcessesDrilling);
+        //设置tag
+        R r1 = itSysDictService.getTagDate(null);
+        if (r1.getCode() != 0) {
+            return R.failed(r1.getMsg());
+        }
+        tProcessesDrilling.setTag((String) r1.getData());
         //增加
         int insert = baseMapper.insert(tProcessesDrilling);
         if (insert > 0) {
             return R.ok("穿孔工序中->增加成功");
         } else {
-            log.info(JSON.toJSONString(tProcessesDrilling));
+            log.error("穿孔工序中->增加失败,{}",JSON.toJSONString(tProcessesDrilling));
             return R.failed("穿孔工序中->增加失败");
         }
     }
@@ -134,6 +146,10 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         if (StringUtils.isNotBlank(query.getHoleID())) {
             return R.failed("穿孔工序中->不能修改炮孔编号");
         }
+        //不能修改tag
+        if (StringUtils.isNotBlank(query.getTag())){
+            return R.failed("穿孔工序中->tag标注日期自动生成，不能修改");
+        }
         //条件封装
         BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
         //判断是否需要修改关联的 矿山爆区表
@@ -215,7 +231,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         if (update > 0) {
             return R.ok("穿孔工序中->修改成功");
         } else {
-            log.info(JSON.toJSONString(temp));
+            log.error("穿孔工序中->修改失败:{}",JSON.toJSONString(temp));
             return R.failed("穿孔工序中->修改失败");
         }
     }
@@ -242,7 +258,7 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
         if (update > 0) {
             return R.ok("穿孔工序中->修改成功");
         } else {
-            log.info(JSON.toJSONString(temp));
+            log.error("穿孔工序中->修改失败:{}",JSON.toJSONString(temp));
             return R.failed("穿孔工序中->修改失败");
         }
     }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.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.TProcessesTruck;
 import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
@@ -8,12 +9,14 @@ import cn.wise.sc.acquisition.business.mapper.TProcessesTruckMapper;
 import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TProcessesTruckQuery;
 import cn.wise.sc.acquisition.business.service.ITProcessesTruckService;
+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;
@@ -37,7 +40,8 @@ public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMappe
 	@Resource
 	private TProcessesTruckMapper processesTruckMapper;
 
-
+	@Autowired
+	private ITSysDictService itSysDictService;
 	/**
 	 * 今日数量统计
 	 * @param deliveryDate
@@ -102,8 +106,16 @@ public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMappe
 		Rcode.NOT_PARAM.assertNotNull(query.getStopeName());
 		Rcode.NOT_PARAM.assertNotNull(query.getStepName());
 		Rcode.NOT_PARAM.assertNotNull(query.getBlastAreaName());
+		if (StringUtils.isNotBlank(query.getTag())){
+			return R.fail(ResponseEnum.FAIL,"运输工序中->tag不能添加");
+		}
 		TProcessesTruck truck = new TProcessesTruck();
 		BeanUtils.copyProperties(query, truck);
+		com.baomidou.mybatisplus.extension.api.R r = itSysDictService.getTagDate(null);
+		if (r.getCode()!=0){
+			return R.fail(ResponseEnum.FAIL,r.getMsg());
+		}
+		truck.setTag((String) r.getData());
 		processesTruckMapper.insert(truck);
 		return R.ok();
 	}
@@ -117,9 +129,13 @@ public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMappe
 	public R update(TProcessesTruckQuery query) {
 		Rcode.NOT_PARAM.assertNotNull(query);
 		Rcode.NOT_PARAM.assertNotNull(query.getUid());
+		if (StringUtils.isNotBlank(query.getTag())){
+			return R.fail(ResponseEnum.FAIL,"运输工序中->tag不能修改");
+		}
 		TProcessesTruck digging = processesTruckMapper.selectById(query.getUid());
 		Rcode.NOT_FOUND.assertNotNull(digging);
 		BeanUtils.copyProperties(query, digging);
+
 		processesTruckMapper.updateById(digging);
 		return R.ok();
 	}

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

@@ -56,17 +56,17 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         //查询数据
         TSampleLaboratorysheet tSampleLaboratorysheet = baseMapper.selectById(query.getYh());
         if (tSampleLaboratorysheet == null) {
-            return R.failed("数据不存在，样号：" + query.getYh());
+            return R.failed("结果分析单中->数据不存在，样号：" + query.getYh());
         }
         //封装
         tSampleLaboratorysheet = new TSampleLaboratorysheet();
         BeanUtils.copyProperties(query, tSampleLaboratorysheet);
         int update = baseMapper.updateById(tSampleLaboratorysheet);
         if (update > 0) {
-            return R.ok("修改成功");
+            return R.ok("结果分析单中->修改成功");
         } else {
-            log.info(JSON.toJSONString(tSampleLaboratorysheet));
-            return R.failed("修改失败");
+            log.error("结果分析单中->修改失败: {}",JSON.toJSONString(tSampleLaboratorysheet));
+            return R.failed("结果分析单中->修改失败");
         }
     }
 
@@ -79,14 +79,14 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         //查询数据
         TSampleLaboratorysheet tSampleLaboratorysheet = baseMapper.selectById(query.getYh());
         if (tSampleLaboratorysheet == null) {
-            return R.failed("数据不存在，样号：" + query.getYh());
+            return R.failed("结果分析单中->数据不存在，样号：" + query.getYh());
         }
         //删除
         int delete = baseMapper.deleteById(query.getYh());
         if (delete > 0) {
-            return R.ok("修改成功");
+            return R.ok("结果分析单中->修改成功");
         } else {
-            return R.failed("修改失败");
+            return R.failed("结果分析单中->修改失败");
         }
     }
 
@@ -99,12 +99,12 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         //判断是否存在送样号
         R temp = tSampleListService.getByYh(new TSampleListQuery(query.getYh()));
         if (temp.getData() == null) {
-            return R.failed("送验单不存在，样号：" + query.getYh());
+            return R.failed("结果分析单中->送验单不存在，样号：" + query.getYh());
         }
         //判断是否已经存在分析结果单
         R temp1 = getByYh(query);
         if (temp1.getData() != null) {
-            return R.failed("分析结果样号已存在，样号：" + query.getYh());
+            return R.failed("结果分析单中->分析结果样号已存在，样号：" + query.getYh());
         }
 
         //继续判断参数
@@ -131,10 +131,10 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         //保存
         int insert = baseMapper.insert(tSampleLaboratorysheet);
         if (insert > 0) {
-            return R.ok("添加成功");
+            return R.ok("结果分析单中->添加成功");
         } else {
             log.info(JSON.toJSONString(tSampleLaboratorysheet));
-            return R.failed("添加失败");
+            return R.failed("结果分析单中->添加失败");
         }
     }
 
@@ -155,7 +155,7 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         //查询
         TSampleLaboratorysheet tSampleLaboratorysheet = baseMapper.selectById(query.getYh());
         if (tSampleLaboratorysheet == null) {
-            return R.failed("数据不存在，样号：" + query.getYh());
+            return R.failed("结果分析单中->数据不存在，样号：" + query.getYh());
         }
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String content = "";
@@ -187,6 +187,6 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         //下载图片
         ImageUtil.getImage(ProjectEnum.ImageType.QR_CODE.getValue(), tSampleLaboratorysheet, response);
         //如果下载失败才会执行return
-        return R.failed("该条数据没有图片");
+        return R.failed("结果分析单中->该条数据没有图片");
     }
 }

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

@@ -85,7 +85,7 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         //判断数据是否存在
         TSampleList temp = baseMapper.selectById(query.getYh());
         if (temp == null) {
-            return R.failed("数据不存在，样号：" + query.getYh());
+            return R.failed("送样单中->数据不存在，样号：" + query.getYh());
         }
         //条件封装
         TSampleList tSampleList = new TSampleList();
@@ -96,10 +96,10 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         //修改
         int update = baseMapper.update(tSampleList, queryWrapper);
         if (update > 0) {
-            return R.ok("修改成功");
+            return R.ok("送样单中->修改成功");
         } else {
-            log.info(JSON.toJSONString(tSampleList));
-            return R.failed("修改失败");
+            log.error("送样单中->修改失败 {}",JSON.toJSONString(tSampleList));
+            return R.failed("送样单中->修改失败");
         }
 
     }
@@ -115,7 +115,7 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         //判断数据是否已存在，如果存在不能添加
         TSampleList temp = baseMapper.selectById(query.getYh());
         if (temp != null) {
-            return R.failed("送验单样号已存在，样号：" + query.getYh());
+            return R.failed("送样单中->送验单样号已存在，样号：" + query.getYh());
         }
         //继续判断参数
         Rcode.NOT_PARAM.assertNotEmpty(query.getHolesID());
@@ -136,10 +136,10 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         log.info(JSON.toJSONString(tSampleList));
         int insert = baseMapper.insert(tSampleList);
         if (insert > 0) {
-            return R.ok("增加成功");
+            return R.ok("送样单中->增加成功");
         } else {
-            log.info(JSON.toJSONString(tSampleList));
-            return R.failed("增加失败");
+            log.error("送样单中->增加失败：{}",JSON.toJSONString(tSampleList));
+            return R.failed("送样单中->增加失败");
         }
 
     }
@@ -154,14 +154,14 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         Rcode.NOT_PARAM.assertNotEmpty(query.getYh());
         TSampleList temp = baseMapper.selectById(query.getYh());
         if (temp == null) {
-            return R.failed("数据不存在，样号：" + query.getYh());
+            return R.failed("送样单中->数据不存在，样号：" + query.getYh());
         }
         //删除
         int delete = baseMapper.delete(new QueryWrapper<TSampleList>().eq(ProjectEnum.TSampleListType.YH.getLabel(), query.getYh()));
         if (delete > 0) {
-            return R.ok("删除成功");
+            return R.ok("送样单中->删除成功");
         } else {
-            return R.failed("删除失败");
+            return R.failed("送样单中->删除失败");
         }
 
     }
@@ -176,7 +176,7 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         //判断数据是否存在
         TSampleList temp = baseMapper.selectById(query.getYh());
         if (temp == null) {
-            return R.failed("数据不存在，样号：" + query.getYh());
+            return R.failed("送样单中->数据不存在，样号：" + query.getYh());
         }
         Rcode.NOT_PARAM.assertNotNull(file);
         //封装
@@ -187,9 +187,9 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         //保存
         int update = baseMapper.updateById(tSampleList);
         if (update > 0) {
-            return R.ok("保存成功");
+            return R.ok("送样单中->保存成功");
         } else {
-            return R.failed("保存失败");
+            return R.failed("送样单中->保存失败");
         }
 
     }
@@ -209,12 +209,12 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
         Rcode.NOT_PARAM.assertNotEmpty(query.getYh());
         TSampleList tSampleList = baseMapper.selectById(query.getYh());
         if (tSampleList == null) {
-            return R.failed("数据不存在，样号：" + query.getYh());
+            return R.failed("送样单中->数据不存在，样号：" + query.getYh());
         }
         //获取二维码或者记录形式
         ImageUtil.getImage(ProjectEnum.ImageType.RECORD_CODE.getValue(), tSampleList, response);
         //如果下载失败才会执行return
-        return R.failed("该条数据没有图片");
+        return R.failed("送样单中->该条数据没有图片");
     }
 
 

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

 package cn.wise.sc.acquisition.business.service.impl;
 
 import cn.wise.sc.acquisition.business.entity.TSysDict;
+import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TSysDictMapper;
+import cn.wise.sc.acquisition.business.model.query.TSysDictQuery;
 import cn.wise.sc.acquisition.business.service.ITSysDictService;
+import cn.wise.sc.acquisition.business.util.DateUtil;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 服务实现类
@@ -17,4 +24,43 @@ import org.springframework.stereotype.Service;
 @Service
 public class TSysDictServiceImpl extends ServiceImpl<TSysDictMapper, TSysDict> implements ITSysDictService {
 
+    /**
+     * 获取标注日期，将字典中id为6的数据的name字段做比较，
+     * 大于name字段记录下一个月，小于该字段记录本月
+     *
+     * @param tSysDictQuery
+     * @return
+     */
+    @Override
+    public R getTagDate(TSysDictQuery tSysDictQuery) {
+        //获取标注日期，将字典中id为6的数据的name字段做比较
+        //大于name字段记录下一个月，小于该字段记录本月
+        //获取id为6的字典
+        TSysDict tSysDict = baseMapper.selectById(ProjectEnum.TSysDict.SIX.getValue());
+        if (tSysDict == null || StringUtils.isBlank(tSysDict.getName())) {
+            return R.failed("数据字典中->不存在id为6的数据");
+        }
+        //将name转化为integer
+        Integer tagDate;
+        try {
+            tagDate = Integer.valueOf(tSysDict.getName());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.failed("数据字典中->name字段转化为integer失败,数据为null或者不为数字");
+        }
+        //获取当前时间的几号
+        LocalDateTime now = LocalDateTime.now();
+        int dayOfMonth = now.getDayOfMonth();
+        //如果当天日期小于id为6的数据name字段为记录为本月，如果大于等于id为6的数据name字段  记录为下个月
+        String format = "yyyy年MM月";
+        if (dayOfMonth >= tagDate) {
+            //下一个月
+            now.plusMonths(1);
+            return R.ok(DateUtil.timeToStr(now, format));
+        } else {
+            //本月
+            return R.ok(DateUtil.timeToStr(now, format));
+        }
+    }
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/DateUtil.java

@@ -2,11 +2,9 @@ package cn.wise.sc.acquisition.business.util;
 
 import org.apache.commons.lang3.StringUtils;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
@@ -22,6 +20,8 @@ public class DateUtil {
 
     public static final String FORMAT_TO_DAY = "yyyy-MM-dd";
 
+    public static final String FORMAT_TO_MONTH = "yyyy-MM";
+
     public static final String FORMAT_DAY_TO_SECOND = " HH:mm:ss";
 
     public static final String FORMAT_TO_SECOND = "yyyy-MM-dd HH:mm:ss";
@@ -68,19 +68,10 @@ public class DateUtil {
      * @return
      */
     public static LocalDateTime getToday(LocalDateTime localDateTime, String format) {
-        return formatDateToDay(localDateTime, format);
+        return formatDateToTime(localDateTime, format);
     }
 
 
-    /**
-     * 获取今天 返回String  例如参数为 2021-04-05 17:37:33  返回 2021-04-05 00.00.00
-     *
-     * @param localDateTime
-     * @return
-     */
-    public static String getTodayStr(LocalDateTime localDateTime, String format) {
-        return formatDateToStr(localDateTime, format);
-    }
 
     /**
      * 获取下一天  例如参数为 2021-04-05 17:37:33  返回 2021-04-06 00.00.00
@@ -89,19 +80,10 @@ public class DateUtil {
      * @return
      */
     public static LocalDateTime getTomorrow(LocalDateTime localDateTime, String format) {
-        return formatDateToDay(localDateTime.plusDays(ONE), format);
+        return formatDateToTime(localDateTime.plusDays(ONE), format);
     }
 
 
-    /**
-     * 获取下一天  返回String 例如参数为 2021-04-05 17:37:33  返回 2021-04-06 00.00.00
-     *
-     * @param localDateTime
-     * @return
-     */
-    public static String getTomorrowStr(LocalDateTime localDateTime, String format) {
-        return formatDateToStr(localDateTime.plusDays(ONE), format);
-    }
 
 
     /**
@@ -110,7 +92,7 @@ public class DateUtil {
      * @param localDateTime
      * @return
      */
-    private static LocalDateTime formatDateToDay(LocalDateTime localDateTime, String format) {
+    private static LocalDateTime formatDateToTime(LocalDateTime localDateTime, String format) {
         if (localDateTime == null) throw new RuntimeException("formatDate method:LocalDateTime localDateTime is null");
         if (StringUtils.isBlank(format)) throw new RuntimeException("formatDate method:String format is null");
 
@@ -120,19 +102,6 @@ public class DateUtil {
     }
 
 
-    /**
-     * 按照参数格式化时间
-     *
-     * @param localDateTime
-     * @return
-     */
-    private static String formatDateToStr(LocalDateTime localDateTime, String format) {
-        if (localDateTime == null) throw new RuntimeException("formatDate method:LocalDateTime localDateTime is null");
-        if (StringUtils.isBlank(format)) throw new RuntimeException("formatDate method:String format is null");
-        SimpleDateFormat sdf = new SimpleDateFormat(format);
-        return sdf.format(localDateTime);
-    }
-
 
     /**
      * 获取今天的最后一刻

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