修改问题

src/main/java/com/chinaitop/agile/controller/KeepAccountController.java

@@ -176,28 +176,30 @@ public class KeepAccountController {
 		List<DataKcglFcbgzDefault> list = keepAccountService.queryTotalByExample(example);
 		for (DataKcglFcbgzDefault fcbgz : list) {
 			try {
-				fcbgz.setUnitid(orgId);
-				DataKcglFcbgzDefault obj = fcbgzService.findConditionMax(fcbgz);
-				fcbgz.setKcsl(obj.getKcsl());
-				//获取是否审核和是否记账
-				Map<String, Object> map = keepaccountFeignService.selectHouseKeepAccountData(fcbgz.getCh(), 
-						fcbgz.getHwh(), 
-						Integer.parseInt(fcbgz.getHwxz()), 
-						Integer.parseInt(fcbgz.getPz()),
-						ParameterUtil.date2string(fcbgz.getRq()),
-						0);
-				Map<String, Object> datamap = (Map<String, Object>) map.get("obj");
-				String isJZ = ObjectUtils.toString(datamap.get("accountingPerson"),"");
-				String isSH = ObjectUtils.toString(datamap.get("auditor"),"");
-				if ("".equals(isJZ)) {
-					fcbgz.setJZ(true);
-				} else {
-					fcbgz.setJZ(false);
-				}
-				if ("".equals(isSH)) {
-					fcbgz.setSH(true);
-				} else {
-					fcbgz.setSH(false);
+				if (ParameterUtil.isnotnull(fcbgz.getHwxz())) {
+					fcbgz.setUnitid(orgId);
+					DataKcglFcbgzDefault obj = fcbgzService.findConditionMax(fcbgz);
+					fcbgz.setKcsl(obj.getKcsl());
+					//获取是否审核和是否记账
+					Map<String, Object> map = keepaccountFeignService.selectHouseKeepAccountData(fcbgz.getCh(),
+							fcbgz.getHwh(),
+							Integer.parseInt(fcbgz.getHwxz()),
+							Integer.parseInt(fcbgz.getPz()),
+							ParameterUtil.date2string(fcbgz.getRq()),
+							0);
+					Map<String, Object> datamap = (Map<String, Object>) map.get("obj");
+					String isJZ = ObjectUtils.toString(datamap.get("accountingPerson"),"");
+					String isSH = ObjectUtils.toString(datamap.get("auditor"),"");
+					if ("".equals(isJZ)) {
+						fcbgz.setJZ(true);
+					} else {
+						fcbgz.setJZ(false);
+					}
+					if ("".equals(isSH)) {
+						fcbgz.setSH(true);
+					} else {
+						fcbgz.setSH(false);
+					}
 				}
 			} catch (Exception e) {
 				e.printStackTrace();

src/main/java/com/chinaitop/agile/service/impl/DataKcglFcbgzDefaultServiceImpl.java

@@ -35,13 +35,16 @@ public class DataKcglFcbgzDefaultServiceImpl implements DataKcglFcbgzDefaultServ
 		String data = ParameterUtil.date2string(fcbgz.getRq());
 		Date start_rq = ParameterUtil.string2datetime(data +" 00:00:00");
 		Date end_rq = ParameterUtil.string2datetime(data +" 23:59:59");
-		criteria.andRqBetween(start_rq, end_rq);
+		criteria.andRqGreaterThanOrEqualTo(start_rq);
+		criteria.andRqLessThanOrEqualTo(end_rq);
 
-		example.setOrderByClause("ModifyDate desc");
+		example.setOrderByClause("rq desc");
 
 		List<DataKcglFcbgzDefault> list = mapper.selectByExample(example);
 		if (null != list && list.size() > 0) {
 			obj = list.get(0);
+		} else {
+			obj = new DataKcglFcbgzDefault();
 		}
 		
 		return obj;