Commit 77f7ace8 authored by fangxinjiang's avatar fangxinjiang

人员花名册

parent a239ad2b
...@@ -375,13 +375,5 @@ public class TPersonnelRoster extends BaseEntity { ...@@ -375,13 +375,5 @@ public class TPersonnelRoster extends BaseEntity {
@ExcelProperty("数据生产月") @ExcelProperty("数据生产月")
@Schema(description = "数据生产月") @Schema(description = "数据生产月")
private String dataCreateMonth; private String dataCreateMonth;
/**
* dataCreateMomth
*/
@ExcelAttribute(name = "dataCreateMomth", maxLength = 255)
@Length(max = 255, message = "dataCreateMomth不能超过255个字符")
@ExcelProperty("dataCreateMomth")
@Schema(description = "dataCreateMomth")
private String dataCreateMomth;
} }
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
<result property="contractCreater" column="CONTRACT_CREATER"/> <result property="contractCreater" column="CONTRACT_CREATER"/>
<result property="contractCreateTime" column="CONTRACT_CREATE_TIME"/> <result property="contractCreateTime" column="CONTRACT_CREATE_TIME"/>
<result property="dataCreateMonth" column="DATA_CREATE_MONTH"/> <result property="dataCreateMonth" column="DATA_CREATE_MONTH"/>
<result property="dataCreateMomth" column="DATA_CREATE_MOMTH"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -110,8 +109,7 @@ ...@@ -110,8 +109,7 @@
a.CONTRACT_CODE, a.CONTRACT_CODE,
a.CONTRACT_CREATER, a.CONTRACT_CREATER,
a.CONTRACT_CREATE_TIME, a.CONTRACT_CREATE_TIME,
a.DATA_CREATE_MONTH, a.DATA_CREATE_MONTH
a.DATA_CREATE_MOMTH
</sql> </sql>
<sql id="tPersonnelRoster_where"> <sql id="tPersonnelRoster_where">
<if test="tPersonnelRoster != null"> <if test="tPersonnelRoster != null">
...@@ -241,9 +239,7 @@ ...@@ -241,9 +239,7 @@
<if test="tPersonnelRoster.dataCreateMonth != null and tPersonnelRoster.dataCreateMonth.trim() != ''"> <if test="tPersonnelRoster.dataCreateMonth != null and tPersonnelRoster.dataCreateMonth.trim() != ''">
AND a.DATA_CREATE_MONTH = #{tPersonnelRoster.dataCreateMonth} AND a.DATA_CREATE_MONTH = #{tPersonnelRoster.dataCreateMonth}
</if> </if>
<if test="tPersonnelRoster.dataCreateMomth != null and tPersonnelRoster.dataCreateMomth.trim() != ''">
AND a.DATA_CREATE_MOMTH = #{tPersonnelRoster.dataCreateMomth}
</if>
</if> </if>
</sql> </sql>
<!--tPersonnelRoster简单分页查询--> <!--tPersonnelRoster简单分页查询-->
......
...@@ -523,7 +523,7 @@ public class Common { ...@@ -523,7 +523,7 @@ public class Common {
* @param null * @param null
* @return * @return
**/ **/
private static final String insuranceSuffixList = "pdf|png|jpg|doc|docx|xls|xlsx|rar|zip"; private static final String insuranceSuffixList = "pdf|png|jpg|doc|docx|xls|xlsx|rar|zip|txt";
/** /**
* 判断是否为允许的上传文件类型,true表示允许 * 判断是否为允许的上传文件类型,true表示允许
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment