资产指标调整单处理接口

lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetAdjustDayMasterController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.lzbi.draft.domain.DcBusiTargetAdjustDayMasterDao;
+import com.lzbi.draft.domain.DcBusiTargetAdjustDaySubDao;
 import com.lzbi.draft.service.DcBusiTargetAdjustDayMasterService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -82,7 +83,7 @@ public class DcBusiTargetAdjustDayMasterController extends BaseController
     @PreAuthorize("@ss.hasPermi('lzbi:master:add')")
     @Log(title = "资产指标调整单主(日)", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DcBusiTargetAdjustDayMasterDao dcBusiTargetAdjustDayMasterDao)
+    public AjaxResult add(@RequestBody DcBusiTargetAdjustDayMasterDao<DcBusiTargetAdjustDaySubDao> dcBusiTargetAdjustDayMasterDao)
     {
         return toAjax(dcBusiTargetAdjustDayMasterService.insertDcBusiTargetAdjustDayMasterDao(dcBusiTargetAdjustDayMasterDao));
     }
@@ -113,7 +114,7 @@ public class DcBusiTargetAdjustDayMasterController extends BaseController
      * 审核资产指标调整单(日)
      */
     @ApiOperation("审核资产指标调整单")
-    @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class, paramType = "path")
+    @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class, paramType = "path", required = true)
     @PreAuthorize("@ss.hasPermi('lzbi:master:add')")
     @Log(title = "资产指标调整单主(日)", businessType = BusinessType.OTHER)
     @PostMapping("/audit/{id}")
@@ -126,7 +127,7 @@ public class DcBusiTargetAdjustDayMasterController extends BaseController
      * 处理资产指标调整单主(日)
      */
     @ApiOperation("处理资产指标调整单")
-    @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class, paramType = "path")
+    @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class, paramType = "path", required = true)
     @PreAuthorize("@ss.hasPermi('lzbi:master:add')")
     @Log(title = "资产指标调整单主(日)", businessType = BusinessType.OTHER)
     @PostMapping("/dispose/{id}")

lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDayMasterDao.java

@@ -21,7 +21,7 @@ import springfox.documentation.annotations.ApiIgnore;
  */
 @ApiModel(value = "DcBusiTargetAdjustDayMasterDao对象", description = "资产指标调整单主表对象")
 @Data
-public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity {
+public class DcBusiTargetAdjustDayMasterDao<T> extends BaseModuleEntity {
     /**
      * 待审核状态
      */
@@ -44,21 +44,21 @@ public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity {
     /**
      * 单据号
      */
-    @ApiModelProperty(value = "单据号", dataType = "String")
+    @ApiModelProperty(name = "billSerial", value = "单据号")
     @Excel(name = "单据号")
     private String billSerial;
 
     /**
      * 单据类别
      */
-    @ApiModelProperty(value = "单据类别", dataType = "String")
+    @ApiModelProperty(name = "biilType", value = "单据类别")
     @Excel(name = "单据类别")
     private String biilType;
 
     /**
      * 公司ID
      */
-    @ApiModelProperty(value = "公司ID", dataType = "Long")
+    @ApiModelProperty(name = "companyId", value = "公司ID")
     @Excel(name = "公司ID")
     private Long companyId;
 
@@ -79,14 +79,14 @@ public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity {
     /**
      * 组织机构ID
      */
-    @ApiModelProperty(value = "组织机构ID", dataType = "String")
+    @ApiModelProperty(name = "oragnizeId", value = "组织机构ID")
     @Excel(name = "组织机构ID")
     private Long oragnizeId;
 
     /**
      * 统计单元编码
      */
-    @ApiModelProperty(value = "统计单元编码", dataType = "String")
+    @ApiModelProperty(name = "assetCode", value = "统计单元编码")
     @Excel(name = "统计单元编码")
     private String assetCode;
 
@@ -100,7 +100,7 @@ public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity {
     /**
      * 统计专业代码
      */
-    @ApiModelProperty(value = "统计专业代码", dataType = "String")
+    @ApiModelProperty(name = "fieldCode", value = "统计专业代码")
     @Excel(name = "统计专业代码")
     private String fieldCode;
 
@@ -119,7 +119,7 @@ public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity {
     /**
      * 调整目标日期
      */
-    @ApiModelProperty(value = "调整目标日期", dataType = "String")
+    @ApiModelProperty(name = "dateAdjust", value = "调整目标日期")
     @Excel(name = "调整目标日期")
     private String dateAdjust;
 
@@ -164,7 +164,7 @@ public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity {
     /**
      * 统计单元指标调整单子表集合
      */
-    @ApiModelProperty(value = "统计单元指标调整单子表集合", dataType = "DcBusiTargetAdjustDaySubDao")
+    @ApiModelProperty(name = "children", value = "统计单元指标调整单子表集合")
-    private List<DcBusiTargetAdjustDaySubDao> children;
+    private List<T> children;
 
 }

lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetAdjustDaySubDao.java

@@ -62,7 +62,7 @@ public class DcBusiTargetAdjustDaySubDao extends BaseModuleEntity {
     /**
      * 指标编码
      */
-    @ApiModelProperty(value = "指标编码")
+    @ApiModelProperty(name = "targetCode", value = "指标编码")
     @Excel(name = "指标编码")
     private String targetCode;
 
@@ -76,42 +76,42 @@ public class DcBusiTargetAdjustDaySubDao extends BaseModuleEntity {
     /**
      * 指标单位
      */
-    @ApiModelProperty(value = "指标单位")
+    @ApiModelProperty(name = "tagetUnit", value = "指标单位")
     @Excel(name = "指标单位")
     private String tagetUnit;
 
     /**
      * 日期调整日期
      */
-    @ApiModelProperty(value = "日期调整日期")
+    @ApiModelProperty(name = "adjustDate", value = "日期调整日期")
     @Excel(name = "日期调整日期")
     private String adjustDate;
 
     /**
      * 调整时间
      */
-    @ApiModelProperty(value = "调整时间")
+    @ApiModelProperty(name = "adjstTime", value = "调整时间")
     @Excel(name = "调整时间")
     private Long adjstTime;
 
     /**
      * 原值
      */
-    @ApiModelProperty(value = "原值")
+    @ApiModelProperty(name = "valOrigin", value = "原值")
     @Excel(name = "原值")
     private BigDecimal valOrigin;
 
     /**
      * 调整值
      */
-    @ApiModelProperty(value = "调整值")
+    @ApiModelProperty(name = "valAdjust", value = "调整值")
     @Excel(name = "调整值")
     private BigDecimal valAdjust;
 
     /**
      * 结果值
      */
-    @ApiModelProperty(value = "结果值")
+    @ApiModelProperty(name = "valResult", value = "结果值")
     @Excel(name = "结果值")
     private BigDecimal valResult;