推送工时按钮位置修改，微信登录授权，日报审核

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -1525,7 +1525,7 @@ public class WeiXinCorpController {
                                 newCompany.setPackageProvider(0);//供应商模块
                                 break;
                             //建筑版
-                            case "spd04f1b0582a0fe19":
+                            case "sp29bdb884f4a78392":
                                 newCompany.setPackageProject(1);//项目协作平台
                                 newCompany.setPackageOa(0);//OA平台;请假，出差等
                                 newCompany.setPackageExpense(1);//费用报销
@@ -1534,7 +1534,7 @@ public class WeiXinCorpController {
                                 newCompany.setPackageProvider(0);//供应商模块
                                 break;
                             //旗舰版
-                            case "specf7090ca7757870":
+                            case "sp852fec2d1198957a":
                                 newCompany.setPackageProject(1);//项目协作平台
                                 newCompany.setPackageOa(1);//OA平台;请假，出差等
                                 newCompany.setPackageExpense(1);//费用报销
@@ -3422,7 +3422,7 @@ public class WeiXinCorpController {
                     newCompany.setPackageProvider(0);//供应商模块
                     break;
                 //建筑版
-                case "spd04f1b0582a0fe19":
+                case "sp29bdb884f4a78392":
                     newCompany.setPackageProject(1);//项目协作平台
                     newCompany.setPackageOa(0);//OA平台;请假，出差等
                     newCompany.setPackageExpense(1);//费用报销
@@ -3431,7 +3431,7 @@ public class WeiXinCorpController {
                     newCompany.setPackageProvider(0);//供应商模块
                     break;
                 //旗舰版
-                case "specf7090ca7757870":
+                case "sp852fec2d1198957a":
                     newCompany.setPackageProject(1);//项目协作平台
                     newCompany.setPackageOa(1);//OA平台;请假，出差等
                     newCompany.setPackageExpense(1);//费用报销

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -1484,7 +1484,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             User auditTargetUser = userMapper.selectById(creatorId);
             if (timeType.getReportAuditType() == 2) {
                 //先按分组审核，再进行项目经理审核
-                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("id, state, group_audit_state, project_id, project_audit_state").in("id", ids));
+                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("id, state, group_audit_state, project_id, project_audit_state, project_auditor_id").in("id", ids));
                 List<Integer> assProjectIds = reportList.stream().map(Report::getProjectId).collect(Collectors.toList());
                 List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id, incharger_id").in("id", assProjectIds));
                 Optional<Project> first = projectList.stream().filter(p -> StringUtils.isEmpty(p.getInchargerId())).findFirst();
@@ -1501,10 +1501,20 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     if (r.getGroupAuditState() == 0) {
                         r.setGroupAuditState(1);
                         r.setProjectAuditTime(LocalDateTime.now());
+
                         //分组审核完，该项目的pm审核了
                         Project project1 = projectList.stream().filter(project -> project.getId().equals(r.getProjectId())).findFirst().get();
-                        r.setProjectAuditorId(project1.getInchargerId());
-                        r.setProjectAuditorName(userMapper.selectById(project1.getInchargerId()).getName());
+
+                        //如果分组负责人和项目经理是同一个人，那么就不需要项目经理审核了
+                        if (r.getProjectAuditorId().equals(project1.getInchargerId())) {
+                            r.setProjectAuditState(1);
+                            r.setProjectAuditTime(LocalDateTime.now());
+                            r.setState(1);
+                        } else {
+                            //不是同一个人，那么就需要项目经理审核
+                            r.setProjectAuditorId(project1.getInchargerId());
+                            r.setProjectAuditorName(userMapper.selectById(project1.getInchargerId()).getName());
+                        }
                     } else if (r.getProjectAuditState() == 0) {
                         r.setProjectAuditState(1);
                         r.setProjectAuditTime(LocalDateTime.now());
@@ -2556,7 +2566,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             if (timeType.getReportAuditType() == 2) {
                 allUsers = userMapper.selectList(new QueryWrapper<User>().select("id, name, department_id").eq("company_id", company.getId()));
                 //先分组负责人审核，再项目负责人审核
-                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("id, state, group_audit_state, project_id, project_audit_state, creator_id, create_date, company_id").in("id", ids));
+                List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().select("id, state, group_audit_state, project_id, project_audit_state, project_auditor_id, creator_id, create_date, company_id").in("id", ids));
                 allReports = reportList;
                 List<Integer> assProjectIds = reportList.stream().map(Report::getProjectId).collect(Collectors.toList());
                 List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id, incharger_id").in("id", assProjectIds));
@@ -2574,10 +2584,23 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     if (r.getGroupAuditState() == 0) {
                         r.setGroupAuditState(1);
                         r.setProjectAuditTime(LocalDateTime.now());
-                        //分组审核完，该项目的pm审核了
+
                         Project project1 = projectList.stream().filter(project -> project.getId().equals(r.getProjectId())).findFirst().get();
-                        r.setProjectAuditorId(project1.getInchargerId());
-                        r.setProjectAuditorName(userMapper.selectById(project1.getInchargerId()).getName());
+                        Optional<User> pmFirst = allUsers.stream().filter(a -> a.getId().equals(project1.getInchargerId())).findFirst();
+                        if (!pmFirst.isPresent()) {
+                            httpRespMsg.setError(MessageUtils.message("project.masterError",project1.getProjectName()));
+                            return httpRespMsg;
+                        }
+                        //如果分组负责人和项目经理是同一个人，那么就不需要项目经理审核了
+                        if (r.getProjectAuditorId().equals(project1.getInchargerId())) {
+                            r.setProjectAuditState(1);
+                            r.setProjectAuditTime(LocalDateTime.now());
+                            r.setState(1);
+                        } else {
+                            //分组审核完，该项目的pm审核了
+                            r.setProjectAuditorId(project1.getInchargerId());
+                            r.setProjectAuditorName(pmFirst.get().getName());
+                        }
                     } else if (r.getProjectAuditState() == 0) {
                         r.setProjectAuditState(1);
                         r.setProjectAuditTime(LocalDateTime.now());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -2732,15 +2732,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         String requestUrl = GET_TOKEN_URL.replace("APPID", appId).replace("SECRET", appSecret)
                 .replace("CODE", code);
         // 存储获取到的授权字段信息
-        JSONObject result = new JSONObject();
         Map<String, String> dataMap = new HashMap<>();
         ResponseEntity<String> responseEntity = this.restTemplate.exchange(requestUrl,
                 HttpMethod.GET, null, String.class);
         List<User> userList = new ArrayList<>();
         if (responseEntity.getStatusCode() == HttpStatus.OK) {
             String resp = responseEntity.getBody();
-            log.debug("返回信息==" + resp);
-            System.out.println("返回信息==" + resp);
             dataMap.put("resp", resp);
             JSONObject OpenidJSONO = JSONObject.parseObject(resp);
             if (OpenidJSONO.containsKey("access_token")) {
@@ -2749,7 +2746,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 userList = userMapper.selectList(new QueryWrapper<User>().eq("wx_openid", openid));
             }
         }
-        Integer companyId = null;
+        Integer companyId = 0;
         if (userList.size() > 0) {
             //该用户已存在
             User curUser = userList.get(0);

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -8,7 +8,6 @@
                             <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM"
                             style="width:190px;"
                             @change="changeMonthOut" :clearable="false" type="month" :placeholder="$t('Selectmonth')" :picker-options="getPickerOptions"></el-date-picker>
-                            <el-button v-if="user.timeType.pushReportData == 1 && permissions.reportPush" style="margin-left:10px;" icon="iconfont firerock-icontuisong" size="mini" @click="pushWorkTime"></el-button>
                             <el-button style="margin-left:10px;" icon="iconfont firerock-icongongshitongji" size="mini"  @click="showWorkTime"></el-button>
                         </div>
                     <div slot="header" class="clearfix" id="clearfix" style="padding-left: 255px;">
@@ -141,6 +140,9 @@
                                     <el-link type="primary" style="margin-right:10px;" :underline="false" @click="showExportDialog" v-if="permissions.reportExport">{{$t('textLink.exportWork')}}</el-link>
                                     <!--部门负责人给个导出工时的功能 -->
                                     <el-link type="primary" v-if="user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="showExportTimeDialog">{{$t('textLink.exportingTimeStatistics')}}</el-link>
+                                    <el-link type="primary" v-if="user.timeType.pushReportData == 1 && permissions.reportPush" :underline="false" @click="pushWorkTime">推送工时</el-link>
+                                    <!-- <el-button v-if="user.timeType.pushReportData == 1 && permissions.reportPush" style="margin-left:10px;" icon="iconfont firerock-icontuisong" size="mini" @click="pushWorkTime"></el-button> -->
+
                                 </span>
                             </div>
                             <div :style="'height:'+(tableHeight-50)+'px;overflow:scroll;padding-top:10px;'">