修改代码

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

@@ -348,6 +348,7 @@ public class WeiXinCorpController {
                 String forObject = this.restTemplate.getForObject(getTicketUrl, String.class);
                 JSONObject json = JSONObject.parseObject(forObject);
                 log.info("返回："+json.toJSONString());
+                System.out.println("返回："+json.toJSONString());
                 if (json.getIntValue("errcode") == 0) {
                     String ticket = json.getString("ticket");
                     Item it = new Item();
@@ -376,6 +377,8 @@ public class WeiXinCorpController {
             packageParams.put("sign", sign);
             packageParams.put("appid", wxCorpInfo.getCorpid());//这里使用企业微信corpId
             msg.data = packageParams;
+            System.out.println("最后返回："+packageParams);
+            log.info("最后返回："+packageParams);
         } catch (Exception e) {
             e.printStackTrace();
             msg.setError(e.getMessage());
@@ -1301,7 +1304,7 @@ public class WeiXinCorpController {
                     JSONArray jsonArray = obj.getJSONObject("auth_info").getJSONArray("agent");
                     for (int i=0;i<jsonArray.size(); i++) {
                         JSONObject jsonObject = jsonArray.getJSONObject(i);
-                        if (jsonObject.getString("name").equals("客户管家")) {
+                        if (jsonObject.getString("name").contains("客户管家")) {
                             int agentId = jsonObject.getInteger("agentid");
                             data.setAgentid(agentId);
                             //授权模式：0为管理员授权；1为成员授权
@@ -1435,7 +1438,7 @@ public class WeiXinCorpController {
                     JSONArray jsonArray = obj.getJSONObject("auth_info").getJSONArray("agent");
                     for (int i=0;i<jsonArray.size(); i++) {
                         JSONObject jsonObject = jsonArray.getJSONObject(i);
-                        if (jsonObject.getString("name").equals("客户管家")) {
+                        if (jsonObject.getString("name").contains("客户管家")) {
                             int agentId = jsonObject.getInteger("agentid");
                             data.setAgentid(agentId);
                         }

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

@@ -1435,17 +1435,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     if (first.isPresent()) {
                         reportOwner = first.get().getName();
                     }
-                    String msg = null;
-                    if (report.getFillUserid()==null) {
-                        //自己填写自己的
-                        //msg = reportOwner+"提交了日报";
-                        msg = MessageUtils.message("profession.submit",reportOwner);
-                    } else {
-                        //代填的
-                        first = userList.stream().filter(u -> u.getId().equals(log.getOperatorId())).findFirst();
-                        //msg = first.get().getName()+"为" + reportOwner+"代填了日报";
-                        msg = MessageUtils.message("profession.submitReplace",first.get().getName(),reportOwner);
-                    }
+                    String msg = MessageUtils.message("profession.submit",reportOwner);
+//                    if (report.getFillUserid()==null) {
+//                        //自己填写自己的
+//                        //msg = reportOwner+"提交了日报";
+////                        msg = MessageUtils.message("profession.submit",reportOwner);
+//                    } else {
+//                        //代填的
+////                        first = userList.stream().filter(u -> u.getId().equals(log.getOperatorId())).findFirst();
+//                        //msg = first.get().getName()+"为" + reportOwner+"代填了日报";
+////                        msg = MessageUtils.message("profession.submitReplace",first.get().getName(),reportOwner);
+//                    }
                     log.setMsg(msg);
                     log.setCompanyId(companyId);
                     log.setReportIds(report.getId()+"");
@@ -1453,7 +1453,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     detail.setOperatorId(log.getOperatorId());
                     detail.setOperateDate(log.getOperateDate());
                     detail.setMsg(log.getMsg());
-
                 } else {
                     ReportLog reportLog = oldLog.get();
                     reportLog.setReportIds(reportLog.getReportIds()+","+report.getId());

fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue

@@ -81,8 +81,8 @@
                         <el-table-column :label="$t('operation')" :width="300" align="left" fixed="right">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="primary" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck)&&scope.row.status!=1" @click="handleAdd(scope.$index, scope.row)">{{'编辑'}}</el-button>
-                                <!-- <el-button size="mini" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0"  @click="check(scope.row,1)">{{'通过'}}</el-button>
-                                <el-button size="mini" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0" @click="check(scope.row,2)">{{'驳回'}}</el-button> -->
+                                <el-button size="mini" type="success" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0"  @click="check(scope.row,1)" >{{'通过'}}</el-button>
+                                <el-button size="mini" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0" @click="check(scope.row,2)">{{'驳回'}}</el-button>
                                 <el-button size="mini" v-if="(permissions.projectApprovalEdit ||permissions.projectApprovalCheck) && scope.row.status==1" @click="check(scope.row,3)">{{'撤销'}}</el-button>
                             </template>
                         </el-table-column>
@@ -226,7 +226,7 @@
                                     </el-tabs>
                                 </div>
                                 <el-divider></el-divider>
-                                <!-- <template>
+                                <template>
                                     <div><span>{{'审核人'}}</span></div>
                                     <div>
                                         <div v-for="(item, index) in pointList" :key="index" >
@@ -242,7 +242,7 @@
                                         <span>{{item.status==0?'待审核':item.status==1?"已审核":"已驳回"}}</span>
                                         </div>
                                     </div>
-                                </template> -->
+                                </template>
                             </el-form>  
                         </div>
                         <div slot="footer" class="dialog-footer;">

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

@@ -139,7 +139,7 @@
                                     <el-link v-if="user.timeType.enableNewWeeklyfill == 1" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">{{ $t('textLink.fillInAWeek') }}</el-link>
                                     <!-- <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">按周填报123</el-link> -->
                                     <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;weekIndex++,fillWeekDialogVisiCustomTwo=true" v-if="user.timeType.enableNewWeeklyfill==2">按周填报</el-link>
-                                    <el-link type="primary" v-if="user.companyId != 5978 && permissions.reportsFillOut && user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,(user.companyId == 5814||user.companyId==5693)?2:0)">{{$t('textLink.helpToFillIn')}}</el-link>
+                                    <el-link type="primary" v-if="user.companyId != 5978 && permissions.reportsFillOut && user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,(user.companyId == 5814||user.companyId==5693 || user.companyId==4407)?2:0)">{{$t('textLink.helpToFillIn')}}</el-link>
                                     <!-- 苏州景昱，按周填报的模式进行代填日报 -->
                                     <el-link type="primary" v-if="user.companyId == 5978 && permissions.reportsFillOut && user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReportss();">{{$t('textLink.helpToFillIn')}}</el-link>