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