ソースを参照

客户资料填写新增2处处理完整度计算

anderx 7 年 前
コミット
39d20a8ad8

+ 2 - 2
src/main/java/com/goafanti/customer/controller/OrganizationAnnualReportController.java

@@ -65,7 +65,7 @@ public class OrganizationAnnualReportController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "ID"));
 			return res;
 		}
-		res.setData(adminOrgAnnualReportService.delectOrgAnnual(o.getId()));
+		res.setData(adminOrgAnnualReportService.delectOrgAnnual(o));
 		return res;
 	}
 	/**
@@ -143,7 +143,7 @@ public class OrganizationAnnualReportController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "ID"));
 			return res;
 		}
-		res.setData(adminOrgAnnualReportService.delectOrgYearProject(o.getId()));
+		res.setData(adminOrgAnnualReportService.delectOrgYearProject(o));
 		return res;
 	}
 	/**

+ 2 - 2
src/main/java/com/goafanti/customer/service/AdminOrgAnnualReportService.java

@@ -8,7 +8,7 @@ public interface AdminOrgAnnualReportService {
 
 	int addOrgAnnual(OrganizationAnnualReport o);
 
-	int delectOrgAnnual(String id);
+	int delectOrgAnnual(OrganizationAnnualReport o);
 
 	OrganizationAnnualReport selectOrgAnnual(String id);
 
@@ -20,7 +20,7 @@ public interface AdminOrgAnnualReportService {
 
 	int addOrgYearProject(OrganizationYearProject o);
 
-	int delectOrgYearProject(String id);
+	int delectOrgYearProject(OrganizationYearProject o);
 
 	OrganizationYearProject selectOrgYearProject(String id);
 

+ 24 - 11
src/main/java/com/goafanti/customer/service/impl/AdminOrgAnnualReportServiceImpl.java

@@ -10,8 +10,10 @@ import com.goafanti.common.dao.OrganizationYearProjectMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.model.OrganizationAnnualReport;
 import com.goafanti.common.model.OrganizationYearProject;
+import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.CustomerOrganizationDetailBo;
 import com.goafanti.customer.service.AdminOrgAnnualReportService;
 import com.goafanti.customer.service.CustomerService;
@@ -31,12 +33,23 @@ public class AdminOrgAnnualReportServiceImpl  extends BaseMybatisDao<Organizatio
 		o.setId(UUID.randomUUID().toString());
 //		o.setAid(TokenManager.getAdminId());
 		o.setAid("1");
+		countIntegrity(o.getUid());
 		return organizationAnnualReportMapper.insert(o);
 	}
 
+	private void countIntegrity(String uid) {
+		User u= new User();
+		CustomerOrganizationDetailBo bo=userMapper.findOrganizationCustomerDetail(uid);
+		u.setAccomplishSituation(uid);
+		u.setIntegrity(customerService.countIntegrity(bo));
+		userMapper.updateByPrimaryKeySelective(u);
+	}
+
 	@Override
-	public int delectOrgAnnual(String id) {
-		return organizationAnnualReportMapper.deleteByPrimaryKey(id);
+	public int delectOrgAnnual(OrganizationAnnualReport o) {
+		int i=organizationAnnualReportMapper.deleteByPrimaryKey(o.getId());
+		countIntegrity(o.getUid());
+		return i; 
 	}
 
 	@Override
@@ -46,8 +59,6 @@ public class AdminOrgAnnualReportServiceImpl  extends BaseMybatisDao<Organizatio
 
 	@Override
 	public int updateOrgAnnual(OrganizationAnnualReport o) {
-		CustomerOrganizationDetailBo bo=userMapper.findOrganizationCustomerDetail(o.getUid());
-		customerService.countIntegrity(bo);
 		return organizationAnnualReportMapper.updateByPrimaryKeySelective(o);
 		
 	}
@@ -80,14 +91,18 @@ public class AdminOrgAnnualReportServiceImpl  extends BaseMybatisDao<Organizatio
 	@Override
 	public int addOrgYearProject(OrganizationYearProject o) {
 		o.setId(UUID.randomUUID().toString());
-//		o.setAid(TokenManager.getAdminId());
-		o.setAid("1");
-		return organizationYearProjectMapper.insert(o);
+		o.setAid(TokenManager.getAdminId());
+//		o.setAid("1");
+		int i=organizationYearProjectMapper.insert(o);
+		countIntegrity(o.getUid());
+		return i; 
 	}
 
 	@Override
-	public int delectOrgYearProject(String id) {
-		return organizationYearProjectMapper.deleteByPrimaryKey(id);
+	public int delectOrgYearProject(OrganizationYearProject o) {
+		int i=organizationYearProjectMapper.deleteByPrimaryKey(o.getId());
+		countIntegrity(o.getUid());
+		return i; 
 	}
 
 	@Override
@@ -97,8 +112,6 @@ public class AdminOrgAnnualReportServiceImpl  extends BaseMybatisDao<Organizatio
 
 	@Override
 	public int updateOrgYearProject(OrganizationYearProject o) {
-		CustomerOrganizationDetailBo bo=userMapper.findOrganizationCustomerDetail(o.getUid());
-		customerService.countIntegrity(bo);
 		return organizationYearProjectMapper.updateByPrimaryKeySelective(o);
 	}