|
@@ -1300,8 +1300,10 @@ public class WorkFullManageController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
//获取报告发起时间
|
|
//获取报告发起时间
|
|
|
|
+ //自较、项目负责人对应时间也变更为质量复核通过时间
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy年 MM月 dd日");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy年 MM月 dd日");
|
|
- Date ziDate=projectReportData.getCreateDate();
|
|
|
|
|
|
+ //Date ziDate=projectReportData.getCreateDate();
|
|
|
|
+ Date ziDate=projectReportData.getAuditPassDate();
|
|
if(null == ziDate){
|
|
if(null == ziDate){
|
|
data.put("ziDate","");
|
|
data.put("ziDate","");
|
|
}else{
|
|
}else{
|