楚江ERP:账期-回笼资金

@@ -5,6 +5,9 @@ import java.math.BigDecimal;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDate;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.xingyun.sc.entity.Recapitalize;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -68,6 +71,9 @@ public class GetRecapitalizeBo extends BaseBo<Recapitalize> {
     @ApiModelProperty("厂别")
     private String factoryType;
 
+    @ApiModelProperty("厂别名称")
+    private String factoryTypeName;
+
     public GetRecapitalizeBo() {
 
     }
@@ -84,6 +90,8 @@ public class GetRecapitalizeBo extends BaseBo<Recapitalize> {
 
     @Override
     protected void afterInit(Recapitalize dto) {
-
+        SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
+        SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("SUPPLIER", dto.getFactoryType());
+        dto.setFactoryTypeName(dataDicItem == null ? "" : dataDicItem.getName());
     }
 }

@@ -5,6 +5,9 @@ import java.math.BigDecimal;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDate;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.xingyun.sc.entity.Recapitalize;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -68,6 +71,9 @@ public class QueryRecapitalizeBo extends BaseBo<Recapitalize> {
     @ApiModelProperty("厂别")
     private String factoryType;
 
+    @ApiModelProperty("厂别名称")
+    private String factoryTypeName;
+
     public QueryRecapitalizeBo() {
 
     }
@@ -84,6 +90,8 @@ public class QueryRecapitalizeBo extends BaseBo<Recapitalize> {
 
     @Override
     protected void afterInit(Recapitalize dto) {
-
+        SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
+        SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("SUPPLIER", dto.getFactoryType());
+        dto.setFactoryTypeName(dataDicItem == null ? "" : dataDicItem.getName());
     }
 }

@@ -91,7 +91,7 @@ public class RecapitalizeController extends DefaultBaseController {
     @ApiOperation("新增")
     @HasPermission({"account-manage:recoup-funds:add"})
     @PostMapping
-    public InvokeResult<Void> create(@Valid CreateRecapitalizeVo vo) {
+    public InvokeResult<Void> create(@Valid @RequestBody CreateRecapitalizeVo vo) {
 
         RecapitalizeService.create(vo);
 
@@ -104,7 +104,7 @@ public class RecapitalizeController extends DefaultBaseController {
     @ApiOperation("修改")
     @HasPermission({"account-manage:recoup-funds:modify"})
     @PutMapping
-    public InvokeResult<Void> update(@Valid UpdateRecapitalizeVo vo) {
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateRecapitalizeVo vo) {
 
         RecapitalizeService.update(vo);
 

@@ -67,6 +67,12 @@ public class Recapitalize extends BaseEntity implements BaseDto {
     private String factoryType;
 
     /**
+     * 厂别名称
+     */
+    @TableField(exist = false)
+    private String factoryTypeName;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)