Skip to content

8
8timerapiv200
Commit b8bbe0d9 by Administrator
Options

Merge branch 'develop' into 'master' 

Develop

See merge request 8timerv2/8timerapiv200!536
parents 41a0b8c9 59a93bcd
Showing with 182 additions and 49 deletions
src/main/java/cn/timer/api/bean/xcgl/XcglAssoJsgzzx.java
...@@ -87,4 +87,7 @@ public class XcglAssoJsgzzx extends Model<XcglAssoJsgzzx> { ...@@ -87,4 +87,7 @@ public class XcglAssoJsgzzx extends Model<XcglAssoJsgzzx> {
@ApiModelProperty(value="是否自定义项（0：否；1：是）",example="0") @ApiModelProperty(value="是否自定义项（0：否；1：是）",example="0")
private Integer isCustom; private Integer isCustom;
@ApiModelProperty(value="薪资档案自定义id",example="0")
private Integer xzdazdyid;
} }
\ No newline at end of file
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
...@@ -98,10 +98,10 @@ public class AttendanceTaskTiming{ ...@@ -98,10 +98,10 @@ public class AttendanceTaskTiming{
//3.添加定时任务 每四小时执行一次 //3.添加定时任务 每四小时执行一次
// @Scheduled(cron = "0 0 */4 * * ?") // @Scheduled(cron = "0 0 */4 * * ?")
//typeid:1-员工 2-考勤组 //typeid:1-员工 2-考勤组
// @Scheduled(cron = "0 */5 * * * ?") // @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0 10 9 * * ?") // @Scheduled(cron = "0 33 9 * * ?")
@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行 @Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
public void AttendanceTask() throws ParseException { public void AttendanceTask() throws ParseException {
......
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
...@@ -756,7 +756,7 @@ public class LastMonthtimingExport { ...@@ -756,7 +756,7 @@ public class LastMonthtimingExport {
} }
if(shif != null && shif.getSxbcs() != null) { if(shif != null && shif.getSxbcs() != null) {
System.out.println(shif.getSxbcs()); // System.out.println(shif.getSxbcs());
answer = shif.getSxbcs();//1=2次 2=4次 3=6次 answer = shif.getSxbcs();//1=2次 2=4次 3=6次
//未打最后一次卡的时候 判断最后一次打卡时间是否在请假范围内 相对应减少下班缺卡次数 //未打最后一次卡的时候 判断最后一次打卡时间是否在请假范围内 相对应减少下班缺卡次数
//最后一次应打卡时间 //最后一次应打卡时间
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoGsjsmxMapper.java
...@@ -17,9 +17,18 @@ import cn.timer.api.dto.xcgl.XcglAssoGsjsmxDto; ...@@ -17,9 +17,18 @@ import cn.timer.api.dto.xcgl.XcglAssoGsjsmxDto;
*/ */
@Repository @Repository
public interface XcglAssoGsjsmxMapper extends BaseMapper<XcglAssoGsjsmx> { public interface XcglAssoGsjsmxMapper extends BaseMapper<XcglAssoGsjsmx> {
List<XcglAssoGsjsmxDto> SelectIndividualincomedetails(@Param("param") SearchSalariedPeopleDto searchsalariedpeopledto); List<XcglAssoGsjsmxDto> SelectIndividualincomedetailsAll(@Param("param") SearchSalariedPeopleDto searchsalariedpeopledto);
IPage<XcglAssoGsjsmxDto> SelectIndividualincomedetails(IPage<XcglAssoGsjsmxDto> page,@Param("param") SearchSalariedPeopleDto searchsalariedpeopledto); /**
* 分页统计总数
* @return
*/
Integer listPageCount(@Param("param") SearchSalariedPeopleDto searchsalariedpeopledto);
/**
* 分页数据
* @return
*/
List<XcglAssoGsjsmxDto> listPage(@Param("param") SearchSalariedPeopleDto searchsalariedpeopledto);
List<XcglAssoGsjsmx> Allyearround(String year,String usernum,Integer qyid); List<XcglAssoGsjsmx> Allyearround(String year,String usernum,Integer qyid);
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoJsgzzxMapper.java
...@@ -31,4 +31,13 @@ public interface XcglAssoJsgzzxMapper extends BaseMapper<XcglAssoJsgzzx> { ...@@ -31,4 +31,13 @@ public interface XcglAssoJsgzzxMapper extends BaseMapper<XcglAssoJsgzzx> {
List<XcglAssoJsgzzx> selectSalarySectionList(int xzzid); List<XcglAssoJsgzzx> selectSalarySectionList(int xzzid);
List<XcglAssoJsgzzx> SalaryRuleGroupItem(int xzzid); List<XcglAssoJsgzzx> SalaryRuleGroupItem(int xzzid);
int insertxcglassojsgzzxListTwo(List<XcglAssoJsgzzx> xcglassojsgzzx);
/**
* 删除薪资档案值的同时删除已添加到薪资组(未锁定的组)中的薪资项
* @param xzdazdyid
* @return
*/
int deleteByxzdazdyid(int xzdazdyid);
} }
src/main/java/cn/timer/api/dao/xcgl/XcglAssoZxfjkcMapper.java
...@@ -23,7 +23,7 @@ public interface XcglAssoZxfjkcMapper extends BaseMapper<XcglAssoZxfjkc> { ...@@ -23,7 +23,7 @@ public interface XcglAssoZxfjkcMapper extends BaseMapper<XcglAssoZxfjkc> {
int insertXcglAssoZxfjkc(XcglAssoZxfjkc xcglassozxfjkc); int insertXcglAssoZxfjkc(XcglAssoZxfjkc xcglassozxfjkc);
List<AdditionalDeductionDto> selectAdditionalDeductiontwo(SearchSalariedPeopleDto searchsalariedpeopledto); List<AdditionalDeductionDto> selectAdditionalDeductiontwo(@Param("param") SearchSalariedPeopleDto searchsalariedpeopledto);
int updateXcglAssoZxfjkc(XcglAssoZxfjkc xcglassozxfjkc); int updateXcglAssoZxfjkc(XcglAssoZxfjkc xcglassozxfjkc);
......
src/main/java/cn/timer/api/dto/xcgl/SearchSalariedPeopleDto.java
package cn.timer.api.dto.xcgl; package cn.timer.api.dto.xcgl;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
import cn.timer.api.utils.Page; import cn.timer.api.utils.Page;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -20,8 +21,8 @@ public class SearchSalariedPeopleDto extends Page { ...@@ -20,8 +21,8 @@ public class SearchSalariedPeopleDto extends Page {
private static final long serialVersionUID = 6251994337286870380L; private static final long serialVersionUID = 6251994337286870380L;
@ApiModelProperty(value="员工状态 ",example="员工状态") @ApiModelProperty(value="员工状态列表 ",example="员工状态列表")
String status; List<Integer> status;
@ApiModelProperty(value="姓名/工号 ",example="姓名/工号") @ApiModelProperty(value="姓名/工号 ",example="姓名/工号")
String text; String text;
......
src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java
...@@ -24,9 +24,9 @@ import lombok.NoArgsConstructor; ...@@ -24,9 +24,9 @@ import lombok.NoArgsConstructor;
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class YgQueryDto extends Page implements Serializable { public class YgQueryDto extends Page {
private static final long serialVersionUID = -1230023773946170942L; // private static final long serialVersionUID = -1230023773946170942L;
@ApiModelProperty(value = "员工姓名", example = "华仔") @ApiModelProperty(value = "员工姓名", example = "华仔")
private String empName; private String empName;
......
src/main/java/cn/timer/api/utils/Page.java
...@@ -41,7 +41,7 @@ public class Page { ...@@ -41,7 +41,7 @@ public class Page {
this.totalPage = totalPage; this.totalPage = totalPage;
} }
public Integer getOffset() { public Integer getOffset() {
return this.currentPage > 0 ? (this.currentPage - 1) * this.totalPage : 0; return this.getCurrentPage() > 0 ? (this.getCurrentPage() - 1) * this.getTotalPage() : 0;
} }
public void setOffset(Integer offset) { public void setOffset(Integer offset) {
......
src/main/resources/mapping/xcgl/XcglAssoGsjsmxMapper.xml
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
<resultMap id="BaseXcglAssoGsjsmxDto" type="cn.timer.api.dto.xcgl.XcglAssoGsjsmxDto" > <resultMap id="BaseXcglAssoGsjsmxDto" type="cn.timer.api.dto.xcgl.XcglAssoGsjsmxDto" >
<result column="phone" property="phone" /> <result column="phone" property="phone" />
<result column="user_num" property="userNum" /> <result column="emp_num" property="userNum" />
<result column="user_name" property="userName" /> <result column="emp_name" property="userName" />
<result column="salary_month" property="salaryMonth" /> <result column="salary_month" property="salaryMonth" />
<result column="tax_month" property="taxMonth" /> <result column="tax_month" property="taxMonth" />
<result column="thmonth_personal" property="thmonthPersonal" /> <result column="thmonth_personal" property="thmonthPersonal" />
...@@ -60,23 +60,63 @@ ...@@ -60,23 +60,63 @@
<result column="cum_ybtse" property="cumYbtse" /> <result column="cum_ybtse" property="cumYbtse" />
<result column="qyid" property="qyid" /> <result column="qyid" property="qyid" />
</resultMap> </resultMap>
<select id="SelectIndividualincomedetails" resultMap="BaseXcglAssoGsjsmxDto"> <!-- 分页 -->
select em.phone, <select id="listPageCount" resultType="java.lang.Integer">
gs.* select count(*)
from xcgl_asso_gsjsmx gs from yggl_main_emp emp
LEFT JOIN yggl_main_emp as em on em.emp_num = gs.user_num and em.org_code = #{param.orgcode} where emp.org_code = #{param.orgcode}
where gs.qyid = #{param.orgcode} <if test="param.status != null and param.status.size() >0" >
<if test="param.datetime != ''" > and emp.job_status in
<foreach collection="param.status" open="(" close=")" separator="," index="i" item="item">
#{item, jdbcType=INTEGER}
</foreach>
</if>
<if test="param.text != ''" >
and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
</if>
</select>
<select id="listPage" resultMap="BaseXcglAssoGsjsmxDto">
select emp.phone, emp.emp_num, emp.name as emp_name, gs.*
from (select emp.phone, emp.emp_num, emp.name
from yggl_main_emp emp
where emp.org_code = #{param.orgcode}
<if test="param.status != null and param.status.size() >0" >
and emp.job_status in
<foreach collection="param.status" open="(" close=")" separator="," index="i" item="item">
#{item, jdbcType=INTEGER}
</foreach>
</if>
<if test="param.text != ''" >
and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
</if>
limit #{param.offset}, #{param.totalPage}) emp
LEFT JOIN xcgl_asso_gsjsmx gs on emp.emp_num = gs.user_num and gs.qyid = #{param.orgcode}
<if test="param.datetime != ''" >
and gs.salary_month = #{param.datetime} and gs.salary_month = #{param.datetime}
</if> </if>
<if test="param.status != ''" >
and em.job_status = #{param.status}
</if>
<if test="param.text != ''" >
and (em.`name` like CONCAT('%',#{param.text},'%') or em.emp_num = #{param.text})
</if>
</select> </select>
<select id="SelectIndividualincomedetailsAll" resultMap="BaseXcglAssoGsjsmxDto">
select emp.phone, emp.emp_num, emp.name as emp_name,gs.*
from (select emp.phone, emp.emp_num, emp.name
from yggl_main_emp emp
where emp.org_code = #{param.orgcode}
<if test="param.status != null and param.status.size() >0" >
and emp.job_status in
<foreach collection="param.status" open="(" close=")" separator="," index="i" item="item">
#{item, jdbcType=INTEGER}
</foreach>
</if>
<if test="param.text != ''" >
and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
</if>
) emp
LEFT JOIN xcgl_asso_gsjsmx gs on emp.emp_num = gs.user_num and gs.qyid = #{param.orgcode}
<if test="param.datetime != ''" >
and gs.salary_month = #{param.datetime}
</if>
</select>
<select id="Allyearround" resultMap="BaseResultMap"> <select id="Allyearround" resultMap="BaseResultMap">
select * from xcgl_asso_gsjsmx gs select * from xcgl_asso_gsjsmx gs
......
src/main/resources/mapping/xcgl/XcglAssoJsgzzxMapper.xml
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<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" /> <result column="is_custom" property="isCustom" />
<result column="xzdazdyid" property="xzdazdyid" />
</resultMap> </resultMap>
...@@ -96,6 +97,12 @@ ...@@ -96,6 +97,12 @@
DELETE FROM xcgl_asso_jsgzzx DELETE FROM xcgl_asso_jsgzzx
WHERE xzzid = #{xzzid} WHERE xzzid = #{xzzid}
</delete> </delete>
<!-- 删除薪资档案值的同时删除已添加到薪资组(未锁定的组)中的薪资项 -->
<delete id="deleteByxzdazdyid">
delete jsgzzx from xcgl_asso_jsgzzx jsgzzx, xcgl_admin_xzz xxz
where jsgzzx.xzdazdyid = #{xzdazdyid} and xxz.is_xzsd = 0
and jsgzzx.xzzid = xxz.id
</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,dygk,degk,xzzid,rulestate,optionid) insert into xcgl_asso_jsgzzx (salaryitem,yhmbzd,rule,type,addtime,adduserid,jxgzid,remarks,gsid,gsgs,dygk,degk,xzzid,rulestate,optionid)
...@@ -151,6 +158,62 @@ ...@@ -151,6 +158,62 @@
) )
</foreach> </foreach>
</insert> </insert>
<insert id="insertxcglassojsgzzxListTwo" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id" >
insert into xcgl_asso_jsgzzx (salaryitem,yhmbzd,rule,type,addtime,adduserid,jxgzid,remarks,gsid,gsgs,dygk,degk,xzzid,rulestate,optionid,xzdazdyid)
<foreach collection="list" item="item" index="index" open="values " close="" separator=",">
(
<if test="item.salaryitem != null" >
#{item.salaryitem,jdbcType=VARCHAR},
</if>
<if test="item.yhmbzd != null" >
#{item.yhmbzd,jdbcType=VARCHAR},
</if>
<if test="item.rule != null" >
#{item.rule,jdbcType=VARCHAR},
</if>
<if test="item.type != null" >
#{item.type,jdbcType=INTEGER},
</if>
<if test="item.addtime != null" >
#{item.addtime,jdbcType=BIGINT},
</if>
<if test="item.adduserid != null" >
#{item.adduserid,jdbcType=INTEGER},
</if>
<if test="item.jxgzid != null" >
#{item.jxgzid,jdbcType=INTEGER},
</if>
<if test="item.remarks != null" >
#{item.remarks,jdbcType=VARCHAR},
</if>
<if test="item.gsid != null" >
#{item.gsid,jdbcType=INTEGER},
</if>
<if test="item.gsgs != null" >
#{item.gsgs,jdbcType=VARCHAR},
</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" >
#{item.xzzid,jdbcType=INTEGER},
</if>
<if test="item.rulestate != null" >
#{item.rulestate,jdbcType=INTEGER},
</if>
<if test="item.optionid != null" >
#{item.optionid,jdbcType=INTEGER},
</if>
<if test="item.xzdazdyid != null" >
#{item.xzdazdyid,jdbcType=INTEGER}
</if>
)
</foreach>
</insert>
<insert id="jsgzzxinsert" useGeneratedKeys="true" keyProperty="id" parameterType="cn.timer.api.bean.xcgl.XcglAssoJsgzzx"> <insert id="jsgzzxinsert" useGeneratedKeys="true" keyProperty="id" parameterType="cn.timer.api.bean.xcgl.XcglAssoJsgzzx">
......
src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
...@@ -175,8 +175,11 @@ ...@@ -175,8 +175,11 @@
<select id="selectFixedSalaryStaffCount" resultType="java.lang.Long"> <select id="selectFixedSalaryStaffCount" resultType="java.lang.Long">
select COUNT(*) from yggl_main_emp emp select COUNT(*) from yggl_main_emp emp
where emp.org_code = #{param.orgcode} where emp.org_code = #{param.orgcode}
<if test="param.status != ''" > <if test="param.status != null and param.status.size() >0" >
and emp.job_status = #{param.status} and emp.job_status in
<foreach collection="param.status" open="(" close=")" separator="," index="i" item="item">
#{item, jdbcType=INTEGER}
</foreach>
</if> </if>
<if test="param.text != ''" > <if test="param.text != ''" >
and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text}) and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
...@@ -209,9 +212,12 @@ ...@@ -209,9 +212,12 @@
xzdaz.xzdadxid as xzdadxid xzdaz.xzdadxid as xzdadxid
from (select * from yggl_main_emp emp from (select * from yggl_main_emp emp
where emp.org_code = #{param.orgcode} where emp.org_code = #{param.orgcode}
<if test="param.status != ''" > <if test="param.status != null and param.status.size() >0" >
and emp.job_status = #{param.status} and emp.job_status in
</if> <foreach collection="param.status" open="(" close=")" separator="," index="i" item="item">
#{item, jdbcType=INTEGER}
</foreach>
</if>
<if test="param.text != ''" > <if test="param.text != ''" >
and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text}) and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
</if> </if>
......
src/main/resources/mapping/xcgl/XcglAssoZxfjkcMapper.xml
...@@ -77,13 +77,12 @@ ...@@ -77,13 +77,12 @@
and zxfj.taxmonth = #{param.datetime} and zxfj.taxmonth = #{param.datetime}
</if> </if>
where emp.org_code = #{param.orgcode} where emp.org_code = #{param.orgcode}
<if test="param.status != null and param.status.size() >0" >
<if test="param.status != '' and param.status != '66'" > and emp.job_status in
and emp.job_status = #{param.status} <foreach collection="param.status" open="(" close=")" separator="," index="i" item="item">
</if> #{item, jdbcType=INTEGER}
<if test="param.status != '' and param.status == '66'" > </foreach>
and emp.job_status in (0,1) </if>
</if>
<if test="param.text != ''" > <if test="param.text != ''" >
and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text}) and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
</if> </if>
...@@ -103,16 +102,18 @@ ...@@ -103,16 +102,18 @@
zxfj.totalmoney as lj zxfj.totalmoney as lj
from yggl_main_emp emp from yggl_main_emp emp
LEFT JOIN xcgl_asso_zxfjkc as zxfj on zxfj.userid = emp.emp_num LEFT JOIN xcgl_asso_zxfjkc as zxfj on zxfj.userid = emp.emp_num
<if test="datetime != ''" > <if test="param.datetime != ''" >
and zxfj.taxmonth = #{datetime} and zxfj.taxmonth = #{param.datetime}
</if>
where emp.org_code = #{orgcode}
<if test="status != ''" >
and emp.job_status = #{status}
</if> </if>
<if test="text != ''" > where emp.org_code = #{param.orgcode}
and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text}) <if test="param.status != null and param.status.size() >0" >
and emp.job_status in
<foreach collection="param.status" open="(" close=")" separator="," index="i" item="item">
#{item, jdbcType=INTEGER}
</foreach>
</if>
<if test="param.text != ''" >
and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
</if> </if>
</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