审核

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

@@ -251,7 +251,7 @@ public class UserAuthenticationApproveController {
             UserAuthenticationApprove userAuthenticationApprove = userAuthenticationApproveService.get(id);
             userAuthenticationApprove.setApprovePersonId(subject);
             userAuthenticationApprove.setApproveTime(new Date());
-            userAuthenticationApprove.setApprovalStatus("2");
+            userAuthenticationApprove.setApprovalStatus("1");
             userAuthenticationApprove.setUpdateBy(subject);
             userAuthenticationApprove.setUpdateTime(new Date());
 

web/src/main/java/com/jpsoft/employment/modules/job/controller/RecruitmentController.java

@@ -10,7 +10,9 @@ import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.job.entity.Recruitment;
+import com.jpsoft.employment.modules.job.entity.RecruitmentApprove;
 import com.jpsoft.employment.modules.job.entity.WorkCategory;
+import com.jpsoft.employment.modules.job.service.RecruitmentApproveService;
 import com.jpsoft.employment.modules.job.service.RecruitmentService;
 import com.jpsoft.employment.modules.job.service.WorkCategoryService;
 import com.jpsoft.employment.modules.sys.entity.DataDictionary;
@@ -39,6 +41,8 @@ public class RecruitmentController {
     @Autowired
     private RecruitmentService recruitmentService;
     @Autowired
+    private RecruitmentApproveService recruitmentApproveService;
+    @Autowired
     private CompanyService companyService;
     @Autowired
     private DataDictionaryService dataDictionaryService;
@@ -733,7 +737,7 @@ public class RecruitmentController {
 
     @ApiOperation(value="更新用户")
     @PostMapping("checked")
-    public MessageResult<Recruitment> checked(String id,@RequestAttribute String subject){
+    public MessageResult<Recruitment> checked(String id, String approveId, @RequestAttribute String subject){
         MessageResult<Recruitment> msgResult = new MessageResult<>();
 
         try {
@@ -745,6 +749,11 @@ public class RecruitmentController {
             int affectCount = recruitmentService.update(recruitment);
 
             if (affectCount > 0) {
+                RecruitmentApprove recruitmentApprove = recruitmentApproveService.get(approveId);
+                recruitmentApprove.setApprovePersonId(subject);
+                recruitmentApprove.setApproveTime(new Date());
+                recruitmentApproveService.update(recruitmentApprove);
+
                 msgResult.setResult(true);
                 msgResult.setData(recruitment);
             } else {

web/src/main/resources/application-dev.yml

@@ -7,14 +7,14 @@ spring:
   datasource:
 
     #开发环境
-     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft2016
+#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     username: root
+#     password: jpsoft2016
 
     #测试环境
-#     url: jdbc:log4jdbc:mysql://121.37.187.149:8100/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft8121234
+     url: jdbc:log4jdbc:mysql://121.37.187.149:8100/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     username: root
+     password: jpsoft8121234
 
     #正式环境
       #url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/enterprise_federation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8