22 changed files with 383 additions and 16 deletions
@ -0,0 +1,27 @@ |
|||
package com.yxt.anrui.base.api.basedistributorapply.flow; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonProperty; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Administrator |
|||
* @description |
|||
* @date 2023/9/28 9:28 |
|||
*/ |
|||
@Data |
|||
public class DistributorDelegateQuery { |
|||
@ApiModelProperty |
|||
private String userSid; |
|||
@ApiModelProperty("流程实例id") |
|||
// @JsonProperty("procInsId")
|
|||
private String instanceId; |
|||
@ApiModelProperty("任务Id") |
|||
private String taskId; |
|||
@ApiModelProperty("审批人sid") |
|||
private String assignee; |
|||
@ApiModelProperty("填写意见") |
|||
private String views; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
package com.yxt.anrui.reportcenter.biz.dailyreport; |
|||
|
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.baomidou.mybatisplus.core.toolkit.Constants; |
|||
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReport; |
|||
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2023/9/28 |
|||
**/ |
|||
@Mapper |
|||
public interface DailyReportMapper extends BaseMapper<DailyReport> { |
|||
IPage<DailyReportVo> listPage(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw); |
|||
|
|||
IPage<DailyReportVo> listPage3(IPage<DailyReport> page, @Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw); |
|||
} |
|||
@ -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.yxt.anrui.reportcenter.biz.dailyreport.DailyReportMapper"> |
|||
<select id="listPage" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo"> |
|||
select * |
|||
from daily_report |
|||
<where> |
|||
${ew.sqlSegment} |
|||
</where> |
|||
order by useOrgSid desc, brandSid desc, vehModelSid desc, vehMConfigSid desc |
|||
</select> |
|||
|
|||
<select id="listPage3" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo"> |
|||
select * |
|||
from daily_report |
|||
<where> |
|||
${ew.sqlSegment} |
|||
</where> |
|||
group by busOrgSid, brandSid, vehModelSid, vehMConfigSid |
|||
</select> |
|||
</mapper> |
|||
@ -0,0 +1,47 @@ |
|||
package com.yxt.anrui.reportcenter.biz.dailyreport; |
|||
|
|||
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeign; |
|||
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportQuery; |
|||
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; |
|||
import com.yxt.common.core.query.PagerQuery; |
|||
import com.yxt.common.core.result.ResultBean; |
|||
import com.yxt.common.core.vo.PagerVo; |
|||
import io.swagger.annotations.Api; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.RestController; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2023/9/28 |
|||
**/ |
|||
@Api(tags = "报表") |
|||
@RestController |
|||
@RequestMapping("v1/DailyReport") |
|||
public class DailyReportRest implements DailyReportFeign { |
|||
|
|||
@Autowired |
|||
private DailyReportService dailyReportService; |
|||
|
|||
@Override |
|||
public ResultBean<PagerVo<DailyReportVo>> listPage(PagerQuery<DailyReportQuery> pagerQuery) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
PagerVo<DailyReportVo> pv = dailyReportService.listPage(pagerQuery); |
|||
return rb.success().setData(pv); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean<PagerVo<DailyReportVo>> listPage2(PagerQuery<DailyReportQuery> pagerQuery) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
PagerVo<DailyReportVo> pv = dailyReportService.listPage2(pagerQuery); |
|||
return rb.success().setData(pv); |
|||
} |
|||
|
|||
@Override |
|||
public ResultBean<PagerVo<DailyReportVo>> listPage3(PagerQuery<DailyReportQuery> pagerQuery) { |
|||
ResultBean rb = ResultBean.fireFail(); |
|||
PagerVo<DailyReportVo> pv = dailyReportService.listPage3(pagerQuery); |
|||
return rb.success().setData(pv); |
|||
} |
|||
} |
|||
@ -0,0 +1,90 @@ |
|||
package com.yxt.anrui.reportcenter.biz.dailyreport; |
|||
|
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|||
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReport; |
|||
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportQuery; |
|||
import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; |
|||
import com.yxt.common.base.service.MybatisBaseService; |
|||
import com.yxt.common.base.utils.PagerUtil; |
|||
import com.yxt.common.core.query.PagerQuery; |
|||
import com.yxt.common.core.vo.PagerVo; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2023/9/28 |
|||
**/ |
|||
@Service |
|||
public class DailyReportService extends MybatisBaseService<DailyReportMapper, DailyReport> { |
|||
|
|||
@Autowired |
|||
private SysStaffOrgFeign sysStaffOrgFeign; |
|||
|
|||
public PagerVo<DailyReportVo> listPage(PagerQuery<DailyReportQuery> pagerQuery) { |
|||
DailyReportQuery query = pagerQuery.getParams(); |
|||
QueryWrapper<DailyReport> qw = new QueryWrapper<>(); |
|||
if (query != null) { |
|||
//生成日期开始时间
|
|||
String createTimeStart = query.getCreateTimeStart(); |
|||
//生成日期结束时间
|
|||
String createTimeEnd = query.getCreateTimeEnd(); |
|||
qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). |
|||
apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" |
|||
); |
|||
if (StringUtils.isNotBlank(query.getOrgPath())) { |
|||
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); |
|||
qw.eq("useOrgSid", useOrgSid); |
|||
} |
|||
} |
|||
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery); |
|||
IPage<DailyReportVo> pagging = baseMapper.listPage(page, qw); |
|||
PagerVo<DailyReportVo> p = PagerUtil.pageToVo(pagging, null); |
|||
return p; |
|||
} |
|||
|
|||
public PagerVo<DailyReportVo> listPage2(PagerQuery<DailyReportQuery> pagerQuery) { |
|||
DailyReportQuery query = pagerQuery.getParams(); |
|||
QueryWrapper<DailyReport> qw = new QueryWrapper<>(); |
|||
if (query != null) { |
|||
//生成日期开始时间
|
|||
String createTimeStart = query.getCreateTimeStart(); |
|||
//生成日期结束时间
|
|||
String createTimeEnd = query.getCreateTimeEnd(); |
|||
qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). |
|||
apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" |
|||
); |
|||
//查询事业部
|
|||
if (StringUtils.isNotBlank(query.getOrgPath())) { |
|||
String busOrgSid = sysStaffOrgFeign.getOrgSidByPath2(query.getOrgPath()).getData(); |
|||
qw.eq("busOrgSid", busOrgSid); |
|||
} |
|||
} |
|||
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery); |
|||
IPage<DailyReportVo> pagging = baseMapper.listPage(page, qw); |
|||
PagerVo<DailyReportVo> p = PagerUtil.pageToVo(pagging, null); |
|||
return p; |
|||
} |
|||
|
|||
public PagerVo<DailyReportVo> listPage3(PagerQuery<DailyReportQuery> pagerQuery) { |
|||
DailyReportQuery query = pagerQuery.getParams(); |
|||
QueryWrapper<DailyReport> qw = new QueryWrapper<>(); |
|||
if (query != null) { |
|||
//生成日期开始时间
|
|||
String createTimeStart = query.getCreateTimeStart(); |
|||
//生成日期结束时间
|
|||
String createTimeEnd = query.getCreateTimeEnd(); |
|||
qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). |
|||
apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" |
|||
); |
|||
} |
|||
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery); |
|||
IPage<DailyReportVo> pagging = baseMapper.listPage3(page, qw); |
|||
PagerVo<DailyReportVo> p = PagerUtil.pageToVo(pagging, null); |
|||
return p; |
|||
} |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
package com.yxt.anrui.terminal.api.autoservice.distributor.flowable; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonProperty; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Administrator |
|||
* @description |
|||
* @date 2023/9/28 10:16 |
|||
*/ |
|||
@Data |
|||
public class AppDistributorDelegateQuery { |
|||
@ApiModelProperty |
|||
private String userSid; |
|||
@ApiModelProperty("流程实例id") |
|||
@JsonProperty("procInsId") |
|||
private String instanceId; |
|||
@ApiModelProperty("任务Id") |
|||
private String taskId; |
|||
@ApiModelProperty("审批人sid") |
|||
private String assignee; |
|||
@ApiModelProperty("填写意见") |
|||
private String views; |
|||
} |
|||
Loading…
Reference in new issue