wks пре 2 година
родитељ
комит
5d643321a0

+ 3 - 3
src/main/java/com/ydtech/modules/esm/controller/EsmInsVehicleInspectionCodeController.java

@@ -33,20 +33,20 @@ public class EsmInsVehicleInspectionCodeController {
 
     @PostMapping("/query")
     @ApiOperation("查询")
-    public HttpResult<BasePageResult<EsmInsVehicleInspectionCode>> queryPage(EsmInsVehicleInspectionCodePageVo esmInsVehicleInspectionCodePageVo) {
+    public HttpResult<BasePageResult<EsmInsVehicleInspectionCode>> queryPage(@RequestBody EsmInsVehicleInspectionCodePageVo esmInsVehicleInspectionCodePageVo) {
         BasePageResult<EsmInsVehicleInspectionCode> esmInsVehicleInspectionCodeBasePageResult= esmInsVehicleInspectionCodeService.queryPage(esmInsVehicleInspectionCodePageVo);
         return HttpResult.ok(esmInsVehicleInspectionCodeBasePageResult);
     }
 
     @PostMapping("/submit")
     @ApiOperation("提交")
-    public HttpResult<Object> submit(EsmInsVehicleInspectionCodeVo esmInsVehicleInspectionCodeVo) {
+    public HttpResult<Object> submit(@RequestBody EsmInsVehicleInspectionCodeVo esmInsVehicleInspectionCodeVo) {
         boolean b = esmInsVehicleInspectionCodeService.submit(esmInsVehicleInspectionCodeVo);
         AssertionUtils.isSucceed(b, "提交失败");
         return HttpResult.ok("提交成功");
     }
 
-    @DeleteMapping("/modification/{id}")
+    @PutMapping("/modification/{id}")
     @ApiOperation("修改")
     public HttpResult<Object> modification(@PathVariable String id, @RequestSingleParam("code") String code) {
         boolean b = esmInsVehicleInspectionCodeService.modification(id, code);

+ 4 - 1
src/main/java/com/ydtech/modules/esm/model/EsmInsVehicleInspectionCode.java

@@ -1,9 +1,11 @@
 package com.ydtech.modules.esm.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -18,7 +20,7 @@ public class EsmInsVehicleInspectionCode implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -43,6 +45,7 @@ public class EsmInsVehicleInspectionCode implements Serializable {
      * 有效时间
      */
     @TableField(value = "valid_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date validTime;
 
     @TableField(exist = false)

+ 10 - 2
src/main/java/com/ydtech/modules/esm/service/impl/EsmInsVehicleInspectionCodeServiceImpl.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.esm.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.esm.dao.EsmInsVehicleInspectionCodeMapper;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.model.EsmInsVehicleInspectionCode;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -49,14 +51,19 @@ public class EsmInsVehicleInspectionCodeServiceImpl extends ServiceImpl<EsmInsVe
     public boolean submit(EsmInsVehicleInspectionCodeVo esmInsVehicleInspectionCodeVo) {
         EsmInsVehicleInspectionCode esmInsVehicleInspectionCode = lambdaQuery().eq(EsmInsVehicleInspectionCode::getCompanyId,
                 esmInsVehicleInspectionCodeVo.getCompanyId()).one();
-        AssertionUtils.isSucceed(ObjectUtils.isEmpty(esmInsVehicleInspectionCode), "此保险公司已经录入验车码");
+        if(!ObjectUtils.isEmpty(esmInsVehicleInspectionCode)){
+            throw new SystemException("此保险公司已经录入验车码");
+        }else {
+            esmInsVehicleInspectionCode = new EsmInsVehicleInspectionCode();
+        }
 
         EsmInsCompany esmInsCompany = esmInsCompanyService.getById(esmInsVehicleInspectionCodeVo.getCompanyId());
         AssertionUtils.isSucceed(!ObjectUtils.isEmpty(esmInsCompany), "录入的保险公司不存在");
 
         esmInsVehicleInspectionCode.setCompanyId(esmInsCompany.getId());
         esmInsVehicleInspectionCode.setName(esmInsCompany.getName());
-        esmInsVehicleInspectionCode.setVehicleInspectionCode(esmInsVehicleInspectionCode.getVehicleInspectionCode());
+        esmInsVehicleInspectionCode.setVehicleInspectionCode(esmInsVehicleInspectionCodeVo.getVehicleInspectionCode());
+        esmInsVehicleInspectionCode.setValidTime(new Date());
         return save(esmInsVehicleInspectionCode);
     }
 
@@ -66,6 +73,7 @@ public class EsmInsVehicleInspectionCodeServiceImpl extends ServiceImpl<EsmInsVe
         AssertionUtils.isEmpty(esmInsVehicleInspectionCode, "修改的编号不存在");
 
         esmInsVehicleInspectionCode.setVehicleInspectionCode(code);
+        esmInsVehicleInspectionCode.setValidTime(new Date());
         return updateById(esmInsVehicleInspectionCode);
     }