gaojiuqi/worktile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改接口

Browse Source
This commit is contained in:
liuxi 2021-06-18 17:44:34 +08:00
parent 7fd5948491
commit 303ca75743
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nbclass/szxgl/model/Project.java
View File

@ -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;
}

4
src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java
View File

@ -399,8 +399,8 @@ public class ProjectServiceImpl implements ProjectService {
String description = "<div class=\"gray\">" + DateUtil.date2String(new Date(), "yyyy年MM月dd日 HH:mm")
+ "</div><br><br>" + "项目名称：" + name
+ "<br>" + "客户单位："
+ projectClientService.getNamesById(p.getProjectClientId()) + "<br>" + "计划时间："
+ DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getPlanTime(), "MM-dd")
+ projectClientService.getNamesById(p.getProjectClientId()) + "<br>" + "项目时间："
+ DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getEndTime()!=null?p.getEndTime():p.getPlanTime(), "MM-dd")
+ "<br>" + "负责人：" + fzrNames // StringUtils.trimToEmpty(StringUtils.join(fzrNames, ","))
+ "<br>" + "创建人：" + syUsersMapper.findByUserName(p.getCreateUserId()).getTrueName();
if (StringUtils.isNotBlank(toUser)) {

6
src/main/resources/mapper/szxgl/ProjectMapper.xml
View File

@ -54,13 +54,13 @@
AND p._status = #{status}
</if>
<if test="starttime != null and starttime != ''">
<![CDATA[ AND p._start_time >= #{starttime} ]]>
<![CDATA[ AND DATE_FORMAT(p._start_time,"%Y-%m-%d") >= #{starttime} ]]>
</if>
<if test="endtime != null and endtime != ''">
<![CDATA[ AND p._end_time <= #{endtime} ]]>
<![CDATA[ AND DATE_FORMAT(p._end_time,"%Y-%m-%d") <= #{endtime} ]]>
</if>
<if test="plantime != null and plantime != ''">
<![CDATA[ AND p._plan_time <= #{plantime} ]]>
<![CDATA[ AND DATE_FORMAT(p._plan_time,"%Y-%m-%d") <= #{plantime} ]]>
</if>
<if test="createUserName != null and createUserName != ''">
AND (p._create_user_id=#{createUserName} or pu._table_id=#{createUserName} or ptu._user_id=#{createUserName})