|
@@ -48,7 +48,7 @@ public class AdminOrgAnnualReportServiceImpl extends BaseMybatisDao<Organizatio
|
|
|
public int updateOrgAnnual(OrganizationAnnualReport o) {
|
|
public int updateOrgAnnual(OrganizationAnnualReport o) {
|
|
|
CustomerOrganizationDetailBo bo=userMapper.findOrganizationCustomerDetail(o.getUid());
|
|
CustomerOrganizationDetailBo bo=userMapper.findOrganizationCustomerDetail(o.getUid());
|
|
|
customerService.countIntegrity(bo);
|
|
customerService.countIntegrity(bo);
|
|
|
- return organizationAnnualReportMapper.updateByPrimaryKey(o);
|
|
|
|
|
|
|
+ return organizationAnnualReportMapper.updateByPrimaryKeySelective(o);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -64,14 +64,14 @@ public class AdminOrgAnnualReportServiceImpl extends BaseMybatisDao<Organizatio
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
@Override
|
|
@Override
|
|
|
- public boolean checkYear(Integer year) {
|
|
|
|
|
- int i=organizationAnnualReportMapper.checkYear(year);
|
|
|
|
|
|
|
+ public boolean checkYear(OrganizationAnnualReport o) {
|
|
|
|
|
+ int i=organizationAnnualReportMapper.checkYear(o.getUid(),o.getYear());
|
|
|
if(i>0)return true;
|
|
if(i>0)return true;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
@Override
|
|
@Override
|
|
|
public boolean checkAnnual(OrganizationAnnualReport o) {
|
|
public boolean checkAnnual(OrganizationAnnualReport o) {
|
|
|
- int i=organizationAnnualReportMapper.checkAnnual(o.getId(),o.getYear());
|
|
|
|
|
|
|
+ int i=organizationAnnualReportMapper.checkAnnual(o.getId(),o.getUid(),o.getYear());
|
|
|
if(i>0)return true;
|
|
if(i>0)return true;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
@@ -99,7 +99,7 @@ public class AdminOrgAnnualReportServiceImpl extends BaseMybatisDao<Organizatio
|
|
|
public int updateOrgYearProject(OrganizationYearProject o) {
|
|
public int updateOrgYearProject(OrganizationYearProject o) {
|
|
|
CustomerOrganizationDetailBo bo=userMapper.findOrganizationCustomerDetail(o.getUid());
|
|
CustomerOrganizationDetailBo bo=userMapper.findOrganizationCustomerDetail(o.getUid());
|
|
|
customerService.countIntegrity(bo);
|
|
customerService.countIntegrity(bo);
|
|
|
- return organizationYearProjectMapper.updateByPrimaryKey(o);
|
|
|
|
|
|
|
+ return organizationYearProjectMapper.updateByPrimaryKeySelective(o);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|