tudc 4 gadi atpakaļ
vecāks
revīzija
f8398819f0

+ 9 - 0
src/main/java/com/minpay/common/service/impl/DianwangServiceImpl.java

@@ -10,10 +10,13 @@ import com.minpay.common.service.IDianwangService;
 import com.minpay.common.util.CommonUtil;
 import com.minpay.db.table.mapper.DwFileDetail00Mapper;
 import com.minpay.db.table.mapper.DwFileDetail01Mapper;
+import com.minpay.db.table.mapper.DwFileDetail02Mapper;
 import com.minpay.db.table.model.DwFileDetail00;
 import com.minpay.db.table.model.DwFileDetail00Example;
 import com.minpay.db.table.model.DwFileDetail01;
 import com.minpay.db.table.model.DwFileDetail01Example;
+import com.minpay.db.table.model.DwFileDetail02;
+import com.minpay.db.table.model.DwFileDetail02Example;
 import com.startup.minpay.frame.constant.IMINBusinessConstant;
 import com.startup.minpay.frame.exception.MINBusinessException;
 import com.startup.minpay.frame.jdbc.MINRowBounds;
@@ -64,6 +67,12 @@ public class DianwangServiceImpl implements IDianwangService {
     		List<DwFileDetail01> resList = db.selectByExample(DwFileDetail01Mapper.class, fileDetail01Example, rows);
     		resList = Service.lookup(IFormatService.class).formatDateTime(resList, "excelTytime");
     		return resList;
+    	} else if (Constant.FILE_DETAIL_TYPE_02.equals(fileType)) {
+    		DwFileDetail02Example fileDetail02Example = new DwFileDetail02Example();
+    		fileDetail02Example.createCriteria().andFileIdEqualTo(fileId);
+    		List<DwFileDetail02> resList = db.selectByExample(DwFileDetail02Mapper.class, fileDetail02Example, rows);
+    		resList = Service.lookup(IFormatService.class).formatDateTime(resList, "beginTime", "endTime");
+    		return resList;
     	}
     	return null;
 	}

+ 3 - 3
src/main/java/com/minpay/common/service/impl/PropertiesServiceImpl.java

@@ -56,9 +56,9 @@ public class PropertiesServiceImpl implements IPropertiesService {
 		}
 		
 		businessProperties = new HashMap<Locale, Map<String, LinkedHashMap<String, String>>>();
-		lsa = Service.lookup(IMINDataBaseService.class).selectByExample(PubAppparMapper.class, new PubAppparExample());
-		
-		
+		PubAppparExample pubAppparExample = new PubAppparExample();
+		pubAppparExample.setOrderByClause("APR_CODE,APR_VALUE");
+		lsa = Service.lookup(IMINDataBaseService.class).selectByExample(PubAppparMapper.class, pubAppparExample);
 	}
 	
 	public void refresh() {

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 336 - 28
src/main/java/com/minpay/common/service/impl/ReportServiceImpl.java