提交相关代码

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

@@ -1263,7 +1263,7 @@ public class ReportController {
                     Optional<Project> first = targetProjectList.stream().filter(tl -> tl.getId().equals(report.getProjectId())).findFirst();
                     if(first.isPresent()){
                         double nowReport = targetCheckList.stream().filter(rl -> rl.getCreateDate().equals(report.getCreateDate()) && rl.getCreatorId().equals(report.getCreatorId())).mapToDouble(Report::getWorkingTime).sum();
-                        if(first.get().getManDay()!=null){
+                        if(first.get().getManDay()!=null && first.get().getManDay()>0){
                             //已填报的工时情况
                             double sum;
                             if(first.get().getManDayStartDate()!=null){
@@ -2195,7 +2195,13 @@ public class ReportController {
     @RequestMapping("/batchDenyHisReport")
     public HttpRespMsg batchDenyHisReport(@RequestParam Integer reportAuditLogId,
                                      String reason, HttpServletRequest request) {
-        return reportService.batchDenyHisReport(reportAuditLogId, reason, request);
+        try {
+            return reportService.batchDenyHisReport(reportAuditLogId, reason, request);
+        } catch (Exception e) {
+            HttpRespMsg msg = new HttpRespMsg();
+            msg.setError("批量审核失败:"+e.getMessage());
+            return msg;
+        }
     }
 
     @RequestMapping("/getMembList")

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

@@ -455,13 +455,16 @@ public class UserCorpwxTimeController {
         List<LocalDate> workDateList = WorkDayCalculateUtils.getWorkDaysListInRange(startDate, endDate, 0);
         if (functionList.size() > 0) {
             //查看全部人员的
-            list = userCorpwxTimeMapper.getUserDataRatioList(user.getCompanyId(), workDateList, ymonth, null);
+            list = userCorpwxTimeMapper.getUserDataRatioList(user.getCompanyId(), workDateList, ymonth, null, null);
         } else {
             if (manageDeptId != null && manageDeptId != 0) {
                 //一个人可能担任多个部门负责人
                 List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
                 List<Integer> allManagedDeptIdList = departmentService.getAllManagedDeptIdList(user, allDeptList);
-                list = userCorpwxTimeMapper.getUserDataRatioList(user.getCompanyId(), workDateList, ymonth, allManagedDeptIdList);
+                list = userCorpwxTimeMapper.getUserDataRatioList(user.getCompanyId(), workDateList, ymonth, allManagedDeptIdList, null);
+            } else {
+                //个人的，可以看自己的
+                list = userCorpwxTimeMapper.getUserDataRatioList(user.getCompanyId(), workDateList, ymonth, null, user.getId());
             }
         }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/UserCorpwxTimeMapper.java

@@ -19,7 +19,7 @@ public interface UserCorpwxTimeMapper extends BaseMapper<UserCorpwxTime> {
 
     public List<Map> getUserDataList(Integer companyId, String startDate, String endDate, Integer deptId, String userId);
 
-    public List<Map> getUserDataRatioList(Integer companyId, List<LocalDate> dateList, String ymonth, List<Integer> deptIds);
+    public List<Map> getUserDataRatioList(Integer companyId, List<LocalDate> dateList, String ymonth, List<Integer> deptIds, String userId);
 
     List<Map> selectByAsk(Integer companyId,String startDate,String endDate);
 }

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

@@ -166,5 +166,5 @@ public interface ReportService extends IService<Report> {
 
     HttpRespMsg transferReport(String reportIds, Integer projectId, Integer groupId, Integer stageId);
 
-    HttpRespMsg batchDenyHisReport(Integer reportAuditLogId, String reason, HttpServletRequest request);
+    HttpRespMsg batchDenyHisReport(Integer reportAuditLogId, String reason, HttpServletRequest request) throws Exception;
 }

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

@@ -5082,20 +5082,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     //数据行
                     //读取工作内容
                     String workContent = null;
-                    if (withCheckIn!=null) {
-                        int workContentIndex = projectNameStartIndex -1;
-                        if (row.getCell(workContentIndex) == null) {
-                            //msg.setError("第"+dataCount+"行缺少工作内容");工作内容为必填项
-                            msg.setError(MessageUtils.message("data.LackWorkContentByRow",dataCount));
-                            return msg;
-                        }
-                        workContent = row.getCell(workContentIndex).getStringCellValue().trim();
-                        if (StringUtils.isEmpty(workContent)) {
-                            //msg.setError("第"+dataCount+"行缺少工作内容");
-                            msg.setError(MessageUtils.message("data.LackWorkContentByRow",dataCount));
-                            return msg;
-                        }
-                    }
+
 
                     for (int i=1;i<projectNameStartIndex+projectList.size(); i++) {
                         if (row.getCell(i) != null) {
@@ -5130,6 +5117,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         return msg;
                     }
                     User reportCreator = any.get();
+                    double curRowTotalTime = 0;
                     for (int i=projectNameStartIndex; i < projectNameStartIndex + projectList.size(); i++) {
                         if (row.getCell(i) == null) {
                             continue;
@@ -5190,6 +5178,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 report.setCreateDate(LocalDate.parse(reportDate, dtf));
                                 report.setCost(reportCreator.getCost()==null?new BigDecimal(0) : reportCreator.getCost().multiply(new BigDecimal(time)));
                                 reportList.add(report);
+                                curRowTotalTime += time;
                             } else if (time < 0) {
                                 //msg.setError(username + "的工时存在负数，请检查修改");
                                 msg.setError(MessageUtils.message("report.negativeError",username));
@@ -5197,6 +5186,23 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             }
                         }
                     }
+                    //导入工时大于0时，需要有工作内容
+                    if (curRowTotalTime > 0) {
+                        if (withCheckIn!=null) {
+                            int workContentIndex = projectNameStartIndex -1;
+                            if (row.getCell(workContentIndex) == null) {
+                                //msg.setError("第"+dataCount+"行缺少工作内容");工作内容为必填项
+                                msg.setError(MessageUtils.message("data.LackWorkContentByRow",dataCount));
+                                return msg;
+                            }
+                            workContent = row.getCell(workContentIndex).getStringCellValue().trim();
+                            if (StringUtils.isEmpty(workContent)) {
+                                //msg.setError("第"+dataCount+"行缺少工作内容");
+                                msg.setError(MessageUtils.message("data.LackWorkContentByRow",dataCount));
+                                return msg;
+                            }
+                        }
+                    }
                 }
             }
 
@@ -6463,12 +6469,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                                     }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                                         projectAuditorName = "$userName=" + userItem.getDingdingUserid() + "$";
                                                     }
-                                                    item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
+                                                    item.add("待"+(companyId == 469?"部门主管":"项目审核人") + "(" + projectAuditorName + ")审核");
                                                     break;
                                                 }
                                             }
                                         } else {
-                                            item.add("待项目审核人" + "(" + projectAuditorName + ")审核");
+                                            item.add("待"+(companyId == 469?"部门主管":"项目审核人") + "(" + projectAuditorName + ")审核");
                                         }
                                     }
                                 }
