小组更新

xm-bootstrap/src/main/resources/application-m1prod.properties

@@ -5,7 +5,7 @@ server.port=7067
 #server.context-path=/${spring.application.name}
 #session失效时间 秒
 server.session.timeout=43200
-spring.session.store-type=none
+spring.session.store-type=redis
 spring.cloud.inetutils.preferredNetworks[0]=^10\.
 spring.cloud.inetutils.preferredNetworks[1]=^172\.
 #eureka.client.serviceUrl.defaultZone=http://172.16.16.16:6110/eureka/

xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@@ -111,21 +111,22 @@ public class XmTaskExecuserController {
 		try{
 			String projectId=xmTaskExecuser.getProjectId();
 			 User user=LoginUtils.getCurrentUserInfo();
-			 List<XmProjectGroupVo> pgroups=groupService.getProjectGroupVoList(projectId);
-			boolean isHead= groupService.checkUserIsOtherUserTeamHead(pgroups, xmTaskExecuser.getUserid(), user.getUserid());
-			if(!isHead ) {
 			 if(user.getUserid().equals(xmTaskExecuser.getUserid())){
-					tips.setFailureMsg(user.getUsername()+"不是组长，无权进行新增任务执行人、候选人等操作");
+				 xmTaskExecuserService.addExecuser(xmTaskExecuser);
+				 m.put("data",xmTaskExecuser);
 			 }else {
-					tips.setFailureMsg(user.getUsername()+"不是"+xmTaskExecuser.getUsername()+"的组长，无权进行新增任务执行人、候选人等操作");
-				}
+				 List<XmProjectGroupVo> myGgroups=groupService.getProjectGroupVoList(projectId);
+				 boolean isTeamHeader= groupService.checkUserIsHeadInGroups(myGgroups,user.getUserid());
+				 boolean isPm=groupService.checkUserIsProjectManager(myGgroups,user.getUserid());
+				 if( !isTeamHeader &&  !isPm ) {
+						 tips.setFailureMsg(user.getUsername()+"不是组长、项目管理者，无权进行新增任务执行人、候选人等操作");
 				 }
 				 if(tips.isOk()) {
-
 					 xmTaskExecuserService.addExecuser(xmTaskExecuser);
 					 m.put("data",xmTaskExecuser);
-
 				 }
+			 }
+
 		}catch (BizException e) { 
 			tips=e.getTips();
 			logger.error("",e);

xm-core/src/main/java/com/xm/core/entity/XmTask.java

@@ -2,12 +2,11 @@ package com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 /**
- * 组织 com.qqkj  顶级模块 xm 大模块 core  小模块 <br> 
+ * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTask所有属性名: <br>
  *	id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,projectPhaseId,projectPhaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,iterationId,iterationName,productId,productName;<br>
  * 表 XM.xm_task xm_task的所有字段名: <br>
@@ -72,10 +71,10 @@ public class XmTask  implements java.io.Serializable {
 	@ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="")
 	String remarks;
 	
-	@ApiModelProperty(notes="任务创建人编号",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="任务创建人编号（谁创建谁负责）",allowEmptyValue=true,example="",allowableValues="")
 	String createUserid;
 	
-	@ApiModelProperty(notes="任务创建人",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="任务创建人（谁创建谁负责）",allowEmptyValue=true,example="",allowableValues="")
 	String createUsername;
 	
 	@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
@@ -277,13 +276,13 @@ public class XmTask  implements java.io.Serializable {
 		this.remarks = remarks;
 	}
 	/**
-	 * 任务创建人编号
+	 * 任务创建人编号（谁创建谁负责）
 	 **/
 	public void setCreateUserid(String createUserid) {
 		this.createUserid = createUserid;
 	}
 	/**
-	 * 任务创建人
+	 * 任务创建人（谁创建谁负责）
 	 **/
 	public void setCreateUsername(String createUsername) {
 		this.createUsername = createUsername;
@@ -566,13 +565,13 @@ public class XmTask  implements java.io.Serializable {
 		return this.remarks;
 	}
 	/**
-	 * 任务创建人编号
+	 * 任务创建人编号（谁创建谁负责）
 	 **/
 	public String getCreateUserid() {
 		return this.createUserid;
 	}
 	/**
-	 * 任务创建人
+	 * 任务创建人（谁创建谁负责）
 	 **/
 	public String getCreateUsername() {
 		return this.createUsername;

xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java

@@ -2,16 +2,15 @@ package com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 /**
- * 组织 com.qqkj  顶级模块 xm 大模块 core  小模块 <br> 
+ * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTaskExecuser所有属性名: <br>
- *	createTime,id,taskId,userid,startTime,endTime,status,remarks,settleAmount,settleWorkload,settleStatus,settleTime,createUserid,createUsername,username,matchScore,quoteWeekday,quoteAmount,quoteTime,bizProcInstId,bizFlowState,projectId,projectPhaseId,skillRemark,quoteWorkload,quoteStartTime,quoteEndTime,branchId,projectPhaseName,taskName,isLeader;<br>
+ *	createTime,id,taskId,userid,startTime,endTime,status,remarks,settleAmount,settleWorkload,settleStatus,settleTime,createUserid,createUsername,username,matchScore,quoteWeekday,quoteAmount,quoteTime,bizProcInstId,bizFlowState,projectId,projectPhaseId,skillRemark,quoteWorkload,quoteStartTime,quoteEndTime,branchId,projectPhaseName,taskName,isLeader,distUserid,distUsername;<br>
  * 表 XM.xm_task_execuser xm_task_execuser的所有字段名: <br>
- *	create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,project_phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,project_phase_name,task_name,is_leader;<br>
+ *	create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,project_phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,project_phase_name,task_name,is_leader,dist_userid,dist_username;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -114,6 +113,12 @@ public class XmTaskExecuser  implements java.io.Serializable {
 	@ApiModelProperty(notes="是否主负责人0否1是",allowEmptyValue=true,example="",allowableValues="")
 	String isLeader;
 	
+	@ApiModelProperty(notes="推荐人编号",allowEmptyValue=true,example="",allowableValues="")
+	String distUserid;
+	
+	@ApiModelProperty(notes="推荐人姓名",allowEmptyValue=true,example="",allowableValues="")
+	String distUsername;
+
 	/**编号**/
 	public XmTaskExecuser(String id) {
 		this.id = id;
@@ -309,6 +314,18 @@ public class XmTaskExecuser  implements java.io.Serializable {
 	public void setIsLeader(String isLeader) {
 		this.isLeader = isLeader;
 	}
+	/**
+	 * 推荐人编号
+	 **/
+	public void setDistUserid(String distUserid) {
+		this.distUserid = distUserid;
+	}
+	/**
+	 * 推荐人姓名
+	 **/
+	public void setDistUsername(String distUsername) {
+		this.distUsername = distUsername;
+	}
 	
 	/**
 	 * 创建时间
@@ -496,5 +513,17 @@ public class XmTaskExecuser  implements java.io.Serializable {
 	public String getIsLeader() {
 		return this.isLeader;
 	}
+	/**
+	 * 推荐人编号
+	 **/
+	public String getDistUserid() {
+		return this.distUserid;
+	}
+	/**
+	 * 推荐人姓名
+	 **/
+	public String getDistUsername() {
+		return this.distUsername;
+	}
 
 }

xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java

@@ -462,10 +462,74 @@ public class XmProjectGroupService extends BaseService {
 		}
     }
 
+	/**
+	 * 获取用户在某个项目中的组
+	 * @param projectId
+	 * @param userid
+	 * @return
+	 */
     public List<XmProjectGroupVo>  getUserGroups(String projectId,String userid){
     	List<XmProjectGroupVo> xmProjectGroupVoList=this.getProjectGroupVoList(projectId);
     	return this.getUserGroups(xmProjectGroupVoList, userid);
     }
+
+	/**
+	 * 检查用户是否在一些组中任意个组当组长
+	 * @param xmProjectGroupVoList
+	 * @param teamHeadUserid
+	 * @return
+	 */
+	public boolean  checkUserIsHeadInGroups( List<XmProjectGroupVo> xmProjectGroupVoList,String teamHeadUserid){
+		if(xmProjectGroupVoList==null || xmProjectGroupVoList.size()==0)return false;
+		if(!StringUtils.hasText(teamHeadUserid)){
+			return false;
+		}
+		for (XmProjectGroupVo xmProjectGroupVo : xmProjectGroupVoList) {
+			List<XmProjectGroupUser> gus=xmProjectGroupVo.getGroupUsers();
+			if(gus==null) {
+				continue;
+			}
+			for (XmProjectGroupUser gu : gus) {
+				if(teamHeadUserid.equals(gu.getUserid()) && "1".equals(gu.getIsHead())) {
+					 return true;
+				}
+			}
+
+		}
+		return false;
+	}
+
+	/**
+	 * 检查用户是否在指定的小组中做组长
+	 * @param xmProjectGroupVoList
+	 * @param groupId
+	 * @param teamHeadUserid
+	 * @return
+	 */
+	public boolean  checkUserIsHeadInGroup( List<XmProjectGroupVo> xmProjectGroupVoList,String groupId,String teamHeadUserid){
+		if(xmProjectGroupVoList==null || xmProjectGroupVoList.size()==0)return false;
+		if(!StringUtils.hasText(teamHeadUserid)){
+			return false;
+		}
+		if(!StringUtils.hasText(groupId)){
+			return false;
+		}
+
+		for (XmProjectGroupVo xmProjectGroupVo : xmProjectGroupVoList) {
+			if(groupId.equals(xmProjectGroupVo.getId())){
+				List<XmProjectGroupUser> gus=xmProjectGroupVo.getGroupUsers();
+				if(gus==null) {
+					continue;
+				}
+				for (XmProjectGroupUser gu : gus) {
+					if(teamHeadUserid.equals(gu.getUserid()) && "1".equals(gu.getIsHead())) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
     public List<XmProjectGroupVo>  getUserGroups( List<XmProjectGroupVo> xmProjectGroupVoList,String userid){
      	List<XmProjectGroupVo> userGroups=new ArrayList<>();
      	if(xmProjectGroupVoList==null) {

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml

@@ -172,15 +172,15 @@
 		insert into XM.xm_task_execuser(
 			<include refid="columns"/>
 		) values (
-		#{createTime},#{id},#{taskId},#{userid},#{startTime},#{endTime},#{status},#{remarks},#{settleAmount},#{settleWorkload},#{settleStatus},#{settleTime},#{createUserid},#{createUsername},#{username},#{matchScore},#{quoteWeekday},#{quoteAmount},#{quoteTime},#{bizProcInstId},#{bizFlowState},#{projectId},#{projectPhaseId},#{skillRemark},#{quoteWorkload},#{quoteStartTime},#{quoteEndTime},#{branchId},#{projectPhaseName},#{taskName},#{isLeader}
+		#{createTime},#{id},#{taskId},#{userid},#{startTime},#{endTime},#{status},#{remarks},#{settleAmount},#{settleWorkload},#{settleStatus},#{settleTime},#{createUserid},#{createUsername},#{username},#{matchScore},#{quoteWeekday},#{quoteAmount},#{quoteTime},#{bizProcInstId},#{bizFlowState},#{projectId},#{projectPhaseId},#{skillRemark},#{quoteWorkload},#{quoteStartTime},#{quoteEndTime},#{branchId},#{projectPhaseName},#{taskName},#{isLeader},#{distUserid},#{distUsername}
 		)
 	</insert>
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmTaskExecuser">
-		delete from XM.xm_task_execuser res
+		delete from XM.xm_task_execuser
 		<where>  
-			<include refid="where"/>
+			1=2
 		</where>
 	</delete>
 	
@@ -225,51 +225,56 @@
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
 		delete from XM.xm_task_execuser 
-			where id in
+			where
+			(id)
+			    in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-			        #{item.id }  
+                    ( #{item.id}
+                    )
                 </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,project_phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,project_phase_name,task_name,is_leader
+		create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,project_phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,project_phase_name,task_name,is_leader,dist_userid,dist_username
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
-		<if test="createTime != null">      and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD')     </if>
+		<if test="createTime != null">      and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')     </if>
 		<if test="id != null and id != ''">      and res.id = #{id}     </if>
 		<if test="taskId != null and taskId != ''">      and res.task_id = #{taskId}     </if>
 		<if test="userid != null and userid != ''">      and res.userid = #{userid}     </if>
-		<if test="startTime != null">      and TO_CHAR(res.start_time,'YYYY-MM-DD') = TO_CHAR(#{startTime},'YYYY-MM-DD')     </if>
-		<if test="endTime != null">      and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD')     </if>
+		<if test="startTime != null">      and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d')     </if>
+		<if test="endTime != null">      and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d')     </if>
 		<if test="status != null and status != ''">      and res.status = #{status}     </if>
 		<if test="remarks != null and remarks != ''">      and res.remarks = #{remarks}     </if>
 		<if test="settleAmount != null and settleAmount != ''">      and res.settle_amount = #{settleAmount}     </if>
 		<if test="settleWorkload != null and settleWorkload != ''">      and res.settle_workload = #{settleWorkload}     </if>
 		<if test="settleStatus != null and settleStatus != ''">      and res.settle_status = #{settleStatus}     </if>
-		<if test="settleTime != null">      and TO_CHAR(res.settle_time,'YYYY-MM-DD') = TO_CHAR(#{settleTime},'YYYY-MM-DD')     </if>
+		<if test="settleTime != null">      and date_format(res.settle_time,'%Y-%m-%d') = date_format(#{settleTime},'%Y-%m-%d')     </if>
 		<if test="createUserid != null and createUserid != ''">      and res.create_userid = #{createUserid}     </if>
 		<if test="createUsername != null and createUsername != ''">      and res.create_username = #{createUsername}     </if>
 		<if test="username != null and username != ''">      and res.username = #{username}     </if>
 		<if test="matchScore != null and matchScore != ''">      and res.match_score = #{matchScore}     </if>
 		<if test="quoteWeekday != null and quoteWeekday != ''">      and res.quote_weekday = #{quoteWeekday}     </if>
 		<if test="quoteAmount != null and quoteAmount != ''">      and res.quote_amount = #{quoteAmount}     </if>
-		<if test="quoteTime != null">      and TO_CHAR(res.quote_time,'YYYY-MM-DD') = TO_CHAR(#{quoteTime},'YYYY-MM-DD')     </if>
+		<if test="quoteTime != null">      and date_format(res.quote_time,'%Y-%m-%d') = date_format(#{quoteTime},'%Y-%m-%d')     </if>
 		<if test="bizProcInstId != null and bizProcInstId != ''">      and res.biz_proc_inst_id = #{bizProcInstId}     </if>
 		<if test="bizFlowState != null and bizFlowState != ''">      and res.biz_flow_state = #{bizFlowState}     </if>
 		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
 		<if test="projectPhaseId != null and projectPhaseId != ''">      and res.project_phase_id = #{projectPhaseId}     </if>
 		<if test="skillRemark != null and skillRemark != ''">      and res.skill_remark = #{skillRemark}     </if>
 		<if test="quoteWorkload != null and quoteWorkload != ''">      and res.quote_workload = #{quoteWorkload}     </if>
-		<if test="quoteStartTime != null">      and TO_CHAR(res.quote_start_time,'YYYY-MM-DD') = TO_CHAR(#{quoteStartTime},'YYYY-MM-DD')     </if>
-		<if test="quoteEndTime != null">      and TO_CHAR(res.quote_end_time,'YYYY-MM-DD') = TO_CHAR(#{quoteEndTime},'YYYY-MM-DD')     </if>
+		<if test="quoteStartTime != null">      and date_format(res.quote_start_time,'%Y-%m-%d') = date_format(#{quoteStartTime},'%Y-%m-%d')     </if>
+		<if test="quoteEndTime != null">      and date_format(res.quote_end_time,'%Y-%m-%d') = date_format(#{quoteEndTime},'%Y-%m-%d')     </if>
 		<if test="branchId != null and branchId != ''">      and res.branch_id = #{branchId}     </if>
 		<if test="projectPhaseName != null and projectPhaseName != ''">      and res.project_phase_name = #{projectPhaseName}     </if>
 		<if test="taskName != null and taskName != ''">      and res.task_name = #{taskName}     </if>
 		<if test="isLeader != null and isLeader != ''">      and res.is_leader = #{isLeader}     </if>
+		<if test="distUserid != null and distUserid != ''">      and res.dist_userid = #{distUserid}     </if>
+		<if test="distUsername != null and distUsername != ''">      and res.dist_username = #{distUsername}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -302,7 +307,9 @@
 		branch_id = #{branchId},
 		project_phase_name = #{projectPhaseName},
 		task_name = #{taskName},
-		is_leader = #{isLeader}
+		is_leader = #{isLeader},
+		dist_userid = #{distUserid},
+		dist_username = #{distUsername}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="createTime != null"> create_time = #{createTime},     </if>
@@ -335,6 +342,8 @@
 		<if test="projectPhaseName != null and projectPhaseName != ''"> project_phase_name = #{projectPhaseName},     </if>
 		<if test="taskName != null and taskName != ''"> task_name = #{taskName},     </if>
 		<if test="isLeader != null and isLeader != ''"> is_leader = #{isLeader},     </if>
+		<if test="distUserid != null and distUserid != ''"> dist_userid = #{distUserid},     </if>
+		<if test="distUsername != null and distUsername != ''"> dist_username = #{distUsername},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -367,6 +376,8 @@
 			branch_id = #{item.branchId},
 			project_phase_name = #{item.projectPhaseName},
 			task_name = #{item.taskName},
-			is_leader = #{item.isLeader}
+			is_leader = #{item.isLeader},
+			dist_userid = #{item.distUserid},
+			dist_username = #{item.distUsername}
 	</sql>
 </mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@@ -175,9 +175,9 @@
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmTask">
-		delete from XM.xm_task res
+		delete from XM.xm_task
 		<where>  
-			<include refid="where"/>
+			1=2
 		</where>
 	</delete>
 	
@@ -222,9 +222,12 @@
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
 		delete from XM.xm_task 
-			where id in
+			where
+			(id)
+			    in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-			        #{item.id }  
+                    ( #{item.id}
+                    )
                 </foreach>
 	</delete>
 	
@@ -248,14 +251,14 @@
 		<if test="executorUsername != null and executorUsername != ''">      and res.executor_username = #{executorUsername}     </if>
 		<if test="preTaskid != null and preTaskid != ''">      and res.pre_taskid = #{preTaskid}     </if>
 		<if test="preTaskname != null and preTaskname != ''">      and res.pre_taskname = #{preTaskname}     </if>
-		<if test="startTime != null">      and TO_CHAR(res.start_time,'YYYY-MM-DD') = TO_CHAR(#{startTime},'YYYY-MM-DD')     </if>
-		<if test="endTime != null">      and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD')     </if>
+		<if test="startTime != null">      and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d')     </if>
+		<if test="endTime != null">      and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d')     </if>
 		<if test="milestone != null and milestone != ''">      and res.milestone = #{milestone}     </if>
 		<if test="description != null and description != ''">      and res.description = #{description}     </if>
 		<if test="remarks != null and remarks != ''">      and res.remarks = #{remarks}     </if>
 		<if test="createUserid != null and createUserid != ''">      and res.create_userid = #{createUserid}     </if>
 		<if test="createUsername != null and createUsername != ''">      and res.create_username = #{createUsername}     </if>
-		<if test="createTime != null">      and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD')     </if>
+		<if test="createTime != null">      and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')     </if>
 		<if test="rate != null and rate != ''">      and res.rate = #{rate}     </if>
 		<if test="budgetCost != null and budgetCost != ''">      and res.budget_cost = #{budgetCost}     </if>
 		<if test="budgetWorkload != null and budgetWorkload != ''">      and res.budget_workload = #{budgetWorkload}     </if>
@@ -265,8 +268,8 @@
 		<if test="taskType != null and taskType != ''">      and res.task_type = #{taskType}     </if>
 		<if test="taskClass != null and taskClass != ''">      and res.task_class = #{taskClass}     </if>
 		<if test="toTaskCenter != null and toTaskCenter != ''">      and res.to_task_center = #{toTaskCenter}     </if>
-		<if test="actStartTime != null">      and TO_CHAR(res.act_start_time,'YYYY-MM-DD') = TO_CHAR(#{actStartTime},'YYYY-MM-DD')     </if>
-		<if test="actEndTime != null">      and TO_CHAR(res.act_end_time,'YYYY-MM-DD') = TO_CHAR(#{actEndTime},'YYYY-MM-DD')     </if>
+		<if test="actStartTime != null">      and date_format(res.act_start_time,'%Y-%m-%d') = date_format(#{actStartTime},'%Y-%m-%d')     </if>
+		<if test="actEndTime != null">      and date_format(res.act_end_time,'%Y-%m-%d') = date_format(#{actEndTime},'%Y-%m-%d')     </if>
 		<if test="bizProcInstId != null and bizProcInstId != ''">      and res.biz_proc_inst_id = #{bizProcInstId}     </if>
 		<if test="bizFlowState != null and bizFlowState != ''">      and res.biz_flow_state = #{bizFlowState}     </if>
 		<if test="projectPhaseId != null and projectPhaseId != ''">      and res.project_phase_id = #{projectPhaseId}     </if>