功能调整

value

2024-04-23 6b6acb4f91f7dcd3ba03652e7546ff06b0b58a28

功能调整

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

@@ -141,7 +141,7 @@
     */
    @ApiModelProperty("登记日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ValueTableShow(1)
//    @ValueTableShow(1)
    private LocalDateTime createTime;
    /**
     *

 data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java

@@ -89,6 +89,7 @@

    @ValueTableShow(5)
    @ApiModelProperty("登记人")
    @TableField(exist = false)
    private String createUserName;
    /**
     *

 data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java

@@ -106,6 +106,7 @@

    @ValueTableShow(5)
    @ApiModelProperty("登记人")
    @TableField(exist = false)
    private String createUserName;
    /**
     *

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

@@ -94,8 +94,8 @@
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList");
        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")));
        if (power == 1) {
            dataReportingPageDto.setDepartment(dataReportingMapper.getUserDepartmentById(map1.get("userId")));
        }
        map.put("head", PrintChina.printChina(DataReportingPageDto.class));
        map.put("body", dataReportingMapper.selectDataReportingDtoPageList(page, QueryWrappers.queryWrappers(dataReportingPageDto)));
@@ -137,9 +137,9 @@
        for (FansSubmit fansSubmit : fansSubmits) {
            sum += fansSubmit.getFansAdd();
        }
        if (dataReporting.getFansAdd()!=null||dataReporting.getFansAdd()!=0){
        if (dataReporting.getFansAdd() != null || dataReporting.getFansAdd() != 0) {
            dataReporting2.setFansAdd(dataReporting.getFansAdd());
        }else{
        } else {
            dataReporting2.setFansAdd(sum);
        }
        return dataReportingMapper.updateById(dataReporting2);
@@ -163,7 +163,10 @@
        if (map1.get("look") == 1) {
            String name = dataReportingMapper.getUserNameById(map1.get("userId"));
            registrantCountDto.setName2(name);
        };
        }
        ;
        String department = dataReportingMapper.getUserDepartmentById(map1.get("userId"));
        registrantCountDto.setDepartment(department);
        map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto), registrantCountDto.getStartTime(), registrantCountDto.getEndTime()));
        return map;
    }
@@ -185,13 +188,14 @@
        int userId = Integer.parseInt(JSONUtil.parseObj(new Jwt().readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + "");
        Map<String, String> map = dataReportingMapper.selectUser(userId);
        String date2 = date;
        if(date == null) {
        if (date == null) {
            date2 = fansSubmitService.getYesterday();
            date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
        } else date = LocalDateTime.parse(date+"T00:00:00").plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
        } else
            date = LocalDateTime.parse(date + "T00:00:00").plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
        for (DataReporting dataReporting : list) {
            FinanceSubmit financeSubmit = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, dataReporting.getAgent()).eq(FinanceSubmit::getName, dataReporting.getName()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, date).orderByDesc(FinanceSubmit::getId).last("limit 1"));
            if(ObjectUtil.isNotEmpty(financeSubmit)){
            if (ObjectUtil.isNotEmpty(financeSubmit)) {
                dataReporting.setAgentRebate(financeSubmit.getEmployeeRebate());
            }
            if (dataReporting.getName() == null || dataReporting.getName().equals(""))
@@ -229,10 +233,10 @@
                    .eq(DataReporting::getAccountConsumption, dataReporting.getAccountConsumption())
                    .eq(DataReporting::getShowNum, dataReporting.getShowNum())
                    .eq(DataReporting::getClick, dataReporting.getClick()));
            if(BeanUtil.isNotEmpty(dataReporting1)){
            if (BeanUtil.isNotEmpty(dataReporting1)) {
                dataReporting.setId(dataReporting1.getId());
                dataReportingMapper.updateById(dataReporting);
            }else{
            } else {
                dataReportingMapper.insert(dataReporting);
            }
        }

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

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