增加功能：员工统计时间段搜索、上报按修改人

value

2024-04-13 e569dcc6da8b7be3ce3983664eb4b0b535425531

增加功能：员工统计时间段搜索、上报按修改人

 data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java

@@ -16,6 +16,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

@Data
@AllArgsConstructor
@@ -153,4 +154,10 @@
    @ApiModelProperty("创建用户")
    private Integer createUser;

    @TableField(exist = false)
    private String startTime;

    @TableField(exist = false)
    private String endTime;

}

 data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java

@@ -27,7 +27,7 @@

    IPage<ProductCountDto> selectProductCountDtoPageList(IPage<ProductCountDto> page, QueryWrapper<ProductCountDto> ew);

    IPage<RegistrantCountDto> selectRegistrantCountDtoPageList(IPage<RegistrantCountDto> page, QueryWrapper<RegistrantCountDto> ew);
    IPage<RegistrantCountDto> selectRegistrantCountDtoPageList(IPage<RegistrantCountDto> page, QueryWrapper<RegistrantCountDto> ew, String startTime, String endTime);

    Map<String, BigDecimal> getDataFor1();


 data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java

@@ -92,7 +92,7 @@
    public Map<String, Object> selectDataReportingList(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) {
        Map<String, Object> map = new HashMap<>();
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList");
        if (map1.get("look") == 1) dataReportingPageDto.setCreateUser(map1.get("userId"));
        if (map1.get("look") == 1) dataReportingPageDto.setUpdateUser(map1.get("userId"));
        Integer power = authMapper.isPower(map1.get("userId"), "dataReportingPower");
        if(power == 1){
           dataReportingPageDto.setDepartment(dataReportingMapper.getUserDepartmentById(map1.get("userId")));
@@ -164,7 +164,7 @@
            String name = dataReportingMapper.getUserNameById(map1.get("userId"));
            registrantCountDto.setName2(name);
        };
        map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto)));
        map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto), registrantCountDto.getStartTime(), registrantCountDto.getEndTime()));
        return map;
    }


 data-server/src/main/resources/mapper/DataReportingMapper.xml

@@ -78,6 +78,7 @@
        date_format(create_time, '%Y-%m-%d')    create_time,
        create_user
        from data_reporting
        where create_time &gt;= #{startTime} and create_time &lt;= #{endTime}
        group by name2,product, date_format(create_time, '%Y-%m-%d')
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">

 framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java

@@ -3,9 +3,11 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.CustomLog;
import org.springframework.stereotype.Component;
@@ -44,10 +46,14 @@
                e.printStackTrace();
                throw new RuntimeException("查询条件生成错误");
            }
            boolean bool = field.isAnnotationPresent(TableField.class);
//            System.out.println(field.getName() + "|" + (value == null || value.equals("")) + "|" + value);
            if(value == null || value.equals("")){
                continue;
            }
            if (bool){
                if(!field.getAnnotation(TableField.class).exist())continue;
            }
            if (!field.getName().equals("orderBy")) {
                if(value.getClass()== LocalDateTime.class){
                    wrapper.like(StrUtil.toUnderlineCase(field.getName()), ((LocalDateTime) value).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));