Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportDeleteController.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 2024-03-05
+ */
+@RestController
+@RequestMapping("/report-delete")
+public class ReportDeleteController {
+
+}
+

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

@@ -58,13 +58,13 @@ public class Department extends Model<Department> {
     /**
      * 部门负责人id
      */
-    @TableField(value = "manager_id", updateStrategy = FieldStrategy.IGNORED)
+    @TableField(value = "manager_id")
     private String managerId;
 
     /**
      * 日报导入审核人
      */
-    @TableField(value = "report_audit_userid", updateStrategy = FieldStrategy.IGNORED)
+    @TableField(value = "report_audit_userid")
     private String reportAuditUserid;
 
 

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

@@ -0,0 +1,347 @@
+package com.management.platform.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+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 2024-03-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ReportDelete extends Model<ReportDelete> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId("id")
+    private Integer id;
+
+    /**
+     * user表外键 报告的作者
+     */
+    @TableField("creator_id")
+    private String creatorId;
+
+    /**
+     * project表外键 相关项目
+     */
+    @TableField("project_id")
+    private Integer projectId;
+
+    /**
+     * 日期
+     */
+    @TableField("create_date")
+    private LocalDate createDate;
+
+    /**
+     * 工作时间
+     */
+    @TableField("working_time")
+    private Double workingTime;
+
+    /**
+     * 报告内容； 根据multi_worktime的取值，形式有差别
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 审查状态 0-未审核 1-已通过 2-未通过, -1-导入待审核， 3草稿
+     */
+    @TableField("state")
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 0-全天， 1-上午，2-下午
+     */
+    @TableField("time_type")
+    private Integer timeType;
+
+    /**
+     * 成本
+     */
+    @TableField("cost")
+    private BigDecimal cost;
+
+    /**
+     * 开始时间
+     */
+    @TableField("start_time")
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    @TableField("end_time")
+    private String endTime;
+
+    /**
+     * 员工填写时长类型
+     */
+    @TableField("report_time_type")
+    private Integer reportTimeType;
+
+    /**
+     * 子项目id
+     */
+    @TableField("sub_project_id")
+    private Integer subProjectId;
+
+    /**
+     * 任务id
+     */
+    @TableField("task_id")
+    private Integer taskId;
+
+    /**
+     * 是否是加班
+     */
+    @TableField("is_overtime")
+    private Integer isOvertime;
+
+    /**
+     * 用时占比
+     */
+    @TableField("progress")
+    private Integer progress;
+
+    /**
+     * 部门审核状态： -1 专业未审核，0-部门未审核，1-已通过，2-未通过
+     */
+    @TableField("department_audit_state")
+    private Integer departmentAuditState;
+
+    /**
+     * 阶段/岗位/工序
+     */
+    @TableField("stage")
+    private String stage;
+
+    /**
+     * 图片的数组字符串
+     */
+    @TableField("pic_str")
+    private String picStr;
+
+    /**
+     * 是否是多个时间工作事项
+     */
+    @TableField("multi_worktime")
+    private Integer multiWorktime;
+
+    /**
+     * 驳回原因
+     */
+    @TableField("reject_reason")
+    private String rejectReason;
+
+    /**
+     * 驳回人姓名
+     */
+    @TableField("reject_username")
+    private String rejectUsername;
+
+    /**
+     * 驳回人id
+     */
+    @TableField("reject_userid")
+    private String rejectUserid;
+
+    /**
+     * 选择的自定义维度
+     */
+    @TableField("degree_id")
+    private Integer degreeId;
+
+    /**
+     * 公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 代填或者导入的用户id
+     */
+    @TableField("fill_userid")
+    private String fillUserid;
+
+    /**
+     * 审核流程：当前审核的部门id
+     */
+    @TableField("audit_deptid")
+    private Integer auditDeptid;
+
+    /**
+     * 审核流程: 是否是部门审核
+     */
+    @TableField("is_dept_audit")
+    private Integer isDeptAudit;
+
+    /**
+     * 审核流程：当前审核的部门负责人id
+     */
+    @TableField("audit_dept_managerid")
+    private String auditDeptManagerid;
+
+    /**
+     * 是否是最后一步审核
+     */
+    @TableField("is_final_audit")
+    private Integer isFinalAudit;
+
+    /**
+     * 审核流程：审核过程中，项目的审核状态； 0-待审核，1-审核通过
+     */
+    @TableField("project_audit_state")
+    private Integer projectAuditState;
+
+    /**
+     * 任务分组id
+     */
+    @TableField("group_id")
+    private Integer groupId;
+
+    /**
+     * 自定义的数值
+     */
+    @TableField("custom_data")
+    private Double customData;
+
+    /**
+     * 项目审核人id
+     */
+    @TableField("project_auditor_id")
+    private String projectAuditorId;
+
+    /**
+     * 工时日报所属部门id
+     */
+    @TableField("dept_id")
+    private Integer deptId;
+
+    /**
+     * 加班时长
+     */
+    @TableField("overtime_hours")
+    private Double overtimeHours;
+
+    /**
+     * 加班薪资
+     */
+    @TableField("overtime_cost")
+    private BigDecimal overtimeCost;
+
+    /**
+     * 自定义文本信息内容
+     */
+    @TableField("custom_text")
+    private String customText;
+
+    /**
+     * 对应成本项的id
+     */
+    @TableField("basecost_id")
+    private Integer basecostId;
+
+    /**
+     * 项目日报审核时间
+     */
+    @TableField("project_audit_time")
+    private LocalDateTime projectAuditTime;
+
+    /**
+     * 任务分组负责人审核状态： 0-待审核，1-审核通过
+     */
+    @TableField("group_audit_state")
+    private Integer groupAuditState;
+
+    /**
+     * 评价
+     */
+    @TableField("evaluate")
+    private String evaluate;
+
+    /**
+     * 是否属于自动审核通过  0-不属于 1-属于
+     */
+    @TableField("report_auto_approve")
+    private Integer reportAutoApprove;
+
+    /**
+     * 批量填报时的report_batch表id
+     */
+    @TableField("batch_id")
+    private Integer batchId;
+
+    /**
+     * 昱众-角色类型:0-PM，1-CRC
+     */
+    @TableField("extra_field1")
+    private Integer extraField1;
+
+    /**
+     * 昱众-工作职责
+     */
+    @TableField("extra_field2")
+    private Integer extraField2;
+
+    /**
+     * 昱众-工作内容
+     */
+    @TableField("extra_field3")
+    private Integer extraField3;
+
+    /**
+     * SAP项目服务ID
+     */
+    @TableField("sap_service_id")
+    private Integer sapServiceId;
+
+    /**
+     * 多选自定义维度id
+     */
+    @TableField("multi_degr_id")
+    private String multiDegrId;
+
+    /**
+     * 删除的人员id
+     */
+    @TableField("delete_user_id")
+    private String deleteUserId;
+
+    /**
+     * 删除时间
+     */
+    @TableField("delete_time")
+    private LocalDateTime deleteTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

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

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

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

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ReportDelete;
+import com.management.platform.mapper.ReportDeleteMapper;
+import com.management.platform.service.ReportDeleteService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-05
+ */
+@Service
+public class ReportDeleteServiceImpl extends ServiceImpl<ReportDeleteMapper, ReportDelete> implements ReportDeleteService {
+
+}

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

@@ -87,6 +87,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     public String appSecret;
     @Resource
     private TaskGroupMapper taskGroupMapper;
+    @Resource
+    private ReportDeleteService reportDeleteService;
+
     @Resource
     private DepartmentService departmentService;
     @Resource
@@ -1593,6 +1596,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Override
     public HttpRespMsg deleteReport(String userId, String date) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
+        String delUserId = request.getHeader("TOKEN");
         Company company = companyMapper.selectById(userMapper.selectById(userId).getCompanyId());
         //某人删除自己某天的全部报告
         QueryWrapper<Report> queryWrapper = new QueryWrapper<Report>().eq("creator_id", userId).eq("create_date", date);
@@ -1610,27 +1614,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         } else {
             //删除日报的日志
             reportLogMapper.delete(new QueryWrapper<ReportLog>().eq("creator_id", userId).eq("create_date", date));
+            reportLogDetailMapper.delete(new QueryWrapper<ReportLogDetail>().in("report_id", collect));
+            //存入日报删除表
+            List<ReportDelete> delList = new ArrayList<>();
+            for (Report r : reportList) {
+                //从report对象中复制所有字段到report_delete对象中
+                ReportDelete delLog = new ReportDelete();
+                BeanUtils.copyProperties(r, delLog);
+                delLog.setDeleteUserId(delUserId);
+                delList.add(delLog);
+            }
+            reportDeleteService.saveBatch(delList);
         }
