gongdanshuju

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmShiYanXiangMu/controller/ItdmShiyanxiangmuController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.itdmShiYanXiangMu.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.itdmShiYanXiangMu.entity.ItdmShiyanxiangmu;
+import org.jeecg.modules.itdmShiYanXiangMu.service.IItdmShiyanxiangmuService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 试验项目输入
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Api(tags="试验项目输入")
+@RestController
+@RequestMapping("/itdmShiYanXiangMu/itdmShiyanxiangmu")
+@Slf4j
+public class ItdmShiyanxiangmuController extends JeecgController<ItdmShiyanxiangmu, IItdmShiyanxiangmuService> {
+	@Autowired
+	private IItdmShiyanxiangmuService itdmShiyanxiangmuService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param itdmShiyanxiangmu
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "试验项目输入-分页列表查询")
+	@ApiOperation(value="试验项目输入-分页列表查询", notes="试验项目输入-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ItdmShiyanxiangmu>> queryPageList(ItdmShiyanxiangmu itdmShiyanxiangmu,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ItdmShiyanxiangmu> queryWrapper = QueryGenerator.initQueryWrapper(itdmShiyanxiangmu, req.getParameterMap());
+		Page<ItdmShiyanxiangmu> page = new Page<ItdmShiyanxiangmu>(pageNo, pageSize);
+		IPage<ItdmShiyanxiangmu> pageList = itdmShiyanxiangmuService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param itdmShiyanxiangmu
+	 * @return
+	 */
+	@AutoLog(value = "试验项目输入-添加")
+	@ApiOperation(value="试验项目输入-添加", notes="试验项目输入-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_shiyanxiangmu:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmShiyanxiangmu itdmShiyanxiangmu) {
+		itdmShiyanxiangmuService.save(itdmShiyanxiangmu);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param itdmShiyanxiangmu
+	 * @return
+	 */
+	@AutoLog(value = "试验项目输入-编辑")
+	@ApiOperation(value="试验项目输入-编辑", notes="试验项目输入-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_shiyanxiangmu:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmShiyanxiangmu itdmShiyanxiangmu) {
+		itdmShiyanxiangmuService.updateById(itdmShiyanxiangmu);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "试验项目输入-通过id删除")
+	@ApiOperation(value="试验项目输入-通过id删除", notes="试验项目输入-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_shiyanxiangmu:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmShiyanxiangmuService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "试验项目输入-批量删除")
+	@ApiOperation(value="试验项目输入-批量删除", notes="试验项目输入-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_shiyanxiangmu:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmShiyanxiangmuService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "试验项目输入-通过id查询")
+	@ApiOperation(value="试验项目输入-通过id查询", notes="试验项目输入-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ItdmShiyanxiangmu> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmShiyanxiangmu itdmShiyanxiangmu = itdmShiyanxiangmuService.getById(id);
+		if(itdmShiyanxiangmu==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmShiyanxiangmu);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmShiyanxiangmu
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_shiyanxiangmu:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmShiyanxiangmu itdmShiyanxiangmu) {
+        return super.exportXls(request, itdmShiyanxiangmu, ItdmShiyanxiangmu.class, "试验项目输入");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_shiyanxiangmu:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmShiyanxiangmu.class);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmShiYanXiangMu/entity/ItdmShiyanxiangmu.java

@@ -0,0 +1,155 @@
+package org.jeecg.modules.itdmShiYanXiangMu.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-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_shiyanxiangmu")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_shiyanxiangmu对象", description="试验项目输入")
+public class ItdmShiyanxiangmu implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @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 newkehu;
+	/**客户行业*/
+	@Excel(name = "客户行业", width = 15)
+    @ApiModelProperty(value = "客户行业")
+    private java.lang.String kehuHangye;
+	/**客户名称*/
+	@Excel(name = "客户名称", width = 15)
+    @ApiModelProperty(value = "客户名称")
+    private java.lang.String kehuMingcheng;
+	/**输入类型*/
+	@Excel(name = "输入类型", width = 15)
+    @ApiModelProperty(value = "输入类型")
+    private java.lang.String shuruLeixing;
+	/**试验信息*/
+	@Excel(name = "试验信息", width = 15)
+    @ApiModelProperty(value = "试验信息")
+    private java.lang.String shiyanXinxi;
+	/**方案设计*/
+	@Excel(name = "方案设计", width = 15, dicCode = "fangan_sheji")
+	@Dict(dicCode = "fangan_sheji")
+    @ApiModelProperty(value = "方案设计")
+    private java.lang.String fanganSheji;
+	/**试验评审*/
+	@Excel(name = "试验评审", width = 15, dicCode = "shiyan_pingshen")
+	@Dict(dicCode = "shiyan_pingshen")
+    @ApiModelProperty(value = "试验评审")
+    private java.lang.String shiyanPingshen;
+	/**用车安排*/
+	@Excel(name = "用车安排", width = 15, dicCode = "yongche_anpai")
+	@Dict(dicCode = "yongche_anpai")
+    @ApiModelProperty(value = "用车安排")
+    private java.lang.String yongcheAnpai;
+	/**工装设计*/
+	@Excel(name = "工装设计", width = 15, dicCode = "gongzhuang_sheji")
+	@Dict(dicCode = "gongzhuang_sheji")
+    @ApiModelProperty(value = "工装设计")
+    private java.lang.String gongzhuangSheji;
+	/**用餐安排*/
+	@Excel(name = "用餐安排", width = 15, dicCode = "yongcan_anpai")
+	@Dict(dicCode = "yongcan_anpai")
+    @ApiModelProperty(value = "用餐安排")
+    private java.lang.String yongcanAnpai;
+	/**住宿安排*/
+	@Excel(name = "住宿安排", width = 15, dicCode = "zhusu_anpai")
+	@Dict(dicCode = "zhusu_anpai")
+    @ApiModelProperty(value = "住宿安排")
+    private java.lang.String zhusuAnpai;
+	/**报告确认*/
+	@Excel(name = "报告确认", width = 15, dicCode = "baogao_queren")
+	@Dict(dicCode = "baogao_queren")
+    @ApiModelProperty(value = "报告确认")
+    private java.lang.String baogaoQueren;
+	/**客户姓名*/
+	@Excel(name = "客户姓名", width = 15)
+    @ApiModelProperty(value = "客户姓名")
+    private java.lang.String kehuName;
+	/**客户电话*/
+	@Excel(name = "客户电话", width = 15)
+    @ApiModelProperty(value = "客户电话")
+    private java.lang.String kehuPhone;
+	/**合同编号*/
+	@Excel(name = "合同编号", width = 15)
+    @ApiModelProperty(value = "合同编号")
+    private java.lang.String hetongBianhao;
+	/**试验要求*/
+	@Excel(name = "试验要求", width = 15)
+    @ApiModelProperty(value = "试验要求")
+    private java.lang.String shiyanYaoqiu;
+	/**报告体系*/
+	@Excel(name = "报告体系", width = 15, dicCode = "baogao_tixi")
+	@Dict(dicCode = "baogao_tixi")
+    @ApiModelProperty(value = "报告体系")
+    private java.lang.String baogaoTixi;
+	/**资质要求*/
+	@Excel(name = "资质要求", width = 15, dicCode = "zizhi_yaoqiu")
+	@Dict(dicCode = "zizhi_yaoqiu")
+    @ApiModelProperty(value = "资质要求")
+    private java.lang.String zizhiYaoqiu;
+	/**预计报价*/
+	@Excel(name = "预计报价", width = 15)
+    @ApiModelProperty(value = "预计报价")
+    private java.lang.String yujiBaojia;
+	/**评审结论*/
+	@Excel(name = "评审结论", width = 15)
+    @ApiModelProperty(value = "评审结论")
+    private java.lang.String pingshenJielun;
+	/**主审人*/
+	@Excel(name = "主审人", width = 15)
+    @ApiModelProperty(value = "主审人")
+    private java.lang.String zhushenRen;
+	/**主审时间*/
+	@Excel(name = "主审时间", width = 15)
+    @ApiModelProperty(value = "主审时间")
+    private java.lang.String zhushenShijian;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmShiYanXiangMu/mapper/ItdmShiyanxiangmuMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmShiYanXiangMu.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmShiYanXiangMu.entity.ItdmShiyanxiangmu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 试验项目输入
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+public interface ItdmShiyanxiangmuMapper extends BaseMapper<ItdmShiyanxiangmu> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmShiYanXiangMu/mapper/xml/ItdmShiyanxiangmuMapper.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.itdmShiYanXiangMu.mapper.ItdmShiyanxiangmuMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmShiYanXiangMu/service/IItdmShiyanxiangmuService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmShiYanXiangMu.service;
+
+import org.jeecg.modules.itdmShiYanXiangMu.entity.ItdmShiyanxiangmu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 试验项目输入
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+public interface IItdmShiyanxiangmuService extends IService<ItdmShiyanxiangmu> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmShiYanXiangMu/service/impl/ItdmShiyanxiangmuServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmShiYanXiangMu.service.impl;
+
+import org.jeecg.modules.itdmShiYanXiangMu.entity.ItdmShiyanxiangmu;
+import org.jeecg.modules.itdmShiYanXiangMu.mapper.ItdmShiyanxiangmuMapper;
+import org.jeecg.modules.itdmShiYanXiangMu.service.IItdmShiyanxiangmuService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 试验项目输入
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Service
+public class ItdmShiyanxiangmuServiceImpl extends ServiceImpl<ItdmShiyanxiangmuMapper, ItdmShiyanxiangmu> implements IItdmShiyanxiangmuService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/controller/ItdmGongdanshujuController.java

@@ -0,0 +1,100 @@
+package org.jeecg.modules.itdmgongdanshuju.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.weituochaxun.vo.ItdmWeituoAllVO;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.itdmgongdanshuju.dto.ItdmGongdanDto;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanShuju;
+import org.jeecg.modules.itdmgongdanshuju.service.ItdmGongdanShujuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Description: 委托信息
+ * @Author: jeecg-boot
+ * @Date:   2023-05-17
+ * @Version: V1.011
+ */
+@Api(tags="工单数据11")
+@RestController
+@RequestMapping("/itdmgomgongdanshuju/ItdmGongdanshuju")
+@Slf4j
+public class ItdmGongdanshujuController {
+
+	@Autowired
+	private ItdmGongdanShujuService itdmGongdanShujuService;
+
+
+	@ApiOperation(value="工单数据-列表", notes="工单数据-列表")
+	@GetMapping("/list")
+	public Result<IPage<ItdmGongdanShuju>> list(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+											  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+											  HttpServletRequest req){
+		Page<ItdmGongdanShuju> page = new Page<ItdmGongdanShuju>(pageNo, pageSize);
+		IPage<ItdmGongdanShuju> list = itdmGongdanShujuService.page(page);
+		return Result.OK(list);
+	}
+
+
+	@ApiOperation(value = "工单数据-生成", notes = "工单数据-生成")
+	@PostMapping("/create")
+	public Result create(@RequestBody ItdmGongdanDto itdmGongdanDto, HttpServletRequest req) {
+		Boolean b  = itdmGongdanShujuService.generate(itdmGongdanDto);
+		if (b) {
+			return Result.OK();
+		}
+		return Result.error("数据生成失败");
+	}
+
+
+//	@ApiOperation(value = "工单数据-修改", notes = "工单数据-修改")
+//	@GetMapping("/update")
+//	public ItdmGongdanShuju update(@RequestBody ItdmGongdanShuju itdmGongdanShuju, HttpServletRequest req) {
+//		itdmGongdanShujuService.updateById(itdmGongdanShuju);
+//		return itdmGongdanShuju;
+//	}
+
+	@AutoLog(value = "工单数据-添加")
+	@ApiOperation(value="工单数据-添加", notes="工单数据-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmGongdanShuju itdmGongdanShuju) {
+		itdmGongdanShujuService.save(itdmGongdanShuju);
+		return Result.OK("添加成功！");
+	}
+
+	@AutoLog(value = "工单数据-通过id删除")
+	@ApiOperation(value="工单数据-通过id删除", notes="工单数据-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmGongdanShujuService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param itdmGongdanShuju
+	 * @return
+	 */
+	@AutoLog(value = "工单数据-编辑")
+	@ApiOperation(value="工单数据-编辑", notes="工单数据-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmGongdanShuju itdmGongdanShuju) {
+		itdmGongdanShujuService.updateById(itdmGongdanShuju);
+		return Result.OK("编辑成功!");
+	}
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/dto/ItdmGongdanDto.java

@@ -0,0 +1,39 @@
+package org.jeecg.modules.itdmgongdanshuju.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 工单detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21
+ * @Version: V1.0
+ */
+@Data
+public class ItdmGongdanDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**工单id*/
+    private String woId;
+
+	/**实绩试验类型*/
+    private String shiyanType;
+
+	/**试验开始时间*/
+    private String shiyanKaishitime;
+	/**试验结束时间*/
+    private String shiyanJieshutime;
+    /**频次*/
+    private String pinci;
+}

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

@@ -0,0 +1,107 @@
+package org.jeecg.modules.itdmgongdanshuju.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 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.AUTO)
+    @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")
+    //@Dict(dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
+
+    private java.lang.String shijiShebeiId;
+	/**实绩试验类型*/
+	//@Excel(name = "实绩试验类型", width = 15, dicCode = "shiyan_type")
+	//@Dict(dicCode = "shiiyan_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 = "传感器")
+    //@Dict(dictTable = "itdm_chuanganqi", dicText = "xuliehao", dicCode = "id")
+    private java.lang.String chuanganqi;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/entity/ItdmGongdanShuju.java

@@ -0,0 +1,98 @@
+package org.jeecg.modules.itdmgongdanshuju.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 工单数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_gongdan_shuju")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_gongdan_shuju对象", description="工单数据")
+public class ItdmGongdanShuju implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @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;
+	/**工单id*/
+	//@Excel(name = "工单id", width = 15)
+    @ApiModelProperty(value = "工单id")
+    private java.lang.String woId;
+	/**试验类型*/
+	//@Excel(name = "试验类型", width = 15, dicCode = "shiiyan_type")
+	//@Dict(dicCode = "shiiyan_type")
+    @ApiModelProperty(value = "试验类型")
+    private java.lang.String shiyanType;
+	/**试验开始时间*/
+	//@Excel(name = "试验开始时间", width = 15)
+    @ApiModelProperty(value = "试验开始时间")
+    private java.lang.String shiyanKaishitime;
+	/**试验结束时间*/
+	//@Excel(name = "试验结束时间", width = 15)
+    @ApiModelProperty(value = "试验结束时间")
+    private java.lang.String shiyanJieshutime;
+	/**频次*/
+	//@Excel(name = "频次", width = 15)
+    @ApiModelProperty(value = "频次")
+    private java.lang.String pinci;
+	/**生成的时间*/
+	//@Excel(name = "生成的时间", width = 15)
+    @ApiModelProperty(value = "生成的时间")
+    private java.lang.String shiyanTime;
+	/**试验数据温度*/
+	//@Excel(name = "试验数据温度", width = 15)
+    @ApiModelProperty(value = "试验数据温度")
+    private java.lang.String shiyanWendu;
+	/**试验数据湿度*/
+	//@Excel(name = "试验数据湿度", width = 15)
+    @ApiModelProperty(value = "试验数据湿度")
+    private java.lang.String shiyanShidu;
+	/**试验图片*/
+	//@Excel(name = "试验图片", width = 15)
+    @ApiModelProperty(value = "试验图片")
+    private java.lang.String extraPic;
+	/**备注*/
+	//@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/entity/ItdmPeizhi.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.itdmgongdanshuju.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 系统配置
+ * @Author: jeecg-boot
+ * @Date:   2023-05-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_peizhi")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_peizhi对象", description="系统配置")
+public class ItdmPeizhi implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @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 peizhiName;
+	/**配置状态*/
+	//@Excel(name = "配置状态", width = 15, dicCode = "peizhi_state")
+	//@Dict(dicCode = "peizhi_state")
+    @ApiModelProperty(value = "配置状态")
+    private java.lang.Integer peizhiState;
+	/**备注*/
+	//@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String peizhiNotes;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/mapper/ItdmGongdanDetail1Mapper.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.itdmgongdanshuju.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanDetail;
+
+@Mapper
+public interface ItdmGongdanDetail1Mapper extends BaseMapper<ItdmGongdanDetail> {
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/mapper/ItdmGongdanShujuMapper.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.itdmgongdanshuju.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanShuju;
+
+/**
+ * 创建人:zwl
+ * 时间：2023/5/27-9:04 上午
+ *
+ * @version 1.0.0
+ */
+@Mapper
+public interface ItdmGongdanShujuMapper extends BaseMapper<ItdmGongdanShuju> {
+}

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

@@ -0,0 +1,10 @@
+<?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.itdmgongdanshuju.entity.ItdmGongdanDetail">
+
+
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/mapper/xml/ItdmGongdanShujuMapper.xml

@@ -0,0 +1,10 @@
+<?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.itdmgongdanshuju.entity.ItdmGongdanShuju">
+
+
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/service/ItdmGongdanDetailService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.itdmgongdanshuju.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanDetail;
+
+
+
+import java.util.List;
+
+public interface  ItdmGongdanDetailService extends IService<ItdmGongdanDetail> {
+
+}
+
+

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/service/ItdmGongdanShujuService.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.itdmgongdanshuju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.itdmgongdanshuju.dto.ItdmGongdanDto;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanShuju;
+
+public interface ItdmGongdanShujuService extends IService<ItdmGongdanShuju> {
+
+    Boolean generate(ItdmGongdanDto itdmGongdanDto);
+}
+
+

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/service/impl/ItdmGongdanDetail1ServiceImpl.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.itdmgongdanshuju.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmgongdanshuju.mapper.ItdmGongdanDetail1Mapper;
+import org.jeecg.modules.itdmgongdanshuju.service.ItdmGongdanDetailService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+/**
+ * @Description: 委托信息
+ * @Author: jeecg-boot
+ * @Date: 2023-05-17
+ * @Version: V1.0
+ */
+@Service
+public class ItdmGongdanDetail1ServiceImpl extends ServiceImpl<ItdmGongdanDetail1Mapper, ItdmGongdanDetail> implements ItdmGongdanDetailService {
+
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/service/impl/ItdmGongdanShujuServiceImpl.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.itdmgongdanshuju.service.impl;
+
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.BagUtils;
+
+import org.jeecg.modules.itdmgongdanshuju.dto.ItdmGongdanDto;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanShuju;
+import org.jeecg.modules.itdmgongdanshuju.mapper.ItdmGongdanDetail1Mapper;
+import org.jeecg.modules.itdmgongdanshuju.mapper.ItdmGongdanShujuMapper;
+import org.jeecg.modules.itdmgongdanshuju.service.ItdmGongdanDetailService;
+import org.jeecg.modules.itdmgongdanshuju.service.ItdmGongdanShujuService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 委托信息
+ * @Author: jeecg-boot
+ * @Date: 2023-05-17
+ * @Version: V1.0
+ */
+@Service
+public class ItdmGongdanShujuServiceImpl extends ServiceImpl<ItdmGongdanShujuMapper, ItdmGongdanShuju> implements ItdmGongdanShujuService {
+
+    @Autowired
+    ItdmGongdanDetail1Mapper itdmGongdanDetailMapper;
+    @Autowired
+    ItdmGongdanShujuMapper itdmGongdanShujuMapper;
+
+    @Override
+    @Transactional
+    public Boolean generate(ItdmGongdanDto itdmGongdanDto) {
+        try {
+            List<ItdmGongdanDetail> itdmGongdanDetailList = itdmGongdanDetailMapper.selectList(new QueryWrapper<ItdmGongdanDetail>().eq("end_time", itdmGongdanDto.getShiyanJieshutime()).eq("start_time", itdmGongdanDto.getShiyanKaishitime()).eq("wo_id", itdmGongdanDto.getWoId()));
+            ItdmGongdanDetail itdmGongdanDetail = itdmGongdanDetailList.get(0);
+            String startTime = itdmGongdanDto.getShiyanKaishitime();
+            String endTime = itdmGongdanDto.getShiyanJieshutime();
+            Date date1 = DateUtil.parse(startTime);
+            Date date2 = DateUtil.parse(endTime);
+            long betweenMinute = DateUtil.between(date1, date2, DateUnit.MINUTE);
+            // 频次
+            int l = (int) (betweenMinute / Integer.parseInt(itdmGongdanDto.getPinci()));
+            for (int i = 1; i <= l; i++) {
+                ItdmGongdanShuju itdmGongdanShuju = new ItdmGongdanShuju();
+                itdmGongdanDetail.setId(null);
+                BeanUtils.copyProperties(itdmGongdanDetail, itdmGongdanShuju);
+                itdmGongdanShuju.setShiyanTime(DateUtil.offsetMinute(date1, i *  Integer.parseInt(itdmGongdanDto.getPinci())).toString().split(" ")[1]);
+                boolean save = this.save(itdmGongdanShuju);
+                if (!save){
+                    throw new IllegalArgumentException();
+                }
+            }
+        }catch (Exception e){
+            return false;
+        }
+        return true;
+    }
+
+
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituochaxun/controller/ItdmWeituochaxunController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.weituochaxun.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
@@ -7,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
 import org.jeecg.modules.weituo.service.IItdmWeituoInfoService;
 import org.jeecg.modules.weituochaxun.service.IItdmWeituochaxunService;
@@ -36,10 +38,11 @@ public class ItdmWeituochaxunController {
 	// 三表关联查询
 	@ApiOperation(value="委托查询-三表关联查询", notes="委托查询-三表关联查询")
 	@GetMapping("/list")
-	public Result<IPage<ItdmWeituoAllVO>> get(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+	public Result<IPage<ItdmWeituoAllVO>> get(ItdmWeituoAllVO itdmWeituoAllVO,
+			@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 																   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 																   HttpServletRequest req){
-
+		QueryWrapper<ItdmWeituoAllVO> queryWrapper = QueryGenerator.initQueryWrapper(itdmWeituoAllVO, req.getParameterMap());
 		Page<ItdmWeituoAllVO> page = new Page<ItdmWeituoAllVO>(pageNo, pageSize);
 		List<ItdmWeituoAllVO> itdmWeituoAllVOS =  iItdmWeituochaxunService.getAll(page);
 		page.setRecords(itdmWeituoAllVOS);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituochaxun/vo/ItdmWeituoAllVO.java

@@ -10,11 +10,13 @@ import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 @Data
-public class ItdmWeituoAllVO  {
+public class ItdmWeituoAllVO implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**主键*/
     private String id;