12-22-修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/SysCompanyWorkController.java

@@ -0,0 +1,106 @@
+package org.dromara.bigscreen.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bigscreen.domain.bo.SysCompanyWorkBo;
+import org.dromara.bigscreen.domain.vo.SysCompanyWorkVo;
+import org.dromara.bigscreen.service.ISysCompanyWorkService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 公司流程对应
+ *
+ * @author Lion Li
+ * @date 2025-12-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/company/work")
+public class SysCompanyWorkController extends BaseController {
+
+    private final ISysCompanyWorkService sysCompanyWorkService;
+
+    /**
+     * 查询公司流程对应列表
+     */
+    @SaCheckPermission("company:work:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysCompanyWorkVo> list(SysCompanyWorkBo bo, PageQuery pageQuery) {
+        return sysCompanyWorkService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出公司流程对应列表
+     */
+    @SaCheckPermission("company:work:export")
+    @Log(title = "公司流程对应", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysCompanyWorkBo bo, HttpServletResponse response) {
+        List<SysCompanyWorkVo> list = sysCompanyWorkService.queryList(bo);
+        ExcelUtil.exportExcel(list, "公司流程对应", SysCompanyWorkVo.class, response);
+    }
+
+    /**
+     * 获取公司流程对应详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("company:work:query")
+    @GetMapping("/{id}")
+    public R<SysCompanyWorkVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysCompanyWorkService.queryById(id));
+    }
+
+    /**
+     * 新增公司流程对应
+     */
+    @SaCheckPermission("company:work:add")
+    @Log(title = "公司流程对应", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysCompanyWorkBo bo) {
+        return toAjax(sysCompanyWorkService.insertByBo(bo));
+    }
+
+    /**
+     * 修改公司流程对应
+     */
+    @SaCheckPermission("company:work:edit")
+    @Log(title = "公司流程对应", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysCompanyWorkBo bo) {
+        return toAjax(sysCompanyWorkService.updateByBo(bo));
+    }
+
+    /**
+     * 删除公司流程对应
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("company:work:remove")
+    @Log(title = "公司流程对应", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysCompanyWorkService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/SysCompanyWork.java

@@ -0,0 +1,52 @@
+package org.dromara.bigscreen.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 公司流程对应对象 sys_company_work
+ *
+ * @author Lion Li
+ * @date 2025-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_company_work")
+public class SysCompanyWork extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 流程名称
+     */
+    private String lcmc;
+
+    /**
+     * 流程描述
+     */
+    private String lcms;
+
+    /**
+     * 流程详情
+     */
+    private String lcxq;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/bo/SysCompanyWorkBo.java

@@ -0,0 +1,46 @@
+package org.dromara.bigscreen.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.bigscreen.domain.SysCompanyWork;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 公司流程对应业务对象 sys_company_work
+ *
+ * @author Lion Li
+ * @date 2025-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysCompanyWork.class, reverseConvertGenerate = false)
+public class SysCompanyWorkBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 流程名称
+     */
+    private String lcmc;
+
+    /**
+     * 流程描述
+     */
+    private String lcms;
+
+    /**
+     * 流程详情
+     */
+    private String lcxq;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/SysCompanyWorkVo.java

@@ -0,0 +1,58 @@
+package org.dromara.bigscreen.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bigscreen.domain.SysCompanyWork;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 公司流程对应视图对象 sys_company_work
+ *
+ * @author Lion Li
+ * @date 2025-12-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysCompanyWork.class)
+public class SysCompanyWorkVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 项目id
+     */
+    @ExcelProperty(value = "项目id")
+    private Long projectId;
+
+    /**
+     * 流程名称
+     */
+    @ExcelProperty(value = "流程名称")
+    private String lcmc;
+
+    /**
+     * 流程描述
+     */
+    @ExcelProperty(value = "流程描述")
+    private String lcms;
+
+    /**
+     * 流程详情
+     */
+    @ExcelProperty(value = "流程详情")
+    private String lcxq;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/mapper/SysCompanyWorkMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.bigscreen.mapper;
+
+import org.dromara.bigscreen.domain.SysCompanyWork;
+import org.dromara.bigscreen.domain.vo.SysCompanyWorkVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 公司流程对应Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-12-23
+ */
+public interface SysCompanyWorkMapper extends BaseMapperPlus<SysCompanyWork, SysCompanyWorkVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ISysCompanyWorkService.java

@@ -0,0 +1,70 @@
+package org.dromara.bigscreen.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.bigscreen.domain.SysCompanyWork;
+import org.dromara.bigscreen.domain.bo.SysCompanyWorkBo;
+import org.dromara.bigscreen.domain.vo.SysCompanyWorkVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 公司流程对应Service接口
+ *
+ * @author Lion Li
+ * @date 2025-12-23
+ */
+public interface ISysCompanyWorkService extends IService<SysCompanyWork>{
+
+    /**
+     * 查询公司流程对应
+     *
+     * @param id 主键
+     * @return 公司流程对应
+     */
+    SysCompanyWorkVo queryById(Long id);
+
+    /**
+     * 分页查询公司流程对应列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 公司流程对应分页列表
+     */
+    TableDataInfo<SysCompanyWorkVo> queryPageList(SysCompanyWorkBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的公司流程对应列表
+     *
+     * @param bo 查询条件
+     * @return 公司流程对应列表
+     */
+    List<SysCompanyWorkVo> queryList(SysCompanyWorkBo bo);
+
+    /**
+     * 新增公司流程对应
+     *
+     * @param bo 公司流程对应
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SysCompanyWorkBo bo);
+
+    /**
+     * 修改公司流程对应
+     *
+     * @param bo 公司流程对应
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SysCompanyWorkBo bo);
+
+    /**
+     * 校验并批量删除公司流程对应信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/SysCompanyWorkServiceImpl.java

@@ -0,0 +1,134 @@
+package org.dromara.bigscreen.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bigscreen.domain.SysCompanyWork;
+import org.dromara.bigscreen.domain.bo.SysCompanyWorkBo;
+import org.dromara.bigscreen.domain.vo.SysCompanyWorkVo;
+import org.dromara.bigscreen.mapper.SysCompanyWorkMapper;
+import org.dromara.bigscreen.service.ISysCompanyWorkService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 公司流程对应Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-12-23
+ */
+@RequiredArgsConstructor
+@Service
+public class SysCompanyWorkServiceImpl extends ServiceImpl<SysCompanyWorkMapper, SysCompanyWork> implements ISysCompanyWorkService {
+
+    private final SysCompanyWorkMapper baseMapper;
+
+    /**
+     * 查询公司流程对应
+     *
+     * @param id 主键
+     * @return 公司流程对应
+     */
+    @Override
+    public SysCompanyWorkVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询公司流程对应列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 公司流程对应分页列表
+     */
+    @Override
+    public TableDataInfo<SysCompanyWorkVo> queryPageList(SysCompanyWorkBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysCompanyWork> lqw = buildQueryWrapper(bo);
+        Page<SysCompanyWorkVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的公司流程对应列表
+     *
+     * @param bo 查询条件
+     * @return 公司流程对应列表
+     */
+    @Override
+    public List<SysCompanyWorkVo> queryList(SysCompanyWorkBo bo) {
+        LambdaQueryWrapper<SysCompanyWork> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysCompanyWork> buildQueryWrapper(SysCompanyWorkBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysCompanyWork> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(SysCompanyWork::getId);
+        lqw.eq(bo.getProjectId() != null, SysCompanyWork::getProjectId, bo.getProjectId());
+        lqw.eq(StringUtils.isNotBlank(bo.getLcmc()), SysCompanyWork::getLcmc, bo.getLcmc());
+        lqw.eq(StringUtils.isNotBlank(bo.getLcms()), SysCompanyWork::getLcms, bo.getLcms());
+        lqw.eq(StringUtils.isNotBlank(bo.getLcxq()), SysCompanyWork::getLcxq, bo.getLcxq());
+        return lqw;
+    }
+
+    /**
+     * 新增公司流程对应
+     *
+     * @param bo 公司流程对应
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SysCompanyWorkBo bo) {
+        SysCompanyWork add = MapstructUtils.convert(bo, SysCompanyWork.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改公司流程对应
+     *
+     * @param bo 公司流程对应
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SysCompanyWorkBo bo) {
+        SysCompanyWork update = MapstructUtils.convert(bo, SysCompanyWork.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysCompanyWork entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除公司流程对应信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java

@@ -2869,19 +2869,19 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
         LambdaQueryWrapper<BusAttendance>  lqw1 = new LambdaQueryWrapper<BusAttendance>()
             .eq(BusAttendance::getProjectId, projectId);
 //            .eq(BusAttendance::getUserId, userId);
-        if (timeType == 1L) {
+//        if (timeType == 1L) {
             lqw1.eq(BusAttendance::getClockDate, LocalDate.now());
-        } else if (timeType == 2L) {
+//        } else if (timeType == 2L) {
-            // 获取本周一到今天的日期
+//            // 获取本周一到今天的日期
-            LocalDate today = LocalDate.now();
+//            LocalDate today = LocalDate.now();
-            LocalDate monday = today.with(DayOfWeek.MONDAY);
+//            LocalDate monday = today.with(DayOfWeek.MONDAY);
-            lqw1.between(BusAttendance::getClockDate, monday, today);
+//            lqw1.between(BusAttendance::getClockDate, monday, today);
-        }else if (timeType == 3L){
+//        }else if (timeType == 3L){
-            // 获取本月1号到今天的日期
+//            // 获取本月1号到今天的日期
-            LocalDate today = LocalDate.now();
+//            LocalDate today = LocalDate.now();
-            LocalDate firstDayOfMonth = today.with(TemporalAdjusters.firstDayOfMonth());
+//            LocalDate firstDayOfMonth = today.with(TemporalAdjusters.firstDayOfMonth());
-            lqw1.between(BusAttendance::getClockDate, firstDayOfMonth, today);
+//            lqw1.between(BusAttendance::getClockDate, firstDayOfMonth, today);
-        }
+//        }
         lqw1.in(BusAttendance::getClockStatus, ATTENDANCE_STATUS)
             .apply(" user_id not in (select sys_user_id from sub_construction_user where project_id = {0} and user_role != '0' )", projectId);
         attendanceList = this.list(lqw1);
@@ -2925,8 +2925,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
             }else {
                 vo.setDgl(BigDecimal.ZERO);
             }
-            fbcqr = fbcqr + vo.getDgrs();
+            fbcqr += vo.getDgrs();
-            fbTotal = fbTotal + vo.getZrs();
+            fbTotal += vo.getZrs();
         }
         for (RyglWebSocketVo vo : bzList) {
             if (vo.getZrs()>0){
@@ -2937,8 +2937,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
             }else {
                 vo.setDgl(BigDecimal.ZERO);
             }
-            bzcqr = bzcqr + vo.getDgrs();
+            bzcqr += vo.getDgrs();
-            bzTotal = bzTotal + vo.getZrs();
+            bzTotal += vo.getZrs();
         }
 
         //总出勤人