@@ -6478,8 +6484,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
 
                 if (timeType.getEnableNewWeeklyfill() == 1) {
-//                    String createDate = new SimpleDateFormat("yyyy-MM-dd")
-//                            .format((java.sql.Date) map.get("createDate"));
                     ReportBatch batchItem = reportBatchMapper.selectOne(new QueryWrapper<ReportBatch>().eq("creator_id", map.get("creatorId")).eq("start_date", createDate).last("limit 1"));
                     if (batchItem != null) {
                         item.add(batchItem.getSummary());
@@ -9922,15 +9926,93 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     }
 
     @Override
-    public HttpRespMsg batchDenyHisReport(Integer reportAuditLogId, String reason, HttpServletRequest request) {
-        List<ReportAlogMembdate> list = reportAlogMembdateMapper.selectList(new QueryWrapper<ReportAlogMembdate>().eq("rlog_id", reportAuditLogId));
-        for (ReportAlogMembdate logMembItem : list) {
-            HttpRespMsg msg = denyHisReport(logMembItem.getId(), reason, request);
-            if (msg.code.equals("error")) {
-                //异常需要跳出
-                return msg;
+    @Transactional(rollbackFor = Exception.class)
+    public HttpRespMsg batchDenyHisReport(Integer reportAuditLogId, String reason, HttpServletRequest request) throws Exception {
+        List<ReportAlogMembdate> dataList = reportAlogMembdateMapper.selectList(new QueryWrapper<ReportAlogMembdate>().eq("rlog_id", reportAuditLogId));
+        for (ReportAlogMembdate item : dataList) {
+            int hisId = item.getId();
+            ReportAlogMembdate log = reportAlogMembdateMapper.selectById(hisId);
+            String userId = log.getUserId();
+            String createDate = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(log.getCreateDate());
+            if (log.getState() != 1) {
+                //已通过的直接跳过
+                continue;
+            }
+            User user = userMapper.selectById(request.getHeader("Token"));
+            Company company = companyMapper.selectById(user.getCompanyId());
+            if (reason == null) {
+                reason = "-";
+            }
+            QueryWrapper<Report> eq = new QueryWrapper<Report>().eq("create_date", createDate).eq("creator_id", userId);
+            List<Report> list = reportMapper.selectList(eq);
+            Report oneReport = null;
+            if (list.size() == 0) {
+                //httpRespMsg.setError("日报已不存在");
+                throw new Exception(MessageUtils.message("profession.alreadyNull"));
+            } else  {
+                if (list.get(0).getState() == 3) {
+                    //只有已通过的历史记录才能撤销
+                    continue;
+                } else if (list.get(0).getState() == 2) {
+                    //只有已通过的历史记录才能撤销
+                    //httpRespMsg.setError("该日报已被撤销，无法重复操作");
+                    continue;
+                }
+            }
+            oneReport = list.get(0);
+            //直接进行项目经理审核驳回
+            reportMapper.update(new Report().setState(2)
+                            .setRejectReason(reason).setRejectUserid(user.getId()).setRejectUsername(user.getName()),eq);
+
+            TimeType timeType = timeTypeMapper.selectById(company.getId());
+            if (timeType.getReportAuditType() == 2 || timeType.getReportAuditType() == 9) {
+                List<Report> rList = list;
+                //退回任务分组审核状态
+                List<Report> newList = new ArrayList<>();
+                for (Report r : rList) {
+                    Report upR = new Report();
+                    upR.setId(r.getId());
+                    upR.setGroupAuditState(0);
+                    String inchargerId = taskGroupMapper.selectById(r.getGroupId()).getInchargerId();
+                    upR.setProjectAuditorId(inchargerId);
+                    upR.setProjectAuditorName(userMapper.selectById(inchargerId).getName());
+                    newList.add(upR);
+                }
+                updateBatchById(newList);
+            }
+
+            //修改审核记录的状态
+            log.setState(3);
+            reportAlogMembdateMapper.updateById(log);
+
+            saveDenyReportLog(list, user.getId(), user.getName(), reason);
+
+            List<Integer> collect = list.stream().map(Report::getProjectId).collect(Collectors.toList());
+            List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect));
+            String pNames = projectList.stream().map(Project::getProjectName).collect(Collectors.joining(", ", "[", "]"));
+            //String str = "您"+createDate+"填写的日报中"+pNames+"项目被["+user.getName()+"]驳回。原因:" + reason;;
+            String str = MessageUtils.message("report.dailyReject",createDate,pNames,user.getName(),reason);
+            String fillUserId = oneReport.getCreatorId();
+
+            informationMapper.insert(new Information().setType(0).setContent(createDate).setUserId(fillUserId).setMsg(str));
+
+            //发送企业微信通知消息
+            User reporter = userMapper.selectById(fillUserId);
+            String corpwxUserid = reporter.getCorpwxUserid();
+            //先判断钉钉
+            if (reporter.getDingdingUserid() != null) {
+                projectMapper.selectById(oneReport.getProjectId()).getProjectName();
+                companyDingdingService.sendRejectReportMsg(reporter.getCompanyId(), createDate, pNames, reason, user.getName(), reporter.getDingdingUserid());
+            }
+            if (corpwxUserid != null) {
+                WxCorpInfo info = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", company.getId()));
+                wxCorpInfoService.sendWXCorpMsg(info, corpwxUserid, str, null, WxCorpInfoServiceImpl.TEXT_CARD_MSG_REPORT_DENY);
+            } else if (reporter.getWxOpenid() != null){
+                //发送个人微信通知
+                pushReject(str, reporter, user.getName(), reason);
             }
         }
+
         return new HttpRespMsg();
     }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserCorpwxTimeMapper.xml

@@ -61,15 +61,20 @@
                 #{date}
             </foreach> GROUP BY r.`creator_id` ) report_time
         ON report_time.creator_id = user.id
-        WHERE user.company_id=#{companyId}
-        and  ((user.`is_active` = 1 AND (user.`induction_date` IS NULL OR DATE_FORMAT(user.`induction_date`, '%Y%m') &lt;= #{ymonth} )) OR (user.`is_active` = 0 AND DATE_FORMAT(user.`inactive_date`, '%Y%m%d') &gt; CONCAT(#{ymonth}, '01')))
-        <if test="deptIds != null">
-            AND user.`department_id` in
-            <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
-                #{deptId}
-            </foreach>
+        WHERE user.company_id = #{companyId}
+        <if test="userId != null">
+            AND user.`id` = #{userId}
+        </if>
+        <if test="userId == null">
+            and  ((user.`is_active` = 1 AND (user.`induction_date` IS NULL OR DATE_FORMAT(user.`induction_date`, '%Y%m') &lt;= #{ymonth} )) OR (user.`is_active` = 0 AND DATE_FORMAT(user.`inactive_date`, '%Y%m%d') &gt; CONCAT(#{ymonth}, '01')))
+            <if test="deptIds != null">
+                AND user.`department_id` in
+                <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
+                    #{deptId}
+                </foreach>
+            </if>
+            ORDER BY user.id ASC
         </if>
-        ORDER BY user.id ASC
     </select>
 
     <select id="selectByAsk" resultType="java.util.Map">

fhKeeper/formulahousekeeper/timesheet/src/views/contract/components/customContract.vue

@@ -66,9 +66,9 @@
           <el-dropdown>
             <el-link type="primary" :underline="false">{{$t('viewmore')}}<i class="el-icon-arrow-down el-icon--right"></i></el-link>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item v-if="permissions.contractType"><el-link type="primary" :underline="false" @click="typeEdit()">{{$t('bian-ji') + $t('types')}}</el-link></el-dropdown-item>
-              <el-dropdown-item v-if="permissions.contractImport"><el-link type="primary" :underline="false" @click="importDialog = true">{{$t('dao-ru')}}</el-link></el-dropdown-item>
-              <el-dropdown-item v-if="permissions.contractExport"><el-link type="primary" :underline="false" @click="exportContract()">{{$t('export.export')}}</el-link></el-dropdown-item>
+              <el-dropdown-item v-if="permissions.contractType" @click.native="typeEdit()"><el-link type="primary" :underline="false" >{{$t('bian-ji') + $t('types')}}</el-link></el-dropdown-item>
+              <el-dropdown-item v-if="permissions.contractImport" @click.native="importDialog = true"><el-link type="primary" :underline="false" >{{$t('dao-ru')}}</el-link></el-dropdown-item>
+              <el-dropdown-item v-if="permissions.contractExport" @click.native="exportContract()"><el-link type="primary" :underline="false" >{{$t('export.export')}}</el-link></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </el-form-item>
@@ -551,7 +551,7 @@
     <el-dialog :title="$t('dao-ru-he-tong')" :visible.sync="importDialog" v-if="importDialog" width="30%">
       <!-- 模板？ -->
       <p>1. {{$t('other.download')}}
-        <el-link type="primary" style="margin-left:5px;" :underline="false" :href="'./upload/'+$t('he-tong-guan-li-dao-ru-mo-ban')+'.xlsx'" :download="$t('he-tong-guan-li-dao-ru-mo-ban')+'.xlsx'">{{$t('he-tong-guan-li-dao-ru-mo-ban')+ '.xlsx'}}</el-link>
+        <el-link type="primary" style="margin-left:5px;" :underline="false" :href="'./upload/上海民航合同模板.xlsx'" download="上海民航合同模板.xlsx">上海民航合同模板.xlsx</el-link>
       </p>
       <div slot="footer" class="dialog-footer" style="text-align:center;">
         <el-upload ref="upload" action="#" :limit="1" :http-request="importContract" :show-file-list="false">

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

@@ -100,14 +100,14 @@
                                         <span v-else>
                                             <span v-if="item.isDeptAudit==0">
                                                 <span v-if="item.projectAuditState==0">
-                                                    {{ $t('other.waitForTheProjectReviewer') }}<span v-if="item.projectAuditorName != null">(
+                                                    {{ user.companyId == 469?"待部门主管":$t('other.waitForTheProjectReviewer') }}<span v-if="item.projectAuditorName != null">(
                                                         <!-- {{item.projectAuditorName}} -->
                                                         <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
                                                         <span v-if="user.userNameNeedTranslate != '1'">{{item.projectAuditorName}}</span>
                                                         )</span>{{ $t('other.audit') }}
                                                 </span>
                                                 <span style="color:#32CD32;" v-else-if="item.projectAuditState==1">
-                                                    {{ $t('other.projectAuditor') }}<span v-if="item.projectAuditorName != null">(
+                                                    {{ user.companyId == 469?"待部门主管":$t('other.projectAuditor') }}<span v-if="item.projectAuditorName != null">(
                                                         <!-- {{item.projectAuditorName}} -->
                                                         <span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='item.projectAuditorName'></TranslationOpenDataText></span>
                                                         <span v-if="user.userNameNeedTranslate != '1'">{{item.projectAuditorName}}</span>
@@ -249,7 +249,7 @@
                                         <!-- {{scope.row.isDeptAudit==0?$t('other.Tobereviewedbytheprojectreviewer'):($t('other.await')+scope.row.auditDeptName+('('+scope.row.deptAuditorName+')')+$t('other.audit'))}} -->
                                         <span v-if="scope.row.isDeptAudit==0">
                                             <span>
-                                                {{ $t('other.waitForTheProjectReviewer') }}<span>(
+                                                {{ user.companyId == 469?"待部门主管":$t('other.waitForTheProjectReviewer') }}<span>(
                                                     <template v-for="(auditItem, auditindexs) in (scope.row.reviewerNames || [])">
                                                         <TranslationOpenDataText type='userName' :openid='auditItem'></TranslationOpenDataText>
                                                         <span v-if="auditindexs < scope.row.reviewerNames.length-1">,</span>
@@ -269,7 +269,7 @@
                                     <!-- <span v-if="scope.row.isDeptAudit==0">{{$t('other.Tobereviewedbytheprojectreviewer')}}</span> -->
                                      <span v-if="scope.row.isDeptAudit==0">
                                         <span>
-                                            {{ $t('other.waitForTheProjectReviewer') }}<span>(
+                                            {{ user.companyId == 469?"待部门主管":$t('other.waitForTheProjectReviewer') }}<span>(
                                                 <template v-for="(auditItem, auditindexs) in (scope.row.reviewerNames || [])">
                                                     <TranslationOpenDataText type='userName' :openid='auditItem'></TranslationOpenDataText>
                                                     <span v-if="auditindexs < scope.row.reviewerNames.length-1">,</span>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -1530,7 +1530,6 @@ export default {
                     if(aiReportData.length != 0) {
                         var arr = [];
                         var list = aiReportData;
-                        console.log('11111111')
                         for(var i in list) {
                             var subProjectName = null;
                             if (list[i].subProjectId) {