Skip to content

8
8timerapiv200
Commit 815aa215 by ilal Committed by chenzg
Options

提交

parent 2cd47022
Showing with 44 additions and 64 deletions
src/main/java/cn/timer/api/bean/xcgl/XcglAdminXzz.java
...@@ -75,7 +75,7 @@ public class XcglAdminXzz extends Model<XcglAdminXzz> { ...@@ -75,7 +75,7 @@ public class XcglAdminXzz extends Model<XcglAdminXzz> {
private String monthtime; private String monthtime;
@ApiModelProperty(value="算薪月份",example="2019-12") @ApiModelProperty(value="算薪月份",example="2019-12")
private String salarymonth; private String xzyf;
} }
\ No newline at end of file
src/main/java/cn/timer/api/bean/xcgl/XcglAssoJsgzzx.java
...@@ -78,4 +78,7 @@ public class XcglAssoJsgzzx extends Model<XcglAssoJsgzzx> { ...@@ -78,4 +78,7 @@ public class XcglAssoJsgzzx extends Model<XcglAssoJsgzzx> {
@ApiModelProperty(value="薪资选项id",example="薪资选项id") @ApiModelProperty(value="薪资选项id",example="薪资选项id")
private Integer optionid; private Integer optionid;
@ApiModelProperty(value="是否自定义项（0：否；1：是）",example="0")
private Integer isCustom;
} }
\ No newline at end of file
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXcjsgz.java
...@@ -53,5 +53,8 @@ public class XcglAssoXcjsgz extends Model<XcglAssoXcjsgz> { ...@@ -53,5 +53,8 @@ public class XcglAssoXcjsgz extends Model<XcglAssoXcjsgz> {
@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;
@ApiModelProperty(value = "", example = "")
private Integer optionid;
} }
\ No newline at end of file
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzbMapper.java
...@@ -20,7 +20,7 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> { ...@@ -20,7 +20,7 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> {
int deleteByuserid(int userid,int xzzid,String xzyf); int deleteByuserid(int userid,int xzzid,String xzyf);
List<CalculationDto> CalculationResults(int xzzid,String xzyf,int orgcode); List<CalculationDto> CalculationResults(int xzzid,int orgcode);
int deleteByAttendance(int userid,int xzzid,String xzyf); int deleteByAttendance(int userid,int xzzid,String xzyf);
......
src/main/java/cn/timer/api/dto/xcgl/ModifysalaryruleDto.java 0 → 100644
package cn.timer.api.dto.xcgl;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ModifysalaryruleDto {
private Integer jsgzzxid;// 计薪规则组项id
private Integer xcjsgzid;// 薪酬计算规则公式id
private String formula;// 公式
}
src/main/resources/mapping/xcgl/XcglAdminXzzMapper.xml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<result column="qyid" property="qyid" /> <result column="qyid" property="qyid" />
<result column="pxfs" property="pxfs" /> <result column="pxfs" property="pxfs" />
<result column="monthtime" property="monthtime" /> <result column="monthtime" property="monthtime" />
<result column="salarymonth" property="salarymonth" /> <result column="xzyf" property="xzyf" />
</resultMap> </resultMap>
<resultMap id="PayrollExceptionDtoMap" type="cn.timer.api.dto.xcgl.PayrollExceptionDto" > <resultMap id="PayrollExceptionDtoMap" type="cn.timer.api.dto.xcgl.PayrollExceptionDto" >
......
src/main/resources/mapping/xcgl/XcglAssoJsgzzxMapper.xml
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<result column="xzzid" property="xzzid" /> <result column="xzzid" property="xzzid" />
<result column="rulestate" property="rulestate" /> <result column="rulestate" property="rulestate" />
<result column="optionid" property="optionid" /> <result column="optionid" property="optionid" />
<result column="is_custom" property="isCustom" />
</resultMap> </resultMap>
...@@ -39,40 +40,6 @@ ...@@ -39,40 +40,6 @@
<result column="salaryitem" property="salaryitem"/> <result column="salaryitem" property="salaryitem"/>
<result column="rsz" property="rsz"/> <result column="rsz" property="rsz"/>
</resultMap> </resultMap>
<sql id="Base_Column_List">
id,
salaryitem,
yhmbzd,
rule,
type,
addtime,
adduserid,
jxgzid,
remarks,
gsid,
gsgs,
xzzid,
rulestate,
optionid
</sql>
<sql id="Base_Column_List_Alias">
id XcglAssoJsgzzx_id,
salaryitem XcglAssoJsgzzx_salaryitem,
yhmbzd XcglAssoJsgzzx_yhmbzd,
rule XcglAssoJsgzzx_rule,
type XcglAssoJsgzzx_type,
addtime XcglAssoJsgzzx_addtime,
adduserid XcglAssoJsgzzx_adduserid,
jxgzid XcglAssoJsgzzx_jxgzid,
remarks XcglAssoJsgzzx_remarks,
gsid XcglAssoJsgzzx_gsid,
gsgs XcglAssoJsgzzx_gsgs,
xzzid XcglAssoJsgzzx_xzzid,
rulestate XcglAssoJsgzzx_rulestate,
optionid XcglAssoJsgzzx_optionid
</sql>
<select id="selectSalarySectionList" resultMap="BaseResultMap"> <select id="selectSalarySectionList" resultMap="BaseResultMap">
select jsgzzx.* from xcgl_asso_jsgzzx jsgzzx select jsgzzx.* from xcgl_asso_jsgzzx jsgzzx
...@@ -203,7 +170,10 @@ ...@@ -203,7 +170,10 @@
rulestate, rulestate,
</if> </if>
<if test ='null != optionid'> <if test ='null != optionid'>
optionid optionid,
</if>
<if test ='null != isCustom'>
is_custom
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
...@@ -244,7 +214,10 @@ ...@@ -244,7 +214,10 @@
#{rulestate}, #{rulestate},
</if> </if>
<if test ='null != optionid'> <if test ='null != optionid'>
#{optionid} #{optionid},
</if>
<if test ='null != isCustom'>
#{isCustom}
</if> </if>
</trim> </trim>
</insert> </insert>
...@@ -264,32 +237,12 @@ ...@@ -264,32 +237,12 @@
<if test ='null != gsgs'>gsgs = #{gsgs},</if> <if test ='null != gsgs'>gsgs = #{gsgs},</if>
<if test ='null != xzzid'>xzzid = #{xzzid},</if> <if test ='null != xzzid'>xzzid = #{xzzid},</if>
<if test ='null != rulestate'>rulestate = #{rulestate},</if> <if test ='null != rulestate'>rulestate = #{rulestate},</if>
<if test ='null != optionid'>optionid = #{optionid}</if> <if test ='null != optionid'>optionid = #{optionid},</if>
<if test ='null != optionid'>is_custom = #{isCustom}</if>
</set> </set>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<!-- <delete id="delete" >
DELETE FROM xcgl_asso_jsgzzx
WHERE id = #{id}
</delete>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM xcgl_asso_jsgzzx
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM xcgl_asso_jsgzzx
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM xcgl_asso_jsgzzx
</select> -->
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapping/xcgl/XcglAssoXcjsgzMapper.xml
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<result column="dygk" property="dygk" /> <result column="dygk" property="dygk" />
<result column="degk" property="degk" /> <result column="degk" property="degk" />
<result column="type" property="type" /> <result column="type" property="type" />
<result column="optionid" property="optionid" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
......
src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml
...@@ -74,8 +74,7 @@ ...@@ -74,8 +74,7 @@
left join zzgl_bmgw_m um on um.id = m.up_id left join zzgl_bmgw_m um on um.id = m.up_id
) as bmgw on bmgw.mid = emp.bmgw_id ) as bmgw on bmgw.mid = emp.bmgw_id
where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{xzzid}) where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{xzzid})
and xzbs.xzyf = #{xzyf} or xzbs.xzyf = '' and xzbs.xzyf = (select xzz.xzyf from xcgl_admin_xzz xzz where xzz.id = #{xzzid})
and emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{xzzid})
) as aa ) as aa
where aa.orgcode = #{orgcode} where aa.orgcode = #{orgcode}
</select> </select>
......
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