diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBudgetNlaborMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBudgetNlaborMapper.xml
index 84f7ffc5..ce2aee49 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBudgetNlaborMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBudgetNlaborMapper.xml
@@ -15,6 +15,45 @@
+
+
+
+
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml
deleted file mode 100644
index e2f8f6e5..00000000
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml
+++ /dev/null
@@ -1,281 +0,0 @@
-
-
-
-
-
-
-
-
- and (res.id) in
-
- ( #{item})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- insert into xm_project_m_cost_nouser(
-
- ) values (
- #{projectId},#{userid},#{createTime},#{sendCostTime},#{username},#{projectName},#{remark},#{id},#{taskId},#{taskName},#{subjectId},#{bizzStartDate},#{bizzEndDate},#{bizProcInstId},#{bizFlowState},#{projectPhaseId},#{actCostAmount},#{costType},#{bizMonth},#{bizDate},#{subjectName},#{projectPhaseName}
- )
-
-
-
-
- delete from xm_project_m_cost_nouser res
-
-
-
-
-
-
-
- delete from xm_project_m_cost_nouser
- where id = #{id}
-
-
-
-
- update xm_project_m_cost_nouser
-
-
-
- where id = #{id}
-
-
-
-
- update xm_project_m_cost_nouser
-
-
-
- where id = #{id}
-
-
-
-
-
-
-
- update xm_project_m_cost_nouser
- set
-
- where id = #{item.id}
-
-
-
-
-
- update xm_project_m_cost_nouser
-
-
-
- where (id) in
-
- ( #{item})
-
-
-
-
- delete from xm_project_m_cost_nouser
- where
- (id) in
-
- ( #{item.id} )
-
-
-
-
-
-
- project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,subject_id,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,project_phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,project_phase_name
-
-
-
-
- and res.project_id = #{projectId}
- and res.userid = #{userid}
- and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')
- and date_format(res.send_cost_time,'%Y-%m-%d') = date_format(#{sendCostTime},'%Y-%m-%d')
- and res.username = #{username}
- and res.project_name = #{projectName}
- and res.remark = #{remark}
- and res.id = #{id}
- and res.task_id = #{taskId}
- and res.task_name = #{taskName}
- and res.subject_id = #{subjectId}
- and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d')
- and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d')
- and res.biz_proc_inst_id = #{bizProcInstId}
- and res.biz_flow_state = #{bizFlowState}
- and res.project_phase_id = #{projectPhaseId}
- and res.act_cost_amount = #{actCostAmount}
- and res.cost_type = #{costType}
- and res.biz_month = #{bizMonth}
- and res.biz_date = #{bizDate}
- and res.subject_name = #{subjectName}
- and res.project_phase_name = #{projectPhaseName}
-
-
-
- project_id = #{projectId},
- userid = #{userid},
- create_time = #{createTime},
- send_cost_time = #{sendCostTime},
- username = #{username},
- project_name = #{projectName},
- remark = #{remark},
- task_id = #{taskId},
- task_name = #{taskName},
- subject_id = #{subjectId},
- bizz_start_date = #{bizzStartDate},
- bizz_end_date = #{bizzEndDate},
- biz_proc_inst_id = #{bizProcInstId},
- biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
- act_cost_amount = #{actCostAmount},
- cost_type = #{costType},
- biz_month = #{bizMonth},
- biz_date = #{bizDate},
- subject_name = #{subjectName},
- project_phase_name = #{projectPhaseName}
-
-
- project_id = #{projectId},
- userid = #{userid},
- create_time = #{createTime},
- send_cost_time = #{sendCostTime},
- username = #{username},
- project_name = #{projectName},
- remark = #{remark},
- task_id = #{taskId},
- task_name = #{taskName},
- subject_id = #{subjectId},
- bizz_start_date = #{bizzStartDate},
- bizz_end_date = #{bizzEndDate},
- biz_proc_inst_id = #{bizProcInstId},
- biz_flow_state = #{bizFlowState},
- project_phase_id = #{projectPhaseId},
- act_cost_amount = #{actCostAmount},
- cost_type = #{costType},
- biz_month = #{bizMonth},
- biz_date = #{bizDate},
- subject_name = #{subjectName},
- project_phase_name = #{projectPhaseName},
-
-
-
- project_id = #{item.projectId},
- userid = #{item.userid},
- create_time = #{item.createTime},
- send_cost_time = #{item.sendCostTime},
- username = #{item.username},
- project_name = #{item.projectName},
- remark = #{item.remark},
- task_id = #{item.taskId},
- task_name = #{item.taskName},
- subject_id = #{item.subjectId},
- bizz_start_date = #{item.bizzStartDate},
- bizz_end_date = #{item.bizzEndDate},
- biz_proc_inst_id = #{item.bizProcInstId},
- biz_flow_state = #{item.bizFlowState},
- project_phase_id = #{item.projectPhaseId},
- act_cost_amount = #{item.actCostAmount},
- cost_type = #{item.costType},
- biz_month = #{item.bizMonth},
- biz_date = #{item.bizDate},
- subject_name = #{item.subjectName},
- project_phase_name = #{item.projectPhaseName}
-
-
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml
deleted file mode 100644
index 477f1b58..00000000
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml
+++ /dev/null
@@ -1,332 +0,0 @@
-
-
-
-
-
-
-
-
- and (res.id) in
-
- ( #{item})
-
-
-
-
-
-
- update xm_project_m_cost_user pa set pa.execuser_status=#{execuserStatus}
- where pa.execuser_proc_inst_id = #{execuserProcInstId}
-
-
-
-
- delete from xm_project_m_cost_user
- where execuser_proc_inst_id=#{execuserProcInstId}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- insert into xm_project_m_cost_user(
-
- ) values (
- #{subjectId},#{projectId},#{userid},#{createTime},#{sendCostTime},#{username},#{projectName},#{remark},#{id},#{taskId},#{taskName},#{actWorkload},#{bizzStartDate},#{bizzEndDate},#{bizProcInstId},#{bizFlowState},#{phaseId},#{actCostAmount},#{costType},#{bizMonth},#{bizDate},#{subjectName},#{phaseName},#{execuserProcInstId},#{execuserStatus},#{payStatus},#{payOpUserid},#{payOpUsername}
- )
-
-
-
-
- delete from xm_project_m_cost_user res
-
-
-
-
-
-
-
- delete from xm_project_m_cost_user
- where id = #{id}
-
-
-
-
- update xm_project_m_cost_user
-
-
-
- where id = #{id}
-
-
-
-
- update xm_project_m_cost_user
-
-
-
- where id = #{id}
-
-
-
-
-
-
-
- update xm_project_m_cost_user
- set
-
- where id = #{item.id}
-
-
-
-
- delete from xm_project_m_cost_user
- where
- (id) in
-
- ( #{item.id} )
-
-
-
-
-
-
- subject_id,project_id,userid,create_time,send_cost_time,username,project_name,remark,id,task_id,task_name,act_workload,bizz_start_date,bizz_end_date,biz_proc_inst_id,biz_flow_state,phase_id,act_cost_amount,cost_type,biz_month,biz_date,subject_name,phase_name,execuser_proc_inst_id,execuser_status,pay_status,pay_op_userid,pay_op_username
-
-
-
-
- and res.subject_id = #{subjectId}
- and res.project_id = #{projectId}
- and res.userid = #{userid}
- and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')
- and date_format(res.send_cost_time,'%Y-%m-%d') = date_format(#{sendCostTime},'%Y-%m-%d')
- and res.username = #{username}
- and res.project_name = #{projectName}
- and res.remark = #{remark}
- and res.id = #{id}
- and res.task_id = #{taskId}
- and res.task_name = #{taskName}
- and res.act_workload = #{actWorkload}
- and date_format(res.bizz_start_date,'%Y-%m-%d') = date_format(#{bizzStartDate},'%Y-%m-%d')
- and date_format(res.bizz_end_date,'%Y-%m-%d') = date_format(#{bizzEndDate},'%Y-%m-%d')
- and res.biz_proc_inst_id = #{bizProcInstId}
- and res.biz_flow_state = #{bizFlowState}
- and res.phase_id = #{phaseId}
- and res.act_cost_amount = #{actCostAmount}
- and res.cost_type = #{costType}
- and res.biz_month = #{bizMonth}
- and res.biz_date = #{bizDate}
- and res.subject_name = #{subjectName}
- and res.phase_name = #{phaseName}
- and res.execuser_proc_inst_id = #{execuserProcInstId}
- and res.execuser_status = #{execuserStatus}
- and res.pay_status = #{payStatus}
- and res.pay_op_userid = #{payOpUserid}
- and res.pay_op_username = #{payOpUsername}
-
-
-
- subject_id = #{subjectId},
- project_id = #{projectId},
- userid = #{userid},
- create_time = #{createTime},
- send_cost_time = #{sendCostTime},
- username = #{username},
- project_name = #{projectName},
- remark = #{remark},
- task_id = #{taskId},
- task_name = #{taskName},
- act_workload = #{actWorkload},
- bizz_start_date = #{bizzStartDate},
- bizz_end_date = #{bizzEndDate},
- biz_proc_inst_id = #{bizProcInstId},
- biz_flow_state = #{bizFlowState},
- phase_id = #{phaseId},
- act_cost_amount = #{actCostAmount},
- cost_type = #{costType},
- biz_month = #{bizMonth},
- biz_date = #{bizDate},
- subject_name = #{subjectName},
- phase_name = #{phaseName},
- execuser_proc_inst_id = #{execuserProcInstId},
- execuser_status = #{execuserStatus},
- pay_status = #{payStatus},
- pay_op_userid = #{payOpUserid},
- pay_op_username = #{payOpUsername}
-
-
- subject_id = #{subjectId},
- project_id = #{projectId},
- userid = #{userid},
- create_time = #{createTime},
- send_cost_time = #{sendCostTime},
- username = #{username},
- project_name = #{projectName},
- remark = #{remark},
- task_id = #{taskId},
- task_name = #{taskName},
- act_workload = #{actWorkload},
- bizz_start_date = #{bizzStartDate},
- bizz_end_date = #{bizzEndDate},
- biz_proc_inst_id = #{bizProcInstId},
- biz_flow_state = #{bizFlowState},
- phase_id = #{phaseId},
- act_cost_amount = #{actCostAmount},
- cost_type = #{costType},
- biz_month = #{bizMonth},
- biz_date = #{bizDate},
- subject_name = #{subjectName},
- phase_name = #{phaseName},
- execuser_proc_inst_id = #{execuserProcInstId},
- execuser_status = #{execuserStatus},
- pay_status = #{payStatus},
- pay_op_userid = #{payOpUserid},
- pay_op_username = #{payOpUsername},
-
-
-
- subject_id = #{item.subjectId},
- project_id = #{item.projectId},
- userid = #{item.userid},
- create_time = #{item.createTime},
- send_cost_time = #{item.sendCostTime},
- username = #{item.username},
- project_name = #{item.projectName},
- remark = #{item.remark},
- task_id = #{item.taskId},
- task_name = #{item.taskName},
- act_workload = #{item.actWorkload},
- bizz_start_date = #{item.bizzStartDate},
- bizz_end_date = #{item.bizzEndDate},
- biz_proc_inst_id = #{item.bizProcInstId},
- biz_flow_state = #{item.bizFlowState},
- phase_id = #{item.phaseId},
- act_cost_amount = #{item.actCostAmount},
- cost_type = #{item.costType},
- biz_month = #{item.bizMonth},
- biz_date = #{item.bizDate},
- subject_name = #{item.subjectName},
- phase_name = #{item.phaseName},
- execuser_proc_inst_id = #{item.execuserProcInstId},
- execuser_status = #{item.execuserStatus},
- pay_status = #{item.payStatus},
- pay_op_userid = #{item.payOpUserid},
- pay_op_username = #{item.payOpUsername}
-
-
\ No newline at end of file