Merge remote-tracking branch 'origin/master'

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

@@ -81,7 +81,7 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="EnterpriseInfoMap">
-		select * from base_enterprise_info where id_=#{0}
+		select * from base_enterprise_info where id_=#{0} and del_flag = 0
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_enterprise_info where id_=#{0}

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

@@ -173,10 +173,15 @@
 	</select>
 	<select id="searchMobile" parameterType="hashmap" resultMap="RecruitInformationInfoMap">
 		<![CDATA[
-			select a.* from base_recruit_information_info a
+			SELECT
+				a.*
+			FROM
+				base_recruit_information_info a
+				left join base_enterprise_info b on a.enterprise_id = b.id_
 		]]>
 		<where>
 			a.del_flag = 0
+			and b.del_flag = 0
 			<if test="searchParams.enterpriseId != null">
 				and a.enterprise_id = #{searchParams.enterpriseId}
 			</if>
@@ -211,6 +216,9 @@
 			<if test="searchParams.status != null">
 				and a.status_ = #{searchParams.status}
 			</if>
+			<if test="searchParams.isOnline != null">
+				and a.is_online = #{searchParams.isOnline}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}

web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java

@@ -71,6 +71,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/mobile/training/trainingList")
 				.excludePathPatterns("/mobile/training/trainingDetail")
 				.excludePathPatterns("/wechat/decryptData")
+				.excludePathPatterns("/mobile/user/saveLoginRecord")
+
 		;
 
 

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

@@ -164,6 +164,7 @@ public class RecruitApiController {
                 }
 
                 searchParams.put("status","1");