-        //不需要调绎维的删除接口了。工时在我们这边系统内管理控制。
-//        if(company.getId()==862){
-//            String url = "http://183.194.0.98:3202/api/web-server/controlCenter/billRejected";
-//            HttpHeaders headers = new HttpHeaders();
-//            headers.setContentType(MediaType.APPLICATION_JSON);
-//            headers.add("token",getTokenOfYiWei());
-//            JSONObject body=new JSONObject();
-//            body.put("type","EXPENSE");
-//            body.put("billNo","GS"+reportList.get(0).getCreatorId()+reportList.get(0).getCreateDate());
-//            HttpEntity<String> requestEntity = new HttpEntity<String>(body.toJSONString(), headers);
-//            ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,
-//                    HttpMethod.POST, requestEntity, String.class);
-//            if (responseEntity.getStatusCode() == HttpStatus.OK) {
-//                String resp = responseEntity.getBody();
-//                JSONObject json = JSONObject.parseObject(resp);
-//                if(json.getIntValue("status")==0){
-//                    JSONArray jsonArray = json.getJSONArray("data");
-//                }
-//            }
-//        }
         return httpRespMsg;
     }
 
@@ -2051,6 +2046,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             log.setUserId(user.getId());
             log.setUserName(user.getName());
             log.setProjectName(pNames);
