主营项目bug

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -34,13 +35,13 @@ import java.util.stream.Collectors;
 @Service
 public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMapper, ServiceProject> implements ServiceProjectService
 {
-   @Autowired
+   @Resource
    private ServiceProjectMapper serviceProjectMapper;
-   @Autowired
+	@Resource
    private ServiceProjectItemMapper serviceProjectItemMapper;
-   @Autowired
+	@Resource
    private ServiceProjectFilesMapper serviceProjectFilesMapper;
-   @Autowired
+	@Resource
    private ISerialClient serialClient;//生成系统编号
 
 	@Override
@@ -60,6 +61,8 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
           {
              throw new RuntimeException("已收金额+未收金额≠合同总金额,请确认后提交");
 		  }
+		  R billNo = serialClient.getBillNo("ZY", null);
+		  serviceProject.setSysNo(billNo.getData().toString());
 		  serviceProject.setTenantId(AuthUtil.getTenantId());
 		  serviceProject.setCreateTime(new Date());
 		  serviceProject.setCreateUser(SecureUtil.getUserId());

blade-service/trade-finance/src/main/java/com/trade/finance/controller/SettlementController.java

@@ -157,7 +157,8 @@ public class SettlementController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入settlement")
 	public R submit(@Valid @RequestBody Settlement settlement) {
-		return R.status(settlementService.saveOrUpdate(settlement));
+		 settlementService.saveOrUpdate(settlement);
+		return R.data(settlement);
 	}