重新生成工时表

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

@@ -8,9 +8,9 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTaskSbill所有属性名: <br>
- *	id,title,amt,ctime,cuserid,cusername,remark,branchId,deptid,cpId,cpName,workload,bizMonth,bizDate,bizFlowState,bizProcInstId,ltime,status,fmsg,projectId,projectName,userCnt;<br>
+ *	id,title,amt,ctime,cuserid,cusername,remark,branchId,deptid,cpId,cpName,workload,bizMonth,bizDate,bizFlowState,bizProcInstId,ltime,status,fmsg,projectId,projectName,userCnt,cpType;<br>
  * 表 xm_task_sbill 任务结算表的所有字段名: <br>
- *	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;<br>
+ *	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;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -86,6 +86,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) {
 		this.id = 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;
+	}
 
 }

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

@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTaskSbillDetail所有属性名: <br>
- *	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;<br>
+ *	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;<br>
  * 表 xm_task_sbill_detail 工时登记表的所有字段名: <br>
- *	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;<br>
+ *	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;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -107,6 +107,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) {
 		this.id = 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;
+	}
 
 }

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

@@ -76,7 +76,7 @@
 		insert into xm_task_sbill_detail(
 			<include refid="columns"/>
 		) 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}
 		)
 	</insert>
 	
@@ -151,7 +151,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		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
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -185,6 +185,11 @@
 		<if test="actStartTime != null">      and date_format(res.act_start_time,'%Y-%m-%d') = date_format(#{actStartTime},'%Y-%m-%d')     </if>
 		<if test="oshare != null and oshare != ''">      and res.oshare = #{oshare}     </if>
 		<if test="shareFee != null and shareFee != ''">      and res.share_fee = #{shareFee}     </if>
+		<if test="sfee != null and sfee != ''">      and res.sfee = #{sfee}     </if>
+		<if test="sfeeRate != null and sfeeRate != ''">      and res.sfee_rate = #{sfeeRate}     </if>
+		<if test="cpId != null and cpId != ''">      and res.cp_id = #{cpId}     </if>
+		<if test="cpName != null and cpName != ''">      and res.cp_name = #{cpName}     </if>
+		<if test="cpType != null and cpType != ''">      and res.cp_type = #{cpType}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -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}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="userid != null and userid != ''"> userid = #{userid},     </if>
@@ -246,6 +256,11 @@
 		<if test="actStartTime != null"> act_start_time = #{actStartTime},     </if>
 		<if test="oshare != null and oshare != ''"> oshare = #{oshare},     </if>
 		<if test="shareFee != null and shareFee != ''"> share_fee = #{shareFee},     </if>
+		<if test="sfee != null and sfee != ''"> sfee = #{sfee},     </if>
+		<if test="sfeeRate != null and sfeeRate != ''"> sfee_rate = #{sfeeRate},     </if>
+		<if test="cpId != null and cpId != ''"> cp_id = #{cpId},     </if>
+		<if test="cpName != null and cpName != ''"> cp_name = #{cpName},     </if>
+		<if test="cpType != null and cpType != ''"> cp_type = #{cpType},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -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}
 	</sql>
 </mapper>

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

@@ -89,7 +89,7 @@
 		insert into xm_task_sbill(
 			<include refid="columns"/>
 		) 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}
 		)
 	</insert>
 	
@@ -164,7 +164,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		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
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -191,6 +191,7 @@
 		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
 		<if test="projectName != null and projectName != ''">      and res.project_name = #{projectName}     </if>
 		<if test="userCnt != null and userCnt != ''">      and res.user_cnt = #{userCnt}     </if>
+		<if test="cpType != null and cpType != ''">      and res.cp_type = #{cpType}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -214,7 +215,8 @@
 		fmsg = #{fmsg},
 		project_id = #{projectId},
 		project_name = #{projectName},
-		user_cnt = #{userCnt}
+		user_cnt = #{userCnt},
+		cp_type = #{cpType}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="title != null and title != ''"> title = #{title},     </if>
@@ -238,6 +240,7 @@
 		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
 		<if test="projectName != null and projectName != ''"> project_name = #{projectName},     </if>
 		<if test="userCnt != null and userCnt != ''"> user_cnt = #{userCnt},     </if>
+		<if test="cpType != null and cpType != ''"> cp_type = #{cpType},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -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}
 	</sql>
 </mapper>