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

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

 package org.springblade.founder.asj.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.apache.ibatis.annotations.Mapper;
 import org.springblade.founder.asj.entity.*;
 import org.springblade.founder.flwsfj.entity.TbStAsjFlws;
@@ -14,7 +15,10 @@ import java.util.Map;
 @Component
 @Mapper
 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);

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

@@ -204,8 +204,17 @@
         from TB_ST_ASJ asj LEFT JOIN tb_xw_asjcz asjcz on asj.asjbh=asjcz.asjbh
 		WHERE asj.asjbh=#{asjbh,jdbcType=VARCHAR}
 		and  asj.xxsc_pdbz='0'
+    </select>
+    <select id="getAsjByAsjbh" resultType="org.springblade.founder.asj.entity.TbStAsj" parameterType="java.lang.String">
+        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
+		WHERE asj.asjbh=#{asjbh,jdbcType=VARCHAR}
+		and  asj.xxsc_pdbz='0'
 
     </select>
+
     <select id="getFzxyrxxByAsjbh" parameterType="java.util.Map" resultType="org.springblade.founder.asj.entity.TbXwZbfzxyr">
         select
         xyr.XXZJBH,