修复dmp 收入上传

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

@@ -38,9 +38,9 @@ public class DmpIncomeController {
     }
 
     @PostMapping("/delete")
-    public ResultModel deleteItem(Long id) {
+    public ResultModel deleteItem(@RequestBody DmpIncome dmpIncome) {
         //删除数据
-        return ResultModel.OK(dmpIncomeService.delete(id));
+        return ResultModel.OK(dmpIncomeService.delete(dmpIncome));
     }
 
 

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

@@ -9,159 +9,169 @@ import java.util.Date;
 @Entity
 public class DmpIncome {
 
-    private Long id;// ID
-    private String contractCode;//合同编号
-    private String incomeMonth;//收入月份
-    private String period;//结算周期
-    private String sysSettlement;//系统结算
-    private String monthSettlement;//按月结算
-    private String confirmSettlement;//确认结算
-    private String taxRate;//税率
-    private Date createTime;
-    private Date modifyTime;
-    private String uploadUser;
-
-    //contract_code, my_body_name, customer_body, customer_short, business_type, agreement_type
-
-    private String myBodyName,
-            customerBody,
-            customerShort,
-            businessType,
-            agreementType;
-
-
-    @Id
-    @GeneratedValue
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getContractCode() {
-        return contractCode;
-    }
-
-    public void setContractCode(String contractCode) {
-        this.contractCode = contractCode;
-    }
-
-    public String getIncomeMonth() {
-        return incomeMonth;
-    }
-
-    public void setIncomeMonth(String incomeMonth) {
-        this.incomeMonth = incomeMonth;
-    }
-
-    public String getPeriod() {
-        return period;
-    }
-
-    public void setPeriod(String period) {
-        this.period = period;
-    }
-
-    public String getSysSettlement() {
-        return sysSettlement;
-    }
-
-    public void setSysSettlement(String sysSettlement) {
-        this.sysSettlement = sysSettlement;
-    }
-
-    public String getMonthSettlement() {
-        return monthSettlement;
-    }
-
-    public void setMonthSettlement(String monthSettlement) {
-        this.monthSettlement = monthSettlement;
-    }
-
-    public String getConfirmSettlement() {
-        return confirmSettlement;
-    }
-
-    public void setConfirmSettlement(String confirmSettlement) {
-        this.confirmSettlement = confirmSettlement;
-    }
-
-    public String getTaxRate() {
-        return taxRate;
-    }
-
-    public void setTaxRate(String taxRate) {
-        this.taxRate = taxRate;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getModifyTime() {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Date modifyTime) {
-        this.modifyTime = modifyTime;
-    }
-
-    public String getUploadUser() {
-        return uploadUser;
-    }
-
-    public void setUploadUser(String uploadUser) {
-        this.uploadUser = uploadUser;
-    }
-
-    @Transient
-    public String getMyBodyName() {
-        return myBodyName;
-    }
-
-    public void setMyBodyName(String myBodyName) {
-        this.myBodyName = myBodyName;
-    }
-
-    @Transient
-    public String getCustomerBody() {
-        return customerBody;
-    }
-
-    public void setCustomerBody(String customerBody) {
-        this.customerBody = customerBody;
-    }
-
-    @Transient
-    public String getCustomerShort() {
-        return customerShort;
-    }
-
-    public void setCustomerShort(String customerShort) {
-        this.customerShort = customerShort;
-    }
-
-    @Transient
-    public String getBusinessType() {
-        return businessType;
-    }
-
-    public void setBusinessType(String businessType) {
-        this.businessType = businessType;
-    }
-
-    @Transient
-    public String getAgreementType() {
-        return agreementType;
-    }
-
-    public void setAgreementType(String agreementType) {
-        this.agreementType = agreementType;
-    }
+	private Long id;// ID
+	private String contractCode;//合同编号
+	private String incomeMonth;//收入月份
+	private String period;//结算周期
+	private String sysSettlement;//系统结算
+	private String monthSettlement;//按月结算
+	private String confirmSettlement;//确认结算
+	private String taxRate;//税率
+	private Date createTime;
+	private Date modifyTime;
+	private String uploadUser;
+	private int index;
+
+	//contract_code, my_body_name, customer_body, customer_short, business_type, agreement_type
+
+	private String myBodyName,
+			customerBody,
+			customerShort,
+			businessType,
+			agreementType;
+
+
+	@Id
+	@GeneratedValue
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getContractCode() {
+		return contractCode;
+	}
+
+	public void setContractCode(String contractCode) {
+		this.contractCode = contractCode;
+	}
+
+	public String getIncomeMonth() {
+		return incomeMonth;
+	}
+
+	public void setIncomeMonth(String incomeMonth) {
+		this.incomeMonth = incomeMonth;
+	}
+
+	public String getPeriod() {
+		return period;
+	}
+
+	public void setPeriod(String period) {
+		this.period = period;
+	}
+
+	public String getSysSettlement() {
+		return sysSettlement;
+	}
+
+	public void setSysSettlement(String sysSettlement) {
+		this.sysSettlement = sysSettlement;
+	}
+
+	public String getMonthSettlement() {
+		return monthSettlement;
+	}
+
+	public void setMonthSettlement(String monthSettlement) {
+		this.monthSettlement = monthSettlement;
+	}
+
+	public String getConfirmSettlement() {
+		return confirmSettlement;
+	}
+
+	public void setConfirmSettlement(String confirmSettlement) {
+		this.confirmSettlement = confirmSettlement;
+	}
+
+	public String getTaxRate() {
+		return taxRate;
+	}
+
+	public void setTaxRate(String taxRate) {
+		this.taxRate = taxRate;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getModifyTime() {
+		return modifyTime;
+	}
+
+	public void setModifyTime(Date modifyTime) {
+		this.modifyTime = modifyTime;
+	}
+
+	public String getUploadUser() {
+		return uploadUser;
+	}
+
+	public void setUploadUser(String uploadUser) {
+		this.uploadUser = uploadUser;
+	}
+
+	@Transient
+	public String getMyBodyName() {
+		return myBodyName;
+	}
+
+	public void setMyBodyName(String myBodyName) {
+		this.myBodyName = myBodyName;
+	}
+
+	@Transient
+	public String getCustomerBody() {
+		return customerBody;
+	}
+
+	public void setCustomerBody(String customerBody) {
+		this.customerBody = customerBody;
+	}
+
+	@Transient
+	public String getCustomerShort() {
+		return customerShort;
+	}
+
+	public void setCustomerShort(String customerShort) {
+		this.customerShort = customerShort;
+	}
+
+	@Transient
+	public String getBusinessType() {
+		return businessType;
+	}
+
+	public void setBusinessType(String businessType) {
+		this.businessType = businessType;
+	}
+
+	@Transient
+	public String getAgreementType() {
+		return agreementType;
+	}
+
+	public void setAgreementType(String agreementType) {
+		this.agreementType = agreementType;
+	}
+
+	@Transient
+	public int getIndex() {
+		return index;
+	}
+
+	public void setIndex(int index) {
+		this.index = index;
+	}
 }

src/main/java/common/repository/DmpIncomeRepository.java

@@ -16,4 +16,5 @@ public interface DmpIncomeRepository extends JpaRepository<DmpIncome, Long> {
 
     @Query(value = "select * from dmp_income where contract_code = ?1 and  income_month =?2 limit 1 ", nativeQuery = true)
     DmpIncome findByCodeMonth(String contractCode, String incomeMonth);
+
 }

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

@@ -10,17 +10,17 @@ import java.util.List;
 
 public interface DmpIncomeService {
 
-    List<DmpIncome> listByCode(String contractCode);
+	List<DmpIncome> listByCode(String contractCode);
 
-    List<DmpIncome> listByDs(String start, String end);
+	List<DmpIncome> listByDs(String start, String end);
 
-    HSSFWorkbook exportIncomeList(String startDate, String endDate, String bodyCode, String serchName);
+	HSSFWorkbook exportIncomeList(String startDate, String endDate, String bodyCode, String serchName);
 
-    DmpIncome update(DmpIncome dmpIncome);
+	DmpIncome update(DmpIncome dmpIncome);
 
-    Long delete(Long id);
+	Long delete(DmpIncome dmpIncome);
 
-    ResultModel uploadFile(MultipartFile file, String platform, User loginAccount);
+	ResultModel uploadFile(MultipartFile file, String platform, User loginAccount);
 
-    ResultModel contractUploadFile(MultipartFile file, String platform, User loginAccount);
+	ResultModel contractUploadFile(MultipartFile file, String platform, User loginAccount);
 }