diff --git a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java index e8dbf055..942631bd 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java @@ -8,9 +8,9 @@ import java.util.Date; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmBranchTaskTypeState所有属性名:
- * taskType,planWorkload,planAmount,actWorkload,actAmount,branchId,bizDate,calcTime,planOuserAt,planIuserAt,actOuserAt,actIuserAt,planOuserWorkload,planIuserWorkload,actOuserWorkload,actIuserWorkload,planNouserAt,actNouserAt,id,branchName;
+ * taskType,planWorkload,planAmount,actWorkload,actAmount,branchId,bizDate,calcTime,planOuserAt,planIuserAt,actOutUserAt,actInnerUserAt,planOuserWorkload,planIuserWorkload,actOuserWorkload,actIuserWorkload,planNouserAt,actNouserAt,id,branchName;
* 表 xm_branch_task_type_state 按机构编号任务类型汇总的所有字段名:
- * task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_out_user_at,plan_inner_user_at,act_out_user_at,act_inner_user_at,plan_out_user_workload,plan_inner_user_workload,act_out_user_workload,act_inner_user_workload,plan_nouser_at,act_nouser_at,id,branch_name;
+ * task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_out_user_at,act_inner_user_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id,branch_name;
* 当前主键(包括多主键):
* id;
*/ @@ -54,10 +54,10 @@ public class XmBranchTaskTypeState implements java.io.Serializable { BigDecimal planIuserAt; @ApiModelProperty(notes="实际外购成本",allowEmptyValue=true,example="",allowableValues="") - BigDecimal actOuserAt; + BigDecimal actOutUserAt; @ApiModelProperty(notes="实际内购成本",allowEmptyValue=true,example="",allowableValues="") - BigDecimal actIuserAt; + BigDecimal actInnerUserAt; @ApiModelProperty(notes="计划外购工作量",allowEmptyValue=true,example="",allowableValues="") BigDecimal planOuserWorkload; @@ -152,14 +152,14 @@ public class XmBranchTaskTypeState implements java.io.Serializable { /** * 实际外购成本 **/ - public void setActOuserAt(BigDecimal actOuserAt) { - this.actOuserAt = actOuserAt; + public void setActOutUserAt(BigDecimal actOutUserAt) { + this.actOutUserAt = actOutUserAt; } /** * 实际内购成本 **/ - public void setActIuserAt(BigDecimal actIuserAt) { - this.actIuserAt = actIuserAt; + public void setActInnerUserAt(BigDecimal actInnerUserAt) { + this.actInnerUserAt = actInnerUserAt; } /** * 计划外购工作量 @@ -273,14 +273,14 @@ public class XmBranchTaskTypeState implements java.io.Serializable { /** * 实际外购成本 **/ - public BigDecimal getActOuserAt() { - return this.actOuserAt; + public BigDecimal getActOutUserAt() { + return this.actOutUserAt; } /** * 实际内购成本 **/ - public BigDecimal getActIuserAt() { - return this.actIuserAt; + public BigDecimal getActInnerUserAt() { + return this.actInnerUserAt; } /** * 计划外购工作量 diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java index e9cd8cf5..34a18f63 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java @@ -1,17 +1,16 @@ -package com.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - import java.math.BigDecimal; import java.util.Date; /** - * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProjectTaskTypeState所有属性名:
- * projectId,projectName,taskType,planWorkload,planAmount,actWorkload,actAmount,branchId,bizDate,calcTime,planOuserAt,planIuserAt,actOuserAt,actIuserAt,planOuserWorkload,planIuserWorkload,actOuserWorkload,actIuserWorkload,planNouserAt,actNouserAt,id;
- * 表 XM.xm_project_task_type_state 按任务类型汇总的所有字段名:
- * project_id,project_name,task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_out_user_at,plan_inner_user_at,act_out_user_at,act_inner_user_at,plan_out_user_workload,plan_inner_user_workload,act_out_user_workload,act_inner_user_workload,plan_nouser_at,act_nouser_at,id;
+ * projectId,projectName,taskType,planWorkload,planAmount,actWorkload,actAmount,branchId,bizDate,calcTime,planOuserAt,planIuserAt,actOutUserAt,actInnerUserAt,planOuserWorkload,planIuserWorkload,actOuserWorkload,actIuserWorkload,planNouserAt,actNouserAt,id;
+ * 表 xm_project_task_type_state 按任务类型汇总的所有字段名:
+ * project_id,project_name,task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_out_user_at,act_inner_user_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id;
* 当前主键(包括多主键):
* id;
*/ @@ -61,10 +60,10 @@ public class XmProjectTaskTypeState implements java.io.Serializable { BigDecimal planIuserAt; @ApiModelProperty(notes="实际外购成本",allowEmptyValue=true,example="",allowableValues="") - BigDecimal actOuserAt; + BigDecimal actOutUserAt; @ApiModelProperty(notes="实际内购成本",allowEmptyValue=true,example="",allowableValues="") - BigDecimal actIuserAt; + BigDecimal actInnerUserAt; @ApiModelProperty(notes="计划外购工作量",allowEmptyValue=true,example="",allowableValues="") BigDecimal planOuserWorkload; @@ -168,14 +167,14 @@ public class XmProjectTaskTypeState implements java.io.Serializable { /** * 实际外购成本 **/ - public void setActOuserAt(BigDecimal actOuserAt) { - this.actOuserAt = actOuserAt; + public void setActOutUserAt(BigDecimal actOutUserAt) { + this.actOutUserAt = actOutUserAt; } /** * 实际内购成本 **/ - public void setActIuserAt(BigDecimal actIuserAt) { - this.actIuserAt = actIuserAt; + public void setActInnerUserAt(BigDecimal actInnerUserAt) { + this.actInnerUserAt = actInnerUserAt; } /** * 计划外购工作量 @@ -295,14 +294,14 @@ public class XmProjectTaskTypeState implements java.io.Serializable { /** * 实际外购成本 **/ - public BigDecimal getActOuserAt() { - return this.actOuserAt; + public BigDecimal getActOutUserAt() { + return this.actOutUserAt; } /** * 实际内购成本 **/ - public BigDecimal getActIuserAt() { - return this.actIuserAt; + public BigDecimal getActInnerUserAt() { + return this.actInnerUserAt; } /** * 计划外购工作量 diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml index b3c7b27f..171dfedd 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml @@ -71,7 +71,7 @@ insert into xm_branch_task_type_state( ) values ( - #{taskType},#{planWorkload},#{planAmount},#{actWorkload},#{actAmount},#{branchId},#{bizDate},#{calcTime},#{planOuserAt},#{planIuserAt},#{actOuserAt},#{actIuserAt},#{planOuserWorkload},#{planIuserWorkload},#{actOuserWorkload},#{actIuserWorkload},#{planNouserAt},#{actNouserAt},#{id},#{branchName} + #{taskType},#{planWorkload},#{planAmount},#{actWorkload},#{actAmount},#{branchId},#{bizDate},#{calcTime},#{planOuserAt},#{planIuserAt},#{actOutUserAt},#{actInnerUserAt},#{planOuserWorkload},#{planIuserWorkload},#{actOuserWorkload},#{actIuserWorkload},#{planNouserAt},#{actNouserAt},#{id},#{branchName} ) @@ -134,7 +134,7 @@ - task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_out_user_at,plan_inner_user_at,act_out_user_at,act_inner_user_at,plan_out_user_workload,plan_inner_user_workload,act_out_user_workload,act_inner_user_workload,plan_nouser_at,act_nouser_at,id,branch_name + task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_out_user_at,act_inner_user_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id,branch_name @@ -147,14 +147,14 @@ and res.branch_id = #{branchId} and res.biz_date = #{bizDate} and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d') - and res.plan_out_user_at = #{planOuserAt} - and res.plan_inner_user_at = #{planIuserAt} - and res.act_out_user_at = #{actOuserAt} - and res.act_inner_user_at = #{actIuserAt} - and res.plan_out_user_workload = #{planOuserWorkload} - and res.plan_inner_user_workload = #{planIuserWorkload} - and res.act_out_user_workload = #{actOuserWorkload} - and res.act_inner_user_workload = #{actIuserWorkload} + and res.plan_ouser_at = #{planOuserAt} + and res.plan_iuser_at = #{planIuserAt} + and res.act_out_user_at = #{actOutUserAt} + and res.act_inner_user_at = #{actInnerUserAt} + and res.plan_ouser_workload = #{planOuserWorkload} + and res.plan_iuser_workload = #{planIuserWorkload} + and res.act_ouser_workload = #{actOuserWorkload} + and res.act_iuser_workload = #{actIuserWorkload} and res.plan_nouser_at = #{planNouserAt} and res.act_nouser_at = #{actNouserAt} and res.id = #{id} @@ -170,14 +170,14 @@ branch_id = #{branchId}, biz_date = #{bizDate}, calc_time = #{calcTime}, - plan_out_user_at = #{planOuserAt}, - plan_inner_user_at = #{planIuserAt}, - act_out_user_at = #{actOuserAt}, - act_inner_user_at = #{actIuserAt}, - plan_out_user_workload = #{planOuserWorkload}, - plan_inner_user_workload = #{planIuserWorkload}, - act_out_user_workload = #{actOuserWorkload}, - act_inner_user_workload = #{actIuserWorkload}, + plan_ouser_at = #{planOuserAt}, + plan_iuser_at = #{planIuserAt}, + act_out_user_at = #{actOutUserAt}, + act_inner_user_at = #{actInnerUserAt}, + plan_ouser_workload = #{planOuserWorkload}, + plan_iuser_workload = #{planIuserWorkload}, + act_ouser_workload = #{actOuserWorkload}, + act_iuser_workload = #{actIuserWorkload}, plan_nouser_at = #{planNouserAt}, act_nouser_at = #{actNouserAt}, branch_name = #{branchName} @@ -191,14 +191,14 @@ branch_id = #{branchId}, biz_date = #{bizDate}, calc_time = #{calcTime}, - plan_out_user_at = #{planOuserAt}, - plan_inner_user_at = #{planIuserAt}, - act_out_user_at = #{actOuserAt}, - act_inner_user_at = #{actIuserAt}, - plan_out_user_workload = #{planOuserWorkload}, - plan_inner_user_workload = #{planIuserWorkload}, - act_out_user_workload = #{actOuserWorkload}, - act_inner_user_workload = #{actIuserWorkload}, + plan_ouser_at = #{planOuserAt}, + plan_iuser_at = #{planIuserAt}, + act_out_user_at = #{actOutUserAt}, + act_inner_user_at = #{actInnerUserAt}, + plan_ouser_workload = #{planOuserWorkload}, + plan_iuser_workload = #{planIuserWorkload}, + act_ouser_workload = #{actOuserWorkload}, + act_iuser_workload = #{actIuserWorkload}, plan_nouser_at = #{planNouserAt}, act_nouser_at = #{actNouserAt}, branch_name = #{branchName}, @@ -213,14 +213,14 @@ branch_id = #{item.branchId}, biz_date = #{item.bizDate}, calc_time = #{item.calcTime}, - plan_out_user_at = #{item.planOuserAt}, - plan_inner_user_at = #{item.planIuserAt}, - act_out_user_at = #{item.actOuserAt}, - act_inner_user_at = #{item.actIuserAt}, - plan_out_user_workload = #{item.planOuserWorkload}, - plan_inner_user_workload = #{item.planIuserWorkload}, - act_out_user_workload = #{item.actOuserWorkload}, - act_inner_user_workload = #{item.actIuserWorkload}, + plan_ouser_at = #{item.planOuserAt}, + plan_iuser_at = #{item.planIuserAt}, + act_out_user_at = #{item.actOutUserAt}, + act_inner_user_at = #{item.actInnerUserAt}, + plan_ouser_workload = #{item.planOuserWorkload}, + plan_iuser_workload = #{item.planIuserWorkload}, + act_ouser_workload = #{item.actOuserWorkload}, + act_iuser_workload = #{item.actIuserWorkload}, plan_nouser_at = #{item.planNouserAt}, act_nouser_at = #{item.actNouserAt}, branch_name = #{item.branchName} diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml index 2d2e1718..6001a2ba 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml @@ -175,13 +175,6 @@ where res.menu_id = #{menuId} - - select * from xm_project_task_type_state res - - and - id in - - #{item} - - + + - @@ -43,7 +44,13 @@ where res.id = #{id} - + - + insert into xm_project_task_type_state( ) values ( - #{projectId},#{projectName},#{taskType},#{planWorkload},#{planAmount},#{actWorkload},#{actAmount},#{branchId},#{bizDate},#{calcTime},#{planOuserAt},#{planIuserAt},#{actOuserAt},#{actIuserAt},#{planOuserWorkload},#{planIuserWorkload},#{actOuserWorkload},#{actIuserWorkload},#{planNouserAt},#{actNouserAt},#{id} + #{projectId},#{projectName},#{taskType},#{planWorkload},#{planAmount},#{actWorkload},#{actAmount},#{branchId},#{bizDate},#{calcTime},#{planOuserAt},#{planIuserAt},#{actOutUserAt},#{actInnerUserAt},#{planOuserWorkload},#{planIuserWorkload},#{actOuserWorkload},#{actIuserWorkload},#{planNouserAt},#{actNouserAt},#{id} ) @@ -76,13 +83,13 @@ - delete from xm_project_task_type_state + delete from xm_project_task_type_state where id = #{id} - update xm_project_task_type_state + update xm_project_task_type_state @@ -91,7 +98,7 @@ - update xm_project_task_type_state + update xm_project_task_type_state @@ -106,7 +113,7 @@ - update xm_project_task_type_state + update xm_project_task_type_state set where id = #{item.id} @@ -114,19 +121,20 @@ - delete from xm_project_task_type_state - where id in - - #{item.id } - + delete from xm_project_task_type_state + where + (id) in + + ( #{item.id} ) + - project_id,project_name,task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_out_user_at,plan_inner_user_at,act_out_user_at,act_inner_user_at,plan_out_user_workload,plan_inner_user_workload,act_out_user_workload,act_inner_user_workload,plan_nouser_at,act_nouser_at,id + project_id,project_name,task_type,plan_workload,plan_amount,act_workload,act_amount,branch_id,biz_date,calc_time,plan_ouser_at,plan_iuser_at,act_out_user_at,act_inner_user_at,plan_ouser_workload,plan_iuser_workload,act_ouser_workload,act_iuser_workload,plan_nouser_at,act_nouser_at,id - + and res.project_id = #{projectId} @@ -138,15 +146,15 @@ and res.act_amount = #{actAmount} and res.branch_id = #{branchId} and res.biz_date = #{bizDate} - and TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD') - and res.plan_out_user_at = #{planOuserAt} - and res.plan_inner_user_at = #{planIuserAt} - and res.act_out_user_at = #{actOuserAt} - and res.act_inner_user_at = #{actIuserAt} - and res.plan_out_user_workload = #{planOuserWorkload} - and res.plan_inner_user_workload = #{planIuserWorkload} - and res.act_out_user_workload = #{actOuserWorkload} - and res.act_inner_user_workload = #{actIuserWorkload} + and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d') + and res.plan_ouser_at = #{planOuserAt} + and res.plan_iuser_at = #{planIuserAt} + and res.act_out_user_at = #{actOutUserAt} + and res.act_inner_user_at = #{actInnerUserAt} + and res.plan_ouser_workload = #{planOuserWorkload} + and res.plan_iuser_workload = #{planIuserWorkload} + and res.act_ouser_workload = #{actOuserWorkload} + and res.act_iuser_workload = #{actIuserWorkload} and res.plan_nouser_at = #{planNouserAt} and res.act_nouser_at = #{actNouserAt} and res.id = #{id} @@ -163,14 +171,14 @@ branch_id = #{branchId}, biz_date = #{bizDate}, calc_time = #{calcTime}, - plan_out_user_at = #{planOuserAt}, - plan_inner_user_at = #{planIuserAt}, - act_out_user_at = #{actOuserAt}, - act_inner_user_at = #{actIuserAt}, - plan_out_user_workload = #{planOuserWorkload}, - plan_inner_user_workload = #{planIuserWorkload}, - act_out_user_workload = #{actOuserWorkload}, - act_inner_user_workload = #{actIuserWorkload}, + plan_ouser_at = #{planOuserAt}, + plan_iuser_at = #{planIuserAt}, + act_out_user_at = #{actOutUserAt}, + act_inner_user_at = #{actInnerUserAt}, + plan_ouser_workload = #{planOuserWorkload}, + plan_iuser_workload = #{planIuserWorkload}, + act_ouser_workload = #{actOuserWorkload}, + act_iuser_workload = #{actIuserWorkload}, plan_nouser_at = #{planNouserAt}, act_nouser_at = #{actNouserAt} @@ -185,14 +193,14 @@ branch_id = #{branchId}, biz_date = #{bizDate}, calc_time = #{calcTime}, - plan_out_user_at = #{planOuserAt}, - plan_inner_user_at = #{planIuserAt}, - act_out_user_at = #{actOuserAt}, - act_inner_user_at = #{actIuserAt}, - plan_out_user_workload = #{planOuserWorkload}, - plan_inner_user_workload = #{planIuserWorkload}, - act_out_user_workload = #{actOuserWorkload}, - act_inner_user_workload = #{actIuserWorkload}, + plan_ouser_at = #{planOuserAt}, + plan_iuser_at = #{planIuserAt}, + act_out_user_at = #{actOutUserAt}, + act_inner_user_at = #{actInnerUserAt}, + plan_ouser_workload = #{planOuserWorkload}, + plan_iuser_workload = #{planIuserWorkload}, + act_ouser_workload = #{actOuserWorkload}, + act_iuser_workload = #{actIuserWorkload}, plan_nouser_at = #{planNouserAt}, act_nouser_at = #{actNouserAt}, @@ -208,14 +216,14 @@ branch_id = #{item.branchId}, biz_date = #{item.bizDate}, calc_time = #{item.calcTime}, - plan_out_user_at = #{item.planOuserAt}, - plan_inner_user_at = #{item.planIuserAt}, - act_out_user_at = #{item.actOuserAt}, - act_inner_user_at = #{item.actIuserAt}, - plan_out_user_workload = #{item.planOuserWorkload}, - plan_inner_user_workload = #{item.planIuserWorkload}, - act_out_user_workload = #{item.actOuserWorkload}, - act_inner_user_workload = #{item.actIuserWorkload}, + plan_ouser_at = #{item.planOuserAt}, + plan_iuser_at = #{item.planIuserAt}, + act_out_user_at = #{item.actOutUserAt}, + act_inner_user_at = #{item.actInnerUserAt}, + plan_ouser_workload = #{item.planOuserWorkload}, + plan_iuser_workload = #{item.planIuserWorkload}, + act_ouser_workload = #{item.actOuserWorkload}, + act_iuser_workload = #{item.actIuserWorkload}, plan_nouser_at = #{item.planNouserAt}, act_nouser_at = #{item.actNouserAt}