+            if (pNames.length() > 2000) {
+                log.setProjectName(pNames.substring(0, 2000));
+            }
             reportAuditLogMapper.insert(log);
             //员工的日期
             ReportAlogMembdate membdate = new ReportAlogMembdate();
@@ -2550,6 +2548,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             log.setUserId(user.getId());
             log.setUserName(user.getName());
             log.setProjectName(pNames);
+            if (pNames.length() > 2000) {
+                log.setProjectName(pNames.substring(0, 2000));
+            }
             reportAuditLogMapper.insert(log);
             //员工的日期
             ReportAlogMembdate membdate = new ReportAlogMembdate();
@@ -2843,6 +2844,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         log.setUserId(user.getId());
         log.setUserName(user.getName());
         log.setProjectName(pNames);
+        if (pNames.length() > 2000) {
+            log.setProjectName(pNames.substring(0, 2000));
+        }
         reportAuditLogMapper.insert(log);
         //员工的日期
         ReportAlogMembdate membdate = new ReportAlogMembdate();
@@ -3772,6 +3776,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             log.setResult(MessageUtils.message("profession.batchPass"));
             log.setUserId(user.getId());
             log.setUserName(user.getName());
+            if (s.length()>2000) {
+                s = s.substring(0, 2000);
+            }
             log.setProjectName(s);
             reportAuditLogMapper.insert(log);
 
@@ -3886,6 +3893,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         log.setUserId(user.getId());
         log.setUserName(user.getName());
         log.setProjectName(s);
+        if (s.length() > 2000) {
+            s = s.substring(0, 2000);
+        }
         reportAuditLogMapper.insert(log);
         List<Report> allReports = reportMapper.selectList(new QueryWrapper<Report>().in("id", ids));
         saveDenyReportLog(allReports, user.getId(), user.getName(), reason);
@@ -6080,9 +6090,22 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     public List<Map<String, Object>> getNotFullReportUserList(Integer companyId, LocalDate localStart, LocalDate localEnd) {
         List<Report> reportList  = reportMapper.selectList(new QueryWrapper<Report>().select("id,create_date,creator_id, state").eq("company_id", companyId).between("create_date", localStart, localEnd));
         List<User> allRangeUserList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId).eq("report_status",0));
-
         List<Map<String, Object>> noReportDataList = new ArrayList<Map<String, Object>>();
         long cnt = localStart.until(localEnd, ChronoUnit.DAYS);