+                searchParams.put("isOnline",true);
                 Page<RecruitInformationInfo> page = recruitInformationInfoService.pageSearchMobile(searchParams,pageIndex,pageSize,true,sortList);
                 for(RecruitInformationInfo recruitInformationInfo : page.getResult()){
                     recruitInformationInfo.setSettlementMethodN(dataDictionaryService.findNameByCatalogNameAndValue("结算方式",recruitInformationInfo.getSettlementMethod()));
@@ -294,6 +295,7 @@ public class RecruitApiController {
             @ApiImplicitParam(name = "workArea", value = "工作地区", required = false, paramType = "form"),
             @ApiImplicitParam(name = "address", value = "详细地址", required = false, paramType = "form"),
             @ApiImplicitParam(name = "salaryForm", value = "薪资形式(字典:计件,计时,定额)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "isOnline", value = "是否上架", required = false, paramType = "form"),
     })
     public MessageResult<Map> createRecruit(
             @RequestParam(value="id",defaultValue="") String id,
@@ -308,6 +310,7 @@ public class RecruitApiController {
             @RequestParam(value="workArea",defaultValue="") String workArea,
             @RequestParam(value="address",defaultValue="") String address,
             @RequestParam(value="salaryForm",defaultValue="") String salaryForm,
+            @RequestParam(value="isOnline",defaultValue="true") Boolean isOnline,
             @RequestAttribute String subject){
 
         MessageResult<Map> msgResult = new MessageResult<>();
@@ -340,6 +343,7 @@ public class RecruitApiController {
                 recruitInformationInfo.setWorkArea(workArea);
                 recruitInformationInfo.setAddress(address);
                 recruitInformationInfo.setSalaryForm(salaryForm);
+                recruitInformationInfo.setIsOnline(isOnline);
 
                 recruitInformationInfoService.update(recruitInformationInfo);
             } else {
@@ -363,6 +367,7 @@ public class RecruitApiController {
                 recruitInformationInfo.setWorkArea(workArea);
                 recruitInformationInfo.setAddress(address);
                 recruitInformationInfo.setSalaryForm(salaryForm);
+                recruitInformationInfo.setIsOnline(isOnline);
 
                 recruitInformationInfoService.insert(recruitInformationInfo);
             }
@@ -377,6 +382,45 @@ public class RecruitApiController {
         return msgResult;
     }
 
+    @ApiOperation(value="修改招聘信息")
+    @RequestMapping(value = "updateRecruitOnline",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "isOnline", value = "上架状态", required = false, paramType = "form"),
+    })
+    public MessageResult<Map> updateRecruitOnline(
+            @RequestParam(value="id",defaultValue="") String id,
+            @RequestParam(value="isOnline",defaultValue="true") Boolean isOnline,
+            @RequestAttribute String subject){
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+        try {
+
+            PersonInfo personInfo = personInfoService.get(subject);
+            if (personInfo == null) {
+                throw new Exception("未登录");
+            }
+
+            RecruitInformationInfo recruitInformationInfo = recruitInformationInfoService.get(id);
+            if(recruitInformationInfo == null){
+                throw new Exception("未找到岗位");
+            }
+            recruitInformationInfo.setUpdateBy(subject);
+            recruitInformationInfo.setUpdateTime(new Date());
+            recruitInformationInfo.setIsOnline(isOnline);
+            recruitInformationInfoService.update(recruitInformationInfo);
+
+
+            msgResult.setResult(true);
+        }catch (Exception e){
+            msgResult.setResult(false);
+            msgResult.setMessage(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
+
     @ApiOperation(value="招聘信息详细(公开接口")
     @RequestMapping(value = "recruitDetail",method = RequestMethod.POST)
     @ApiImplicitParams({
@@ -536,9 +580,11 @@ public class RecruitApiController {
     @RequestMapping(value = "myEmployment",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "status", value = "发布中1,待审核0,未通过2", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "isOnline", value = "是否上架", required = false, paramType = "form"),
     })
     public MessageResult<Map> myEmployment(
             @RequestParam(value="status",defaultValue="1") String status,
+            @RequestParam(value="isOnline",defaultValue="") Boolean isOnline,
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
             @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
             @RequestAttribute String subject){
@@ -559,6 +605,9 @@ public class RecruitApiController {
             searchParams.put("enterpriseId",personInfo.getEnterpriseId());
 
             searchParams.put("status",status);
+            if(isOnline != null) {
+                searchParams.put("isOnline", isOnline);
+            }
 
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("a.create_time","desc"));

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

@@ -7,6 +7,7 @@ import com.jpsoft.employment.modules.base.entity.*;
 import com.jpsoft.employment.modules.base.service.EnterpriseInfoService;
 import com.jpsoft.employment.modules.base.service.JobInformationInfoService;
 import com.jpsoft.employment.modules.base.service.PersonInfoService;
+import com.jpsoft.employment.modules.base.service.PersonLoginLogService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.utils.DES3;
 import com.jpsoft.employment.modules.common.utils.JwtUtil;
@@ -49,7 +50,8 @@ public class UserApiController {
     private EnterpriseInfoService enterpriseInfoService;
     @Autowired
     private JobInformationInfoService jobInformationInfoService;
-
+    @Autowired
+    private PersonLoginLogService personLoginLogService;
 
 
     @GetMapping("findByOpenId")
@@ -363,6 +365,8 @@ public class UserApiController {
             @ApiImplicitParam(name = "enterpriseName", value = "企业全称", required = false, paramType = "form"),
             @ApiImplicitParam(name = "licenseUrl", value = "营业执照地址", required = false, paramType = "form"),
             @ApiImplicitParam(name = "type", value = "认证类型(0个人,1企业 不传默认0", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "address", value = "地址", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "contactsPersonId", value = "联系人", required = false, paramType = "form"),
     })
     public MessageResult<Map> createAuthentication(
             @RequestParam(value="realName",defaultValue="") String realName,
@@ -370,6 +374,8 @@ public class UserApiController {
             @RequestParam(value="enterpriseName",defaultValue="") String enterpriseName,
             @RequestParam(value="licenseUrl",defaultValue="") String licenseUrl,
             @RequestParam(value="type",defaultValue="0") String type,
+            @RequestParam(value="address",defaultValue="") String address,
+            @RequestParam(value="contactsPersonId",defaultValue="") String contactsPersonId,
             @RequestAttribute String subject){
 
         MessageResult<Map> msgResult = new MessageResult<>();
@@ -397,6 +403,9 @@ public class UserApiController {
                     enterpriseInfo.setLicenseImage(licenseUrl);
                     enterpriseInfo.setName(enterpriseName);
                     enterpriseInfo.setStatus("0");
+                    enterpriseInfo.setAddress(address);
+                    enterpriseInfo.setContactsPersonId(contactsPersonId);
+
                     enterpriseInfoService.update(enterpriseInfo);
                 }else{
                     EnterpriseInfo enterpriseInfo = new EnterpriseInfo();
@@ -407,6 +416,8 @@ public class UserApiController {
                     enterpriseInfo.setLicenseImage(licenseUrl);
                     enterpriseInfo.setName(enterpriseName);
                     enterpriseInfo.setStatus("0");
+                    enterpriseInfo.setAddress(address);
+                    enterpriseInfo.setContactsPersonId(contactsPersonId);
 
                     int count = enterpriseInfoService.insert(enterpriseInfo);
 
@@ -461,10 +472,34 @@ public class UserApiController {
     }
 
 
+    @ApiOperation(value="保存登陆记录(免登陆")
+    @RequestMapping(value = "saveLoginRecord",method = RequestMethod.POST)
+    public MessageResult<Map> saveLoginRecord(@RequestParam(value="openId",defaultValue="") String openId){
+        MessageResult<Map> msgResult = new MessageResult<>();
 
-    public static void main(String[] args) {
-        int status = new BigDecimal("0").compareTo(BigDecimal.ZERO);
-        System.out.println(status);
-    }
+        try {
+            PersonInfo regUser= personInfoService.findByOpenId(openId);
+            if (regUser != null) {
+                PersonLoginLog personLoginLog = new PersonLoginLog();
+                personLoginLog.setId(UUID.randomUUID().toString());
+                personLoginLog.setDelFlag(false);
+                personLoginLog.setCreateBy(regUser.getId());
+                personLoginLog.setCreateTime(new Date());
+                personLoginLog.setPersonId(regUser.getId());
+                personLoginLogService.insert(personLoginLog);
+            }
+            msgResult.setResult(true);
+        } catch (Exception ex) {
+            if (ex instanceof CustomException) {
+                log.error(ex.getMessage());
+            } else {
+                log.error(ex.getMessage(), ex);
+            }
 
+            msgResult.setMessage(ex.getMessage());
+            msgResult.setResult(false);
+        }
+
+        return msgResult;
+    }
 }