山西新需求修改

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

@@ -98,4 +98,23 @@ public class StorageAccountRecordController {
 		}
 		return map;
 	}
+
+	/**
+	 * 查询保管总账数量合计
+	 * @param orgId 组织机构id
+	 * @param lspz 粮食品种
+	 * @param lsxz 粮食性质
+	 * @return
+	 */
+	@RequestMapping(value="/getCountSumAccountzl", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="保管总账数量合计", notes = "保管总账数量合计")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query"),
+			@ApiImplicitParam(name="lspz", value="粮食品种", paramType="query"),
+			@ApiImplicitParam(name="lsxz", value="粮食性质", paramType="query")
+	})
+	public Map<String, Object> getCountSumAccountzl(Integer orgId, Integer lspz, Integer lsxz) {
+		Map<String, Object> mapSumNumber = recordService.getCountSumAccountzl(orgId,lspz,lsxz);
+		return mapSumNumber;
+	}
 }

src/main/java/com/chinaitop/depot/keeperAccount/mapper/StorageAccountRecordMapper.java

@@ -50,4 +50,6 @@ public interface StorageAccountRecordMapper {
      * @return
      */
     List<Map<String, Object>> selectKCSL(Map<String, Object> map);
+
+    Map<String, Object> getCountSumAccountzl(Map<String, Object> map);
 }

src/main/java/com/chinaitop/depot/keeperAccount/mapper/StorageAccountRecordMapper.xml

@@ -561,4 +561,20 @@
 	</if>
 	ORDER BY rq DESC
   </select>
+
+  <select id="getCountSumAccountzl" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT sum(srsl),sum(zcsl) FROM storage_account_record
+    WHERE 1=1
+    AND account_type = 0
+    AND auditor_date IS NOT NULL
+    <if test="orgId != null">
+      AND org_id=#{orgId}
+    </if>
+    <if test="pz != null">
+      and lspz = #{pz}
+    </if>
+    <if test="hwxz != null">
+      and hwxz = #{hwxz}
+    </if>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/keeperAccount/service/StorageAccountRecordService.java

@@ -89,4 +89,6 @@ public interface StorageAccountRecordService {
 	 * @return
 	 */
 	PageInfo<Map<String, Object>> setListData(HttpServletRequest request, PageInfo<Map<String, Object>> pageInfo);
+
+	Map<String, Object> getCountSumAccountzl(Integer orgId, Integer lspz, Integer lsxz);
 }

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageAccountRecordServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.chinaitop.depot.utils.ParameterUtil;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
 
@@ -125,4 +126,20 @@ public class StorageAccountRecordServiceImpl implements StorageAccountRecordServ
 		}
 		return pageInfo;
 	}
+
+	@Override
+	public Map<String, Object> getCountSumAccountzl(Integer orgId, Integer lspz, Integer lsxz) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		if (lspz != null) {
+			map.put("pz", lspz+"");
+		}
+		if (lsxz != null) {
+			map.put("hwxz", lsxz+"");
+		}
+
+		if (null != orgId && !"".equals(orgId)) {
+			map.put("orgId", orgId);
+		}
+		return mapper.getCountSumAccountzl(map);
+	}
 }