Merge remote-tracking branch 'origin/master'

itdmServer/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -144,9 +144,9 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 119.3.255.154
     port: 6379
-    password: ''
+    password: Mysql123+-
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -182,9 +182,9 @@ jeecg:
   path:
     #文件上传根目录 设置
 #    upload: D://file_upload//upFiles
-    upload: /Users/zunguidemacyonghu/workspace/upload
+    upload: D://Users/zunguidemacyonghu/workspace/upload
     #webapp文件路径
-    webapp: /Users/zunguidemacyonghu/workspace/upload
+    webapp: D://Users/zunguidemacyonghu/workspace/upload
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/controller/ItdmGongdanQuerenController.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.gongdandetail.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
+import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+
+/**
+ * @Description: 工单detail
+ * @Author: jeecg-boot
+ * @Date: 2023-05-21
+ * @Version: V1.0
+ */
+@Api(tags = "工单detail")
+@RestController
+@RequestMapping("/gongdandetail/itdmGongdanDetail")
+@Slf4j
+public class ItdmGongdanQuerenController extends JeecgController<ItdmGongdanDetail, IItdmGongdanQuerenService> {
+    @Autowired
+    private IItdmGongdanQuerenService itdmGongdanDetailService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param itdmGongdanDetail
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "工单detail-分页列表查询")
+    @ApiOperation(value = "工单detail-分页列表查询", notes = "工单detail-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ItdmGongdanDetail>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        QueryWrapper<ItdmGongdanDetail> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanDetail, req.getParameterMap());
+        Page<ItdmGongdanDetail> page = new Page<ItdmGongdanDetail>(pageNo, pageSize);
+        IPage<ItdmGongdanDetail> pageList = itdmGongdanDetailService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
+    /**
+     * 编辑
+     *
+     * @param itdmGongdanDetail
+     * @return
+     */
+    @AutoLog(value = "工单detail-编辑")
+    @ApiOperation(value = "工单detail-编辑", notes = "工单detail-编辑")
+    //@RequiresPermissions("org.jeecg.modules:itdm_gongdan_detail:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody ItdmGongdanDetail itdmGongdanDetail) throws ParseException {
+        itdmGongdanDetailService.queren(itdmGongdanDetail);
+        return Result.OK("编辑成功!");
+    }
+
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/IItdmGongdanQuerenService.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.gongdandetail.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+
+import java.text.ParseException;
+
+/**
+ * @Description: 工单detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21
+ * @Version: V1.0
+ */
+public interface IItdmGongdanQuerenService extends IService<ItdmGongdanDetail> {
+
+
+    void queren(ItdmGongdanDetail itdmGongdanDetail) throws ParseException;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/impl/ItdmGongdanQuerenServiceImpl.java

@@ -0,0 +1,108 @@
+package org.jeecg.modules.gongdandetail.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
+import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper;
+import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 工单detail
+ * @Author: jeecg-boot
+ * @Date: 2023-05-21
+ * @Version: V1.0
+ */
+@Service
+public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailMapper, ItdmGongdanDetail> implements IItdmGongdanQuerenService {
+
+
+    @Autowired
+    private ItdmGongdanMasterMapper masterMapper;
+
+    @Override
+    public void queren(ItdmGongdanDetail itdmGongdanDetail) throws ParseException {
+
+        ItdmGongdanDetail data = this.baseMapper.selectById(itdmGongdanDetail.getId());
+
+
+        SimpleDateFormat simpleDate = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat simpleDate1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+        this.baseMapper.updateById(itdmGongdanDetail);
+
+        List<ItdmGongdanDetail> list = baseMapper.
+                selectList(Wrappers.lambdaQuery(ItdmGongdanDetail.class));
+
+
+        List<ItdmGongdanDetail> list1 = baseMapper.
+                selectList(Wrappers.lambdaQuery(ItdmGongdanDetail.class).eq(ItdmGongdanDetail::getWoId, data.getWoId()).isNull(ItdmGongdanDetail::getShijiEndTime)
+                        .isNull(ItdmGongdanDetail::getShijiStartTime).isNull(ItdmGongdanDetail::getShijiWorkDate));
+
+
+        if (list1.size() > 0) {
+            ItdmGongdanMaster master = new ItdmGongdanMaster();
+            master.setId(data.getWoId());
+            master.setShijiStartDate(getMin(list, simpleDate, simpleDate1));
+            masterMapper.updateById(master);
+        }
+
+
+        if (list.size() > 0 && list1.size() < 1) {
+            // todo
+            ItdmGongdanMaster master = new ItdmGongdanMaster();
+            master.setId(data.getWoId());
+            master.setShijiEndDate(getMax(list, simpleDate, simpleDate1));
+            master.setShijiStartDate(getMin(list, simpleDate, simpleDate1));
+            masterMapper.updateById(master);
+        }
+
+
+    }
+
+
+    private Date getMax(List<ItdmGongdanDetail> list, SimpleDateFormat simpleDate, SimpleDateFormat simpleDate1) {
+
+
+        return list.stream()
+                .filter(i -> i.getShijiWorkDate() != null && i.getShijiEndTime() != null)
+
+                .map(i -> getDateFormat(i, i::getShijiEndTime, simpleDate, simpleDate1)).max(Date::compareTo).orElse(null);
+    }
+
+
+    private Date getMin(List<ItdmGongdanDetail> list, SimpleDateFormat simpleDate, SimpleDateFormat simpleDate1) {
+
+
+        return list.stream().filter(i -> i.getShijiWorkDate() != null && i.getShijiStartTime() != null)
+
+                .map(i -> getDateFormat(i, i::getShijiStartTime, simpleDate, simpleDate1)).min(Date::compareTo).orElse(null);
+
+
+    }
+
+
+    private Date getDateFormat(ItdmGongdanDetail getDateFormat, Supplier<String> supplier, SimpleDateFormat simpleDate, SimpleDateFormat simpleDate1) {
+
+        try {
+            return simpleDate1.parse(simpleDate.format(getDateFormat.getShijiWorkDate()) + " " + supplier.get());
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/controller/ItdmDeviceController.java

@@ -51,6 +51,18 @@ public class ItdmDeviceController extends JeecgController<ItdmDevice, IItdmDevic
 	@Autowired
 	private IItdmDeviceService itdmDeviceService;
 
+	 /**
+	  * 设备列表
+	  */
+	 @ApiOperation(value="设备下拉列表", notes="设备下拉列表")
+	 @GetMapping("/xialalist")
+	 public List<ItdmDevice> list1()
+	 {
+		 List<ItdmDevice> list = itdmDeviceService.queryList();
+		 return list;
+	 }
+
+
 	/**
 	 * 分页列表查询
 	 *

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/mapper/ItdmDeviceMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.itdmDevice.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -13,4 +14,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  */
 public interface ItdmDeviceMapper extends BaseMapper<ItdmDevice> {
+
+    @Select("select * from itdm_device" )
+    List<ItdmDevice> queryList();
+
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/service/IItdmDeviceService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.itdmDevice.service;
 import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 设备表
  * @Author: jeecg-boot
@@ -10,4 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface IItdmDeviceService extends IService<ItdmDevice> {
+
+    public List<ItdmDevice> queryList();
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/service/impl/ItdmDeviceServiceImpl.java

@@ -8,6 +8,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 设备表
  * @Author: jeecg-boot
@@ -16,4 +18,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class ItdmDeviceServiceImpl extends ServiceImpl<ItdmDeviceMapper, ItdmDevice> implements IItdmDeviceService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmDeviceMapper itdmDeviceMapper;
+
+    public List<ItdmDevice> queryList(){
+        return itdmDeviceMapper.queryList();
+    }
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/entity/ItdmGongdanDetail.java

@@ -0,0 +1,106 @@
+package org.jeecg.modules.itdmGongdanDetail.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 工单detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_gongdan_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_gongdan_detail对象", description="工单detail")
+public class ItdmGongdanDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**工单id*/
+	@Excel(name = "工单id", width = 15)
+    @ApiModelProperty(value = "工单id")
+    private java.lang.String woId;
+	/**实绩设备id*/
+	@Excel(name = "实绩设备id", width = 15)
+    @ApiModelProperty(value = "实绩设备id")
+    private java.lang.String shijiShebeiId;
+	/**实绩试验类型*/
+	@Excel(name = "实绩试验类型", width = 15, dicCode = "shiyan_type")
+	@Dict(dicCode = "shiyan_type")
+    @ApiModelProperty(value = "实绩试验类型")
+    private java.lang.String shijiShiiyanType;
+	/**任务日期*/
+	@Excel(name = "任务日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "任务日期")
+    private java.util.Date workDate;
+	/**试验开始时间*/
+	@Excel(name = "试验开始时间", width = 15)
+    @ApiModelProperty(value = "试验开始时间")
+    private java.lang.String startTime;
+	/**试验结束时间*/
+	@Excel(name = "试验结束时间", width = 15)
+    @ApiModelProperty(value = "试验结束时间")
+    private java.lang.String endTime;
+	/**实绩任务日期*/
+	@Excel(name = "实绩任务日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩任务日期")
+    private java.util.Date shijiWorkDate;
+	/**实绩试验开始时间*/
+	@Excel(name = "实绩试验开始时间", width = 15)
+    @ApiModelProperty(value = "实绩试验开始时间")
+    private java.lang.String shijiStartTime;
+	/**实绩试验结束时间*/
+	@Excel(name = "实绩试验结束时间", width = 15)
+    @ApiModelProperty(value = "实绩试验结束时间")
+    private java.lang.String shijiEndTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;/**传感器*/
+    @Excel(name = "传感器", width = 20)
+    @ApiModelProperty(value = "传感器")
+    private java.lang.String chuanganqi;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/mapper/ItdmGongdanDetailMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmGongdanDetail.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 工单detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21
+ * @Version: V1.0
+ */
+public interface ItdmGongdanDetailMapper extends BaseMapper<ItdmGongdanDetail> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/mapper/xml/ItdmGongdanDetailMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/entity/ItdmGongdanMaster.java

@@ -0,0 +1,122 @@
+package org.jeecg.modules.itdmGongdanMaster.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 工单master
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_gongdan_master")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_gongdan_master对象", description="工单master")
+public class ItdmGongdanMaster implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**试验计划id*/
+	@Excel(name = "试验计划id", width = 15)
+    @ApiModelProperty(value = "试验计划id")
+    private java.lang.String jihuaShiyanId;
+	/**检测项目id*/
+	@Excel(name = "检测项目id", width = 15)
+    @ApiModelProperty(value = "检测项目id")
+    private java.lang.String testItemsId;
+	/**委托样品id*/
+	@Excel(name = "委托样品id", width = 15)
+    @ApiModelProperty(value = "委托样品id")
+    private java.lang.String weituoYangpinId;
+	/**设备id*/
+	@Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String shebeiId;
+	/**试验类型*/
+	@Excel(name = "试验类型", width = 15)
+    @ApiModelProperty(value = "试验类型")
+    private java.lang.String shiiyanType;
+	/**试验员*/
+	@Excel(name = "试验员", width = 15)
+    @ApiModelProperty(value = "试验员")
+    private java.lang.String worker;
+	/**委托样品数量*/
+	@Excel(name = "委托样品数量", width = 15)
+    @ApiModelProperty(value = "委托样品数量")
+    private java.lang.Integer yangpinCount;
+	/**计划开始日期*/
+	@Excel(name = "计划开始日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划开始日期")
+    private java.util.Date startDate;
+	/**计划结束日期*/
+	@Excel(name = "计划结束日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划结束日期")
+    private java.util.Date endDate;
+	/**实绩开始日期*/
+	@Excel(name = "实绩开始日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩开始日期")
+    private java.util.Date shijiStartDate;
+	/**实绩结束日期*/
+	@Excel(name = "实绩结束日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实绩结束日期")
+    private java.util.Date shijiEndDate;
+	/**内容*/
+	@Excel(name = "内容", width = 15)
+    @ApiModelProperty(value = "内容")
+    private java.lang.String neirong;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**传感器*/
+    @Excel(name = "传感器", width = 20)
+    @ApiModelProperty(value = "传感器")
+    private java.lang.String chuanganqi;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/mapper/ItdmGongdanMasterMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmGongdanMaster.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 工单master
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21
+ * @Version: V1.0
+ */
+public interface ItdmGongdanMasterMapper extends BaseMapper<ItdmGongdanMaster> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/mapper/xml/ItdmGongdanMasterMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/entity/ItdmTestPlan.java

@@ -0,0 +1,107 @@
+package org.jeecg.modules.itdmTestPlan.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 试验计划
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_test_plan")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_test_plan对象", description="试验计划")
+public class ItdmTestPlan implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**委托id*/
+	@Excel(name = "委托id", width = 15)
+    @ApiModelProperty(value = "委托id")
+    private java.lang.String weituoId;
+	/**检测项目id*/
+	@Excel(name = "检测项目id", width = 15)
+    @ApiModelProperty(value = "检测项目id")
+    private java.lang.String testItemsId;
+	/**委托样品id*/
+	@Excel(name = "委托样品id", width = 15)
+    @ApiModelProperty(value = "委托样品id")
+    private java.lang.String weituoYangpinId;
+	/**设备id*/
+	@Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String shebeiId;
+	/**项目经理*/
+	@Excel(name = "项目经理", width = 15)
+    @ApiModelProperty(value = "项目经理")
+    private java.lang.String pm;
+	/**计划开始日期*/
+	@Excel(name = "计划开始日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划开始日期")
+    private java.util.Date jihuaStartDate;
+	/**计划结束日期*/
+	@Excel(name = "计划结束日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划结束日期")
+    private java.util.Date jihuaEndDate;
+	/**状态*/
+	@Excel(name = "状态", width = 15, dicCode = "test_plan_status")
+	@Dict(dicCode = "test_plan_status")
+    @ApiModelProperty(value = "状态")
+    private java.lang.Integer status;
+	/**报告编号*/
+	@Excel(name = "报告编号", width = 15)
+    @ApiModelProperty(value = "报告编号")
+    private java.lang.String reportNo;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+    /**传感器*/
+    @Excel(name = "传感器", width = 20)
+    @ApiModelProperty(value = "传感器")
+    private java.lang.String chuanganqi;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/ItdmTestPlanMapper.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.itdmTestPlan.mapper;
+
+import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 试验计划
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21
+ * @Version: V1.0
+ */
+public interface ItdmTestPlanMapper extends BaseMapper<ItdmTestPlan> {
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/xml/ItdmTestPlanMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper">
+
+</mapper>