diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index e34d3a8e..7a3136fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -9,6 +9,7 @@ import com.adc.da.slrs.sarStandItems.entity.FindStandDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; +import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -72,6 +73,7 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "标准查询") @PostMapping("/saveBatch") public String saveBatch(@RequestBody List findStandDto){ + findStandDto.forEach(sarStandItems -> sarStandItems.setId(UUIDUtils.randomUUID(32))); return ServiceImpl.sarStandItemsaveBatch(findStandDto); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 57068a2b..b05f19aa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -121,6 +121,17 @@ public class SarStandItems extends BaseEntity { @TableField("FILE_TYPE") private String fileType; + + @ApiModelProperty(value = "新车型实施日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("XCXSSRQ") + private Date xccssrq; + + @ApiModelProperty(value = "在产车实施日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("ZCCSSRQ") + private Date zccssrq; + @TableField(exist = false) private String emergyKindShow; @TableField(exist = false) @@ -157,6 +168,7 @@ public class SarStandItems extends BaseEntity { private SarCompStatusInfo pgForm; //责任工程师 + @TableField(exist = false) private String responsibleEngineer; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 758eee82..65be9704 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -178,7 +178,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems) { - boolean flag=this.saveBatch(sarStandItems,sarStandItems.size()); + boolean flag=this.saveBatch(sarStandItems); if (flag){ return "0"; }else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java index cf78fea2..7a8f4972 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java @@ -86,5 +86,7 @@ public class SarInterpretationNationalStandard extends BaseEntity { @TableField("INTERPRETATION_TIME") private Date interpretationTime; + @TableField("ID") + private String id; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index e2752569..3b189f8b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -29,6 +29,7 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl sarInterpretationNationalStandards) { + sarInterpretationNationalStandards.forEach(sarInterpretationNationalStandard -> {sarInterpretationNationalStandard.setId(UUIDUtils.randomUUID(32));}); boolean flag = this.saveBatch(sarInterpretationNationalStandards,sarInterpretationNationalStandards.size()); sarInterpretationNationalStandards.forEach(sarInterpretationNationalStandard -> { QueryWrapper queryWrapper=new QueryWrapper<>(); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 121a16f4..eb3ce0d5 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -169,13 +169,13 @@ - - - insert into SAR_STAND_ITEMS() - values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) - + + + + + + +