.

src/main/java/com/chinaitop/depot/keeperAccount/controller/StorageAccountRecordController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.chinaitop.depot.keeperAccount.model.StorageAccountRecord;
+import com.chinaitop.depot.keeperAccount.model.StorageAccountRecordExample;
 import com.chinaitop.depot.keeperAccount.service.StorageAccountRecordService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
@@ -81,6 +82,31 @@ public class StorageAccountRecordController {
 					obj.put("kcsl", kcsl);
 					kcsl = 0d;
 				}
+				//查询是否记账和是否审核
+				StorageAccountRecordExample example = new StorageAccountRecordExample();
+				StorageAccountRecordExample.Criteria criteria = example.createCriteria();
+				criteria.andLspzEqualTo(Integer.parseInt(obj.get("lspz")+""));
+				criteria.andHwxzEqualTo(Integer.parseInt(obj.get("hwxz")+""));
+				criteria.andRqEqualTo(obj.get("rq")+"");
+				criteria.andOrgIdEqualTo(Integer.parseInt(kcsl_map.get("orgId")+""));
+				criteria.andAccountTypeEqualTo(1);
+				List<StorageAccountRecord> findList = recordService.findByConditon(example);
+				if (null != findList && findList.size() > 0) {
+					StorageAccountRecord record = findList.get(0);
+					String accountingPerson = record.getAccountingPerson();
+					if (null != accountingPerson && !"".equals(accountingPerson)) {
+						obj.put("jz", true);
+					} else {
+						obj.put("jz", false);
+					}
+					String auditor = record.getAuditor();
+					if (null != auditor && !"".equals(auditor)) {
+						obj.put("sh", true);
+					} else {
+						obj.put("sh", false);
+					}
+				}
+				
 			}
 		}
 		PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);