|
|
@@ -23,6 +23,7 @@ import com.zcxk.core.utils.export.EasyExcelUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -44,6 +45,7 @@ import java.util.stream.Collectors;
|
|
|
@RestController
|
|
|
@RequestMapping("/revenue")
|
|
|
@Api(tags = "营收信息")
|
|
|
+@Slf4j
|
|
|
public class RevenueController {
|
|
|
|
|
|
/**
|
|
|
@@ -114,8 +116,7 @@ public class RevenueController {
|
|
|
monthRevenueDto.setTenantId(loginUser.getTenantId());
|
|
|
oneConvertWan(monthRevenueDto);
|
|
|
|
|
|
- MonthRevenueEntity revenueEntity = new MonthRevenueEntity();
|
|
|
- BeanCopyUtils.copyProperties(monthRevenueDto, revenueEntity, MonthSellwaterEntity.class);
|
|
|
+ MonthRevenueEntity revenueEntity = BeanCopyUtils.copy(monthRevenueDto, MonthRevenueEntity.class);
|
|
|
revenueService.insert(revenueEntity);
|
|
|
//插入售水数据
|
|
|
for (MonthSellwaterDto entity : monthRevenueDto.getMonthSellList()) {
|
|
|
@@ -132,7 +133,8 @@ public class RevenueController {
|
|
|
}
|
|
|
return AjaxMessage.success( );
|
|
|
}catch (Exception e){
|
|
|
- return AjaxMessage.fail(RespCodeEnum.ERROR_500);
|
|
|
+ log.error("保存报错",e);
|
|
|
+ return AjaxMessage.fail(RespCodeEnum.ERROR_500.getStatus(),e.getMessage());
|
|
|
}
|
|
|
|
|
|
}
|
lihui001