Commit eed56c24 by ilal

提交考勤遗漏员工BUG

parent 680a1618
......@@ -241,8 +241,15 @@ public class JxglController {
new QueryWrapper<JxglAppraisalT>().lambda().eq(JxglAppraisalT::getId, jxglAppraisalT.getId())) > 0) {
jxglAppraisalT.updateById();
} else {
jxglAppraisalT.setOrgCode(userBean.getOrgCode());
jxglAppraisalT.insert();
List<JxglAppraisalT> alt = JxglAppraisalT.builder().build().selectList(new QueryWrapper<JxglAppraisalT>().lambda().eq(JxglAppraisalT::getOrgCode, userBean.getOrgCode())
.eq(JxglAppraisalT::getName, jxglAppraisalT.getName()));
if(alt.size() > 0) {
return ResultUtil.error("模板名称不允许重复");
}else {
jxglAppraisalT.setOrgCode(userBean.getOrgCode());
jxglAppraisalT.insert();
}
}
LambdaQueryWrapper<JxglAppraisalIndicatorsT> q = new QueryWrapper<JxglAppraisalIndicatorsT>().lambda()
.eq(JxglAppraisalIndicatorsT::getAppraisalTId, jxglAppraisalT.getId());
......
......@@ -186,6 +186,8 @@ public class AttendanceTaskTiming{
if(sum != null) {
summaryid = sum.getId();
}else {
summaryid = 0;
}
double traveltotal = 0,egresstotal = 0,overtimetotal = 0;
......
......@@ -283,6 +283,7 @@
where nod.executor_id = #{param.id}
and pe.org_code = #{param.orgCode}
and nod.sts = 2
and em.org_code = #{param.orgCode}
ORDER BY pe.id DESC
</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