~yxh/opo.git - Gitblit

			@@ -32,6 +32,7 @@
			import org.apache.commons.lang.StringUtils;
			import org.apache.ibatis.annotations.Options;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.util.CollectionUtils;
			import org.springframework.web.bind.annotation.*;

			import java.io.*;
			@@ -220,14 +221,14 @@

			public int addReiSharedDatd(ServiceReimbursement serviceReimbursement, int nType) {
			//remShare = ;
			ServiceReimbursementShared remShare = null;
			ServiceReimbursementShared remShare = new ServiceReimbursementShared();
			if (nType == 1) {
			remShare = new ServiceReimbursementShared();
			// remShare = new ServiceReimbursementShared();
			remShare.setReimid(serviceReimbursement.getId());
			} else //modify
			{
			List<ServiceReimbursementShared> remlist = serviceReimbursementServiceShare.getRemShareInfoByRemId(serviceReimbursement.getId());
			if (remlist != null) remShare = remlist.get(0);
			if (!CollectionUtils.isEmpty(remlist)) remShare = remlist.get(0);
			}

			remShare.setUserno(serviceReimbursement.getUserno());
			@@ -859,11 +860,16 @@
			map.put("DA", s.getDeparture() == null ? "" : s.getDeparture());

			Date et = s.getEndtime();
			SimpleDateFormat formatter_et = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			String date_et = formatter_et.format(et);
			String year_et = date_et.substring(0, 4);
			String month_et = date_et.substring(5, 7);
			String day_et = date_et.substring(8, 10);
			String year_et = null;
			String month_et = null;
			String day_et = null;
			if (et != null) {
			SimpleDateFormat formatter_et = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			String date_et = formatter_et.format(et);
			year_et = date_et.substring(0, 4);
			month_et = date_et.substring(5, 7);
			day_et = date_et.substring(8, 10);
			}

			map.put("AY", year_et == null ? "" : year_et);
			map.put("AM", month_et == null ? "" : month_et);