DMP 收入

src/main/java/common/controller/DmpIncomeController.java

@@ -44,11 +44,13 @@ public class DmpIncomeController {
     }
 
 
-    @PostMapping("/upload/{platform}")
-    public ResultModel uploadList(@RequestParam("file") MultipartFile file, @PathVariable String platform, @CurrentAccount User loginAccount) {
+    @PostMapping("/upload")
+    public ResultModel uploadList(@RequestParam("file") MultipartFile file, @CurrentAccount User loginAccount) {
         //上传收入数据
-        dmpIncomeService.uploadFile(file,platform,loginAccount);
+        dmpIncomeService.uploadFile(file, "dmp", loginAccount);
         return ResultModel.OK();
     }
 
+
+
 }

src/main/java/common/model/Contract.java

@@ -107,6 +107,8 @@ public class Contract {
 
     private int businessType; //业务类型 1 VIP 2 共管
     private int agreementType; //协议类型 1 普通协议 2 框架协议
+    private String businessTypeName; //业务类型 1 VIP 2 共管
+    private String agreementTypeName; //协议类型 1 普通协议 2 框架协议
 
     @Id
     @GeneratedValue
@@ -791,4 +793,22 @@ public class Contract {
     public void setAgreementType(int agreementType) {
         this.agreementType = agreementType;
     }
+
+    @Transient
+    public String getBusinessTypeName() {
+        return businessTypeName;
+    }
+
+    public void setBusinessTypeName(String businessTypeName) {
+        this.businessTypeName = businessTypeName;
+    }
+
+    @Transient
+    public String getAgreementTypeName() {
+        return agreementTypeName;
+    }
+
+    public void setAgreementTypeName(String agreementTypeName) {
+        this.agreementTypeName = agreementTypeName;
+    }
 }

src/main/java/common/model/DmpIncome.java

@@ -9,8 +9,8 @@ import java.util.Date;
 @Entity
 public class DmpIncome {
 
-    private Long id;
-    private String contractCode;
+    private Long id;// ID
+    private String contractCode;//合同编号
     private String incomeMonth;//收入月份
     private String period;//结算周期
     private String sysSettlement;//系统结算

src/main/java/common/service/DmpIncomeService.java

@@ -21,4 +21,6 @@ public interface DmpIncomeService {
     Long delete(Long id);
 
     ResultModel uploadFile(MultipartFile file, String platform, User loginAccount);
+
+    ResultModel contractUploadFile(MultipartFile file, String platform, User loginAccount);
 }

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -232,6 +232,9 @@ public class ContractServiceImpl implements ContractService {
     @Autowired
     private CalculationFlowRepository calculationFlowRepository;
 
+    @Autowired
+    private DmpIncomeService dmpIncomeService;
+
 
     @Override
     public Map<String, Object> checkAccount(String email, String platfrom) {
@@ -2487,6 +2490,12 @@ public class ContractServiceImpl implements ContractService {
 
     @Override
     public ResultModel uploadBatchInfo(MultipartFile file, String platform, User loginAccount) {
+
+        if ("dmp".equals(platform)) {
+            return dmpIncomeService.contractUploadFile(file, platform, loginAccount);
+        }
+
+
         InputStream stream = null;
         try {
             int row_length;