Переглянути джерело

添加人员申请认证时间

yanliming 1 рік тому
батько
коміт
4a61551a3a

+ 5 - 0
common/src/main/java/com/jpsoft/employment/modules/base/entity/PersonInfo.java

@@ -99,4 +99,9 @@ public class PersonInfo {
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date checkTime;
+
+	@ApiModelProperty(value = "申请认证时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date applicationCheckTime;
 }

+ 8 - 2
common/src/main/resources/mapper/base/PersonInfo.xml

@@ -26,6 +26,8 @@
 			<result property="jobStatus" column="job_status" />
 			<result property="phoneLastUpdateTime" column="phone_last_update_time" />
 			<result property="checkTime" column="check_time" />
+			<result property="applicationCheckTime" column="application_check_time" />
+
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.PersonInfo">
 	<!--
@@ -37,7 +39,7 @@
 		insert into base_person_info
 	    (id_,user_name,password_,real_name,phone_,id_card,open_id,photo_,gender_,age_,
 	    enterprise_id,status_,create_by,create_time,update_by,update_time,del_flag,
-	    intention_,is_anonymous,job_status,phone_last_update_time,check_time)
+	    intention_,is_anonymous,job_status,phone_last_update_time,check_time,application_check_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -62,6 +64,7 @@
 ,#{jobStatus,jdbcType=VARCHAR}
 ,#{phoneLastUpdateTime,jdbcType= TIMESTAMP }
 ,#{checkTime,jdbcType= TIMESTAMP }
+,#{applicationCheckTime,jdbcType= TIMESTAMP }
 		)
 	]]>
 	</insert>
@@ -133,7 +136,10 @@
 			</if>
 			<if test="checkTime!=null">
 			check_time=#{checkTime,jdbcType= TIMESTAMP },
-		</if>
+			</if>
+			<if test="applicationCheckTime!=null">
+				application_check_time=#{applicationCheckTime,jdbcType= TIMESTAMP },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

+ 15 - 3
web/src/main/java/com/jpsoft/employment/modules/base/controller/PersonInfoController.java

@@ -78,13 +78,16 @@ public class PersonInfoController {
         MessageResult<PersonInfo> msgResult = new MessageResult<>();
 
         try {
+            Date now = new Date();
+
             personInfo.setId(UUID.randomUUID().toString());
             personInfo.setDelFlag(false);
             personInfo.setCreateBy(subject);
-            personInfo.setCreateTime(new Date());
+            personInfo.setCreateTime(now);
             DES3 des3 = new DES3();
             personInfo.setPassword(des3.encrypt(jwtSecret, "123456"));
             personInfo.setStatus("0");
+            personInfo.setApplicationCheckTime(now);
 
             int affectCount = personInfoService.insert(personInfo);
 
@@ -311,6 +314,14 @@ public class PersonInfoController {
 
                 map.put("checkTime", checkTime);
 
+                //申请认证时间
+                String applicationCheckTime = "";
+                if (personInfo.getApplicationCheckTime() != null) {
+                    applicationCheckTime = sdf.format(personInfo.getApplicationCheckTime());
+                }
+
+                map.put("applicationCheckTime", applicationCheckTime);
+
                 mapList.add(map);
             }
 
@@ -411,7 +422,7 @@ public class PersonInfoController {
                     personInfo.setIntention("1");//求职中
                     personInfo.setJobStatus("1");//显示简历
                     personInfo.setCheckTime(now);
-
+                    personInfo.setApplicationCheckTime(now);
 
                     //是否填写关联企业
                     if (StringUtils.isNotEmpty(enterpriseName)) {
@@ -525,7 +536,7 @@ public class PersonInfoController {
         //表头
         Row rowTitle = sheet.createRow(0);
 
-        String[] titles = new String[]{"序号", "姓名", "联系电话", "身份证号", "性别", "年龄", "最后登录时间", "认证状态","认证时间"};
+        String[] titles = new String[]{"序号", "姓名", "联系电话", "身份证号", "性别", "年龄", "最后登录时间", "认证状态", "认证时间"};
 
         for (int i = 0; i < titles.length; i++) {
             Cell cell = rowTitle.createCell(i);
@@ -546,6 +557,7 @@ public class PersonInfoController {
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("age"), ""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("lastLoginTime"), ""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("statusN"), ""));
+            row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("applicationCheckTime"), ""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("checkTime"), ""));
         }