Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/esm/controller/EsmInsPackageController.java

@@ -38,6 +38,13 @@ public class EsmInsPackageController {
         return HttpResult.ok("提交成功");
     }
 
+    @GetMapping("/queryById/{id}")
+    @ApiOperation("通过id查询")
+    public HttpResult<EsmInsPackage> queryById(@PathVariable String id) {
+        EsmInsPackage esmInsPackage = esmInsPackageService.getById(id);
+        return HttpResult.ok(esmInsPackage);
+    }
+
     @PutMapping("/modification/{id}")
     @ApiOperation("修改")
     public HttpResult<Object> modification(@RequestBody EsmInsPackageVo esmInsPackageVo, @PathVariable String id) {
@@ -59,7 +66,7 @@ public class EsmInsPackageController {
     public HttpResult<List<EsmInsPackage>> query() {
         List<EsmInsPackage> list = esmInsPackageService
                 .lambdaQuery()
-                .eq(EsmInsPackage::getEffective, true)
+                .eq(EsmInsPackage::isEffective, true)
                 .list();
         return HttpResult.ok(list);
     }

src/main/java/com/ydtech/modules/esm/model/EsmInsPackage.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
  *
  * @TableName esm_ins_package
  */
-@TableName(value = "esm_ins_package")
+@TableName(value = "esm_ins_package", autoResultMap = true)
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -46,7 +46,7 @@ public class EsmInsPackage implements Serializable {
      * 是否启用
      */
     @TableField(value = "effective")
-    private Integer effective;
+    private boolean effective;
 
     /**
      * 险种信息
@@ -57,12 +57,11 @@ public class EsmInsPackage implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
-
-
     public EsmInsPackage(EsmInsPackageVo esmInsPackageVo) {
         this.title = esmInsPackageVo.getTitle();
         this.description = esmInsPackageVo.getDescription();
-        this.effective = esmInsPackageVo.getEffective();
+        this.effective = esmInsPackageVo.isEffective();
         this.kind = JSONObject.parseArray(JSONObject.toJSONString(esmInsPackageVo.getKindList()));
     }
+
 }

src/main/java/com/ydtech/modules/esm/model/vo/EsmInsPackageVo.java

@@ -23,7 +23,7 @@ public class EsmInsPackageVo implements Serializable {
     private String description;
 
     @ApiModelProperty("是否启用")
-    private Integer effective;
+    private boolean effective;
 
     @Valid
     @ApiModelProperty("险种信息")

src/main/java/com/ydtech/modules/esm/service/impl/EsmInsPackageServiceImpl.java

@@ -47,7 +47,7 @@ public class EsmInsPackageServiceImpl extends ServiceImpl<EsmInsPackageMapper, E
         EsmInsPackage insPackage = new EsmInsPackage(esmInsPackageVo);
         insPackage.setId(esmInsPackage.getId());
 
-        return updateById(esmInsPackage);
+        return updateById(insPackage);
     }