Merge remote-tracking branch 'origin/master'

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

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

@@ -137,7 +137,7 @@ public class JobInformationInfo {
 
 	@Transient
 	@ApiModelProperty(value = "是否匿名")
-	private Boolean isAnonymous = false;
+	private Boolean isAnonymous = true;
 
 	@Transient
 	@ApiModelProperty(value = "简历状态(1公开0隐藏")

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

@@ -27,7 +27,6 @@
 			<result property="isOnline" column="is_online" />
 			<result property="ageRequirement" column="age_requirement" />
 			<result property="isTopping" column="is_topping" />
-
 			</resultMap>
 	<insert id="insert"  parameterType="com.jpsoft.employment.modules.base.entity.RecruitInformationInfo">
 	<!--

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

@@ -380,6 +380,9 @@ public class PersonInfoController {
                     personInfo.setCreateBy(subject);
                     personInfo.setCreateTime(new Date());
                     personInfo.setDelFlag(false);
+                    personInfo.setIsAnonymous(true);
+                    personInfo.setIntention("1");//求职中
+                    personInfo.setJobStatus("1");//显示简历
 
 
                     //是否填写关联企业

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

@@ -314,7 +314,6 @@ public class RecruitInformationInfoController {
                 map.put("address",recruitInformationInfo.getAddress());
                 map.put("browseNumber",recruitInformationInfo.getBrowseNumber());
                 map.put("ageRequirement",recruitInformationInfo.getAgeRequirement());
-                map.put("isTopping",recruitInformationInfo.getIsTopping());
 
                 String statusN;
                 if ("1".equals(recruitInformationInfo.getStatus())) {
@@ -388,7 +387,6 @@ public class RecruitInformationInfoController {
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("positionName"), ""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("salary"), ""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("settlementMethodN"), ""));
-            row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("ageRequirement"), ""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("recruitingNumbers"), ""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("contacts"), ""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.employment.modules.common.utils.StringUtils.strValue(map.get("contactsPhone"), ""));
@@ -487,45 +485,6 @@ public class RecruitInformationInfoController {
     }
 
 
-    @ApiOperation(value="修改是否置顶")
-    @PostMapping("changeTopping/{id}")
-    public MessageResult<RecruitInformationInfo> changeTopping(@PathVariable("id") String id,@RequestAttribute String subject){
-        MessageResult<RecruitInformationInfo> msgResult = new MessageResult<>();
-
-        try {
-
-            RecruitInformationInfo recruitInformationInfo = recruitInformationInfoService.get(id);
-            recruitInformationInfo.setUpdateBy(subject);
-            recruitInformationInfo.setUpdateTime(new Date());
-
-            if(recruitInformationInfo.getIsTopping()){
-                recruitInformationInfo.setIsTopping(false);
-            }
-            else{
-                recruitInformationInfo.setIsTopping(true);
-            }
-
-            int affectCount = recruitInformationInfoService.update(recruitInformationInfo);
-
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-            } else {
-                msgResult.setResult(false);
-                msgResult.setMessage("数据库修改失败");
-            }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-
-
 
     @ApiOperation(value = "导入招聘信息")
     @PostMapping("importXls")
@@ -672,6 +631,7 @@ public class RecruitInformationInfoController {
                     recruitInformationInfo.setWorkArea(workArea);
                     recruitInformationInfo.setAddress(address);
                     recruitInformationInfo.setIsOnline(true);
+                    recruitInformationInfo.setIsTopping(false);
                     recruitInformationInfo.setAgeRequirement(ageRequirement);
 
 

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

@@ -147,6 +147,7 @@ public class RecruitApiController {
             }
 
             if("0".equals(status)){
+                sortList.add(new Sort("a.is_topping","desc"));
                 sortList.add(new Sort("a.update_time","desc"));
                 if (StringUtils.isNotEmpty(content)) {
                     searchParams.put("content","%" + content.trim() + "%");
@@ -185,6 +186,7 @@ public class RecruitApiController {
                     searchParams.put("method",settlementMethod);
                 }
 
+                sortList.add(new Sort("a.sort_no","asc"));
 
                 if ("2".equals(statusType)) {
                     sortList.add(new Sort("a.browse_number","asc"));
@@ -193,7 +195,6 @@ public class RecruitApiController {
                     sortList.add(new Sort("a.update_time","desc"));
                 }
 
-                searchParams.put("status","1");
                 //searchParams.put("notIntention","2");
                 searchParams.put("intention","1");//只显示公开的
                 searchParams.put("jobStatus","1");//只显示公开的
@@ -374,6 +375,7 @@ public class RecruitApiController {
                 recruitInformationInfo.setSalaryForm(salaryForm);
                 recruitInformationInfo.setIsOnline(isOnline);
                 recruitInformationInfo.setAgeRequirement(ageRequirement);
+                recruitInformationInfo.setIsTopping(false);
 
                 recruitInformationInfoService.insert(recruitInformationInfo);
             }

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

@@ -331,7 +331,7 @@ public class UserApiController {
                     DES3 des3 = new DES3();
                     personInfo.setPassword(des3.encrypt(jwtSecret,"123456"));
                     personInfo.setStatus("0");
-                    personInfo.setIsAnonymous(false);
+                    personInfo.setIsAnonymous(true);
                     personInfo.setIntention("1");//求职中
                     personInfo.setJobStatus("1");//显示简历