+        //判断用户注册的平台类型
+//        int platform = 0;
+//        if (allRangeUserList.size() > 0) {
+//            User user = allRangeUserList.get(0);
+//            if (user.getCorpwxUserid() != null) {
+//                platform = 1;
+//            } else if (user.getWxOpenid() != null) {
+//                platform = 2;
+//            } else if (user.getDingdingUserid() != null) {
+//                platform = 3;
+//            } else if (user.getFeishuUserid() != null) {
+//                platform = 4;
+//            }
+//        }
         //已驳回的数据
         //按人员过滤
         for (User curUser: allRangeUserList){
@@ -6105,14 +6128,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 if (!reportList.stream().anyMatch(item->item.getCreatorId().equals(curUser.getId())&&item.getCreateDate().isEqual(date)&&(item.getState() == 0 || item.getState() == 1))) {
                     HashMap map = new HashMap();
                     map.put("corpwxUserid", curUser.getCorpwxUserid());
+                    map.put("dingdingUserid", curUser.getDingdingUserid());
+                    map.put("wxOpenid", curUser.getWxOpenid());
+                    map.put("feishuUserid", curUser.getFeishuUserid());
+                    map.put("id", curUser.getId());
                     map.put("name", curUser.getName());
                     map.put("days", 1);
                     map.put("daysTxt", date.format(DateTimeFormatter.ofPattern("MM/dd")));
-                    if (!noReportDataList.stream().anyMatch(noItem->noItem.get("corpwxUserid").equals(curUser.getCorpwxUserid()))) {
+                    if (!noReportDataList.stream().anyMatch(noItem->noItem.get("id").equals(curUser.getId()))) {
                         noReportDataList.add(map);
                     } else {
                         //已经添加过了，需要更新天数
-                        Optional<Map<String, Object>> optional = noReportDataList.stream().filter(data -> data.get("corpwxUserid").equals(curUser.getCorpwxUserid())).findFirst();
+                        Optional<Map<String, Object>> optional = noReportDataList.stream().filter(data -> data.get("id").equals(curUser.getId())).findFirst();
                         if (optional.isPresent()) {
                             Map<String, Object> findUser = optional.get();
                             Object days = findUser.get("days");

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

@@ -1630,27 +1630,36 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                         }
                         //针对赛元微电子，请半天假的情况下。重新校正打卡和工作时长
                         if (corpInfo.getCorpid().equals("wpy9TkCAAAgNp4jvqxKTpXrhvwFvyFHg")) {
-                            if ((morningLeave && afternoonLeave) || isWholeDayLeave) {
-                                ct.setAskLeaveTime(baseMorningWorkTime + baseAfternoonWorkTime);
+                            if (dtf.format(ct.getCreateDate()).equals("2024-02-09") ) {
+                                //硬编码，这天由于特殊情况，考勤有数据但是他们没有上班，需要修正为0
                                 ct.setWorkHours(0.0);
                                 ct.setCardTime(0.0);
-                                ct.setStartTime(baseMorningStart);
-                                ct.setEndTime(baseAfternoonEnd);
-                                if (showLog) System.out.println("再次校正，全天请假");
-                            } else if (morningLeave){
-                                ct.setAskLeaveTime(baseMorningWorkTime);
-                                ct.setWorkHours(baseAfternoonWorkTime);
-                                ct.setCardTime(baseAfternoonWorkTime);
-                                ct.setStartTime(baseAfternoonStart);
-                                ct.setEndTime(baseAfternoonEnd);
-                                if (showLog) System.out.println("再次校正，上午请假");
-                            } else if (afternoonLeave) {
-                                ct.setAskLeaveTime(baseAfternoonWorkTime);
-                                ct.setWorkHours(baseMorningWorkTime);
-                                ct.setCardTime(baseMorningWorkTime);
-                                ct.setStartTime(baseMorningStart);
-                                ct.setEndTime(baseMorningEnd);
-                                if (showLog) System.out.println("再次校正，下午请假");
+                                ct.setStartTime("00:00");
+                                ct.setEndTime("00:00");
+                                ct.setAskLeaveTime(0.0);
+                            } else {
+                                if ((morningLeave && afternoonLeave) || isWholeDayLeave) {
+                                    ct.setAskLeaveTime(baseMorningWorkTime + baseAfternoonWorkTime);
+                                    ct.setWorkHours(0.0);
+                                    ct.setCardTime(0.0);
+                                    ct.setStartTime(baseMorningStart);
+                                    ct.setEndTime(baseAfternoonEnd);
+                                    if (showLog) System.out.println("再次校正，全天请假");
+                                } else if (morningLeave){
+                                    ct.setAskLeaveTime(baseMorningWorkTime);
+                                    ct.setWorkHours(baseAfternoonWorkTime);
+                                    ct.setCardTime(baseAfternoonWorkTime);
+                                    ct.setStartTime(baseAfternoonStart);
+                                    ct.setEndTime(baseAfternoonEnd);
+                                    if (showLog) System.out.println("再次校正，上午请假");
+                                } else if (afternoonLeave) {
+                                    ct.setAskLeaveTime(baseAfternoonWorkTime);
+                                    ct.setWorkHours(baseMorningWorkTime);
+                                    ct.setCardTime(baseMorningWorkTime);
+                                    ct.setStartTime(baseMorningStart);
+                                    ct.setEndTime(baseMorningEnd);
+                                    if (showLog) System.out.println("再次校正，下午请假");
+                                }
                             }
                         }
                     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -1400,47 +1400,16 @@ public class TimingTask {
                         LocalDate endDate = localDate.minusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
                         userList = reportService.getNotFullReportUserList(company.getId(), startDate, endDate);
                     }
+                } else if (t.getAlertType() == 4) {
+                    //4--每周提醒上周漏填
+                    LocalDate lastSunday = localDate.with(DayOfWeek.SUNDAY).minusWeeks(1);
+                    LocalDate lastMonday = lastSunday.minusDays(6);
+                    userList = reportService.getNotFullReportUserList(company.getId(), lastMonday, lastSunday);
+                    System.out.println("用户数量="+userList.size());
+                    lastWeekNotFill = true;
                 }
                 List<WxCorpInfo> cpList = wxCorpInfoMapper.selectList(new QueryWrapper<WxCorpInfo>().eq("company_id", t.getCompanyId()));
                 final boolean finalLastWeekNotFill = lastWeekNotFill;
-//                userList.forEach(u->{
-//                    if (u.get("corpwxUserid") != null){
-//                        //推送到企业微信
-//                        String corpUid = (String) u.get("corpwxUserid");
-//                        JSONObject json=new JSONObject();
-//                        JSONArray dataJson = new JSONArray();
-//                        JSONObject jsonObj = new JSONObject();
-//                        jsonObj.put("key", "提示");
-//                        if (t.getAlertType() == 3) {
-//                            //每月提醒上个月的
-//                            if ((Integer)u.get("days") > 3) {
-//                                jsonObj.put("value", "您上个月有"+u.get("daysTxt")+"...共"+(Integer)u.get("days")+"天未填写工时报告，请尽快填写");
-//                            } else {
-//                                jsonObj.put("value", "您上个月有"+u.get("daysTxt")+"共"+(Integer)u.get("days")+"天未填写工时报告，请尽快填写");
-//                            }
-//                        } else {
-//                            if (finalLastWeekNotFill) {
-//                                jsonObj.put("value", "您上周有"+(Integer)u.get("days")+"天未填写工时报告，请尽快填写");
-//                            } else {
-//                                jsonObj.put("value", StringUtils.isEmpty(t.getAlertMsg())?"":t.getAlertMsg());
-//                            }
-//                        }
-//                        dataJson.add(jsonObj);
-//                        if(isPrivateDeploy){
-//                            json.put("content",StringUtils.isEmpty(t.getAlertMsg())?"":t.getAlertMsg()+"\\n<a href=\\\"https://open.weixin.qq.com/connect/oauth2/authorize?appid="+suitId+"&redirect_uri="+pcUrl+"/api/corpInsideWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect\\\">去填写</a>");
-//                        }else {
-//                            json.put("template_id","tty9TkCAAAYoevY-40ciWD5lDncDfR5w");
-//                            json.put("url", "https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://worktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
-//                            json.put("content_item",dataJson);
-//                        }
-//                        if (cpList.size() > 0) {
-////                            System.out.println("发送企业微信漏填提醒：" + LocalDateTime.now().toString() + ", corpUid=" + corpUid + ", json=" + json.toJSONString());
-//                            wxCorpInfoService.sendWXCorpTemplateMsg(cpList.get(0), corpUid, json);
-//                        }
-//                    } else if (u.get("wxOpenid") != null) {
-//                        push(u, t.getAlertMsg());
-//                    }
-//                });
                 //今天或者明天统一提醒，提醒内容大家都一样
                 if (t.getAlertType() == 0 || t.getAlertType() == 1) {
                     //判断是企业微信用户还是微信用户
@@ -1514,6 +1483,13 @@ public class TimingTask {
                             push(u, t.getAlertMsg());
                         }
                     });
+                    //针对钉钉发送提醒
+                    if (userList.size() > 0 && userList.get(0).get("dingdingUserid") != null) {
+                        CompanyDingding compDingding = companyDingdingMapper.selectOne(new QueryWrapper<CompanyDingding>().eq("company_id", t.getCompanyId()));
+                        String idStr = userList.stream().map(u -> (String) u.get("dingdingUserid")).collect(Collectors.joining(","));
+                        //TODO: 批量发送，最大支持1000个用户Id. 多的话需要分批发送； 目前尚无这么大的数据量
+                        companyDingdingService.sendFillReportAlertMsg(t.getCompanyId(), compDingding.getAgentId(), t.getAlertMsg(), idStr);
+                    }
                 }
 
             }
@@ -1521,6 +1497,7 @@ public class TimingTask {
         if (isDev) {
             return;
         }
+        //针对钉钉提醒类型是0或者1的情况，发送提醒。（当天提醒或者今天提醒昨天漏填)
         List<Map<String, Object>> dingdingUserList = userMapper.getPushDingdingUserList(str, date);
         //钉钉平台的用批量发送, 每分钟5000个
         int minuteSize = 5000;
@@ -2047,4 +2024,10 @@ public class TimingTask {
         }
     }
 
+
+
+    @Scheduled(cron = "1 1 1 1 1 ?")
+    public void cleanUselessData(){
+        //TODO: 日报删除表report_delete，需要定期清理
+    }
 }

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

