fix:工单确认bug

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

@@ -10,6 +10,7 @@ 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.dto.ItdmGongdanDetailEditDTO;
 import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
 import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +66,7 @@ public class ItdmGongdanQuerenController extends JeecgController<ItdmGongdanDeta
     @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 {
+    public Result<String> edit(@RequestBody ItdmGongdanDetailEditDTO itdmGongdanDetail) throws ParseException {
         itdmGongdanDetailService.queren(itdmGongdanDetail);
         return Result.OK("编辑成功!");
     }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/convert/GongdanDetailConvert.java

@@ -0,0 +1,42 @@
+package org.jeecg.modules.gongdandetail.convert;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.baogao.dto.ItdmBaogaoCreateDTO;
+import org.jeecg.modules.baogao.entity.ItdmBaogao;
+import org.jeecg.modules.baogao.vo.ItdmBaogaoListVO;
+import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
+import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 敏感词 Convert
+ *
+ * @author 永不言败
+ */
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+
+public interface GongdanDetailConvert {
+
+    GongdanDetailConvert INSTANCE = Mappers.getMapper(GongdanDetailConvert.class);
+
+
+    ItdmGongdanDetail convert(ItdmGongdanDetailEditDTO convert);
+
+
+
+
+
+
+
+
+
+
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/dto/ItdmGongdanDetailEditDTO.java

@@ -0,0 +1,57 @@
+package org.jeecg.modules.gongdandetail.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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 工单detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-21
+ * @Version: V1.0
+ */
+@Data
+
+public class ItdmGongdanDetailEditDTO {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+    private String id;
+
+	/**实绩设备id*/
+
+    private String shijiShebeiId;
+
+	/**实绩试验类型*/
+    private String shijiShiiyanType;
+
+	/**实绩任务日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date shijiWorkDate;
+
+	/**实绩试验开始时间*/
+
+    private String shijiStartTime;
+	/**实绩试验结束时间*/
+
+    private String shijiEndTime;
+
+
+    /**传感器*/
+
+    private String chuanganqi;
+}

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.gongdandetail.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
 import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
 
 import java.text.ParseException;
@@ -14,5 +15,5 @@ import java.text.ParseException;
 public interface IItdmGongdanQuerenService extends IService<ItdmGongdanDetail> {
 
 
-    void queren(ItdmGongdanDetail itdmGongdanDetail) throws ParseException;
+    void queren(ItdmGongdanDetailEditDTO itdmGongdanDetail) throws ParseException;
 }

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

@@ -2,6 +2,8 @@ package org.jeecg.modules.gongdandetail.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
+import org.jeecg.modules.gongdandetail.convert.GongdanDetailConvert;
+import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
 import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
 import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
 import org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper;
@@ -36,7 +38,7 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
     private ItdmGongdanMasterMapper masterMapper;
 
     @Override
-    public void queren(ItdmGongdanDetail itdmGongdanDetail) throws ParseException {
+    public void queren(ItdmGongdanDetailEditDTO itdmGongdanDetail) throws ParseException {
 
         ItdmGongdanDetail data = this.baseMapper.selectById(itdmGongdanDetail.getId());
 
@@ -44,7 +46,7 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
         SimpleDateFormat simpleDate = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat simpleDate1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
-        this.baseMapper.updateById(itdmGongdanDetail);
+        this.baseMapper.updateById(GongdanDetailConvert.INSTANCE.convert(itdmGongdanDetail));
 
         List<ItdmGongdanDetail> list = baseMapper.
                 selectList(Wrappers.lambdaQuery(ItdmGongdanDetail.class));