提交代码

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

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+@RestController
+@RequestMapping("/finance-monthly-worktime")
+public class FinanceMonthlyWorktimeController {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+@RestController
+@RequestMapping("/fmw-detail")
+public class FmwDetailController {
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/FinanceMonthlyWorktime.java

@@ -0,0 +1,73 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FinanceMonthlyWorktime extends Model<FinanceMonthlyWorktime> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 年月，格式yyyy-MM
+     */
+    @TableField("ymonth")
+    private String ymonth;
+
+    /**
+     * 0-未定稿，1-已定稿
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 是否已发送
+     */
+    @TableField("is_send")
+    private Boolean isSend;
+
+    /**
+     * 最近一次发送时间
+     */
+    @TableField("last_send_time")
+    private LocalDateTime lastSendTime;
+
+    /**
+     * 操作人
+     */
+    @TableField("user_id")
+    private String userId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/FmwDetail.java

@@ -0,0 +1,111 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FmwDetail extends Model<FmwDetail> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 财务月度工时表的主键id
+     */
+    @TableField("fmw_id")
+    private Integer fmwId;
+
+    @TableField("dept_id")
+    private Integer deptId;
+
+    /**
+     * 部门名称
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 部门编码
+     */
+    @TableField("dept_code")
+    private String deptCode;
+
+    /**
+     * 项目id
+     */
+    @TableField("project_id")
+    private Integer projectId;
+
+    /**
+     * 项目号
+     */
+    @TableField("project_code")
+    private String projectCode;
+
+    /**
+     * 工单号
+     */
+    @TableField("extra_field4")
+    private String extraField4;
+
+    /**
+     * 行号
+     */
+    @TableField("extra_field5")
+    private String extraField5;
+
+    /**
+     * 组装维修工时
+     */
+    @TableField("maintance_time")
+    private Double maintanceTime;
+
+    /**
+     * 调试工时
+     */
+    @TableField("debug_time")
+    private Double debugTime;
+
+    /**
+     * 等料工时
+     */
+    @TableField("waiting_time")
+    private Double waitingTime;
+
+    /**
+     * 协助工时
+     */
+    @TableField("assist_time")
+    private Double assistTime;
+
+    /**
+     * 公共分摊工时
+     */
+    @TableField("public_time")
+    private Double publicTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.FinanceMonthlyWorktime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+public interface FinanceMonthlyWorktimeMapper extends BaseMapper<FinanceMonthlyWorktime> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.FmwDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+public interface FmwDetailMapper extends BaseMapper<FmwDetail> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.FinanceMonthlyWorktime;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+public interface FinanceMonthlyWorktimeService extends IService<FinanceMonthlyWorktime> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.FmwDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+public interface FmwDetailService extends IService<FmwDetail> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.FinanceMonthlyWorktime;
+import com.management.platform.mapper.FinanceMonthlyWorktimeMapper;
+import com.management.platform.service.FinanceMonthlyWorktimeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+@Service
+public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthlyWorktimeMapper, FinanceMonthlyWorktime> implements FinanceMonthlyWorktimeService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.FmwDetail;
+import com.management.platform.mapper.FmwDetailMapper;
+import com.management.platform.service.FmwDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-16
+ */
+@Service
+public class FmwDetailServiceImpl extends ServiceImpl<FmwDetailMapper, FmwDetail> implements FmwDetailService {
+
+}

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

@@ -875,8 +875,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
                 showRefresh = true;
             }else if(timeType.getSyncFanwei()==1){
+                System.out.println("获取泛微考勤==="+date+", userId="+userId);
                 List<UserFvTime> userFvTimeList = userFvTimeMapper.selectList(new QueryWrapper<UserFvTime>()
                         .eq("user_id", userId).eq("work_date", date));
+                System.out.println("userFvTimeList:"+userFvTimeList.size());
                 if (userFvTimeList.size() > 0) {
                     UserFvTime time = userFvTimeList.get(0);
                     resultMap.put("time", time);
@@ -2255,7 +2257,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     for (Map map : nameList) {
                         String itemUid = (String)map.get("userId");
                         String dateStr = (String)map.get("dateStr");
-                        Optional<UserFvTime> first = timeList.stream().filter(time -> time.getUserId().equals(itemUid) && dtf.format(time.getWorkDate()).equals(dateStr)).findFirst();
+                        Optional<UserFvTime> first = timeList.stream().filter(time -> itemUid.equals(time.getUserId()) && dtf.format(time.getWorkDate()).equals(dateStr)).findFirst();
                         if (first.isPresent()) {
                             double wh = first.get().getWorkHours();
                             //赋值打卡时长

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

@@ -2501,6 +2501,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         userVO.setHasAuditDept(num>0);
         //获取当前角色的权限菜单
         setUserRoleMenu(userVO);
+
+        if(company.getId()==Constant.MLD_COMPANY_ID) {
+            //检测项目角色
+            userVO.setProjectLeaderType(judgeIsProjectLeader(userVO.getId(),company.getId()));
+        }
         httpRespMsg.data = userVO;
         return httpRespMsg;
     }

fhKeeper/formulahousekeeper/timesheet/src/views/project/detail.vue

@@ -225,7 +225,13 @@
                             normal: {
                                 show: true,
                                 position: 'top',
-                                formatter: `{c} ${this.yAxisValue == 0 ? '元' : '小时'}`,
+                                // formatter: `{c} ${this.yAxisValue == 0 ? '元' : '小时'}`,
+                                formatter: function (params) {
+                                    var value = params.value.toFixed(1);
+                                    const totalValue = _this.yAxisValue == 0 ? value + '元' : value + 'h';
+                                    const dayValue = _this.yAxisValue == 0 ? 0 : (value/_this.user.timeType.allday).toFixed(1);
+                                    return `${totalValue}${_this.yAxisValue == 0?'':('/'+dayValue+'人天')}`;
+                                }
                             }
                         }
                     }]

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

@@ -235,7 +235,7 @@
                       {{scope.row.reportTime | amounts}}
                   </template>
               </el-table-column>
-              <el-table-column prop="cardHours" :label="$t('workAttendance') + '(h)'" v-if="user.timeType.showCorpwxCardtime==1||user.timeType.showDdCardtime==1">
+              <el-table-column prop="cardHours" :label="$t('workAttendance') + '(h)'" v-if="user.timeType.showCorpwxCardtime==1||user.timeType.showDdCardtime==1 || user.timeType.syncFanwei==1">
                   <template slot-scope="scope">
                       <span :style="scope.row.cardHours != scope.row.reportTime?'color:red':''">{{scope.row.cardHours?scope.row.cardHours.toFixed(1):'-'}}</span>
                   </template>