diff --git a/src/weaver/interfaces/organization/cronjob/JobAndPlanCron.java b/src/weaver/interfaces/organization/cronjob/JobAndPlanCron.java index c7beb66d..0c7b88c7 100644 --- a/src/weaver/interfaces/organization/cronjob/JobAndPlanCron.java +++ b/src/weaver/interfaces/organization/cronjob/JobAndPlanCron.java @@ -61,7 +61,8 @@ public class JobAndPlanCron extends BaseCronJob { break; case "3": staffPO = getStaffMapper().getStaffsByParamId(Integer.parseInt(type), null, null, String.valueOf(id)); - rs.executeQuery("select count(1) as fonjob from jcl_org_map ftype=? and id=? and fdateend>?"); + + rs.executeQuery("select count(1) as fonjob from jcl_org_map where ftype=4 and fparentid="+id+" and fdateend>"+currentDate); if (rs.next()) { getJclOrgMapMapper().updateMapById(id, null, Integer.valueOf(rs.getString("fonjob")), date); } @@ -87,9 +88,9 @@ public class JobAndPlanCron extends BaseCronJob { } } JclOrgMap jclOrgMap = getJclOrgMapMapper().getSumPlanAndJobByFParentId(date, fparentid); - getJclOrgMapMapper().updateMapById(Integer.parseInt(fparentid), jclOrgMap.getFPlan(), null, date); + getJclOrgMapMapper().updateMapById(Integer.parseInt(fparentid), jclOrgMap.getFPlan(), jclOrgMap.getFOnJob(), date); - if ("-1".equals(fparentid)) { + if (!"-1".equals(fparentid)) { countJobAndPlans(ftype, Integer.parseInt(fparentid), String.valueOf(currentDate)); } }