From 2116f585c5f9e8859c4f102b8bda4fdf13ed59c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 27 Jul 2022 17:52:35 +0800
Subject: [PATCH] bug

---
 .../core/ctrl/XmTaskWorkloadController.java   |  4 +-
 .../core/service/XmTaskWorkloadService.java   |  2 +-
 .../mapper/xm/core/dao/XmTaskMapper.xml       |  2 +-
 .../xm/core/dao/XmTaskWorkloadMapper.xml      | 48 +++++++++----------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
index b76ba6cf..ad1fd6cc 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
 import static com.mdp.core.utils.ResponseHelper.failed;
 
 /**
- * url编制采用rest风格,如对xm_task_workload 工时登记表的操作有增删改查,对应的url分别为:<br>
+ * url编制采用rest风格,如对xm_workload 工时登记表的操作有增删改查,对应的url分别为:<br>
  *  新增: core/xmTaskWorkload/add <br>
  *  查询: core/xmTaskWorkload/list<br>
  *  模糊查询: core/xmTaskWorkload/listKey<br>
@@ -41,7 +41,7 @@ import static com.mdp.core.utils.ResponseHelper.failed;
  *  删除: core/xmTaskWorkload/del<br>
  *  批量删除: core/xmTaskWorkload/batchDel<br>
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
- * 实体 XmTaskWorkload 表 xm_task_workload 当前主键(包括多主键): id; 
+ * 实体 XmTaskWorkload 表 xm_workload 当前主键(包括多主键): id; 
  ***/
 @RestController("xm.core.xmTaskWorkloadController")
 @RequestMapping(value="/**/core/xmTaskWorkload")
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java
index 4bd026d3..c60714bf 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java
@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
- * 实体 XmTaskWorkload 表 xm_task_workload 当前主键(包括多主键): id; 
+ * 实体 XmTaskWorkload 表 xm_workload 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmTaskWorkloadService")
 public class XmTaskWorkloadService extends BaseService {
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
index 804395d0..60bd9ccb 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
@@ -301,7 +301,7 @@
 	</update>
 	<update id="calcWorkloadByRecord" parameterType="List">
 		update xm_task res left join
-		(select w.task_id, sum(ifnull(w.workload,0)) as workload  from xm_task_workload w where w.task_id  in
+		(select w.task_id, sum(ifnull(w.workload,0)) as workload  from xm_workload w where w.task_id  in
 			<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
 				#{item}
 			</foreach>
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
index 0275ceb2..92c646f7 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
@@ -48,11 +48,11 @@
 		</if>
     </sql>
 	<update id="updateStatusBySbillIdBySbillDel" parameterType="String">
-		update xm_task_workload res set detail_id=null,sbill_id=null,sstatus='1'
+		update xm_workload res set detail_id=null,sbill_id=null,sstatus='1'
 		where exists (select 1 from xm_task_sbill_detail d where d.id=res.detail_id and d.sbill_id=#{sbillId})
 	</update>
 	<update id="updateStatusBySbillId" parameterType="HashMap">
-		update xm_task_workload res set sstatus=#{sstatus}
+		update xm_workload res set sstatus=#{sstatus}
 		where exists (select 1 from xm_task_sbill_detail d where d.id=res.detail_id and d.sbill_id=#{sbillId})
 	</update>
 
@@ -68,7 +68,7 @@
 		sum(if(res.sstatus='3',ifnull(res.workload,0),0)) as had_agree_sworkload,
 		sum(if(res.sstatus='4',ifnull(res.workload,0),0)) as had_set_sworkload,
 		count(distinct res.userid) as user_num
-		from xm_task_workload res
+		from xm_workload res
 		<where>
 			<include refid="whereForMap"/>
 			<include refid="where"/>
@@ -89,7 +89,7 @@
 		sum(if(res.sstatus='3',ifnull(res.workload,0),0)) as had_agree_sworkload,
 		sum(if(res.sstatus='4',ifnull(res.workload,0),0)) as had_set_sworkload,
 		count(distinct res.userid) as user_num
-		from xm_task_workload res
+		from xm_workload res
 		<where>
 			<include refid="whereForMap"/>
 			<include refid="where"/>
@@ -100,7 +100,7 @@
 
 	<select id="listTaskWorkloadBySbillIdGroupByUseridAndTaskId" parameterType="String" resultType="HashMap">
 		select sum(ifnull(res.workload,0)) as workload,
-		sum(ifnull(res.workload,0)) as sworkload,res.task_id ,max(res.username) as username,max(t.name) as task_name from xm_task_workload res inner join xm_task t on res.task_id=t.id
+		sum(ifnull(res.workload,0)) as sworkload,res.task_id ,max(res.username) as username,max(t.name) as task_name from xm_workload res inner join xm_task t on res.task_id=t.id
 		where
 		exists (select 1 from xm_task_sbill_detail d where d.id=res.detail_id and d.sbill_id=#{sbillId})
 		and res.sstatus='4'
@@ -121,7 +121,7 @@
 		sum(if(res.sstatus='2',ifnull(res.workload,0),0)) as had_commit_sworkload,
 		sum(if(res.sstatus='3',ifnull(res.workload,0),0)) as had_agree_sworkload,
 		sum(if(res.sstatus='4',ifnull(res.workload,0),0)) as had_set_sworkload
-		from xm_task_workload res
+		from xm_workload res
 		<where>
 			<include refid="whereForMap"/>
 			<include refid="where"/>
@@ -161,7 +161,7 @@
 		sum(if(res.sstatus='2',ifnull(res.workload,0),0)) as had_commit_sworkload,
 		sum(if(res.sstatus='3',ifnull(res.workload,0),0)) as had_agree_sworkload,
 		sum(if(res.sstatus='4',ifnull(res.workload,0),0)) as had_set_sworkload
-		from xm_task_workload res
+		from xm_workload res
 		<where>
 			<if test="projectId!=null and projectId!=''">
 				and res.project_id=#{projectId}
@@ -211,14 +211,14 @@
 
 	</select>
 	<update id="updateStatusAfterJoinSbill" parameterType="HashMap">
-			update xm_task_workload res set res.sstatus='2',res.detail_id=#{detailId},res.sbill_id=#{sbillId}
+			update xm_workload res set res.sstatus='2',res.detail_id=#{detailId},res.sbill_id=#{sbillId}
 			where  res.id in
 			<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
 				#{item}
 			</foreach>
  	</update>
 	<update id="updateStatusAfterDetailDel" parameterType="List">
-		update xm_task_workload res set res.sstatus='1',res.detail_id=null,res.sbill_id=null
+		update xm_workload res set res.sstatus='1',res.detail_id=null,res.sbill_id=null
 		where  res.detail_id in
 		<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
 			#{item}
@@ -226,7 +226,7 @@
 	</update>
 
 	<update id="updateStatusBySbillIdByFlowStatea" parameterType="HashMap">
-		update xm_task_workload res inner join xm_task_sbill_detail d on d.id=res.detail_id
+		update xm_workload res inner join xm_task_sbill_detail d on d.id=res.detail_id
 		set res.sstatus=#{sstatus},d.sstatus=#{sstatus}
 		where d.sbill_id=#{sbillId}
 	</update>
@@ -237,7 +237,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select res.* ,task.project_name,task.name as task_name,task.budget_workload,task.act_workload,task.task_state from xm_task_workload res
+		select res.* ,task.project_name,task.name as task_name,task.budget_workload,task.act_workload,task.task_state from xm_workload res
 		inner join xm_task task
 		on res.task_id = task.id
 		<where>
@@ -248,7 +248,7 @@
 	
 	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
 	<select id="selectListByWhere" parameterType="com.xm.core.entity.XmTaskWorkload" resultType="com.xm.core.entity.XmTaskWorkload">
-		select * from xm_task_workload res
+		select * from xm_workload res
 		<where>
 			<include refid="where"/>
 		</where>
@@ -256,12 +256,12 @@
 	
 		<!-- 通过主键查询获取数据对象 返回object -->
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmTaskWorkload" resultType="com.xm.core.entity.XmTaskWorkload">
-		select * from xm_task_workload res
+		select * from xm_workload res
 		where 
 			res.id = #{id}
 	</select>
     <select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmTaskWorkload">
-        select * from xm_task_workload res
+        select * from xm_workload res
         where  (res.id) in
              <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
                  ( #{item})
@@ -269,20 +269,20 @@
     </select>
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_task_workload res
+		select * from xm_workload res
 		where 
 			 res.id = #{id}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmTaskWorkload" resultType="long">
-		select count(*) from xm_task_workload res
+		select count(*) from xm_workload res
 		<where>
 			<include refid="where"/>
 		</where>
 	</select>
 	<!-- 新增一条记录  主键id,-->
 	<insert id="insert" parameterType="com.xm.core.entity.XmTaskWorkload" useGeneratedKeys="false"   keyProperty="id">
-		insert into xm_task_workload(
+		insert into xm_workload(
 			<include refid="columns"/>
 		) values (
 		#{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{stime},#{sstatus},#{workload},#{rworkload},#{cusername},#{projectId},#{branchId},#{ubranchId},#{sbillId},#{detailId},#{menuId},#{productId},#{caseId},#{planId},#{bugId},#{bizType}
@@ -291,7 +291,7 @@
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmTaskWorkload">
-		delete from xm_task_workload res
+		delete from xm_workload res
 		<where>  
 			<include refid="where"/>
 		</where>
@@ -299,13 +299,13 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmTaskWorkload">
-		delete from xm_task_workload 
+		delete from xm_workload
 		where id = #{id} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmTaskWorkload">
-		update  xm_task_workload 
+		update  xm_workload
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
@@ -314,7 +314,7 @@
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmTaskWorkload">
-		update  xm_task_workload 
+		update  xm_workload
 		<set>
 			<include refid="set"/>
 		</set>
@@ -329,7 +329,7 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_task_workload 
+   		update  xm_workload
 		set 
 			<include refid="batchSet"/>
 			where id = #{item.id}  
@@ -338,7 +338,7 @@
 
 	<!-- 批量修改某几个字段 -->
 	<delete id="editSomeFields" parameterType="HashMap">
-		update  xm_task_workload
+		update  xm_workload
         <set>
             <include refid="someFieldSet"/>
         </set>
@@ -349,7 +349,7 @@
 	</delete>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_task_workload 
+		delete from xm_workload
 			where
 			(id) in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >