Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -1315,7 +1315,9 @@ public class ReportController {
             }
         }
         //更新填报时间
-        reportList.forEach(r->r.setCreateTime(LocalDateTime.now()));
+        reportList.forEach(r->{
+            r.setCreateTime(LocalDateTime.now());
+        });
 
         HttpRespMsg httpRespMsg = reportService.editReport(reportList, createDate.length > 0 ? createDate[0] : null, targetUserList, hourCost, user.getCompanyId());
         //【上海绎维】、【火石演示】、【博通容合】使用

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

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.management.platform.entity.Project;
 import com.management.platform.entity.ReportImportLog;
 import com.management.platform.mapper.ReportImportLogMapper;
+import com.management.platform.mapper.UserMapper;
 import com.management.platform.util.HttpRespMsg;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RequestParam;
@@ -34,6 +36,8 @@ public class ReportImportLogController {
 
     @Resource
     private ReportImportLogMapper reportImportLogMapper;
+    @Resource
+    private UserMapper userMapper;
 
     @RequestMapping("/getList")
     public HttpRespMsg getList(Integer companyId, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
@@ -53,14 +57,27 @@ public class ReportImportLogController {
 
 
     @RequestMapping("/changeTime")
-    public HttpRespMsg changeTime(Integer id, String modLogDateTime) {
+    public HttpRespMsg changeTime(Integer id, String modLogDateTime, String modImportUserId) {
         HttpRespMsg msg = new HttpRespMsg();
         ReportImportLog reportImportLog = reportImportLogMapper.selectById(id);
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime localDateTime = LocalDateTime.parse(modLogDateTime, dateTimeFormatter);
+        if (!StringUtils.isEmpty(modImportUserId)) {
+            reportImportLog.setUserId(modImportUserId);
+            reportImportLog.setUserName(userMapper.selectById(modImportUserId).getName());
+        }
         reportImportLog.setIndate(localDateTime);
         reportImportLogMapper.updateById(reportImportLog);
         return msg;
     }
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id) {
+        HttpRespMsg msg = new HttpRespMsg();
+        reportImportLogMapper.deleteById(id);
+        return msg;
+    }
+
+
+
 }
 

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

@@ -286,6 +286,11 @@ public class UserCorpwxTimeController {
             if (hasPassed) {
                 continue;
             }
+            Double workHours = (Double) dataItem.get("workHours");
+            System.out.println((String)dataItem.get("username") + " workHours:" + workHours);
+            if (workHours == null  || workHours.doubleValue() <= 0.0) {
+                continue;
+            }
             String createDate = (String)dataItem.get("createDate");
             dataList.add(createDate);
             dataList.add((String)dataItem.get("weekDayTxt"));
@@ -300,7 +305,8 @@ public class UserCorpwxTimeController {
 //            dataList.add(""+(Double)dataItem.get("cardTime"));
 //            dataList.add(""+(Double)dataItem.get("askLeaveTime"));
 //            dataList.add(""+(Double)dataItem.get("outdoorTime"));
-            dataList.add(""+(Double)dataItem.get("workHours"));
+
+            dataList.add(""+workHours);
             for (String p : projects) {
                 dataList.add("");
             }

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

@@ -1423,7 +1423,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     rowData.add("");
                     //针对项目合计行，自定义的字段要空出来
                     for (UserCustom userCustom : userCustoms) {
-                        headList.add("");
+                        rowData.add("");
                     }
                     if ("hours".equals(exportContent) && functionTimeList.size()>0){
                         rowData.add(((Double)map.get("cost")).toString());
@@ -1522,9 +1522,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 sumRow.add("");
                 sumRow.add("");
                 sumRow.add("");
-                sumRow.add("");
                 for (UserCustom userCustom : userCustoms) {
-                    headList.add("");
+                    sumRow.add("");
                 }
                 if ("hours".equals(exportContent) && functionTimeList.size()>0){
                     sumRow.add(""+new BigDecimal(totalCostTime).setScale(1, BigDecimal.ROUND_HALF_UP));

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

@@ -3287,6 +3287,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         for (Integer reportId : ids) {
             Report report = new Report();
             report.setState(3);//待提交，即草稿状态
+            report.setGroupAuditState(0);
             if (functionList.size() == 0) {
                 //自己只能撤销待审核状态的
                 cnt += reportMapper.update(report, new QueryWrapper<Report>().eq("id", reportId).eq("state", 0));
@@ -3885,6 +3886,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
             }
             int deptColumnExtra = (hasDept?1:0);
+            //下标从0开始
             int projectNameStartIndex = (withCheckIn==null?2:(6 + deptColumnExtra));
             HttpRespMsg respMsg=new HttpRespMsg();
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1&&userNameList.size()>0){

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

@@ -54,7 +54,7 @@
             </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 OR (user.`is_active` = 0 AND DATE_FORMAT(user.`inactive_date`, '%Y%m') > #{ymonth}))
+        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') &gt;= #{ymonth}))
         <if test="deptIds != null">
             AND user.`department_id` in
             <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">

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

@@ -1542,8 +1542,8 @@
                     <el-table-column  label="操作" v-if="user.companyId == 469 && user.roleName=='超级管理员'">
                         <template slot-scope="scope">
                             <div>
-                                <el-button type="default" size="small" @click="openModImportTime(scope.row)">修改导入时间</el-button>
-                                <!-- <el-button type="primary" @click="delImportTime(scope.row)">删除记录</el-button> -->
+                                <el-button type="default" size="small" @click="openModImportTime(scope.row)">修改导入记录</el-button>
+                                <el-button type="primary" size="small" @click="delImportTime(scope.row)">删除记录</el-button>
                             </div>
                         </template>
                     </el-table-column>
@@ -1699,7 +1699,7 @@
             <el-button @click="confirmBatchApproveReport" :loading="startDeleting" >审批通过</el-button>
             </span>
         </el-dialog>
-        <el-dialog title="修改导入时间" v-if="showModImportTimeDialog" :visible.sync="showModImportTimeDialog"  width="200">
+        <el-dialog title="修改导入记录" v-if="showModImportTimeDialog" :visible.sync="showModImportTimeDialog"  width="200">
             <div>
                 <span>选择时间：</span><el-date-picker 
                     v-model="modImportTime" 
@@ -1707,6 +1707,14 @@
                     :clearable="true" 
                     type="datetime" 
                     ></el-date-picker>
+                <span>选择导入人员：</span><el-select
+                    v-model="modImportUserId"
+                    >
+                    <el-option v-for="item in usersList" :key="item.id" :label="item.name" :value="item.id">
+                        <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                        <span v-else>{{item.name}}</span>
+                    </el-option>
+                </el-select>    
             </div>
             <span slot="footer">
             <el-button @click="confirmChangeModTime" >确认</el-button>
@@ -1826,6 +1834,7 @@
             return {
                 modItemDataId: null,
                 modImportTime: null,
+                modImportUserId: null,
                 showModImportTimeDialog: false,
                 showBatchSimpleApproveReport: false,
                 startDeleting: false,
@@ -2168,6 +2177,38 @@
                 this.showModImportTimeDialog = true;
                 this.modItemDataId = row.id;
             },
+            delImportTime(row) {
+                let rowId = row.id;
+                this.$confirm('您确定要删除该条记录吗？',this.$t('other.prompts'), {
+                    confirmButtonText: this.$t('btn.determine'),
+                    cancelButtonText: this.$t('btn.cancel'),
+                    type: "warning"
+                })
+                .then(() => {
+                    this.http.post('/report-import-log/delete',{ 
+                        id: rowId
+                    },res => {
+                        if (res.code == "ok") {
+                            this.$message({
+                                message: '删除成功',
+                                type: "success"
+                            });
+                            this.getToView();
+                        } else {
+                            this.$message({
+                                message: res.msg,
+                                type: "error"
+                            });
+                        }
+                    },error => {
+                        this.$message({
+                            message: error,
+                            type: "error"
+                        });
+                        }
+                    );
+                }).catch(() => {this.startDeleting = false});
+            },
             confirmChangeModTime() {
                 if (this.modImportTime == null || this.modImportTime.length == 0) {
                     this.$message({
@@ -2178,6 +2219,7 @@
                 }
                 this.http.post('/report-import-log/changeTime',{ 
                         modLogDateTime: this.modImportTime,
+                        modImportUserId: this.modImportUserId,
                         id: this.modItemDataId
                     },res => {
                         if (res.code == "ok") {