feats

src/main/java/com/yunzhi/inte/controller/GuaranteeDetailController.java

@@ -1,5 +1,6 @@
 package com.yunzhi.inte.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -49,12 +50,14 @@ public class GuaranteeDetailController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/guaranteeDetail")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("任务ID") @RequestParam(value ="guaranteeId") Integer guaranteeId) throws Exception {
 
         IPage<GuaranteeDetail> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<GuaranteeDetail> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<GuaranteeDetail> result = guaranteeDetailService.page(pg);
+        QueryWrapper<GuaranteeDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("guarantee_id", guaranteeId);
+        queryWrapper.orderByDesc("id");
+        IPage<GuaranteeDetail> result = guaranteeDetailService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
     }
@@ -67,11 +70,48 @@ public class GuaranteeDetailController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/guaranteeDetail")
-    public ResponseBean add(GuaranteeDetail guaranteeDetail) throws Exception {
+    public ResponseBean add(@ApiParam("实例对象") @RequestBody GuaranteeDetail guaranteeDetail) throws Exception {
         guaranteeDetailService.save(guaranteeDetail);
         return ResponseBean.success(guaranteeDetail);
     }
 
+    /**
+     * 新增数据
+     *
+     * @param jsonStr 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @PostMapping("/guaranteeDetail/batch")
+    public ResponseBean batch(@ApiParam("任务ID") @RequestParam(value ="guaranteeId") Integer guaranteeId,
+                              @ApiParam("实例对象") @RequestBody String jsonStr) throws Exception {
+        if (null == jsonStr || "".equals(jsonStr)) {
+            return ResponseBean.error("未找到需要保存的数据");
+        }
+
+        if (null == guaranteeId) {
+            return ResponseBean.error("未找到需要保存的数据");
+        }
+
+        List<GuaranteeDetail> list = JSONArray.parseArray(jsonStr, GuaranteeDetail.class);
+        if (null == list || list.size() < 1) {
+            return ResponseBean.error("未找到需要保存的数据");
+        }
+
+        // 先删除原有数据
+        QueryWrapper<GuaranteeDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("guarantee_id", guaranteeId);
+        guaranteeDetailService.remove(queryWrapper);
+
+        // 再批量插入
+        for (GuaranteeDetail item : list) {
+            item.setGuaranteeId(guaranteeId);
+        }
+
+        guaranteeDetailService.saveBatch(list);
+        return ResponseBean.success(list);
+    }
+
     /**
      * 更新数据
      *
@@ -80,7 +120,7 @@ public class GuaranteeDetailController extends BaseController {
      */
     @ApiOperation("更新数据")
     @PutMapping("/guaranteeDetail/{id}")
-    public ResponseBean edit(GuaranteeDetail guaranteeDetail) throws Exception {
+    public ResponseBean edit(@ApiParam("实例对象") @RequestBody GuaranteeDetail guaranteeDetail) throws Exception {
         guaranteeDetailService.updateById(guaranteeDetail);
         return ResponseBean.success(guaranteeDetail);
     }
@@ -94,7 +134,7 @@ public class GuaranteeDetailController extends BaseController {
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/guaranteeDetail/{id}")
     public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        guaranteeDetailService.removeLogicById(id);
+        guaranteeDetailService.removeById(id);
         return ResponseBean.success("success");
     }
 }

src/main/java/com/yunzhi/inte/controller/GuaranteeTaskController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
+
+import java.util.Date;
 import java.util.List;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -67,7 +69,9 @@ public class GuaranteeTaskController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/guaranteeTask")
-    public ResponseBean add(GuaranteeTask guaranteeTask) throws Exception {
+    public ResponseBean add(@ApiParam("实例对象") @RequestBody GuaranteeTask guaranteeTask) throws Exception {
+        guaranteeTask.setStatus(1);
+        guaranteeTask.setCreateDate(new Date());
         guaranteeTaskService.save(guaranteeTask);
         return ResponseBean.success(guaranteeTask);
     }
@@ -80,7 +84,9 @@ public class GuaranteeTaskController extends BaseController {
      */
     @ApiOperation("更新数据")
     @PutMapping("/guaranteeTask/{id}")
-    public ResponseBean edit(GuaranteeTask guaranteeTask) throws Exception {
+    public ResponseBean edit(@ApiParam("对象ID") @PathVariable Integer id,
+                             @ApiParam("实例对象") @RequestBody GuaranteeTask guaranteeTask) throws Exception {
+        guaranteeTask.setId(id);
         guaranteeTaskService.updateById(guaranteeTask);
         return ResponseBean.success(guaranteeTask);
     }

src/main/java/com/yunzhi/inte/entity/GuaranteeTask.java

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 public class GuaranteeTask implements Serializable,Cloneable{
     /** id */
     @ApiModelProperty(name = "id",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id ;
     /** 受领人 */
     @ApiModelProperty(name = "受领人",notes = "")
@@ -58,7 +58,7 @@ public class GuaranteeTask implements Serializable,Cloneable{
     private String deputyPhone ;
     /** 通报时间 */
     @ApiModelProperty(name = "通报时间",notes = "")
-    private Date gotDate ;
+    private String gotDate ;
     /** 保障序号 */
     @ApiModelProperty(name = "保障序号",notes = "")
     private String guaranteeNo ;
@@ -92,6 +92,9 @@ public class GuaranteeTask implements Serializable,Cloneable{
     /** 保障标准 */
     @ApiModelProperty(name = "保障标准",notes = "")
     private String standard ;
+    /** 套餐名称 */
+    @ApiModelProperty(name = "套餐名称",notes = "")
+    private String packageName ;
     /** 备注 */
     @ApiModelProperty(name = "备注",notes = "")
     private String remark ;