任务查看，费用报销已通过的也可以编辑删除

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

@@ -106,6 +106,12 @@ public class ReportController {
         return reportService.getReport(date, request);
     }
 
+    @RequestMapping("/getCardTime")
+    public HttpRespMsg getCardTime(@RequestParam String date) {
+        return reportService.getCardTime(date, request);
+    }
+
+
     private void fillReportProgress(Report report, String professionProgress) {
         if (!StringUtil.isEmpty(professionProgress)) {
             professionProgress = professionProgress.replaceAll("@",",");
@@ -437,7 +443,7 @@ public class ReportController {
                     String[] dateArray = createDate[i].split("@");
                     String startDate = dateArray[0];
                     String endDate = dateArray[1];
-                    //检查该时间范围是否已经有填写过的日报了
+                    //检查该时间范围是否已经有填写过的日报了，代填日报不需要检查
                     List<Report> oldReportList = reportService.list(new QueryWrapper<Report>().between("create_date", startDate, endDate).eq("creator_id", token));
                     if (oldReportList.size() > 0) {
                         List<LocalDate> collect = oldReportList.stream().map(Report::getCreateDate).collect(Collectors.toList());
@@ -820,7 +826,7 @@ public class ReportController {
             }
         }
 
-        if (!createDate[0].contains("@")) {
+        if (!createDate[0].contains("@") && targetUids.length == 0) {
             //不是批量，可能是按周填报。
             boolean isWeeklyFill = true;
             if (reportList.stream().anyMatch(r->r.getId() != null)) {

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

@@ -27,6 +27,8 @@ public interface ReportService extends IService<Report> {
 
     HttpRespMsg getReport(String date, HttpServletRequest request);
 
+    HttpRespMsg getCardTime(String date, HttpServletRequest request);
+
     HttpRespMsg editReport(List<Report> reportList, String date, List<User> userList, BigDecimal hourCost, Integer companyId);
 
     HttpRespMsg deleteReport(String userId, String date);

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

@@ -638,6 +638,31 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg getCardTime(String date, HttpServletRequest request) {
+        String userId = request.getHeader("TOKEN");
+        User user = userMapper.selectById(userId);
+        int companyId = user.getCompanyId();
+        TimeType timeType = timeTypeMapper.selectById(companyId);
+        HttpRespMsg msg = new HttpRespMsg();
+        if (timeType.getShowDdCardtime() == 1) {
+            List<UserDingdingTime> dingdingTimes = userDingdingTimeMapper.selectList(new QueryWrapper<UserDingdingTime>()
+                    .eq("user_id", userId).eq("work_date", date));
+            if (dingdingTimes.size() > 0) {
+                UserDingdingTime time = dingdingTimes.get(0);
+                msg.data = time;
+            }
+        } else if (timeType.getShowCorpwxCardtime() == 1) {
+            List<UserCorpwxTime> corpwxTimes = userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>()
+                    .eq("corpwx_userid", user.getCorpwxUserid()).eq("create_date", date));
+            if (corpwxTimes.size() > 0) {
+                UserCorpwxTime time = corpwxTimes.get(0);
+                msg.data = time;
+            }
+        }
+        return msg;
+    }
+
     //新增或编辑报告
     @Override
     public HttpRespMsg editReport(List<Report> reportList, String date, List<User> userList, BigDecimal hourCost, Integer companyId) {

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

@@ -278,6 +278,7 @@
         <if test="pageStart != null and pageSize != null">
             LIMIT #{pageStart},#{pageSize}
         </if>
+        order by project.is_public desc, id asc
     </select>
     <!--分页获取项目收支平衡 -->
     <select id="getProjectInAndOut" resultMap="BaseResultMap">

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

@@ -154,7 +154,7 @@
         task.`task_status`, task.`task_type`,
         project.`project_code`, project.`project_name` FROM task LEFT JOIN project ON project.id = task.`project_id`
         WHERE project.`company_id` = #{companyId}
-        ORDER BY project_name ASC
+        ORDER BY project.is_public desc, project.id ASC
         <if test="pageStart != null and pageSize != null">
             limit #{pageStart}, #{pageSize}
         </if>

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

@@ -256,8 +256,8 @@
                   <template slot-scope="scope" >
                       <div v-if="!isAuditList">
                       <el-button icon="el-icon-view"  circle size="mini"  @click.stop.native="downloadByA(scope.row)" ></el-button>
-                      <el-button icon="el-icon-edit" circle size="mini" style="margin-left:10px;" @click.stop.native="showEditName(scope.row)" v-show="scope.row.status == 1 || scope.row.status == 2 "></el-button>
-                      <el-button icon="el-icon-delete"  circle size="mini" style="margin-left:10px;" @click.stop.native="deleteItem(scope.row)" v-show="scope.row.status == 1 || scope.row.status == 2 "></el-button>
+                      <el-button icon="el-icon-edit" circle size="mini" style="margin-left:10px;" @click.stop.native="showEditName(scope.row)" v-show="permissions.costAudit || scope.row.status == 1 || scope.row.status == 2 "></el-button>
+                      <el-button icon="el-icon-delete"  circle size="mini" style="margin-left:10px;" @click.stop.native="deleteItem(scope.row)" v-show="permissions.costAudit || scope.row.status == 1 || scope.row.status == 2 "></el-button>
                       </div>
                       <div v-if="isAuditList">
                         <el-button  size="mini"  @click.stop.native="downloadByA(scope.row)" >查看</el-button>