Skip to content

8
8timerapiv200
Commit 76449e36 by mobh Committed by chenzg
Options

增加两个薪资变量字段

parent ffc6ae3e
Showing with 51 additions and 6 deletions
src/main/java/cn/timer/api/bean/xcgl/XcglAssoJsgzzx.java
...@@ -69,6 +69,12 @@ public class XcglAssoJsgzzx extends Model<XcglAssoJsgzzx> { ...@@ -69,6 +69,12 @@ public class XcglAssoJsgzzx extends Model<XcglAssoJsgzzx> {
@ApiModelProperty(value="公式格式 ",example="系统提供/自定义公式") @ApiModelProperty(value="公式格式 ",example="系统提供/自定义公式")
private String gsgs; private String gsgs;
@ApiModelProperty(value="公式变量值1 ",example="系统提供/公式变量值1")
private double dygk;
@ApiModelProperty(value="公式变量值2 ",example="系统提供/公式变量值2")
private double degk;
@ApiModelProperty(value="薪资组id ",example="薪资组id") @ApiModelProperty(value="薪资组id ",example="薪资组id")
private Integer xzzid; private Integer xzzid;
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXcjsgz.java
...@@ -46,10 +46,10 @@ public class XcglAssoXcjsgz extends Model<XcglAssoXcjsgz> { ...@@ -46,10 +46,10 @@ public class XcglAssoXcjsgz extends Model<XcglAssoXcjsgz> {
private String gsxs; private String gsxs;
@ApiModelProperty(value = "字段一 ", example = "字段一") @ApiModelProperty(value = "字段一 ", example = "字段一")
private String dygk; private Double dygk;
@ApiModelProperty(value = "字段二 ", example = "字段二") @ApiModelProperty(value = "字段二 ", example = "字段二")
private String degk; private Double degk;
@ApiModelProperty(value = "类型（1：迟到早退扣款；2：事假扣款；3：病假扣款；4：入离职缺勤扣款；5：司龄；6：旷工扣款；7：加班费；8：司龄工资；9：应出勤天数；10：入离职缺勤天数；11：应发工资；12：个税；13：实发工资）") @ApiModelProperty(value = "类型（1：迟到早退扣款；2：事假扣款；3：病假扣款；4：入离职缺勤扣款；5：司龄；6：旷工扣款；7：加班费；8：司龄工资；9：应出勤天数；10：入离职缺勤天数；11：应发工资；12：个税；13：实发工资）")
private Integer type; private Integer type;
......
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
...@@ -636,7 +636,9 @@ public class SalaryManagementController { ...@@ -636,7 +636,9 @@ public class SalaryManagementController {
} }
}else { }else {
XcglAssoJsgzzx.builder().gsid(modifysalaryruledto.getXcjsgzid()).gsgs(modifysalaryruledto.getFormula()) XcglAssoJsgzzx.builder().gsid(modifysalaryruledto.getXcjsgzid()).gsgs(modifysalaryruledto.getFormula())
.rule(modifysalaryruledto.getFormula()).rulestate(xcjsgz.getOptionid()).id(modifysalaryruledto.getJsgzzxid()).build().updateById(); .dygk(modifysalaryruledto.getDygk()).degk(modifysalaryruledto.getDegk())
.rule(modifysalaryruledto.getFormula()).rulestate(xcjsgz.getOptionid())
.id(modifysalaryruledto.getJsgzzxid()).build().updateById();
} }
return ResultUtil.success("操作成功!"); return ResultUtil.success("操作成功!");
...@@ -1164,6 +1166,8 @@ public class SalaryManagementController { ...@@ -1164,6 +1166,8 @@ public class SalaryManagementController {
zzx.setJxgzid(tjsal.getGroid());//计薪规则组id 0：未加入组 zzx.setJxgzid(tjsal.getGroid());//计薪规则组id 0：未加入组
zzx.setRemarks("");//备注 zzx.setRemarks("");//备注
zzx.setXzzid(tjsal.getId()); zzx.setXzzid(tjsal.getId());
zzx.setDygk(xzxj.getDygk());
zzx.setDegk(xzxj.getDegk());
gzzxlist.add(zzx); gzzxlist.add(zzx);
} }
} }
......
src/main/java/cn/timer/api/dto/xcgl/ModifysalaryruleDto.java
...@@ -15,5 +15,15 @@ public class ModifysalaryruleDto { ...@@ -15,5 +15,15 @@ public class ModifysalaryruleDto {
private Integer xcjsgzid;// 薪酬计算规则公式id private Integer xcjsgzid;// 薪酬计算规则公式id
private String formula;// 公式 private String formula;// 公式
/**
* 公式变量值1
*/
private double dygk;
/**
* 公式变量值2
*/
private double degk;
} }
src/main/java/cn/timer/api/dto/xcgl/PayTermDto.java
...@@ -22,6 +22,15 @@ public class PayTermDto implements Serializable { ...@@ -22,6 +22,15 @@ public class PayTermDto implements Serializable {
String xremarks;// 项备注 String xremarks;// 项备注
Integer xgsid;// 项对应的公式id Integer xgsid;// 项对应的公式id
String xgsgs;// 项公式 String xgsgs;// 项公式
/**
* 公式变量值1
*/
private double xdygk;
/**
* 公式变量值2
*/
private double xdegk;
Integer xjxgzid;// Integer xjxgzid;//
Integer xoptionid; Integer xoptionid;
......
src/main/resources/mapping/xcgl/XcglAssoJsgzzxMapper.xml
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
<result column="xremarks" property="xremarks"/> <result column="xremarks" property="xremarks"/>
<result column="xgsid" property="xgsid"/> <result column="xgsid" property="xgsid"/>
<result column="xgsgs" property="xgsgs"/> <result column="xgsgs" property="xgsgs"/>
<result column="xdygk" property="xdygk"/>
<result column="xdegk" property="xdegk"/>
<result column="xjxgzid" property="xjxgzid"/> <result column="xjxgzid" property="xjxgzid"/>
</resultMap> </resultMap>
...@@ -58,7 +60,9 @@ ...@@ -58,7 +60,9 @@
gzzx.jxgzid as xjxgzid, gzzx.jxgzid as xjxgzid,
gzzx.remarks as xremarks, gzzx.remarks as xremarks,
gzzx.gsid as xgsid, gzzx.gsid as xgsid,
gzzx.gsgs as xgsgs gzzx.gsgs as xgsgs,
gzzx.dygk as xdygk,
gzzx.degk as xdegk
from xcgl_asso_jsgzzx gzzx from xcgl_asso_jsgzzx gzzx
where gzzx.jxgzid = 0 where gzzx.jxgzid = 0
and gzzx.xzzid = #{xzzid} and gzzx.xzzid = #{xzzid}
...@@ -83,7 +87,7 @@ ...@@ -83,7 +87,7 @@
</delete> </delete>
<insert id="insertxcglassojsgzzxList" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" > <insert id="insertxcglassojsgzzxList" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
insert into xcgl_asso_jsgzzx (salaryitem,yhmbzd,rule,type,addtime,adduserid,jxgzid,remarks,gsid,gsgs,xzzid,rulestate,optionid) insert into xcgl_asso_jsgzzx (salaryitem,yhmbzd,rule,type,addtime,adduserid,jxgzid,remarks,gsid,gsgs,dygk,degk,xzzid,rulestate,optionid)
<foreach collection="list" item="item" index="index" open="values " close="" separator=","> <foreach collection="list" item="item" index="index" open="values " close="" separator=",">
( (
<if test="item.salaryitem != null" > <if test="item.salaryitem != null" >
...@@ -116,6 +120,14 @@ ...@@ -116,6 +120,14 @@
<if test="item.gsgs != null" > <if test="item.gsgs != null" >
#{item.gsgs,jdbcType=VARCHAR}, #{item.gsgs,jdbcType=VARCHAR},
</if> </if>
<if test="item.dygk != null" >
#{item.dygk,jdbcType=DOUBLE},
</if>
<if test="item.degk != null" >
#{item.degk,jdbcType=DOUBLE},
</if>
<if test="item.xzzid != null" > <if test="item.xzzid != null" >
#{item.xzzid,jdbcType=INTEGER}, #{item.xzzid,jdbcType=INTEGER},
</if> </if>
......
src/main/resources/mapping/xcgl/XcglAssoJxgzMapper.xml
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<result column="xremarks" property="xremarks"/> <result column="xremarks" property="xremarks"/>
<result column="xgsid" property="xgsid"/> <result column="xgsid" property="xgsid"/>
<result column="xgsgs" property="xgsgs"/> <result column="xgsgs" property="xgsgs"/>
<result column="xdygk" property="xdygk"/>
<result column="xdegk" property="xdegk"/>
<result column="xjxgzid" property="xjxgzid"/> <result column="xjxgzid" property="xjxgzid"/>
<result column="xoptionid" property="xoptionid"/> <result column="xoptionid" property="xoptionid"/>
</collection> </collection>
...@@ -180,6 +182,8 @@ ...@@ -180,6 +182,8 @@
gzzx.remarks as xremarks, gzzx.remarks as xremarks,
gzzx.gsid as xgsid, gzzx.gsid as xgsid,
gzzx.gsgs as xgsgs, gzzx.gsgs as xgsgs,
gzzx.dygk as xdygk,
gzzx.degk as xdegk,
gzzx.jxgzid as xjxgzid, gzzx.jxgzid as xjxgzid,
gzzx.optionid as xoptionid, gzzx.optionid as xoptionid,
jxgz.xzzid as zxzzid jxgz.xzzid as zxzzid
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment