diff --git a/src/main/java/com/nbclass/szxgl/model/Project.java b/src/main/java/com/nbclass/szxgl/model/Project.java
index 00a8410..3c0e970 100644
--- a/src/main/java/com/nbclass/szxgl/model/Project.java
+++ b/src/main/java/com/nbclass/szxgl/model/Project.java
@@ -428,10 +428,18 @@ public class Project {
return endtime;
}
+
public void setEndtime(String endtime) {
this.endtime = endtime;
}
+ public void setPlantime(String plantime) {
+ this.plantime = plantime;
+ }
+ public String getPlantime() {
+ return plantime;
+ }
+
public String getFzrIds() {
return fzrIds;
}
diff --git a/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java b/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java
index 07de285..9cc81cb 100644
--- a/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java
@@ -399,8 +399,8 @@ public class ProjectServiceImpl implements ProjectService {
String description = "
" + DateUtil.date2String(new Date(), "yyyy年MM月dd日 HH:mm")
+ "
" + "项目名称:" + name
+ "
" + "客户单位:"
- + projectClientService.getNamesById(p.getProjectClientId()) + "
" + "计划时间:"
- + DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getPlanTime(), "MM-dd")
+ + projectClientService.getNamesById(p.getProjectClientId()) + "
" + "项目时间:"
+ + DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getEndTime()!=null?p.getEndTime():p.getPlanTime(), "MM-dd")
+ "
" + "负责人:" + fzrNames // StringUtils.trimToEmpty(StringUtils.join(fzrNames, ","))
+ "
" + "创建人:" + syUsersMapper.findByUserName(p.getCreateUserId()).getTrueName();
if (StringUtils.isNotBlank(toUser)) {
diff --git a/src/main/resources/mapper/szxgl/ProjectMapper.xml b/src/main/resources/mapper/szxgl/ProjectMapper.xml
index cbc41ba..ab677ca 100644
--- a/src/main/resources/mapper/szxgl/ProjectMapper.xml
+++ b/src/main/resources/mapper/szxgl/ProjectMapper.xml
@@ -54,13 +54,13 @@
AND p._status = #{status}
- = #{starttime} ]]>
+ = #{starttime} ]]>
-
+
-
+
AND (p._create_user_id=#{createUserName} or pu._table_id=#{createUserName} or ptu._user_id=#{createUserName})