Commit 415bad59 by ilal Committed by chenzg

提交考勤遗漏员工BUG

parent 1054ae70
...@@ -241,9 +241,16 @@ public class JxglController { ...@@ -241,9 +241,16 @@ public class JxglController {
new QueryWrapper<JxglAppraisalT>().lambda().eq(JxglAppraisalT::getId, jxglAppraisalT.getId())) > 0) { new QueryWrapper<JxglAppraisalT>().lambda().eq(JxglAppraisalT::getId, jxglAppraisalT.getId())) > 0) {
jxglAppraisalT.updateById(); jxglAppraisalT.updateById();
} else { } else {
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.setOrgCode(userBean.getOrgCode());
jxglAppraisalT.insert(); jxglAppraisalT.insert();
} }
}
LambdaQueryWrapper<JxglAppraisalIndicatorsT> q = new QueryWrapper<JxglAppraisalIndicatorsT>().lambda() LambdaQueryWrapper<JxglAppraisalIndicatorsT> q = new QueryWrapper<JxglAppraisalIndicatorsT>().lambda()
.eq(JxglAppraisalIndicatorsT::getAppraisalTId, jxglAppraisalT.getId()); .eq(JxglAppraisalIndicatorsT::getAppraisalTId, jxglAppraisalT.getId());
......
...@@ -186,6 +186,8 @@ public class AttendanceTaskTiming{ ...@@ -186,6 +186,8 @@ public class AttendanceTaskTiming{
if(sum != null) { if(sum != null) {
summaryid = sum.getId(); summaryid = sum.getId();
}else {
summaryid = 0;
} }
double traveltotal = 0,egresstotal = 0,overtimetotal = 0; double traveltotal = 0,egresstotal = 0,overtimetotal = 0;
......
...@@ -283,6 +283,7 @@ ...@@ -283,6 +283,7 @@
where nod.executor_id = #{param.id} where nod.executor_id = #{param.id}
and pe.org_code = #{param.orgCode} and pe.org_code = #{param.orgCode}
and nod.sts = 2 and nod.sts = 2
and em.org_code = #{param.orgCode}
ORDER BY pe.id DESC ORDER BY pe.id DESC
</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