Skip to content

8
8timerapiv200
Commit aa300085 by lal Committed by chenzg
Options

提交

parent 6ad80dd4
Showing with 148 additions and 29 deletions
src/main/java/cn/timer/api/bean/kqgl/PunchRecord.java
...@@ -38,6 +38,7 @@ public class PunchRecord implements Serializable { ...@@ -38,6 +38,7 @@ public class PunchRecord implements Serializable {
private String remarks;// 考勤备注 private String remarks;// 考勤备注
private Integer punchmode;// 考勤机打卡方式==>1：指紋；2：人脸；3：密码；4：ID卡 private Integer punchmode;// 考勤机打卡方式==>1：指紋；2：人脸；3：密码；4：ID卡
private String punchequipment;// 打卡设备 private String punchequipment;// 打卡设备
private String commentary;
private String username = ""; private String username = "";
private String dept = ""; private String dept = "";
...@@ -45,6 +46,8 @@ public class PunchRecord implements Serializable { ...@@ -45,6 +46,8 @@ public class PunchRecord implements Serializable {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public Integer getId() { public Integer getId() {
return id; return id;
} }
...@@ -262,4 +265,12 @@ public class PunchRecord implements Serializable { ...@@ -262,4 +265,12 @@ public class PunchRecord implements Serializable {
this.post = post; this.post = post;
} }
public String getCommentary() {
return commentary;
}
public void setCommentary(String commentary) {
this.commentary = commentary;
}
} }
\ No newline at end of file
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java
...@@ -99,4 +99,7 @@ public class KqglAssoDkjl extends Model<KqglAssoDkjl> { ...@@ -99,4 +99,7 @@ public class KqglAssoDkjl extends Model<KqglAssoDkjl> {
@ApiModelProperty(value = "打卡设备 ", example = "打卡设备") @ApiModelProperty(value = "打卡设备 ", example = "打卡设备")
private String punchequipment; private String punchequipment;
@ApiModelProperty(value="解释 ",example="解释")
private String commentary;
} }
\ No newline at end of file
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
...@@ -2195,8 +2195,14 @@ public class TimeCardController { ...@@ -2195,8 +2195,14 @@ public class TimeCardController {
Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(data,"yyyy-MM-dd")).getTime(); Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(data,"yyyy-MM-dd")).getTime();
String attdate_ = new SimpleDateFormat("yy-MM-dd").format(Double.valueOf(startDate));//转换打卡时间格式 String attdate_ = new SimpleDateFormat("yy-MM-dd").format(Double.valueOf(startDate));//转换打卡时间格式
int type = 0;
if((chpunchr.getClocktype())%2 > 0){
type = 1;
}else {
type = 2;
}
KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(changed_time).results(results).userId(chpunchr.getNum()).type(chpunchr.getClocktype()).status(9).sort(chpunchr.getClocktype()) KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(changed_time).results(results).userId(chpunchr.getNum()).type(type).status(9).sort(chpunchr.getClocktype())
.cardType(3).qyid(userBean.getOrgCode()).attdate(attdate_+" "+ClockInTool.dateToWeek2(data)).attime(clock_time_).dkmxid(dkmx.getId()).bcid(chpunchr.getBcszid()).remarks("管理员改为正常").punchmode(0) .cardType(3).qyid(userBean.getOrgCode()).attdate(attdate_+" "+ClockInTool.dateToWeek2(data)).attime(clock_time_).dkmxid(dkmx.getId()).bcid(chpunchr.getBcszid()).remarks("管理员改为正常").punchmode(0)
.punchequipment("").build(); .punchequipment("").build();
if (!pre.insert()) { if (!pre.insert()) {
......
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
...@@ -105,7 +105,7 @@ public class AttendanceTaskTiming{ ...@@ -105,7 +105,7 @@ public class AttendanceTaskTiming{
*/ */
//3.添加定时任务 //3.添加定时任务
@Scheduled(cron = "0 10 15 * * ?") @Scheduled(cron = "0 55 10 * * ?")
//或直接指定时间间隔，例如：5秒 //或直接指定时间间隔，例如：5秒
//@Scheduled(fixedRate=5000) //@Scheduled(fixedRate=5000)
...@@ -155,7 +155,7 @@ public class AttendanceTaskTiming{ ...@@ -155,7 +155,7 @@ public class AttendanceTaskTiming{
KqglAssoMonthPunchSummary.builder().build().delete(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda().eq(KqglAssoMonthPunchSummary::getBelongYear, year).eq(KqglAssoMonthPunchSummary::getBelongMonth, month)); KqglAssoMonthPunchSummary.builder().build().delete(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda().eq(KqglAssoMonthPunchSummary::getBelongYear, year).eq(KqglAssoMonthPunchSummary::getBelongMonth, month));
// for(int t = 0;t<orgcodelist.size();t++){ // for(int t = 0;t<orgcodelist.size();t++){
int org_code = 117;//orgcodelist.get(t).getId();//企业组织代码 int org_code = 310;//orgcodelist.get(t).getId();//企业组织代码
List<AdditionalDto> userlist = kqglassoleavebalancemapper.selectAdditionalList(org_code); List<AdditionalDto> userlist = kqglassoleavebalancemapper.selectAdditionalList(org_code);
for(AdditionalDto user : userlist) { for(AdditionalDto user : userlist) {
double traveltotal = 0,egresstotal = 0,overtimetotal = 0; double traveltotal = 0,egresstotal = 0,overtimetotal = 0;
......
src/main/resources/mapping/kqgl/PunchRecordMapper.xml
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<result column="remarks" property="remarks" jdbcType="VARCHAR" /> <result column="remarks" property="remarks" jdbcType="VARCHAR" />
<result column="punchmode" property="punchmode" jdbcType="INTEGER" /> <result column="punchmode" property="punchmode" jdbcType="INTEGER" />
<result column="punchequipment" property="punchequipment" jdbcType="VARCHAR" /> <result column="punchequipment" property="punchequipment" jdbcType="VARCHAR" />
<result column="commentary" property="commentary" />
<result column="username" property="username" jdbcType="VARCHAR" /> <result column="username" property="username" jdbcType="VARCHAR" />
<result column="dept" property="dept" jdbcType="VARCHAR" /> <result column="dept" property="dept" jdbcType="VARCHAR" />
......
src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
<result column="remarks" property="remarks" /> <result column="remarks" property="remarks" />
<result column="punchmode" property="punchmode" /> <result column="punchmode" property="punchmode" />
<result column="punchequipment" property="punchequipment" /> <result column="punchequipment" property="punchequipment" />
<result column="commentary" property="commentary" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -48,7 +49,8 @@ ...@@ -48,7 +49,8 @@
bcid, bcid,
remarks, remarks,
punchmode, punchmode,
punchequipment punchequipment,
commentary
</sql> </sql>
<sql id="Base_Column_List_Alias"> <sql id="Base_Column_List_Alias">
...@@ -72,7 +74,8 @@ ...@@ -72,7 +74,8 @@
bcid KqglAssoDkjl_bcid, bcid KqglAssoDkjl_bcid,
remarks KqglAssoDkjl_remarks, remarks KqglAssoDkjl_remarks,
punchmode KqglAssoDkjl_punchmode, punchmode KqglAssoDkjl_punchmode,
punchequipment KqglAssoDkjl_punchequipment punchequipment KqglAssoDkjl_punchequipment,
commentary KqglAssoDkjl_explain
</sql> </sql>
<!-- <!--
...@@ -138,7 +141,10 @@ ...@@ -138,7 +141,10 @@
punchmode, punchmode,
</if> </if>
<if test ='null != punchequipment'> <if test ='null != punchequipment'>
punchequipment punchequipment,
</if>
<if test ='null != commentary'>
commentary
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
...@@ -200,7 +206,10 @@ ...@@ -200,7 +206,10 @@
#{punchmode}, #{punchmode},
</if> </if>
<if test ='null != punchequipment'> <if test ='null != punchequipment'>
#{punchequipment} #{punchequipment},
</if>
<if test ='null != commentary'>
#{commentary}
</if> </if>
</trim> </trim>
</insert> </insert>
...@@ -232,7 +241,8 @@ ...@@ -232,7 +241,8 @@
<if test ='null != bcid'>bcid = #{bcid},</if> <if test ='null != bcid'>bcid = #{bcid},</if>
<if test ='null != remarks'>remarks = #{remarks},</if> <if test ='null != remarks'>remarks = #{remarks},</if>
<if test ='null != punchmode'>punchmode = #{punchmode},</if> <if test ='null != punchmode'>punchmode = #{punchmode},</if>
<if test ='null != punchequipment'>punchequipment = #{punchequipment}</if> <if test ='null != punchequipment'>punchequipment = #{punchequipment},</if>
<if test ='null != commentary'>commentary = #{commentary}</if>
</set> </set>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
......
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