Antiloveg 8 years ago
parent
commit
181151b796

+ 13 - 11
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1363,6 +1363,11 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, orgActivity.getUid()).getError().isEmpty()) {
 			return res;
 		}
+		
+		if (StringUtils.isBlank(orgActivity.getActivityNumber())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "研发活动编号"));
+			return res;
+		}
 
 		if (StringUtils.isBlank(startDateFormattedDate)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "开始时间"));
@@ -1374,25 +1379,22 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!StringUtils.isBlank(startDateFormattedDate)) {
-			try {
-				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-			}
+		try {
+			orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
 		}
 
-		if (!StringUtils.isBlank(endDateFormattedDate)) {
-			try {
-				orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-			}
+		try {
+			orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
 		}
 
 		OrgActivity oa = new OrgActivity();
 		BeanUtils.copyProperties(orgActivity, oa);
-		oa.setDeletedSign(DeleteStatus.UNDELETE.getCode());
+	
 		if (StringUtils.isBlank(oa.getId())) {
 			oa.setId(UUID.randomUUID().toString());
+			oa.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgActivityService.insert(oa);
 		} else {
 			orgActivityService.updateOrgActivity(oa);

+ 22 - 11
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -1339,27 +1339,38 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!StringUtils.isBlank(startDateFormattedDate)) {
-			try {
-				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-			}
+		if (StringUtils.isBlank(orgActivity.getActivityNumber())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "研发活动编号"));
+			return res;
 		}
 
-		if (!StringUtils.isBlank(endDateFormattedDate)) {
-			try {
-				orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-			}
+		if (StringUtils.isBlank(startDateFormattedDate)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "开始时间"));
+			return res;
+		}
+
+		if (StringUtils.isBlank(endDateFormattedDate)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "结束时间"));
+			return res;
+		}
+
+		try {
+			orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
+		}
+
+		try {
+			orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
 		}
 
 		OrgActivity oa = new OrgActivity();
 		BeanUtils.copyProperties(orgActivity, oa);
-		oa.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 
 		if (StringUtils.isBlank(oa.getId())) {
 			oa.setId(UUID.randomUUID().toString());
 			oa.setUid(TokenManager.getUserId());
+			oa.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgActivityService.insert(oa);
 		} else {
 			orgActivityService.updateOrgActivity(oa);

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/OrgActivityCostService.java

@@ -17,7 +17,7 @@ public interface OrgActivityCostService {
 
 	int updateByPrimaryKeySelective(OrgActivityCost orgActivityCost);
 
-	OrgActivityCost selectOrgActivityCostByAid(String id);
+	List<OrgActivityCost> selectOrgActivityCostByAid(String id);
 
 	int deleteByAid(List<String> id);
 

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java

@@ -85,7 +85,7 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 
 
 	@Override
-	public OrgActivityCost selectOrgActivityCostByAid(String aid) {
+	public List<OrgActivityCost> selectOrgActivityCostByAid(String aid) {
 		return orgActivityCostMapper.selectOrgActivityCostByAid(aid);
 	}
 

+ 27 - 35
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityServiceImpl.java

@@ -22,45 +22,45 @@ import com.goafanti.common.model.OrgActivityCost;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+
 @Service
 public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> implements OrgActivityService {
 	@Autowired
-	private OrgActivityMapper orgActivityMapper;
+	private OrgActivityMapper		orgActivityMapper;
 	@Autowired
-	private OrgActivityCostMapper orgActivityCostMapper;
+	private OrgActivityCostMapper	orgActivityCostMapper;
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<OrgActivity> listOrgActivity(String activityNumber, String activityName, String sDate,
 			String eDate, Integer pageNo, Integer pageSize, String uid) throws ParseException {
 		Map<String, Object> params = new HashMap<>();
-		
+
 		Date startDate = null;
 		Date endDate = null;
-		
-		if (!StringUtils.isBlank(activityNumber)){
+
+		if (!StringUtils.isBlank(activityNumber)) {
 			params.put("activityNumber", activityNumber);
 		}
-		
-		if (!StringUtils.isBlank(activityName)){
+
+		if (!StringUtils.isBlank(activityName)) {
 			params.put("activityName", activityName);
 		}
-		
-		if (!StringUtils.isBlank(sDate)){
+
+		if (!StringUtils.isBlank(sDate)) {
 			startDate = DateUtils.parseDate(sDate, AFTConstants.YYYYMMDD);
 			params.put("startDate", startDate);
 		}
-		
-		if (!StringUtils.isBlank(eDate)){
+
+		if (!StringUtils.isBlank(eDate)) {
 			endDate = DateUtils.addDays(DateUtils.parseDate(eDate, AFTConstants.YYYYMMDD), 1);
 			params.put("endDate", endDate);
 		}
-		
-		if(!StringUtils.isBlank(uid)){
+
+		if (!StringUtils.isBlank(uid)) {
 			params.put("uid", uid);
 		}
-		
-		
+
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
 		}
@@ -101,35 +101,27 @@ public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> im
 	@Override
 	public void updateOrgActivity(OrgActivity orgActivity) {
 		orgActivityMapper.updateByPrimaryKeySelective(orgActivity);
-		Boolean flag = false;
-		OrgActivityCost cost = orgActivityCostMapper.selectOrgActivityCostByAid(orgActivity.getId());
-		if (null != cost) {
-			if (!StringUtils.isBlank(orgActivity.getActivityNumber())) {
-				cost.setActivityNumber(orgActivity.getActivityNumber());
-				flag = true;
-			}
-			if (null != orgActivity.getStartDate()) {
-				cost.setStartDate(orgActivity.getStartDate());
-				flag = true;
+		List<OrgActivityCost> cost = orgActivityCostMapper.selectOrgActivityCostByAid(orgActivity.getId());
+		if (null != cost && cost.size() > 0) {
+			for (OrgActivityCost c : cost) {
+				if (null != c) {
+					c.setActivityNumber(orgActivity.getActivityNumber());
+					c.setStartDate(orgActivity.getStartDate());
+					c.setEndDate(orgActivity.getEndDate());
+					orgActivityCostMapper.updateByPrimaryKeySelective(c);
+				}
 			}
-			if (null != orgActivity.getEndDate()) {
-				cost.setEndDate(orgActivity.getEndDate());
-				flag = true;
-			}
-		}
-		if (flag) {
-			orgActivityCostMapper.updateByPrimaryKeySelective(cost);
 		}
-		
 	}
 
 	@Override
 	public OrgActivity selectDetailByIdAndYear(String id, int year) {
 		OrgActivityDetailCostBo oadcb = orgActivityCostMapper.selectDetailCostByIdAndYear(id, year);
 		OrgActivity oa = orgActivityMapper.selectByPrimaryKey(id);
-		if (null != oadcb){
+		if (null != oadcb) {
 			oa.setFirstYearExpenditure(null == oadcb.getFirstYearCost() ? new BigDecimal(0) : oadcb.getFirstYearCost());
-			oa.setSecondYearExpenditure(null == oadcb.getSecondYearCost() ? new BigDecimal(0) : oadcb.getSecondYearCost());
+			oa.setSecondYearExpenditure(
+					null == oadcb.getSecondYearCost() ? new BigDecimal(0) : oadcb.getSecondYearCost());
 			oa.setThirdYearExpenditure(null == oadcb.getThirdYearCost() ? new BigDecimal(0) : oadcb.getThirdYearCost());
 		}
 		return oa;

+ 1 - 1
src/main/java/com/goafanti/common/dao/OrgActivityCostMapper.java

@@ -22,7 +22,7 @@ public interface OrgActivityCostMapper {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
-	OrgActivityCost selectOrgActivityCostByAid(String aid);
+	List<OrgActivityCost> selectOrgActivityCostByAid(String aid);
 
 	int batchDeleteByAid(List<String> aid);
 

+ 1 - 0
src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml

@@ -348,6 +348,7 @@
     <include refid="Base_Column_List" />
     from org_activity_cost
     where aid = #{aid,jdbcType=VARCHAR}
+    and deleted_sign = 0
   </select>
   
   <update id="batchDeleteByAid" parameterType="java.util.List">