src/main/java/org/springblade/modules/recordk/entity/Recordk.java
@@ -151,18 +151,18 @@ private String contacts; private String contactscell; private String approve; // //派出所审批 // private String papprove; // //县审批 // private String xapprove; // //市审批 // private String sapprove; // //派出意见 // private String popinion; // //县意见 // private String xopinion; // //市意见 // private String sopinion; //派出所审批 private String papprove; //县审批 private String xapprove; //市审批 private String sapprove; //派出意见 private String popinion; //县意见 private String xopinion; //市意见 private String sopinion; // // @ApiModelProperty(value = "审批时间") // @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
@@ -28,11 +28,35 @@ <result column="contacts" property="contacts"/> <result column="contactscell" property="contactscell"/> <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="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> </mapper> src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -144,5 +144,17 @@ private String contactscell; private String approve; private String jurisdiction; //派出所审批 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
@@ -28,11 +28,35 @@ <result column="contactscell" property="contactscell"/> <result column="approve" property="approve"/> <result column="jurisdiction" property="jurisdiction"/> <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> </mapper>
