md
This commit is contained in:
linfso
parent
c7105c2229
commit
f98564d13d
@ -43,6 +43,14 @@ public class EmisCommissionDtl extends BaseEntity
|
||||
private String billMonth;
|
||||
/* 运单号 */
|
||||
private String billCode;
|
||||
/* 报价ID */
|
||||
private Long quoteId;
|
||||
/* 报价名称 */
|
||||
private String quoteName;
|
||||
/* 表达式ID */
|
||||
private Long exprId;
|
||||
/* 计算表达式 */
|
||||
private String calcExpr;
|
||||
/* 费用备注 */
|
||||
private String feeRemark;
|
||||
/* 员工编号 */
|
||||
|
||||
@ -114,8 +114,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
||||
}
|
||||
long endTime=System.currentTimeMillis(); //获取结束时间
|
||||
log.info("Profit MultiDoThread End escape time： "+(endTime-startTime)+"ms");
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -364,6 +362,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
||||
emisCommissionDtl.setEmpCode(profitUser.getEmpCode());
|
||||
emisCommissionDtl.setEmpName(profitUser.getEmpName());
|
||||
|
||||
emisCommissionDtl.setCalcExpr(calcExprStr);
|
||||
emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
|
||||
emisCommissionDtl.setQuoteName(quoteItem.getQuoteName());
|
||||
emisCommissionDtl.setExprId(exprItem.getId());
|
||||
|
||||
emisCommissionDtl.setFeeRemark(calcExprStr);
|
||||
|
||||
emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl);
|
||||
@ -477,6 +480,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
||||
emisCommissionDtl.setEmpCode(empUser.getEmpCode());
|
||||
emisCommissionDtl.setEmpName(empUser.getEmpName());
|
||||
|
||||
emisCommissionDtl.setCalcExpr(calcExprStr);
|
||||
emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
|
||||
emisCommissionDtl.setQuoteName(quoteItem.getQuoteName());
|
||||
emisCommissionDtl.setExprId(exprItem.getId())
|
||||
|
||||
emisCommissionDtl.setFeeRemark(calcExprStr);
|
||||
|
||||
emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl);
|
||||
@ -587,6 +595,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
||||
emisCommissionDtl.setEmpCode(empUser.getEmpCode());
|
||||
emisCommissionDtl.setEmpName(empUser.getEmpName());
|
||||
|
||||
emisCommissionDtl.setCalcExpr(calcExprStr);
|
||||
emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
|
||||
emisCommissionDtl.setQuoteName(quoteItem.getQuoteName());
|
||||
emisCommissionDtl.setExprId(exprItem.getId())
|
||||
|
||||
emisCommissionDtl.setFeeRemark(calcExprStr);
|
||||
|
||||
emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl);
|
||||
@ -703,6 +716,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
||||
emisCommissionDtl.setEmpCode(empUser.getEmpCode());
|
||||
emisCommissionDtl.setEmpName(empUser.getEmpName());
|
||||
|
||||
emisCommissionDtl.setCalcExpr(calcExprStr);
|
||||
emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
|
||||
emisCommissionDtl.setQuoteName(quoteItem.getQuoteName());
|
||||
emisCommissionDtl.setExprId(exprItem.getId())
|
||||
|
||||
emisCommissionDtl.setFeeRemark(calcExprStr);
|
||||
|
||||
emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl);
|
||||
@ -816,6 +834,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
||||
emisCommissionDtl.setEmpCode(empUser.getEmpCode());
|
||||
emisCommissionDtl.setEmpName(empUser.getEmpCode());
|
||||
|
||||
emisCommissionDtl.setCalcExpr(calcExprStr);
|
||||
emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
|
||||
emisCommissionDtl.setQuoteName(quoteItem.getQuoteName());
|
||||
emisCommissionDtl.setExprId(exprItem.getId())
|
||||
|
||||
emisCommissionDtl.setFeeRemark(calcExprStr);
|
||||
|
||||
emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl);
|
||||
@ -938,6 +961,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
||||
emisCommissionDtl.setEmpCode("-1");
|
||||
emisCommissionDtl.setEmpName(salesmen);
|
||||
|
||||
emisCommissionDtl.setCalcExpr(calcExprStr);
|
||||
emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
|
||||
emisCommissionDtl.setQuoteName(quoteItem.getQuoteName());
|
||||
emisCommissionDtl.setExprId(exprItem.getId())
|
||||
|
||||
emisCommissionDtl.setFeeRemark(calcExprStr);
|
||||
|
||||
emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl);
|
||||
@ -1065,6 +1093,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
||||
emisCommissionDtl.setEmpCode(empUser.getEmpCode());
|
||||
emisCommissionDtl.setEmpName(empUser.getEmpName());
|
||||
|
||||
emisCommissionDtl.setCalcExpr(calcExprStr);
|
||||
emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
|
||||
emisCommissionDtl.setQuoteName(quoteItem.getQuoteName());
|
||||
emisCommissionDtl.setExprId(exprItem.getId())
|
||||
|
||||
emisCommissionDtl.setFeeRemark(calcExprStr);
|
||||
|
||||
emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl);
|
||||
@ -1180,6 +1213,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
||||
emisCommissionDtl.setEmpCode(empUser.getEmpCode());
|
||||
emisCommissionDtl.setEmpName(empUser.getEmpName());
|
||||
|
||||
emisCommissionDtl.setCalcExpr(calcExprStr);
|
||||
emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
|
||||
emisCommissionDtl.setQuoteName(quoteItem.getQuoteName());
|
||||
emisCommissionDtl.setExprId(exprItem.getId())
|
||||
|
||||
emisCommissionDtl.setFeeRemark(calcExprStr);
|
||||
|
||||
emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl);
|
||||
|
||||
@ -10,6 +10,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="money" column="money" />
|
||||
<result property="billMonth" column="bill_month" />
|
||||
<result property="billCode" column="bill_code" />
|
||||
<result property="quoteId" column="quote_id" />
|
||||
<result property="quoteName" column="quote_name" />
|
||||
<result property="exprId" column="expr_id" />
|
||||
<result property="calcExpr" column="calc_expr" />
|
||||
<result property="feeRemark" column="fee_remark" />
|
||||
<result property="empCode" column="emp_code" />
|
||||
<result property="empName" column="emp_name" />
|
||||
@ -35,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectEmisCommissionDtlVo">
|
||||
select id, fee_type, money, bill_month, bill_code, fee_remark, emp_code, emp_name, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_dtl
|
||||
select id, fee_type, money, bill_month, bill_code, quote_id, quote_name, expr_id, calc_expr, fee_remark, emp_code, emp_name, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_dtl
|
||||
</sql>
|
||||
|
||||
<select id="selectEmisCommissionDtlList" parameterType="EmisCommissionDtl" resultMap="EmisCommissionDtlResult">
|
||||
@ -105,11 +109,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</select>
|
||||
|
||||
<select id="selectEmisCommissionDtlById" parameterType="Long" resultMap="EmisCommissionDtlResult">
|
||||
select id, fee_type, money, bill_month, bill_code, fee_remark, emp_code, emp_name, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
select id, fee_type, money, bill_month, bill_code, quote_id, quote_name, expr_id, calc_expr, fee_remark, emp_code, emp_name, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
from emis_commission_dtl a
|
||||
where a.id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertEmisCommissionDtl" parameterType="EmisCommissionDtl" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into emis_commission_dtl
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
@ -117,6 +121,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="money != null">money,</if>
|
||||
<if test="billMonth != null and billMonth != ''">bill_month,</if>
|
||||
<if test="billCode != null and billCode != ''">bill_code,</if>
|
||||
<if test="quoteId != null">quote_id,</if>
|
||||
<if test="quoteName != null and quoteName != ''">quote_name,</if>
|
||||
<if test="exprId != null">expr_id,</if>
|
||||
<if test="calcExpr != null and calcExpr != ''">calc_expr,</if>
|
||||
<if test="feeRemark != null and feeRemark != ''">fee_remark,</if>
|
||||
<if test="empCode != null and empCode != ''">emp_code,</if>
|
||||
<if test="empName != null and empName != ''">emp_name,</if>
|
||||
@ -138,12 +146,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="createSite != null and createSite != ''">create_site,</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site,</if>
|
||||
</trim>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="feeType != null and feeType != ''">#{feeType},</if>
|
||||
<if test="money != null">#{money},</if>
|
||||
<if test="billMonth != null and billMonth != ''">#{billMonth},</if>
|
||||
<if test="billCode != null and billCode != ''">#{billCode},</if>
|
||||
<if test="quoteId != null">#{quoteId},</if>
|
||||
<if test="quoteName != null and quoteName != ''">#{quoteName},</if>
|
||||
<if test="exprId != null">#{exprId},</if>
|
||||
<if test="calcExpr != null and calcExpr != ''">#{calcExpr},</if>
|
||||
<if test="feeRemark != null and feeRemark != ''">#{feeRemark},</if>
|
||||
<if test="empCode != null and empCode != ''">#{empCode},</if>
|
||||
<if test="empName != null and empName != ''">#{empName},</if>
|
||||
@ -165,7 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="createSite != null and createSite != ''">#{createSite},</if>
|
||||
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
|
||||
</trim>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateEmisCommissionDtl" parameterType="EmisCommissionDtl">
|
||||
@ -175,6 +187,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="money != null">money = #{money},</if>
|
||||
<if test="billMonth != null and billMonth != ''">bill_month = #{billMonth},</if>
|
||||
<if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
|
||||
<if test="quoteId != null">quote_id = #{quoteId},</if>
|
||||
<if test="quoteName != null and quoteName != ''">quote_name = #{quoteName},</if>
|
||||
<if test="exprId != null">expr_id = #{exprId},</if>
|
||||
<if test="calcExpr != null and calcExpr != ''">calc_expr = #{calcExpr},</if>
|
||||
<if test="feeRemark != null and feeRemark != ''">fee_remark = #{feeRemark},</if>
|
||||
<if test="empCode != null and empCode != ''">emp_code = #{empCode},</if>
|
||||
<if test="empName != null and empName != ''">emp_name = #{empName},</if>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user