完善数据流节点

src/main/java/org/springblade/founder/asj/entity/SjlResult.java

@@ -29,6 +29,10 @@ public class SjlResult {
 
 	//是否通过
 	private String sftg;
+
+	//数据流状态（1：显示改动列表，2：显示查看详情按钮）
+	private String sjlzt;
+
 	//更新字段内容
 	private String updaterecords;
 

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

@@ -430,29 +430,52 @@
     <select id="getSjlByasjbh" parameterType="java.lang.String" resultType="org.springblade.founder.asj.entity.SjlResult">
         select xxczryxm as czry,
         DATE_FORMAT(xxczrq,'%Y-%m-%d %H:%i:%S') as czsj,
-        CONCAT(gnmc,'修改') as czmc,
+        gnmc as czmc,
         updaterecords as updaterecords,
         xxczrdwmc as czdwmc,
         ''  as zjbh,
-        '' as sftg
+        ''  as sftg,
+        '1' as sjlzt
         from sys_record_log where keyvalue in((select xxzjbh from tb_xw_rybh where asjbh = #{asjbh, jdbcType=VARCHAR}))
         UNION
         select xxczryxm as czry,
         DATE_FORMAT(xxczrq,'%Y-%m-%d %H:%i:%S') as czsj,
-        CONCAT(gnmc,'修改') as czmc,
+        gnmc as czmc,
         updaterecords as updaterecords,
         xxczrdwmc as czdwmc,
         '' as zjbh,
-        '' as sftg
+        '' as sftg,
+        '1' as sjlzt
         from sys_record_log where keyvalue in((select xxzjbh from tb_xw_zbfzxyr where asjbh = #{asjbh, jdbcType=VARCHAR}))
         UNION
         select xxczryxm as czry,
         DATE_FORMAT(xxczrq,'%Y-%m-%d %H:%i:%S') as czsj,
-        CONCAT(gnmc,'修改') as czmc,
+        gnmc as czmc,
+        updaterecords as updaterecords,
+        xxczrdwmc as czdwmc,
+        ''  as zjbh,
+        ''  as sftg,
+        '1' as sjlzt
+        from sys_record_log where keyvalue in((select xxzjbh from tb_xw_zczj where asjbh = #{asjbh, jdbcType=VARCHAR}))
+        UNION
+        select xxczryxm as czry,
+        DATE_FORMAT(xxczrq,'%Y-%m-%d %H:%i:%S') as czsj,
+        gnmc as czmc,
         updaterecords as updaterecords,
         xxczrdwmc as czdwmc,
         ''  as zjbh,
-        '' as sftg
+        ''  as sftg,
+        '1' as sjlzt
+        from sys_record_log where keyvalue in((select xxzjbh from tb_yw_magl_bqxgsq where asjbh = #{asjbh, jdbcType=VARCHAR}))
+        UNION
+        select xxczryxm as czry,
+        DATE_FORMAT(xxczrq,'%Y-%m-%d %H:%i:%S') as czsj,
+        gnmc as czmc,
+        updaterecords as updaterecords,
+        xxczrdwmc as czdwmc,
+        '' as zjbh,
+        '' as sftg,
+        '1' as sjlzt
         from sys_record_log where keyvalue = #{asjbh, jdbcType=VARCHAR} and gnmc not like '%提取%'
         UNION
         select xxczryxm as czry,
@@ -461,34 +484,48 @@
         updaterecords as updaterecords,
         xxczrdwmc as czdwmc,
         '' as zjbh,
-        '' as sftg
+        '' as sftg,
+        '0' as sjlzt
         from sys_record_log where keyvalue in((select xxzjbh from tb_st_asj_flws where asjbh =#{asjbh, jdbcType=VARCHAR}))
         UNION
         select xxdjry_xm as czry,
         DATE_FORMAT(xxrsksj,'%Y-%m-%d %H:%i:%S') as czsj,
-        '添加案件' as czmc,
+        '案件入库' as czmc,
         '' as updaterecords,
         xxdjdw_gajgmc as czdwmc,
         '' as zjbh,
-        '' as sftg
+        '' as sftg,
+        '0' as sjlzt
         from tb_st_asj where xxsc_pdbz = '0' and xxrsksj is not null and asjbh = #{asjbh, jdbcType=VARCHAR}
         UNION
         select xxdjry_xm as czry,
+        DATE_FORMAT(djsj,'%Y-%m-%d %H:%i:%S') as czsj,
+        '申请部权修改信息' as czmc,
+        '' as updaterecords,
+        xxdjdw_gajgmc as czdwmc,
+        ''  as zjbh,
+        ''  as sftg,
+        '0' as sjlzt
+        from tb_yw_magl_bqxgsq where xxsc_pdbz = '0' and djsj is not null and asjbh = #{asjbh, jdbcType=VARCHAR}
+        UNION
+        select xxdjry_xm as czry,
         DATE_FORMAT(xxrsksj,'%Y-%m-%d %H:%i:%S') as czsj,
-        '添加犯罪嫌疑人' as czmc,
+        '犯罪嫌疑人入库' as czmc,
         '' as updaterecords,
         xxdjdw_gajgmc as czdwmc,
         xxzjbh as zjbh,
-        '' as sftg
+        '' as sftg,
+        '2' as sjlzt
         from tb_xw_zbfzxyr where xxsc_pdbz = '0' and xxrsksj is not null and asjbh = #{asjbh, jdbcType=VARCHAR}
         UNION
         select xxdjry_xm as czry,
         DATE_FORMAT(xxrsksj,'%Y-%m-%d %H:%i:%S') as czsj,
-        '添加被害人' as czmc,
+        '被害人入库' as czmc,
         '' as updaterecords,
         xxdjdw_gajgmc as czdwmc,
         xxzjbh as zjbh,
-        '' as sftg
+        '' as sftg,
+        '2' as sjlzt
         from tb_xw_rybh where xxsc_pdbz = '0' and xxrsksj is not null and asjbh = #{asjbh, jdbcType=VARCHAR}
         UNION
         select xxdjry_xm as czry,
@@ -497,7 +534,8 @@
         '' as updaterecords,
         xxdjdw_gajgmc as czdwmc,
         '' as zjbh,
-        '' as sftg
+        '' as sftg,
+        '0' as sjlzt
         from sys_gnsyrz where xxsc_pdbz = '0' and czxx_jyqk = #{asjbh, jdbcType=VARCHAR}
         UNION
         select spr_xm as czry,
@@ -512,7 +550,8 @@
         '' as updaterecords,
         spdw_gajgmc as czdwmc,
         '' as zjbh,
-        SPSFTG_PDBZ as sftg
+        SPSFTG_PDBZ as sftg,
+        '0' as sjlzt
         from tb_yw_blgc where ASJBH = #{asjbh, jdbcType=VARCHAR}
         ORDER BY czsj ASC
     </select>

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

@@ -309,15 +309,17 @@ public class MaAsjglServiceImpl implements IMaAsjglService {
 					Object oldValue = recordsMap.get(key).get(0);
 					Object newValue = recordsMap.get(key).get(1);
 					if (!(ObjectUtils.isEmpty(oldValue)&&ObjectUtils.isEmpty(newValue))) {
-						Map<String,Object> map = new HashMap<>();
 						String value = getValue(key);
-						map.put("name",value);
+						if (!StringUtils.isEmpty(value)) {
+							Map<String,Object> map = new HashMap<>();
+							map.put("name", value);
 							map.put("oldValue", oldValue);
 							map.put("key", key);
 							map.put("newValue", newValue);
 							gxnr.add(map);
 						}
 					}
+				}
 				sjlResult.setGxnr(gxnr);
 			}
 		}
@@ -407,6 +409,9 @@ public class MaAsjglServiceImpl implements IMaAsjglService {
 		map.put("zhddXzqhdm","抓获地点区划");
 		map.put("zhdwGajgjgdm","抓获单位");
 		map.put("zhdwGajgmc","抓获单位详称");
+
+		map.put("sqnr","申请撤销内容");
+		map.put("qksm","情况说明");
 		String value = map.get(key);
 		return value;
 	}