From 0c5eb652b329e2c43897272e822ea2c41480e098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 25 Apr 2022 02:01:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/entity/XmTaskSbill.java | 19 ++++- .../com/xm/core/entity/XmTaskSbillDetail.java | 79 ++++++++++++++++++- .../xm/core/dao/XmTaskSbillDetailMapper.xml | 28 ++++++- .../mapper/xm/core/dao/XmTaskSbillMapper.xml | 12 ++- 4 files changed, 126 insertions(+), 12 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java index 9ef7a76a..1d9f8690 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java @@ -8,9 +8,9 @@ import java.util.Date; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTaskSbill所有属性名:
- * id,title,amt,ctime,cuserid,cusername,remark,branchId,deptid,cpId,cpName,workload,bizMonth,bizDate,bizFlowState,bizProcInstId,ltime,status,fmsg,projectId,projectName,userCnt;
+ * id,title,amt,ctime,cuserid,cusername,remark,branchId,deptid,cpId,cpName,workload,bizMonth,bizDate,bizFlowState,bizProcInstId,ltime,status,fmsg,projectId,projectName,userCnt,cpType;
* 表 xm_task_sbill 任务结算表的所有字段名:
- * id,title,amt,ctime,cuserid,cusername,remark,branch_id,deptid,cp_id,cp_name,workload,biz_month,biz_date,biz_flow_state,biz_proc_inst_id,ltime,status,fmsg,project_id,project_name,user_cnt;
+ * id,title,amt,ctime,cuserid,cusername,remark,branch_id,deptid,cp_id,cp_name,workload,biz_month,biz_date,biz_flow_state,biz_proc_inst_id,ltime,status,fmsg,project_id,project_name,user_cnt,cp_type;
* 当前主键(包括多主键):
* id;
*/ @@ -85,6 +85,9 @@ public class XmTaskSbill implements java.io.Serializable { @ApiModelProperty(notes="结算人数",allowEmptyValue=true,example="",allowableValues="") Integer userCnt; + + @ApiModelProperty(notes="相对方类型1-个人，2-企业",allowEmptyValue=true,example="",allowableValues="") + String cpType; /**结算单据编号**/ public XmTaskSbill(String id) { @@ -227,6 +230,12 @@ public class XmTaskSbill implements java.io.Serializable { public void setUserCnt(Integer userCnt) { this.userCnt = userCnt; } + /** + * 相对方类型1-个人，2-企业 + **/ + public void setCpType(String cpType) { + this.cpType = cpType; + } /** * 结算单据编号 @@ -360,5 +369,11 @@ public class XmTaskSbill implements java.io.Serializable { public Integer getUserCnt() { return this.userCnt; } + /** + * 相对方类型1-个人，2-企业 + **/ + public String getCpType() { + return this.cpType; + } } \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java index 91350065..9fb2944a 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java @@ -8,9 +8,9 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTaskSbillDetail所有属性名:
- * userid,username,ctime,taskId,bizDate,remark,id,sbillId,stime,sstatus,amt,samt,workload,projectId,sworkload,bizMonth,budgetAt,budgetWorkload,initWorkload,quoteAt,quoteWorkload,sschemel,uniPrice,qendTime,qstartTime,actEndTime,actStartTime,oshare,shareFee;
+ * userid,username,ctime,taskId,bizDate,remark,id,sbillId,stime,sstatus,amt,samt,workload,projectId,sworkload,bizMonth,budgetAt,budgetWorkload,initWorkload,quoteAt,quoteWorkload,sschemel,uniPrice,qendTime,qstartTime,actEndTime,actStartTime,oshare,shareFee,sfee,sfeeRate,cpId,cpName,cpType;
* 表 xm_task_sbill_detail 工时登记表的所有字段名:
- * userid,username,ctime,task_id,biz_date,remark,id,sbill_id,stime,sstatus,amt,samt,workload,project_id,sworkload,biz_month,budget_at,budget_workload,init_workload,quote_at,quote_workload,sschemel,uni_price,qend_time,qstart_time,act_end_time,act_start_time,oshare,share_fee;
+ * userid,username,ctime,task_id,biz_date,remark,id,sbill_id,stime,sstatus,amt,samt,workload,project_id,sworkload,biz_month,budget_at,budget_workload,init_workload,quote_at,quote_workload,sschemel,uni_price,qend_time,qstart_time,act_end_time,act_start_time,oshare,share_fee,sfee,sfee_rate,cp_id,cp_name,cp_type;
* 当前主键(包括多主键):
* id;
*/ @@ -106,6 +106,21 @@ public class XmTaskSbillDetail implements java.io.Serializable { @ApiModelProperty(notes="分享赚佣金",allowEmptyValue=true,example="",allowableValues="") BigDecimal shareFee; + + @ApiModelProperty(notes="平台服务费",allowEmptyValue=true,example="",allowableValues="") + BigDecimal sfee; + + @ApiModelProperty(notes="服务费率",allowEmptyValue=true,example="",allowableValues="") + Integer sfeeRate; + + @ApiModelProperty(notes="相对方编号(机构写机构号，个人写个人编号)",allowEmptyValue=true,example="",allowableValues="") + String cpId; + + @ApiModelProperty(notes="相对方名称（机构写机构名称，个人写个人名称）",allowEmptyValue=true,example="",allowableValues="") + String cpName; + + @ApiModelProperty(notes="相对方类型1-个人，2-企业",allowEmptyValue=true,example="",allowableValues="") + String cpType; /**主键**/ public XmTaskSbillDetail(String id) { @@ -290,6 +305,36 @@ public class XmTaskSbillDetail implements java.io.Serializable { public void setShareFee(BigDecimal shareFee) { this.shareFee = shareFee; } + /** + * 平台服务费 + **/ + public void setSfee(BigDecimal sfee) { + this.sfee = sfee; + } + /** + * 服务费率 + **/ + public void setSfeeRate(Integer sfeeRate) { + this.sfeeRate = sfeeRate; + } + /** + * 相对方编号(机构写机构号，个人写个人编号) + **/ + public void setCpId(String cpId) { + this.cpId = cpId; + } + /** + * 相对方名称（机构写机构名称，个人写个人名称） + **/ + public void setCpName(String cpName) { + this.cpName = cpName; + } + /** + * 相对方类型1-个人，2-企业 + **/ + public void setCpType(String cpType) { + this.cpType = cpType; + } /** * 员工编号 @@ -465,5 +510,35 @@ public class XmTaskSbillDetail implements java.io.Serializable { public BigDecimal getShareFee() { return this.shareFee; } + /** + * 平台服务费 + **/ + public BigDecimal getSfee() { + return this.sfee; + } + /** + * 服务费率 + **/ + public Integer getSfeeRate() { + return this.sfeeRate; + } + /** + * 相对方编号(机构写机构号，个人写个人编号) + **/ + public String getCpId() { + return this.cpId; + } + /** + * 相对方名称（机构写机构名称，个人写个人名称） + **/ + public String getCpName() { + return this.cpName; + } + /** + * 相对方类型1-个人，2-企业 + **/ + public String getCpType() { + return this.cpType; + } } \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml index 16f04c29..5b573c3f 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml @@ -76,7 +76,7 @@ insert into xm_task_sbill_detail( ) values ( - #{userid},#{username},#{ctime},#{taskId},#{bizDate},#{remark},#{id},#{sbillId},#{stime},#{sstatus},#{amt},#{samt},#{workload},#{projectId},#{sworkload},#{bizMonth},#{budgetAt},#{budgetWorkload},#{initWorkload},#{quoteAt},#{quoteWorkload},#{sschemel},#{uniPrice},#{qendTime},#{qstartTime},#{actEndTime},#{actStartTime},#{oshare},#{shareFee} + #{userid},#{username},#{ctime},#{taskId},#{bizDate},#{remark},#{id},#{sbillId},#{stime},#{sstatus},#{amt},#{samt},#{workload},#{projectId},#{sworkload},#{bizMonth},#{budgetAt},#{budgetWorkload},#{initWorkload},#{quoteAt},#{quoteWorkload},#{sschemel},#{uniPrice},#{qendTime},#{qstartTime},#{actEndTime},#{actStartTime},#{oshare},#{shareFee},#{sfee},#{sfeeRate},#{cpId},#{cpName},#{cpType} ) @@ -151,7 +151,7 @@ - userid,username,ctime,task_id,biz_date,remark,id,sbill_id,stime,sstatus,amt,samt,workload,project_id,sworkload,biz_month,budget_at,budget_workload,init_workload,quote_at,quote_workload,sschemel,uni_price,qend_time,qstart_time,act_end_time,act_start_time,oshare,share_fee + userid,username,ctime,task_id,biz_date,remark,id,sbill_id,stime,sstatus,amt,samt,workload,project_id,sworkload,biz_month,budget_at,budget_workload,init_workload,quote_at,quote_workload,sschemel,uni_price,qend_time,qstart_time,act_end_time,act_start_time,oshare,share_fee,sfee,sfee_rate,cp_id,cp_name,cp_type @@ -185,6 +185,11 @@ and date_format(res.act_start_time,'%Y-%m-%d') = date_format(#{actStartTime},'%Y-%m-%d') and res.oshare = #{oshare} and res.share_fee = #{shareFee} + and res.sfee = #{sfee} + and res.sfee_rate = #{sfeeRate} + and res.cp_id = #{cpId} + and res.cp_name = #{cpName} + and res.cp_type = #{cpType} @@ -215,7 +220,12 @@ act_end_time = #{actEndTime}, act_start_time = #{actStartTime}, oshare = #{oshare}, - share_fee = #{shareFee} + share_fee = #{shareFee}, + sfee = #{sfee}, + sfee_rate = #{sfeeRate}, + cp_id = #{cpId}, + cp_name = #{cpName}, + cp_type = #{cpType} userid = #{userid}, @@ -246,6 +256,11 @@ act_start_time = #{actStartTime}, oshare = #{oshare}, share_fee = #{shareFee}, + sfee = #{sfee}, + sfee_rate = #{sfeeRate}, + cp_id = #{cpId}, + cp_name = #{cpName}, + cp_type = #{cpType}, @@ -276,6 +291,11 @@ act_end_time = #{item.actEndTime}, act_start_time = #{item.actStartTime}, oshare = #{item.oshare}, - share_fee = #{item.shareFee} + share_fee = #{item.shareFee}, + sfee = #{item.sfee}, + sfee_rate = #{item.sfeeRate}, + cp_id = #{item.cpId}, + cp_name = #{item.cpName}, + cp_type = #{item.cpType} \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml index 54ad087a..49af84c2 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml @@ -89,7 +89,7 @@ insert into xm_task_sbill( ) values ( - #{id},#{title},#{amt},#{ctime},#{cuserid},#{cusername},#{remark},#{branchId},#{deptid},#{cpId},#{cpName},#{workload},#{bizMonth},#{bizDate},#{bizFlowState},#{bizProcInstId},#{ltime},#{status},#{fmsg},#{projectId},#{projectName},#{userCnt} + #{id},#{title},#{amt},#{ctime},#{cuserid},#{cusername},#{remark},#{branchId},#{deptid},#{cpId},#{cpName},#{workload},#{bizMonth},#{bizDate},#{bizFlowState},#{bizProcInstId},#{ltime},#{status},#{fmsg},#{projectId},#{projectName},#{userCnt},#{cpType} ) @@ -164,7 +164,7 @@ - id,title,amt,ctime,cuserid,cusername,remark,branch_id,deptid,cp_id,cp_name,workload,biz_month,biz_date,biz_flow_state,biz_proc_inst_id,ltime,status,fmsg,project_id,project_name,user_cnt + id,title,amt,ctime,cuserid,cusername,remark,branch_id,deptid,cp_id,cp_name,workload,biz_month,biz_date,biz_flow_state,biz_proc_inst_id,ltime,status,fmsg,project_id,project_name,user_cnt,cp_type @@ -191,6 +191,7 @@ and res.project_id = #{projectId} and res.project_name = #{projectName} and res.user_cnt = #{userCnt} + and res.cp_type = #{cpType} @@ -214,7 +215,8 @@ fmsg = #{fmsg}, project_id = #{projectId}, project_name = #{projectName}, - user_cnt = #{userCnt} + user_cnt = #{userCnt}, + cp_type = #{cpType} title = #{title}, @@ -238,6 +240,7 @@ project_id = #{projectId}, project_name = #{projectName}, user_cnt = #{userCnt}, + cp_type = #{cpType}, @@ -261,6 +264,7 @@ fmsg = #{item.fmsg}, project_id = #{item.projectId}, project_name = #{item.projectName}, - user_cnt = #{item.userCnt} + user_cnt = #{item.userCnt}, + cp_type = #{item.cpType} \ No newline at end of file