@@ -75,7 +75,7 @@
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN project_separate AS ps on b.id=ps.id
         LEFT JOIN user AS c ON a.creator_id=c.id
-        LEFT JOIN user_with_beisen AS uwb ON c.job_number=c.job_number
+        LEFT JOIN user_with_beisen AS uwb ON uwb.job_number=c.job_number
         left join sub_project as d on d.id = a.sub_project_id
         left join task on task.id = a.task_id
         left join report_extra_degree on report_extra_degree.id = a.degree_id
@@ -132,7 +132,7 @@
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN project_separate AS ps on b.id=ps.id
         LEFT JOIN user AS c ON a.creator_id=c.id
-        LEFT JOIN user_with_beisen AS uwb ON c.job_number=c.job_number
+        LEFT JOIN user_with_beisen AS uwb ON uwb.job_number=c.job_number
         left join sub_project as d on d.id = a.sub_project_id
         left join task on task.id = a.task_id
         left join report_extra_degree on report_extra_degree.id = a.degree_id

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -935,6 +935,7 @@
   "missingfill": "Daily reminder missed filling on the day",
   "missingfills": "Daily reminder missed yesterday",
   "lastDayOfWeek": "Remind on the last day of current week",
+  "alertLastWeek": "Remind last week's missing report",
   "monthAlert": "Remind last month's missed report on fixed day",
   "morningtime": "morning time",
   "owntimeframe": "Choose your own time frame",

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -945,6 +945,7 @@
   "missingfill": "每日提醒当天漏填",
   "missingfills": "每日提醒昨天漏填",
   "lastDayOfWeek": "每周最后一个工作日",
+  "alertLastWeek": "每周提醒上周漏填",
   "monthAlert": "每月固定日期提醒上个月",
   "remindertext": "提醒文本",
   "personneltoset": "不提醒人员设置",

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -217,6 +217,7 @@
                             <el-option :label="$t('missingfills')" :value="1"></el-option>
                             <el-option :label="$t('lastDayOfWeek')" :value="2"></el-option>
                             <el-option :label="$t('monthAlert')" :value="3"></el-option>
+                            <el-option :label="$t('alertLastWeek')" :value="4"></el-option>
                         </el-select>
                         <span v-if="timeType.alertType == 3" style="color:#606266;">(每月
                         <el-select v-model="timeType.alertDay" style="width:80px;">

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -3764,7 +3764,7 @@ export default {
 
 <style scoped>
 .deteee{
-  font-size: 25px;
+  font-size: 18px;
   margin-bottom: 20px;
 }
 .deteeeAce {

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

@@ -108,7 +108,6 @@
                         console.log('urlRight=' + urlRight);
                         urlRight = urlRight.substring(0, urlRight.indexOf('#/'));
                         // window.location = urlLeft + "#/home" + urlRight;//拼接跳转
-                        alert(url);
                         //获取code
                         var code = urlRight.substring('?code='.length,urlRight.indexOf('&state='));
                         var passUserId = urlRight.substring(urlRight.indexOf('&state=')+'&state='.length);
@@ -303,7 +302,6 @@
                                 }else{
                                     corpId = url.substring(url.indexOf(key)+key.length,url.indexOf('#'));
                                 }
-                                alert('钉钉登录==='+corpId);
                                 this.isDingding = true
                                 dd.ready(function() {
                                     dd.runtime.permission.requestAuthCode({