diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java index 2d6231f9..d2639fa8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java @@ -115,13 +115,22 @@ public class SltAgreementInfoController extends BaseController { List projectNames = new ArrayList<>(); List dataList = new ArrayList<>(); SltInfoVo bean = new SltInfoVo(); + Long agreementId = null; for (SltAgreementInfo info : list) { unitNames.add(info.getUnitName()); projectNames.add(info.getProjectName()); SltInfoVo vo = sltAgreementInfoService.getSltInfo(info); dataList.add(vo); + if (info.getAgreementId() != null) { + agreementId = info.getAgreementId(); + } } bean = mergerData(bean, dataList,unitNames,projectNames); + // 根据协议id获取申请时间 + TmTask tmTask = taskMapper.selectTaskById(agreementId); + if (tmTask != null) { + bean.setApplyTime(tmTask.getCreateTime()); + } return AjaxResult.success(bean); } public SltInfoVo mergerData(SltInfoVo vo,List list,List unitNames,List projectNames){ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltInfoVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltInfoVo.java index 07461cae..a7146960 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltInfoVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltInfoVo.java @@ -120,4 +120,8 @@ public class SltInfoVo { String cost; + @ApiModelProperty(value = "申请时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date applyTime; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java index 3df8488f..e8596e63 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java @@ -92,4 +92,17 @@ public interface TmTaskMapper { List getTaskIdList(SltAgreementInfo bean); + /** + * 根据协议id查询申请时间 + * @param agreementId + * @return + */ + TmTask selectTaskById(Long agreementId); + + /** + * 根据协议id查询申请时间 + * @param agreementId + * @return + */ + TmTask selectTaskByIdByCl(Long agreementId); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml index 30947ed2..c5754b99 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml @@ -150,4 +150,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from tm_task_agreement tta where tta.agreement_id = #{agreementId} + + \ No newline at end of file