Merge remote-tracking branch 'remotes/origin/master'

src/main/java/org/springblade/founder/asj/mapper/AjDetailMapper.java

@@ -17,9 +17,7 @@ import java.util.Map;
 public interface AjDetailMapper {
 
     public TbStAsj getTbStAsjByAsjbh(String asjbh);
-	@DS("db1")
 	public TbStAsj getAsjByAsjbh(String asjbh);
-
     public List<TbXwZbfzxyr> getFzxyrxxByAsjbh(Map map);
     public  Integer getFzxyrxxByAsjbhTotalCount(String asjbh);
     public List<TbXwRybh> getRybhxxByAsjbh(Map map);

src/main/java/org/springblade/founder/asj/mapper/AjDetailMapper.xml

@@ -209,7 +209,7 @@
         select
         asj.xxrsksj as xxrsksj,
 		asj.asjbh as asjbh
-        from TB_ST_ASJ asj LEFT JOIN tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh
+        from TB_ST_ASJ asj
 		WHERE asj.asjbh=#{asjbh,jdbcType=VARCHAR}
 		and  asj.xxsc_pdbz='0'
 

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

@@ -13,6 +13,7 @@ import java.util.Map;
  */
 public interface IAjDetailService {
     public TbStAsj getTbStAsjByAsjbh(String asjbh);
+	public TbStAsj getAsjByAsjbh(String asjbh);
 	//抓捕犯罪嫌疑人信息
 	public  List<TbXwZbfzxyr> getFzxyrxxByAsjbh(String asjbh, Integer begin, Integer end);
 	public  Integer getFzxyrxxByAsjbhTotalCount(String asjbh);

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

@@ -39,7 +39,7 @@ public class StAsjXxtqService {
 	@Autowired
 	private ITbGlAsjRyService glAsjRyService;
 	@Autowired
-	private AjDetailMapper ajDetailMapper;
+	protected IAjDetailService ajDetailService;
 
 
 	@DS("xzxt_qgjck")
@@ -572,9 +572,8 @@ public class StAsjXxtqService {
 		return lxr;
 	}
 
-
 	private TbStAsj getTbStAsj(String asjbh){
-		return ajDetailMapper.getAsjByAsjbh(asjbh);
+		return ajDetailService.getAsjByAsjbh(asjbh);
 	}
 
 }

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

 package org.springblade.founder.asj.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.poi.util.IOUtils;
 import org.springblade.founder.asj.entity.*;
@@ -37,6 +38,12 @@ public class AjDetailServiceImpl implements IAjDetailService {
 		TbStAsj tbStAsj=ajDetailDao.getTbStAsjByAsjbh(asjbh);
 		return tbStAsj;
 	}
+	@Override
+	@DS("db1")
+	public TbStAsj getAsjByAsjbh(String asjbh){
+		TbStAsj tbStAsj=ajDetailDao.getAsjByAsjbh(asjbh);
+		return tbStAsj;
+	}
 
 	@Override
 	public List<TbXwZbfzxyr> getFzxyrxxByAsjbh(String asjbh, Integer begin, Integer end) {