diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementVO.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementVO.java index 4533ac26..22305a61 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementVO.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementVO.java @@ -55,12 +55,12 @@ public class PlanManagementVO { /** 借出方原计划数 */ @Excel(name = "原计划数") @ApiModelProperty(value = "借出方原计划数") - private String borrowerOrigPlanNum; + private Double borrowerOrigPlanNum; /** 借出方现计划数 */ @Excel(name = "现计划数") @ApiModelProperty(value = "借出方现计划数") - private String borrowerNowPlanNum; + private Double borrowerNowPlanNum; /** 借入方单位 */ @Excel(name = "借入方单位") @@ -69,25 +69,25 @@ public class PlanManagementVO { /** 借入方原计划数 */ @ApiModelProperty(value = "借入方原计划数") - private String lenderOrigPlanNum; + private Double lenderOrigPlanNum; /** 借入方现计划数 */ @Excel(name = "现有计划数") @ApiModelProperty(value = "借入方现计划数") - private String lenderNowPlanNum; + private Double lenderNowPlanNum; /** 借出数 */ @Excel(name = "借调数量") @ApiModelProperty(value = "借出数") - private String borrowNum; + private Double borrowNum; /** 计划单价 */ @ApiModelProperty(value = "计划单价") - private String planPrice; + private Double planPrice; /** 计划总价 */ @ApiModelProperty(value = "计划总价") - private String planCost; + private Double planCost; /** 类型id */ @ApiModelProperty(value = "类型id") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanVO.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanVO.java index 58e2f003..6301fe39 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanVO.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanVO.java @@ -47,17 +47,17 @@ public class PlanVO { /** 计划数 */ @Excel(name = "计划数") @ApiModelProperty(value = "计划数") - private String lenderOrigPlanNum; + private Double lenderOrigPlanNum; /** 计划单价 */ @Excel(name = "计划单价") @ApiModelProperty(value = "计划单价") - private String planPrice; + private Double planPrice; /** 计划总价 */ @Excel(name = "计划总价") @ApiModelProperty(value = "计划总价") - private String planCost; + private Double planCost; /** 类型id */ @ApiModelProperty(value = "类型id") @@ -77,6 +77,10 @@ public class PlanVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + /** 借出数 */ + @ApiModelProperty(value = "借出数") + private Double borrowNum; + /** 备注 */ @Excel(name = "备注") @ApiModelProperty(value = "备注") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanManagementServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanManagementServiceImpl.java index 2314fedd..9fbd80d9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanManagementServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PlanManagementServiceImpl.java @@ -14,8 +14,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; /** @@ -162,15 +160,9 @@ public class PlanManagementServiceImpl implements PlanManagementService { //新增plan_borrow_details for (CheckDetailsInfo checkDetailsInfo : dto.getCheckDetailsList()) { checkDetailsInfo.setPlanId(dto.getBorrowId()); - //checkDetailsInfo.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); } res += planManagementMapper.insertPlanBorrowDetail(dto.getCheckDetailsList()); return res; } - public static void main(String[] args) { - SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - System.out.println(simpleDateFormat.format(new Date())); - } - }