可疑线索返回线索数量，现场信息增加通过关联编号查询

src/main/java/org/springblade/founder/asj/controller/KyxsController.java

@@ -52,6 +52,17 @@ public class KyxsController {
 		}
 	}
 
+	@PostMapping("/getKyxsCountByAsjbh")
+	public R getKyxsCountByAsjbh(String asjbh) {
+		try {
+			Map<String, Object> resultMap = kyxsService.getKyxsCountByAsjbh(asjbh);
+			return R.ok().data(resultMap);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return R.error(e.getMessage());
+		}
+	}
+
 	@PostMapping("/getKyxsByXxzjbh")
 	public R getKyxsByXxzjbh(String xxzjbh, String type) {
 		try {

src/main/java/org/springblade/founder/asj/dao/TbXwKyxsTxMapper.java

@@ -13,4 +13,6 @@ public interface TbXwKyxsTxMapper extends BaseMapper<TbXwKyxsTx> {
 	List<TbXwKyxsTx> selectListByAsjbh(String asjbh);
 
 	TbXwKyxsTx selectOneByXxzjbh(String xxzjbh);
+
+	Integer selectCountByAsjbh(String asjbh);
 }

src/main/java/org/springblade/founder/asj/dao/TbXwKyxsTxMapper.xml

@@ -56,5 +56,11 @@
         where XXZJBH = #{xxzjbh,jdbcType=VARCHAR}
           and xxsc_pdbz = '0'
     </select>
+    <select id="selectCountByAsjbh" resultType="java.lang.Integer">
+        select count(1)
+        from TB_XW_KYXS_TX
+        where asjbh = #{asjbh,jdbcType=VARCHAR}
+          and xxsc_pdbz = '0'
+    </select>
 
 </mapper>

src/main/java/org/springblade/founder/asj/service/KyxsService.java

@@ -59,4 +59,13 @@ public interface KyxsService {
 	 * 2021/11/24 21:10
 	 */
 	void getFile(String xxzjbh, HttpServletResponse response) throws IOException;
+
+	/**
+	 * getKyxsCountByAsjbh 查询可疑线索总数
+	 * @param asjbh: 案事件编号
+	 * @return java.lang.Integer
+	 * @author lystar
+	 * 2021/12/2 11:22
+	 */
+	Map<String, Object> getKyxsCountByAsjbh(String asjbh);
 }

src/main/java/org/springblade/founder/asj/service/impl/KyxsServiceImpl.java

@@ -155,8 +155,10 @@ public class KyxsServiceImpl implements KyxsService {
 				for (TbXwKyxsHm hm : hmList) {
 					List<String> hnAsjbhList = hnJbAsjXsMapper.getAsjbhListBsh(hm.getKyxshmYdhm());
 					hm.setQsAsjbhList(hnAsjbhList);
+					//本地测试
 					List<String> qgAsjbhList = qgJbAsjXsMapper.getAsjbhListBsh(hm.getKyxshmYdhm(), hnAsjbhList);
 					hm.setQgAsjbhList(qgAsjbhList);
+					//公安网使用
 					// List<TbXszCbypQgaj> qgajList = qgAsjQueryService.getQgAsjByBsh(hm.getKyxshmYdhm());
 					// if (qgajList != null && qgajList.size() > 0){
 					// 	List<String> qgAsjbhList = new ArrayList<>();
@@ -184,8 +186,10 @@ public class KyxsServiceImpl implements KyxsService {
 				for (TbXwKyxsJdc jdc : jdcList) {
 					List<String> hnAsjbhList = hnJbAsjXsMapper.getAsjbhListBsh(jdc.getKyxsjdcCphm());
 					jdc.setQsAsjbhList(hnAsjbhList);
+					//本地测试
 					List<String> qgAsjbhList = qgJbAsjXsMapper.getAsjbhListBsh(jdc.getKyxsjdcCphm(), hnAsjbhList);
 					jdc.setQgAsjbhList(qgAsjbhList);
+					//公安网使用
 					// List<TbXszCbypQgaj> qgajList = qgAsjQueryService.getQgAsjByBsh(jdc.getKyxsjdcCphm());
 					// if (qgajList != null && qgajList.size() > 0){
 					// 	List<String> qgAsjbhList = new ArrayList<>();
@@ -230,6 +234,30 @@ public class KyxsServiceImpl implements KyxsService {
 	}
 
 	@Override
+	public Map<String, Object> getKyxsCountByAsjbh(String asjbh) {
+		QueryWrapper<TbXwKyxsRy> ryQueryWrapper = new QueryWrapper<>();
+		ryQueryWrapper.eq("asjbh", asjbh);
+		ryQueryWrapper.eq("xxsc_pdbz", "0");
+		Integer kyryCount = tbXwKyxsRyMapper.selectCount(ryQueryWrapper);
+		QueryWrapper<TbXwKyxsHm> hmQueryWrapper = new QueryWrapper<>();
+		hmQueryWrapper.eq("asjbh", asjbh);
+		hmQueryWrapper.eq("xxsc_pdbz", "0");
+		Integer kyhmCount = tbXwKyxsHmMapper.selectCount(hmQueryWrapper);
+		QueryWrapper<TbXwKyxsJdc> jdcQueryWrapper = new QueryWrapper<>();
+		jdcQueryWrapper.eq("asjbh", asjbh);
+		jdcQueryWrapper.eq("xxsc_pdbz", "0");
+		Integer kyjdcCount = tbXwKyxsJdcMapper.selectCount(jdcQueryWrapper);
+		Integer kytxCount = tbXwKyxsTxMapper.selectCountByAsjbh(asjbh);
+		HashMap<String, Object> resultMap = new HashMap<>();
+		resultMap.put("kyryCount", kyryCount);
+		resultMap.put("kyhmCount", kyhmCount);
+		resultMap.put("kyjdcCount", kyjdcCount);
+		resultMap.put("kytxCount", kytxCount);
+		resultMap.put("kyxsCount", kyryCount + kyhmCount + kyjdcCount + kytxCount);
+		return resultMap;
+	}
+
+	@Override
 	public Object getKyxsByXxzjbh(String xxzjbh, String type) {
 		if (type != null) {
 			List<String> hnAsjbhList;

src/main/java/org/springblade/founder/xcxx/controller/XcxxController.java

@@ -62,6 +62,18 @@ public class XcxxController {
 		}
 	}
 
+	@PostMapping("/getXcxxListByGlxx")
+	@LogOper(czxxLbdm = "01", yymcJyqk = "查询关联下的现场信息")
+	public R getXcxxListByGlxx(String glxxXxzjbh, String glxxlx){
+		try {
+			Map<String, Object> resultMap = xcxxService.getXcxxListByAsjbh(glxxXxzjbh, glxxlx);
+			return R.ok().data(resultMap);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return R.error(e.getMessage());
+		}
+	}
+
 	@PostMapping("/getXcxxByXcbh")
 	@LogOper(czxxLbdm = "01", yymcJyqk = "查询app现场信息详情")
 	public R getXcxxByXcbh(String xcbh){

src/main/java/org/springblade/founder/xcxx/mapper/XcxxMapper.xml

@@ -97,6 +97,10 @@
         <if test="tbStAppXcxx.cksjEnd != null">
             AND CKSJ <![CDATA[ <= ]]> #{tbStAppXcxx.cksjEnd , jdbcType=TIMESTAMP }
         </if>
+        <if test="tbStAppXcxx.glxxXxzjbh != null and tbStAppXcxx.glxxXxzjbh != ''">
+            and GLXXLX = #{tbStAppXcxx.glxxlx , jdbcType=VARCHAR}
+            and glxx_xxzjbh = #{tbStAppXcxx.glxxXxzjbh , jdbcType=VARCHAR}
+        </if>
             order by djsj desc
         ) t where rownum <![CDATA[ <= ]]> #{tbStAppXcxx.end} ) where r <![CDATA[ > ]]> #{tbStAppXcxx.begin}
     </select>

src/main/java/org/springblade/founder/xcxx/service/XcxxService.java

@@ -66,4 +66,14 @@ public interface XcxxService {
 	void deleteOneFj(String xxzjbh);
 
 	void getFile(String xxzjbh, HttpServletResponse response) throws IOException;
+
+	/**
+	 * getXcxxListByAsjbh 查询案件下的现场信息
+	 * @param glxxXxzjbh: 关联信息编号
+	 * @param glxxlx: 关联信息类型 1案件 2警情
+	 * @return java.util.Map<java.lang.String,java.lang.Object>
+	 * @author lystar
+	 * 2021/12/2 11:34
+	 */
+	Map<String, Object> getXcxxListByAsjbh(String glxxXxzjbh, String glxxlx);
 }

src/main/java/org/springblade/founder/xcxx/service/impl/XcxxServiceImpl.java

@@ -154,6 +154,19 @@ public class XcxxServiceImpl implements XcxxService {
 		}
 	}
 
+	@Override
+	public Map<String, Object> getXcxxListByAsjbh(String glxxXxzjbh, String glxxlx) {
+		TbStAppXcxx tbStAppXcxx = new TbStAppXcxx();
+		tbStAppXcxx.setGlxxXxzjbh(glxxXxzjbh);
+		tbStAppXcxx.setGlxxlx(glxxlx);
+		List<TbStAppXcxx> rows = xcxxMapper.selectPageList(tbStAppXcxx);
+		Integer total = xcxxMapper.selectPageCount(tbStAppXcxx);
+		HashMap<String, Object> resultMap = new HashMap<>();
+		resultMap.put("rows", rows);
+		resultMap.put("total", total);
+		return resultMap;
+	}
+
 	private void setQueryWrapper(QueryWrapper<TbStAppXcxx> queryWrapper, TbStAppXcxx tbStAppXcxx) {
 		//分配时间
 		if (tbStAppXcxx.getCksjStart() != null) {