Skip to content

B
bailuntec-cost
Commit c9a58952 by lizefeng
Options

新增 实际账期字段

parent 25dde9e5
Showing with 61 additions and 1 deletion
cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostDetailDto.java
......@@ -68,4 +68,7 @@ public class CostDetailDto {
@ApiModelProperty("所属账期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date projectDate;
@ApiModelProperty("所属账期实际")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date projectDateA;
}
cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java
......@@ -191,6 +191,10 @@ public class CostDto {
@ApiModelProperty("所属账期")
private Date projectDate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("所属账期实际")
private Date projectDateA;
@ApiModelProperty("物流单号")
private String trackingNumber;
......
cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostPlanTempDto.java
......@@ -26,6 +26,8 @@ public class CostPlanTempDto {
private String project; // 所属项目
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date projectDate; // 所属账期
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date projectDateA; // 所属账期
@ApiModelProperty("会计一级科目")
private String accountingSubjectNo;
......
cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/LogisticsCostDto.java
......@@ -22,6 +22,8 @@ public class LogisticsCostDto {
private String project; //所属项目
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDate; //所属账期
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDateA; //所属账期
//费用来源 1-默认 2-WMS 3-调拨系统
private String sourceFrom;
......
cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/WageCostDto.java
......@@ -61,6 +61,9 @@ public class WageCostDto {
//所属账期
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDate;
//所属账期
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDateA;
private List<WageCostDetailDto> listDetail;
......
cost-service/src/main/java/com/blt/other/database/model/CostPlanDomain.java
......@@ -186,6 +186,10 @@ public class CostPlanDomain implements Serializable {
@ApiModelProperty("所属账期")
private Date projectDate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("所属账期")
private Date projectDateA;
@ApiModelProperty("物流单号")
private String trackingNumber;
......
cost-service/src/main/java/com/blt/other/database/model/CostPlanTempDomain.java
......@@ -39,6 +39,8 @@ public class CostPlanTempDomain {
private String project;
// 所属账期
private Date projectDate;
// 所属账期
private Date projectDateA;
@ApiModelProperty("类型编号")
private Integer typeId;
......
cost-service/src/main/java/com/blt/other/module/cost/dto/request/AddItemReq.java
......@@ -52,4 +52,7 @@ public class AddItemReq {
@ApiModelProperty("所属账期")
private Date projectDate; // 所属账期
@ApiModelProperty("所属账期A")
private Date projectDateA; // 所属账期
}
cost-service/src/main/java/com/blt/other/module/cost/dto/request/ResetItemReq.java
......@@ -53,4 +53,7 @@ public class ResetItemReq {
@ApiModelProperty("所属账期")
private Date projectDate; // 所属账期
@ApiModelProperty("所属账期")
private Date projectDateA; // 所属账期
}
cost-service/src/main/java/com/blt/other/module/cost/dto/request/ResetReq.java
......@@ -63,6 +63,9 @@ public class ResetReq {
@ApiModelProperty("所属账期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDate;
@ApiModelProperty("所属账期A")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date projectDateA;
private MultipartFile fileSelect2;
}
cost-service/src/main/java/com/blt/other/module/cost/model/CostDetailDomain.java
......@@ -74,6 +74,9 @@ public class CostDetailDomain {
@ApiModelProperty("所属账期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date projectDate;
@ApiModelProperty("所属账期A")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date projectDateA;
public CostDetailDto castToDto() {
CostDetailDto costDetailDto = new CostDetailDto();
......
cost-service/src/main/java/com/blt/other/module/cost/model/CostDomain.java
......@@ -244,6 +244,10 @@ public class CostDomain implements Serializable {
@ApiModelProperty("所属账期")
private Date projectDate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("所属账期A")
private Date projectDateA;
@TableField(typeHandler = JacksonTypeHandler.class)
@ApiModelProperty("附加字段")
private List<CostAttach> attach;
......@@ -374,6 +378,7 @@ public class CostDomain implements Serializable {
req.setCategoryName(this.getCategoryName());
req.setProject(this.getProject());
req.setProjectDate(this.getProjectDate());
req.setProjectDateA(this.getProjectDateA());
return req;
}
......
cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostApiServiceImpl.java
......@@ -139,12 +139,14 @@ public class CostApiServiceImpl implements CostApiService {
costDomain.setCostTemplateIdByFrom();
costDomain.setProject(logisticsCostDto.getProject());
costDomain.setProjectDate(logisticsCostDto.getProjectDate());
costDomain.setProjectDateA(logisticsCostDto.getProjectDateA());
costDao.insert(costDomain);
if (costForm == 1) {
CostDetailDomain costDetailDomain = new CostDetailDomain();
BeanUtils.copyProperties(costDomain, costDetailDomain);
costDetailDomain.setProject(logisticsCostDto.getProject());
costDetailDomain.setProjectDate(logisticsCostDto.getProjectDate());
costDetailDomain.setProjectDateA(logisticsCostDto.getProjectDateA());
costDetailDomain.setDetailNo(costNo + "-1");
costDetailDao.insert(costDetailDomain);
}
......@@ -372,6 +374,7 @@ public class CostApiServiceImpl implements CostApiService {
costDetailDomain.setFilePath(path);
costDetailDomain.setProject(costDetail.getProject());
costDetailDomain.setProjectDate(wageCostDto.getProjectDate());
costDetailDomain.setProjectDateA(wageCostDto.getProjectDateA());
costDetailDao.insert(costDetailDomain);
}
} else {
......@@ -388,6 +391,7 @@ public class CostApiServiceImpl implements CostApiService {
costDetailDomain.setFilePath(path);
costDetailDomain.setProject(wageCostDto.getProject());
costDetailDomain.setProjectDate(wageCostDto.getProjectDate());
costDetailDomain.setProjectDateA(wageCostDto.getProjectDateA());
costDetailDao.insert(costDetailDomain);
}
CostLogDomain costLogDomain = new CostLogDomain();
......
cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostExportServiceImpl.java
......@@ -53,7 +53,7 @@ public class CostExportServiceImpl implements CostExportService {
}
// 设置表头
String[] headers = {"费用单号", "费用类型", "费用单大类", "费用单小类", "费用单状态", "借支/借还", "关联借支单号", "借支单状态", "是否抵个税", "付款主体", "收款单位", "付款理由", "付款金额", "币种", "创建人名称", "下单时间", "用途", "付款时间", "发票状态"
, "项目", "客户编号", "会计科目", "所属项目", "所属账期", "人民币金额"};
, "项目", "客户编号", "会计科目", "所属项目", "所属账期", "人民币金额","实际所属账期"};
HSSFRow row0 = sheet.createRow(0);
for (int i = 0; i < headers.length; i++) {
HSSFCell cell = row0.createCell(i);
......@@ -125,6 +125,8 @@ public class CostExportServiceImpl implements CostExportService {
amountRmbDto = costDto.getAmount().multiply(costDto.getToRmbRate()).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
}
row.createCell(24).setCellValue(amountRmbDto);
row.createCell(25).setCellValue(costDto.getProjectDateA() != null ? new SimpleDateFormat("yyyy-MM").format(costDto.getProjectDateA()) : "");
rows++;
}
// 保存到本地，并且返回路径
......
cost-service/src/main/java/com/blt/other/module/cost/service/impl/cost/Lend1CostServiceImpl.java
......@@ -61,6 +61,7 @@ public class Lend1CostServiceImpl extends AbstractCostService implements CostSer
applyMoneyDetail.setMoneyRmb(costDetailDomain.getAmount().multiply(toRmbRate).setScale(2, BigDecimal.ROUND_HALF_UP));
applyMoneyDetail.setProject(costDetailDomain.getProject());
applyMoneyDetail.setProjectDate(costDetailDomain.getProjectDate());
applyMoneyDetail.setProjectDateA(costDetailDomain.getProjectDateA());
applyMoneyDetail.setRemark("");
applyMoneyDetailList.add(applyMoneyDetail);
}
......
cost-service/src/main/java/com/blt/other/module/cost/service/impl/cost/PayCostServiceImpl.java
......@@ -54,6 +54,7 @@ public class PayCostServiceImpl extends AbstractCostService implements CostServi
if (i == 0) {
req.setProject(detailDomain.getProject());
req.setProjectDate(detailDomain.getProjectDate());
req.setProjectDateA(detailDomain.getProjectDateA());
req.setCategoryName(detailDomain.getCategoryName());
}
ApplyMoneyDetail applyMoneyDetail = new ApplyMoneyDetail();
......@@ -71,6 +72,7 @@ public class PayCostServiceImpl extends AbstractCostService implements CostServi
applyMoneyDetail.setCategoryName(detailDomain.getCategoryName());
applyMoneyDetail.setProject(detailDomain.getProject());
applyMoneyDetail.setProjectDate(detailDomain.getProjectDate());
applyMoneyDetail.setProjectDateA(detailDomain.getProjectDateA());
applyMoneyDetailList.add(applyMoneyDetail);
req.setMoneyDetail(applyMoneyDetailList);
}
......
cost-service/src/main/java/com/blt/other/module/cost/service/impl/costplan/CostPlanServiceFactory.java
......@@ -203,6 +203,12 @@ public class CostPlanServiceFactory {
} else {
jsonObject.put(costPlanField, value);
}
if (costPlanField.equals("projectDateA")) {
DateFormat fmt = new SimpleDateFormat("yyyy-MM");
jsonObject.put(costPlanField, fmt.parse(value));
} else {
jsonObject.put(costPlanField, value);
}
}
}
CostPlanDomain costPlanDomain = jsonObject.toJavaObject(CostPlanDomain.class);
......
cost-service/src/main/java/com/blt/other/module/cost/vo/CostPlanEnumVo.java
......@@ -98,6 +98,14 @@ public enum CostPlanEnumVo {
put("借还", "所属账期");
}
}),
projectDateA(new HashMap<String, String>() {
{
put("付款", "实际账期");
put("收款", "实际账期");
put("借支", "实际账期");
put("借还", "实际账期");
}
}),
payCounteract(new HashMap<String, String>() {
{
put("借还", "冲销金额");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment