光纤配置三层架构+辅助工时的审核与批准逻辑修改

zss

2024-05-30 b8045b11ca8af95cb5aeba464bff589e0b9f53b8

光纤配置三层架构+辅助工时的审核与批准逻辑修改

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsBushingController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.mom.controller;

import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„套管表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:58:16
 */
@Api(tags = "检验下单-光纤配置-套管")
@AllArgsConstructor
@RestController
@RequestMapping("/insBushing")
public class InsBushingController {

}

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.mom.controller;

import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:01
 */
@Api(tags = "检验下单-光纤配置-光纤表")
@AllArgsConstructor
@RestController
@RequestMapping("/insFiber")
public class InsFiberController {

}

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsFibersController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.mom.controller;

import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤带表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:13
 */
@Api(tags = "检验下单-光纤配置-光纤带表")
@AllArgsConstructor
@RestController
@RequestMapping("/insFibers")
public class InsFibersController {

}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsBushingMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.yuanchu.mom.mapper;

import com.yuanchu.mom.pojo.InsBushing;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„套管表 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:58:16
 */
public interface InsBushingMapper extends BaseMapper<InsBushing> {

}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFiberMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.yuanchu.mom.mapper;

import com.yuanchu.mom.pojo.InsFiber;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤表 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:01
 */
public interface InsFiberMapper extends BaseMapper<InsFiber> {

}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFibersMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.yuanchu.mom.mapper;

import com.yuanchu.mom.pojo.InsFibers;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤带表 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:13
 */
public interface InsFibersMapper extends BaseMapper<InsFibers> {

}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsBushing.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;

import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„套管表
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:58:16
 */
@Getter
@Setter
@TableName("ins_bushing")
@ApiModel(value = "InsBushing对象", description = "光纤配置的套管表")
public class InsBushing extends OrderBy implements Serializable {

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("管色标")
    @ValueTableShow(2)
    private String color;

    @ApiModelProperty("标量")
    @ValueTableShow(3)
    private Integer standNum;

    @ApiModelProperty("测试量")
    @ValueTableShow(4)
    private Integer testNum;

    @ApiModelProperty("关联 æ ·å“id")
    private Integer insSampleId;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;
}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;

import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤表
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:01
 */
@Getter
@Setter
@TableName("ins_fiber")
@ApiModel(value = "InsFiber对象", description = "光纤配置的光纤表")
public class InsFiber extends OrderBy implements Serializable {

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("管套色标")
    @ValueTableShow(2)
    private String bushColor;

    @ApiModelProperty("光纤色标")
    @ValueTableShow(3)
    private String color;

    @ApiModelProperty("光纤规格")
    @ValueTableShow(4)
    private String model;

    @ApiModelProperty("参考标准")
    @ValueTableShow(5)
    private String standard;

    @ApiModelProperty("关联 æ£€æµ‹é¡¹ç›®id")
    private Integer insProductId;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("关联 å¥—管表id")
    private Integer insBushingId;

    @ApiModelProperty("关联 å…‰çº¤å¸¦è¡¨id")
    private Integer insFibersId;
}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFibers.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,68 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;

import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤带表
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:13
 */
@Getter
@Setter
@TableName("ins_fibers")
@ApiModel(value = "InsFibers对象", description = "光纤配置的光纤带表")
public class InsFibers extends OrderBy implements Serializable {

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("光纤带编号")
    @ValueTableShow(2)
    private String code;

    @ApiModelProperty("光纤带规格")
    @ValueTableShow(3)
    private String model;

    @ApiModelProperty("参考标准")
    @ValueTableShow(4)
    private String standard;

    @ApiModelProperty("光纤检测量")
    @ValueTableShow(5)
    private String num;

    @ApiModelProperty("关联 æ£€æµ‹é¡¹ç›®id")
    private Integer insProductId;

    @ApiModelProperty("关联  å¥—管表id")
    private Integer insBushingId;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;
}

 inspect-server/src/main/java/com/yuanchu/mom/service/InsBushingService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.yuanchu.mom.service;

import com.yuanchu.mom.pojo.InsBushing;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„套管表 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:58:16
 */
public interface InsBushingService extends IService<InsBushing> {

}

 inspect-server/src/main/java/com/yuanchu/mom/service/InsFiberService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.yuanchu.mom.service;

import com.yuanchu.mom.pojo.InsFiber;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤表 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:01
 */
public interface InsFiberService extends IService<InsFiber> {

}

 inspect-server/src/main/java/com/yuanchu/mom/service/InsFibersService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.yuanchu.mom.service;

import com.yuanchu.mom.pojo.InsFibers;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤带表 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:13
 */
public interface InsFibersService extends IService<InsFibers> {

}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.yuanchu.mom.service.impl;

import com.yuanchu.mom.pojo.InsBushing;
import com.yuanchu.mom.mapper.InsBushingMapper;
import com.yuanchu.mom.service.InsBushingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„套管表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:58:16
 */
@Service
public class InsBushingServiceImpl extends ServiceImpl<InsBushingMapper, InsBushing> implements InsBushingService {

}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFiberServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.yuanchu.mom.service.impl;

import com.yuanchu.mom.pojo.InsFiber;
import com.yuanchu.mom.mapper.InsFiberMapper;
import com.yuanchu.mom.service.InsFiberService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:01
 */
@Service
public class InsFiberServiceImpl extends ServiceImpl<InsFiberMapper, InsFiber> implements InsFiberService {

}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFibersServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.yuanchu.mom.service.impl;

import com.yuanchu.mom.pojo.InsFibers;
import com.yuanchu.mom.mapper.InsFibersMapper;
import com.yuanchu.mom.service.InsFibersService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * å…‰çº¤é…ç½®çš„光纤带表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-30 05:59:13
 */
@Service
public class InsFibersServiceImpl extends ServiceImpl<InsFibersMapper, InsFibers> implements InsFibersService {

}

 inspect-server/src/main/resources/mapper/InsBushingMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsBushingMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsBushing">
        <id column="id" property="id" />
        <result column="color" property="color" />
        <result column="stand_num" property="standNum" />
        <result column="test_num" property="testNum" />
        <result column="ins_sample_id" property="insSampleId" />
        <result column="create_user" property="createUser" />
        <result column="create_time" property="createTime" />
        <result column="update_user" property="updateUser" />
        <result column="update_time" property="updateTime" />
    </resultMap>

</mapper>

 inspect-server/src/main/resources/mapper/InsFiberMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsFiberMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsFiber">
        <id column="id" property="id" />
        <result column="bush_color" property="bushColor" />
        <result column="color" property="color" />
        <result column="model" property="model" />
        <result column="standard" property="standard" />
        <result column="ins_product_id" property="insProductId" />
        <result column="create_user" property="createUser" />
        <result column="create_time" property="createTime" />
        <result column="update_user" property="updateUser" />
        <result column="update_time" property="updateTime" />
        <result column="ins_bushing_id" property="insBushingId" />
        <result column="ins_fibers_id" property="insFibersId" />
    </resultMap>

</mapper>

 inspect-server/src/main/resources/mapper/InsFibersMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsFibersMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsFibers">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="model" property="model" />
        <result column="standard" property="standard" />
        <result column="num" property="num" />
        <result column="ins_product_id" property="insProductId" />
        <result column="ins_bushing_id" property="insBushingId" />
        <result column="create_user" property="createUser" />
        <result column="create_time" property="createTime" />
        <result column="update_user" property="updateUser" />
        <result column="update_time" property="updateTime" />
    </resultMap>

</mapper>

 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java

@@ -72,15 +72,15 @@
    @ValueClassify("工时管理")
    @ApiOperation(value = "批准")
    @PostMapping("/approve")
    public Result approve(Integer id, String state) {
        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(id,state));
    public Result approve(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
    }

    @ValueClassify("工时管理")
    @ApiOperation(value = "审核")
    @PostMapping("/check")
    public Result check(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay ) {
        return Result.success(auxiliaryWorkingHoursDayService.updateAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
    }

    @ValueClassify("工时管理")

 performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java

@@ -25,7 +25,7 @@

    AuxiliaryWorkingHoursDay selectAuxiliaryWorkingHoursByNumber(String number);

    int checkOrApprove(Integer id, String state);
    int checkOrApprove(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);

    int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);


 performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java

@@ -186,14 +186,8 @@

        //查询辅助工时
        auxiliaryWorkingHoursDayDtos = auxiliaryWorkingHoursDayMapper.selectDataByUser(ids);
//        if (auxiliaryWorkingHoursDayDtos == null || auxiliaryWorkingHoursDayDtos.size() == 0) {
//            throw new RuntimeException("暂无数据");
//        }
        //查询统计工时
        auxiliaryOutputWorkingHoursDtos = auxiliaryOutputWorkingHoursMapper.selectDataByUser(ids);
//        if (auxiliaryOutputWorkingHoursDtos == null || auxiliaryOutputWorkingHoursDtos.size() == 0) {
//            throw new RuntimeException("暂无数据");
//        }
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("UTF-8");
        // è¿™é‡ŒURLEncoder.encode可以防止中文乱码 å½“然和easyexcel没有关系

 performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java

@@ -61,30 +61,30 @@
        String week = auxiliaryWorkingHoursDayDto.getWeek();
        auxiliaryWorkingHoursDayDto.setDateTime(null);
        auxiliaryWorkingHoursDayDto.setWeek(null);
            Map<String, Object> map = new HashMap<>();
            List<Integer> ids = null;
            map.put("head", PrintChina.printChina(AuxiliaryWorkingHoursDayDto.class));
            //判断组长,组员,管理员权限
            Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryWorkingHoursDay");
            User user = userMapper.selectById(map1.get("userId"));
            Integer roleId = user.getRoleId();
            Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "leader"));
            if (ObjectUtils.isEmpty(power)) {
                //不是组长
                if (map1.get("look") == 1) {
                    //是组员
                    auxiliaryWorkingHoursDayDto.setNameUser(map1.get("userId"));
                } else {
                    //管理员(不添加限制条件所有人都可以看)
                }
        Map<String, Object> map = new HashMap<>();
        List<Integer> ids = null;
        map.put("head", PrintChina.printChina(AuxiliaryWorkingHoursDayDto.class));
        //判断组长,组员,管理员权限
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryWorkingHoursDay");
        User user = userMapper.selectById(map1.get("userId"));
        Integer roleId = user.getRoleId();
        Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "leader"));
        if (ObjectUtils.isEmpty(power)) {
            //不是组长
            if (map1.get("look") == 1) {
                //是组员
                auxiliaryWorkingHoursDayDto.setNameUser(map1.get("userId"));
            } else {
                //是组长
                //查询组员
                List<User> users = userMapper.selectList(Wrappers.<User>lambdaQuery().like(User::getDepartLimsId, user.getDepartLimsId()));
                if (ObjectUtils.isNotEmpty(users)) {
                    ids = users.stream().map(User::getId).distinct().collect(Collectors.toList());
                }
                //管理员(不添加限制条件所有人都可以看)
            }
        } else {
            //是组长
            //查询组员
            List<User> users = userMapper.selectList(Wrappers.<User>lambdaQuery().like(User::getDepartLimsId, user.getDepartLimsId()));
            if (ObjectUtils.isNotEmpty(users)) {
                ids = users.stream().map(User::getId).distinct().collect(Collectors.toList());
            }
        }
        if (ObjectUtils.isNotEmpty(dates)) {
            String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
            if (ObjectUtils.isNotEmpty(week)) {
@@ -92,12 +92,11 @@
                map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page,
                        QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto)
                                .ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59")
                                .ge("week", weeks[0]).le("week", weeks[1] ), ids));
                                .ge("week", weeks[0]).le("week", weeks[1]), ids));
            } else {
                map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto).ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59"), ids));
            }
        }
        else {
        } else {
            map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto), ids));
        }
        return map;
@@ -127,18 +126,17 @@

    //审核/批准
    @Override
    public int checkOrApprove(Integer id, String state) {
        AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay = auxiliaryWorkingHoursDayMapper.selectById(id);
        auxiliaryWorkingHoursDay.setState(state);
    public int checkOrApprove(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
        if (auxiliaryWorkingHoursDay.getState().equals("已审核")) {
            Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
            auxiliaryWorkingHoursDay.setReviewer(userMapper.selectById(userId).getName());
        }
        return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
    }

    //编辑
    @Override
    public int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
        if (!auxiliaryWorkingHoursDay.getState().equals("已提交")) {
            throw new RuntimeException("该数据已经批准或已审核,无法进行编辑!");
        }
        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        auxiliaryWorkingHoursDay.setNameUser(userId);//姓名id
        return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
@@ -156,7 +154,7 @@
        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        PerformanceShift performanceShift = performanceShiftMapper.selectOne(Wrappers.<PerformanceShift>lambdaQuery().eq(PerformanceShift::getUserId, userId).eq(PerformanceShift::getWorkTime, dateTime));
        if (ObjectUtils.isEmpty(performanceShift)) {
           return null;
            return null;
        }
        return performanceShift.getShift();
    }

 system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java

@@ -20,7 +20,7 @@
    public static String database_username = "root";
    public static String database_password= "123456";
    public static String author = "江苏鵷雏网络科技有限公司";
    public static String model_name = "/performance-server"; // å¦‚果为分布式填子模块名称，如果不是分布式为空即可
    public static String model_name = "/inspect-server"; // å¦‚果为分布式填子模块名称，如果不是分布式为空即可
    public static String setParent = "com.yuanchu.mom"; // åŒ…路径
    public static void main(String[] args) {
        String projectPath = System.getProperty("user.dir");