修改背景核查的案件返回数据

src/main/java/org/springblade/common/config/BladeConfiguration.java

@@ -50,12 +50,13 @@ public class BladeConfiguration implements WebMvcConfigurer {
 //		secureRegistry.excludePathPatterns("/matj/**");
 		secureRegistry.excludePathPatterns("/ajzljc/**");
 		secureRegistry.excludePathPatterns("/refreshCodeCache");
-		secureRegistry.excludePathPatterns("/reloadShceDict");
+		secureRegistry.excludePathPatterns("/reloadSysDict");
 		secureRegistry.excludePathPatterns("/xttg/**");
 		secureRegistry.excludePathPatterns("/xgxb/**");
 		secureRegistry.excludePathPatterns("/asj/**");
 		secureRegistry.excludePathPatterns("/ss*/**");
 		secureRegistry.excludePathPatterns("/*/getFile/**");
+		// secureRegistry.excludePathPatterns("/bjhc/**");
 //		secureRegistry.excludePathPatterns("/**");
 		/*secureRegistry.excludePathPatterns("/**");
 		secureRegistry.excludePathPatterns("/ajDetail/**");

src/main/java/org/springblade/founder/ydjwhc/entity/HcAjJg.java

@@ -4,6 +4,8 @@ import lombok.Data;
 import org.springblade.founder.asj.entity.TbXszCbypQgaj;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 @Data
@@ -11,14 +13,28 @@ public class HcAjJg {
 	private String asjbh;
 	private String ajmc;
 	private String ladw;
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date larq;
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date afsj;
+	private String fadq;
+	private String zbrXm;
+	private String ajlb;
 
-	public HcAjJg() {}
+	public HcAjJg() {
+	}
 
 	public HcAjJg(TbXszCbypQgaj asjByBsh) {
-		this.asjbh = asjByBsh.getAsjbh();
-		this.ajmc = asjByBsh.getAjmc();
-		this.ladw = asjByBsh.getLadwGajgMc();
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			this.asjbh = asjByBsh.getAsjbh();
+			this.ajmc = asjByBsh.getAjmc();
+			this.ladw = asjByBsh.getLadwGajgMc();
+			this.afsj = sdf.parse(asjByBsh.getAsjfssjKssj());
+			this.fadq = asjByBsh.getAsjfsddXzqhdm();
+			this.ajlb = asjByBsh.getAjlbdm();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 }

src/main/java/org/springblade/founder/ydjwhc/mapper/QgBjHcMapper.xml

@@ -2,10 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="org.springblade.founder.ydjwhc.mapper.QgBjHcMapper">
     <select id="selectAjBySfzh" resultType="org.springblade.founder.ydjwhc.entity.HcAjJg">
-        select asj.ASJBH as ASJBH,
-               asj.AJMC as AJMC,
-               asj.LADW_GAJGMC as LADW,
-               asj.LARQ
+        select asj.ASJBH                                                                         as asjbh,
+               asj.AJMC                                                                          as ajmc,
+               asj.LADW_GAJGMC                                                                   as ladw,
+               asj.LARQ                                                                          as larq,
+               asj.ASJFSSJ_ASJFSKSSJ                                                             as afsj,
+               asj.ASJFSDD_DZMC                                                                  as fadq,
+               asj.ZBR_XM                                                                        as zbrXm,
         from TB_ST_ASJ asj,
              TB_XW_ZBFZXYR xyr
         where xyr.ZHFZXYR_CYZJ_ZJHM = #{sfzh,jdbcType=VARCHAR}
@@ -20,10 +23,13 @@
           </if>
     </select>
     <select id="selectAjByCphm" resultType="org.springblade.founder.ydjwhc.entity.HcAjJg">
-        select asj.ASJBH       as ASJBH,
-               asj.AJMC        as AJMC,
-               asj.LADW_GAJGMC as LADW,
-               asj.LARQ
+        select asj.ASJBH                                                                         as asjbh,
+               asj.AJMC                                                                          as ajmc,
+               asj.LADW_GAJGMC                                                                   as ladw,
+               asj.LARQ                                                                          as larq,
+               asj.ASJFSSJ_ASJFSKSSJ                                                             as afsj,
+               asj.ASJFSDD_DZMC                                                                  as fadq,
+               asj.ZBR_XM                                                                        as zbrXm,
         from TB_ST_ASJ asj
         where asj.xxsc_pdbz = '0'
           and asj.JYAQ like '%' || #{cphm,jdbcType=VARCHAR} || '%'

src/main/java/org/springblade/founder/ydjwhc/mapper/QsBjHcMapper.java

@@ -2,6 +2,7 @@ package org.springblade.founder.ydjwhc.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.founder.ydjwhc.entity.HcAjJg;
 import org.springframework.stereotype.Repository;
 
@@ -17,4 +18,6 @@ public interface QsBjHcMapper {
 	List<HcAjJg> selectAjBySfzh(String sfzh);
 
 	List<HcAjJg> selectAjByCphm(String cphm);
+
+	String getNameByCodeAndGroupid(@Param("ajlb") String ajlb, @Param("code_ajlb") String code_ajlb);
 }

src/main/java/org/springblade/founder/ydjwhc/mapper/QsBjHcMapper.xml

@@ -11,10 +11,14 @@
           and xxsc_pdbz = '0'
     </select>
     <select id="selectAjBySfzh" resultType="org.springblade.founder.ydjwhc.entity.HcAjJg">
-        select asj.ASJBH       as ASJBH,
-               asj.AJMC        as AJMC,
-               asj.LADW_GAJGMC as LADW,
-               asj.LARQ
+        select asj.ASJBH                                                                         as asjbh,
+               asj.AJMC                                                                          as ajmc,
+               asj.LADW_GAJGMC                                                                   as ladw,
+               asj.LARQ                                                                          as larq,
+               asj.ASJFSSJ_ASJFSKSSJ                                                             as afsj,
+               asj.ASJFSDD_DZMC                                                                  as fadq,
+               asj.ZBR_XM                                                                        as zbrXm,
+               (select name from SYS_DICTITEM where GROUPID = 'CODE_AJLB' and CODE = asj.ajlbdm) as ajlb
         from TB_ST_ASJ asj,
              TB_XW_ZBFZXYR xyr
         where xyr.ZHFZXYR_CYZJ_ZJHM = #{sfzh,jdbcType=VARCHAR}
@@ -24,13 +28,23 @@
         order by asj.djsj desc
     </select>
     <select id="selectAjByCphm" resultType="org.springblade.founder.ydjwhc.entity.HcAjJg">
-        select asj.ASJBH       as ASJBH,
-               asj.AJMC        as AJMC,
-               asj.LADW_GAJGMC as LADW,
-               asj.LARQ
+        select asj.ASJBH                                                                         as asjbh,
+               asj.AJMC                                                                          as ajmc,
+               asj.LADW_GAJGMC                                                                   as ladw,
+               asj.LARQ                                                                          as larq,
+               asj.ASJFSSJ_ASJFSKSSJ                                                             as afsj,
+               asj.ASJFSDD_DZMC                                                                  as fadq,
+               asj.ZBR_XM                                                                        as zbrXm,
+               (select name from SYS_DICTITEM where GROUPID = 'CODE_AJLB' and CODE = asj.ajlbdm) as ajlb
         from TB_ST_ASJ asj
         where asj.xxsc_pdbz = '0'
           and JYAQ like '%' || #{cphm,jdbcType=VARCHAR} || '%'
         order by asj.djsj desc
     </select>
+    <select id="getNameByCodeAndGroupid" resultType="java.lang.String">
+        select name
+        from SYS_DICTITEM
+        where code = #{code}
+          and groupid = #{groupid}
+    </select>
 </mapper>

src/main/java/org/springblade/founder/ydjwhc/service/impl/BjHcServiceImpl.java

@@ -78,6 +78,12 @@ public class BjHcServiceImpl implements BjHcService {
 		resultMap.put("qsAjCount", qsAjList.size());
 
 		List<HcAjJg> qgAjList = qgBjHcMapper.selectAjBySfzh(sfzh, qsAjList);
+		for (HcAjJg hcAjJg : qgAjList) {
+			String ajlb = qsBjHcMapper.getNameByCodeAndGroupid(hcAjJg.getAjlb(), "CODE_AJLB");
+			String fadq = qsBjHcMapper.getNameByCodeAndGroupid(hcAjJg.getFadq(), "CODE_XZQH");
+			hcAjJg.setAjlb(ajlb);
+			hcAjJg.setFadq(fadq);
+		}
 		resultMap.put("qgAjList", qgAjList);
 		resultMap.put("qgAjCount", qgAjList.size());
 
@@ -103,6 +109,10 @@ public class BjHcServiceImpl implements BjHcService {
 			List<HcAjJg> qgAjList = new ArrayList<>();
 			for (TbXszCbypQgaj asjByBsh : asjListByBsh) {
 				HcAjJg hcAjJg = new HcAjJg(asjByBsh);
+				String ajlb = qsBjHcMapper.getNameByCodeAndGroupid(hcAjJg.getAjlb(), "CODE_AJLB");
+				String fadq = qsBjHcMapper.getNameByCodeAndGroupid(hcAjJg.getFadq(), "CODE_XZQH");
+				hcAjJg.setAjlb(ajlb);
+				hcAjJg.setFadq(fadq);
 				qgAjList.add(hcAjJg);
 			}
 			resultMap.put("qgAjList", qgAjList);