src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -42,13 +42,32 @@ <select id="selectPermitPage" resultMap="permitResultMap"> select * from sys_permit from sys_permit si left join sys_jurisdiction sj on sj.id = si.jurisdiction where 1=1 <if test="permit.ptype!=null and permit.ptype!=''"> and ptype=#{record.ptype} </if> <if test="permit.jurisdiction!=null and permit.jurisdiction != '' and permit.jurisdiction!='1372091709474910209'"> and (sj.id = #{record.jurisdiction} or sj.parent_id = #{record.jurisdiction}) </if> <if test="permit.papprove!=null and permit.papprove!=''"> and papprove=#{record.papprove} </if> <if test="permit.xapprove!=null and permit.xapprove!=''"> and xapprove=#{record.xapprove} </if> <if test="permit.sapprove!=null and permit.sapprove!=''"> and sapprove=#{record.sapprove} </if> </select> <select id="selectIn" resultType="java.util.HashMap"> select * from sys_permit where cardid = #{cardid} and ptype=#{type } where cardid = #{cardid} and ptype = #{type } </select> <insert id="insertPer" useGeneratedKeys="true" keyProperty="id"> src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -43,11 +43,32 @@ <select id="selectRecordPage" resultMap="recordResultMap"> select * from sys_record select * from sys_record si left join sys_jurisdiction sj on sj.id = si.jurisdiction where 1=1 <if test="record.ptype!=null and record.ptype!=''"> and ptype=#{record.ptype} </if> <if test="record.jurisdiction!=null and record.jurisdiction != '' and record.jurisdiction!='1372091709474910209'"> and (sj.id = #{record.jurisdiction} or sj.parent_id = #{record.jurisdiction}) </if> <if test="record.papprove!=null and record.papprove!=''"> and papprove=#{record.papprove} </if> <if test="record.xapprove!=null and record.xapprove!=''"> and xapprove=#{record.xapprove} </if> <if test="record.sapprove!=null and record.sapprove!=''"> and sapprove=#{record.sapprove} </if> </select> <select id="selectIn" resultType="java.util.HashMap"> select * from sys_record where cardid=#{cardid} and ptype=#{type} select * from sys_record where cardid = #{cardid} and ptype = #{type} </select> </mapper> src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
@@ -43,7 +43,25 @@ <select id="selectRecordkPage" resultMap="recordkResultMap"> select * from sys_recordk select * from sys_recordk si left join sys_jurisdiction sj on sj.id = si.jurisdiction where 1=1 <if test="recordk.ptype!=null and recordk.ptype!=''"> and ptype=#{record.ptype} </if> <if test="recordk.jurisdiction!=null and recordk.jurisdiction != '' and recordk.jurisdiction!='1372091709474910209'"> and (sj.id = #{record.jurisdiction} or sj.parent_id = #{record.jurisdiction}) </if> <if test="recordk.papprove!=null and recordk.papprove!=''"> and papprove=#{record.papprove} </if> <if test="recordk.xapprove!=null and recordk.xapprove!=''"> and xapprove=#{record.xapprove} </if> <if test="recordk.sapprove!=null and recordk.sapprove!=''"> and sapprove=#{record.sapprove} </if> </select> <select id="selectIn" resultType="java.util.HashMap"> src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -150,5 +150,17 @@ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date overtime; //派出所审批 private String papprove; //县审批 private String xapprove; //市审批 private String sapprove; //派出意见 private String popinion; //县意见 private String xopinion; //市意见 private String sopinion; } src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -33,11 +33,36 @@ <result column="approve" property="approve"/> <result column="jurisdiction" property="jurisdiction"/> <result column="overtime" property="overtime"/> <result column="approve" property="approve"/> <result column="papprove" property="papprove"/> <result column="xapprove" property="xapprove"/> <result column="sapprove" property="sapprove"/> <result column="popinion" property="popinion"/> <result column="xopinion" property="xopinion"/> <result column="sopinion" property="sopinion"/> </resultMap> <select id="selectRevokePage" resultMap="revokeResultMap"> select * from sys_revoke select * from sys_revoke si left join sys_jurisdiction sj on sj.id = si.jurisdiction where 1=1 <if test="revoke.ptype!=null and revoke.ptype!=''"> and ptype=#{record.ptype} </if> <if test="revoke.jurisdiction!=null and revoke.jurisdiction != '' and revoke.jurisdiction!='1372091709474910209'"> and (sj.id = #{record.jurisdiction} or sj.parent_id = #{record.jurisdiction}) </if> <if test="revoke.papprove!=null and revoke.papprove!=''"> and papprove=#{record.papprove} </if> <if test="revoke.xapprove!=null and revoke.xapprove!=''"> and xapprove=#{record.xapprove} </if> <if test="revoke.sapprove!=null and revoke.sapprove!=''"> and sapprove=#{record.sapprove} </if> </select> <select id="selectIn" resultType="java.util.HashMap"> select * from sys_revoke where cardid=#{cardid} and ptype=#{type}