代码同步

common/src/main/java/com/jpsoft/employment/modules/base/entity/JobInformationInfo.java

@@ -66,6 +66,14 @@ public class JobInformationInfo {
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 
+	public Date getUpdateTime(){
+		Date returnTime = updateTime;
+		if(updateTime == null){
+			updateTime = createTime;
+		}
+		return  returnTime;
+	}
+
 	@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
@@ -107,4 +115,7 @@ public class JobInformationInfo {
 	@Transient
 	@ApiModelProperty(value = "性别")
 	private String gender;
+
+	@ApiModelProperty(value = "居住地")
+	private String address;
 }

common/src/main/resources/mapper/base/JobInformationInfo.xml

@@ -21,9 +21,7 @@
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
 			<result property="browseNumber" column="browse_number" />
-			<result property="birthday" column="birthday_" />
-			<result property="age" column="age_" />
-			<result property="sex" column="sex_" />
+			<result property="address" column="address_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.JobInformationInfo">
 	<!--
@@ -34,7 +32,8 @@
 	<![CDATA[
 		insert into base_job_information_info
 	    (id_,person_id,photo_,service_desc,Intended_industries,Intended_position,
-	    hope_salary,method_,work_experience,education_,status_,create_by,create_time,update_by,update_time,del_flag,browse_number)
+	    hope_salary,method_,work_experience,education_,status_,create_by,create_time,
+	    update_by,update_time,del_flag,browse_number,address_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -54,6 +53,7 @@
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{browseNumber,jdbcType= NUMERIC }
+,#{address,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -111,6 +111,9 @@
 			<if test="browseNumber!=null">
 				browse_number=#{browseNumber,jdbcType= NUMERIC },
 			</if>
+			<if test="address!=null">
+				address_=#{address,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

web/src/main/java/com/jpsoft/employment/modules/base/controller/JobInformationInfoController.java

@@ -58,6 +58,7 @@ public class JobInformationInfoController {
 			jobInformationInfo.setDelFlag(false);
             jobInformationInfo.setCreateBy(subject);
             jobInformationInfo.setCreateTime(new Date());
+            jobInformationInfo.setUpdateTime(new Date());
 
             int affectCount = jobInformationInfoService.insert(jobInformationInfo);
 

web/src/main/java/com/jpsoft/employment/modules/base/controller/RecruitInformationInfoController.java

@@ -58,6 +58,7 @@ public class RecruitInformationInfoController {
 			recruitInformationInfo.setDelFlag(false);
             recruitInformationInfo.setCreateBy(subject);
             recruitInformationInfo.setCreateTime(new Date());
+            recruitInformationInfo.setUpdateTime(new Date());
             recruitInformationInfo.setStatus("0");
             recruitInformationInfo.setBrowseNumber(0);
 

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/JobApiController.java

@@ -100,6 +100,7 @@ public class JobApiController {
             @ApiImplicitParam(name = "education", value = "学历", required = false, paramType = "form"),
             @ApiImplicitParam(name = "serviceDesc", value = "服务描述", required = false, paramType = "form"),
             @ApiImplicitParam(name = "photo", value = "头像", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "address", value = "居住地", required = false, paramType = "form"),
     })
     public MessageResult<Map> createJobHunt(
             @RequestParam(value="id",defaultValue="") String id,
@@ -111,6 +112,7 @@ public class JobApiController {
             @RequestParam(value="education",defaultValue="") String education,
             @RequestParam(value="serviceDesc",defaultValue="") String serviceDesc,
             @RequestParam(value="photo",defaultValue="") String photo,
+            @RequestParam(value="address",defaultValue="") String address,
             @RequestAttribute String subject){
 
         MessageResult<Map> msgResult = new MessageResult<>();
@@ -143,6 +145,7 @@ public class JobApiController {
                 jobInformationInfo.setEducation(education);
                 jobInformationInfo.setServiceDesc(serviceDesc);
                 jobInformationInfo.setPhoto(photo);
+                jobInformationInfo.setAddress(address);
 
                 jobInformationInfoService.update(jobInformationInfo);
             } else {
@@ -153,6 +156,7 @@ public class JobApiController {
                     jobInformationInfo.setDelFlag(false);
                     jobInformationInfo.setCreateBy(subject);
                     jobInformationInfo.setCreateTime(new Date());
+                    jobInformationInfo.setUpdateTime(new Date());
                     jobInformationInfo.setStatus("0");
 
                     jobInformationInfo.setPersonId(subject);
@@ -164,6 +168,7 @@ public class JobApiController {
                     jobInformationInfo.setEducation(education);
                     jobInformationInfo.setServiceDesc(serviceDesc);
                     jobInformationInfo.setPhoto(photo);
+                    jobInformationInfo.setAddress(address);
 
                     jobInformationInfoService.insert(jobInformationInfo);
                 }else{
@@ -180,6 +185,7 @@ public class JobApiController {
                     jobInformationInfo.setEducation(education);
                     jobInformationInfo.setServiceDesc(serviceDesc);
                     jobInformationInfo.setPhoto(photo);
+                    jobInformationInfo.setAddress(address);
 
                     jobInformationInfoService.update(jobInformationInfo);
                 }

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruitApiController.java

@@ -79,7 +79,6 @@ public class RecruitApiController {
 
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("a.update_time","desc"));
-            sortList.add(new Sort("a.create_time","desc"));
 
             if (StringUtils.isNotEmpty(type)) {
                 searchParams.put("settlementMethod",type);
@@ -119,7 +118,7 @@ public class RecruitApiController {
     })
     public MessageResult<Map> findRecruitSearch(
             @RequestParam(value="status",defaultValue="0") String status,
-            @RequestParam(value="statusType",defaultValue="") String statusType,
+            @RequestParam(value="statusType",defaultValue="1") String statusType,
             @RequestParam(value="content",defaultValue="") String content,
             @RequestParam(value="industry",defaultValue="") String industry,
             @RequestParam(value="settlementMethod",defaultValue="") String settlementMethod,
@@ -139,7 +138,6 @@ public class RecruitApiController {
 
             if("0".equals(status)){
                 sortList.add(new Sort("a.update_time","desc"));
-                sortList.add(new Sort("a.create_time","desc"));
                 if (StringUtils.isNotEmpty(content)) {
                     searchParams.put("content","%" + content.trim() + "%");
                 }
@@ -185,10 +183,8 @@ public class RecruitApiController {
                 if ("2".equals(statusType)) {
                     sortList.add(new Sort("a.browse_number","asc"));
                     sortList.add(new Sort("a.update_time","desc"));
-                    sortList.add(new Sort("a.create_time","desc"));
                 }else{
                     sortList.add(new Sort("a.update_time","desc"));
-                    sortList.add(new Sort("a.create_time","desc"));
                 }
 
                 searchParams.put("status","1");
@@ -243,7 +239,6 @@ public class RecruitApiController {
 
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("a.update_time","desc"));
-            sortList.add(new Sort("a.create_time","desc"));
 
             if (StringUtils.isNotEmpty(type)) {
                 searchParams.put("settlementMethod",type);
@@ -347,6 +342,7 @@ public class RecruitApiController {
                 recruitInformationInfo.setDelFlag(false);
                 recruitInformationInfo.setCreateBy(subject);
                 recruitInformationInfo.setCreateTime(new Date());
+                recruitInformationInfo.setUpdateTime(new Date());
                 recruitInformationInfo.setStatus("0");
                 recruitInformationInfo.setEnterpriseId(personInfo.getEnterpriseId());