diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java index 22bcf80aab..ecdc69588a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeign.java @@ -31,6 +31,7 @@ import com.yxt.anrui.base.api.basedistributor.app.apply.AppDeptVo; import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorApplyVo; import com.yxt.anrui.base.api.basedistributor.app.apply.AppDistributorDto; import com.yxt.anrui.base.api.basedistributorapply.flow.*; +import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -129,6 +130,11 @@ public interface BaseDistributorApplyFeign { @GetMapping(value = "/getPreviousNodesForReject") ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody DistributorDelegateQuery distributorDelegateQuery); + + //---------------------------移动端-------------------------------------- @ApiOperation("查询本分公司下销售部门/销售专员/对应部门主管") @@ -164,7 +170,7 @@ public interface BaseDistributorApplyFeign { ResultBean deleteDistributor2(@PathVariable("sid") String sid); - //---------------------------------------移动端流程---------------------------------------------// + //---------------------------------------移动端流程---------------------------------------------// @ApiOperation("经销商备案提交") @PostMapping("/submitDistributor") public ResultBean submitDistributor(@RequestBody @Valid AppSubmitApplyDto dto); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java index 4af116fc62..974ad700c2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/BaseDistributorApplyFeignFallback.java @@ -124,6 +124,11 @@ public class BaseDistributorApplyFeignFallback implements BaseDistributorApplyFe return null; } + @Override + public ResultBean delegate(DistributorDelegateQuery distributorDelegateQuery) { + return null; + } + @Override public ResultBean> getSalesDept(String userSid, String orgPath) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/DistributorDelegateQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/DistributorDelegateQuery.java new file mode 100644 index 0000000000..358373ad51 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorapply/flow/DistributorDelegateQuery.java @@ -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; + + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java index 7bb605e8c4..80435abfcd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyRest.java @@ -149,6 +149,11 @@ public class BaseDistributorApplyRest implements BaseDistributorApplyFeign { return baseDistributorApplyService.getPreviousNodesForReject(query); } + @Override + public ResultBean delegate(DistributorDelegateQuery distributorDelegateQuery) { + return baseDistributorApplyService.delegate(distributorDelegateQuery); + } + @Override public ResultBean> getSalesDept(String userSid, String orgPath) { return baseDistributorApplyService.getSalesDept(userSid,orgPath); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java index d33ce9a4e8..b5ce39e820 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java @@ -46,9 +46,12 @@ import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowFeign; +import com.yxt.anrui.flowable.api.flowtask.DelegateQuery; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.*; @@ -120,6 +123,8 @@ public class BaseDistributorApplyService extends MybatisBaseService userVoResultBean1 = sysUserFeign.fetchBySid(userSid); + String userName = ""; + if (userVoResultBean1.getData() != null) { + userName = userVoResultBean1.getData().getName(); + } + ResultBean userVoResultBean2 = sysUserFeign.fetchBySid(assignee); + ProcessCommentDto processCommentDto = new ProcessCommentDto(); + processCommentDto.setReviewerSid(userSid); + if (userVoResultBean2.getData() != null) { + String changeName = userVoResultBean2.getData().getName(); + processCommentDto.setReviewer(userName); + processCommentDto.setContent(userName + "加签给" + changeName + ":" + views); + } + processCommentDto.setTime(new Date()); + processCommentDto.setProcessId(instanceId); + processCommentFeign.save(processCommentDto); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java index 18d3a345b6..bae02bd293 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -111,6 +111,11 @@ public interface SysStaffOrgFeign { @ApiOperation("根据用户组织全路径获取用户的分公司sid") ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); + @GetMapping("/getOrgSidByPath2") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的事业部sid") + ResultBean getOrgSidByPath2(@RequestParam("orgPath") String orgPath); + @PostMapping("/selAllByOrgPath") @ResponseBody @ApiOperation("根据分公司全路径和角色sid模糊查询本公司本角色下的所有员工userSid") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java index 144c144455..aa3fd05235 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java @@ -100,6 +100,11 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { return null; } + @Override + public ResultBean getOrgSidByPath2(String orgPath) { + return null; + } + @Override public ResultBean> selAllByOrgPath(String orgSidPath, String roleSid) { return null; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java index 2f2f689dd2..63f5512172 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java @@ -135,6 +135,11 @@ public class SysStaffOrgRest implements SysStaffOrgFeign { return sysStaffOrgService.getOrgSidByPath(orgPath); } + @Override + public ResultBean getOrgSidByPath2(String orgPath) { + return sysStaffOrgService.getOrgSidByPath2(orgPath); + } + @Override public ResultBean> selAllByOrgPath(String orgSidPath,String roleSid) { return sysStaffOrgService.selAllByOrgPath(orgSidPath,roleSid); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index 90c913ab5a..09cb54f7ee 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -325,4 +325,13 @@ public class SysStaffOrgService extends MybatisBaseService sysStaffOrgByUserVos = baseMapper.selAllByOrgPath(qw); return rb.success().setData(sysStaffOrgByUserVos); } + + public ResultBean getOrgSidByPath2(String orgPath) { + ResultBean rb = ResultBean.fireFail(); + //根据用户全路径获取分公司sid + List stringList = Arrays.asList(orgPath.split("/")); + String orgSid = stringList.get(stringList.size() - 2); + orgPath = sysOrganizationService.getOrgSid(orgSid); + return rb.success().setData(orgPath); + } } \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java index 5368187727..80284c3064 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java @@ -18,8 +18,35 @@ import org.springframework.web.bind.annotation.ResponseBody; path = "v1/DailyReport", fallback = DailyReportFeignFallback.class) public interface DailyReportFeign { - + /** + * 按照生成日期, + * 分公司sid查询,按照分公司sid,品牌sid,车型sid,配置sid排序。 + * + * @param pagerQuery + * @return + */ @PostMapping("listPage") @ResponseBody ResultBean> listPage(PagerQuery pagerQuery); + + /** + * 按照生成日期、 + * 事业部sid查询,并按分公司sid,品牌sid,车型sid,配置sid排序 + * + * @param pagerQuery + * @return + */ + @PostMapping("listPage2") + @ResponseBody + ResultBean> listPage2(PagerQuery pagerQuery); + + /** + * 按照生成日期查询,按照事业部sid,品牌sid,车型sid,配置sid分组 + * + * @param pagerQuery + * @return + */ + @PostMapping("listPage3") + @ResponseBody + ResultBean> listPage3(PagerQuery pagerQuery); } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java index f0b0e038ba..8301a602ed 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java @@ -1,6 +1,7 @@ package com.yxt.anrui.reportcenter.api.dailyreport; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,4 +12,11 @@ import lombok.Data; @Data public class DailyReportQuery implements Query { private static final long serialVersionUID = -3990941897379861702L; + + @ApiModelProperty("生成日期开始") + private String createTimeStart; + @ApiModelProperty("生成日期结束") + private String createTimeEnd; + + private String orgPath; } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/pom.xml b/anrui-reportcenter/anrui-reportcenter-biz/pom.xml index e98f938cee..a6884a084f 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/pom.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/pom.xml @@ -31,6 +31,11 @@ yxt-common-base 0.0.1 + + anrui-portal-api + com.yxt.anrui + 0.0.1-SNAPSHOT + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java index 06d7b62be4..32fc480298 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java @@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.reportcenter" }) @EnableDiscoveryClient -@EnableFeignClients(basePackages = {}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal"}) public class ReportcenterApplication { public static void main(String[] args) { diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java new file mode 100644 index 0000000000..53a7d6cd93 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java @@ -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 { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage listPage3(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml new file mode 100644 index 0000000000..fc8b9b85b0 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java new file mode 100644 index 0000000000..fc6f0a6632 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java @@ -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> listPage(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dailyReportService.listPage(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listPage2(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dailyReportService.listPage2(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listPage3(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = dailyReportService.listPage3(pagerQuery); + return rb.success().setData(pv); + } +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java new file mode 100644 index 0000000000..1535a4b0a3 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java @@ -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 { + + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + public PagerVo listPage(PagerQuery pagerQuery) { + DailyReportQuery query = pagerQuery.getParams(); + QueryWrapper 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 page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo listPage2(PagerQuery pagerQuery) { + DailyReportQuery query = pagerQuery.getParams(); + QueryWrapper 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 page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo listPage3(PagerQuery pagerQuery) { + DailyReportQuery query = pagerQuery.getParams(); + QueryWrapper 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 page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage3(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java index c66c7816b8..7c4fdfa8e5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java @@ -3,10 +3,7 @@ package com.yxt.anrui.terminal.api.autoservice.distributor; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DeptVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.CompleteDistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorFlowableQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorTaskQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.SubmitDistributorApplyDto; +import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -129,7 +126,7 @@ public interface DistributorFeign { @ResponseBody ResultBean deleteDistributor2(@PathVariable("sid") String sid); -////----------------------------------流程代码------------------------------------------------- + ////----------------------------------流程代码------------------------------------------------- // @ApiOperation("提交流程") @PostMapping("/submitDistributorBaseInfo") @@ -167,4 +164,10 @@ public interface DistributorFeign { @GetMapping("/getFlowOperateTitle") @ResponseBody ResultBean getFlowOperateTitle(@Valid @SpringQueryMap DistributorFlowableQuery query); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody AppDistributorDelegateQuery appDistributorDelegateQuery); + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/flowable/AppDistributorDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/flowable/AppDistributorDelegateQuery.java new file mode 100644 index 0000000000..acdb0de9e7 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/flowable/AppDistributorDelegateQuery.java @@ -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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java index 96338e7c21..4583d5e8d3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java @@ -4,10 +4,7 @@ import com.yxt.anrui.terminal.api.autoservice.distributor.*; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DeptVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.CompleteDistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorFlowableQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorTaskQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.SubmitDistributorApplyDto; +import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -161,4 +158,9 @@ public class DistributorRest implements DistributorFeign { public ResultBean getFlowOperateTitle(DistributorFlowableQuery query) { return distributorService.getFlowOperateTitle(query); } + + @Override + public ResultBean delegate(AppDistributorDelegateQuery appDistributorDelegateQuery) { + return distributorService.delegate(appDistributorDelegateQuery); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java index 40f3e05e72..6ba2fa40e0 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java @@ -14,6 +14,7 @@ import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyFeign; import com.yxt.anrui.base.api.basedistributorapply.flow.AppSubmitApplyDto; import com.yxt.anrui.base.api.basedistributorapply.flow.BaseDistributorApplyCompleteDto; import com.yxt.anrui.base.api.basedistributorapply.flow.BaseDistributorApplyTaskQuery; +import com.yxt.anrui.base.api.basedistributorapply.flow.DistributorDelegateQuery; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -23,10 +24,7 @@ import com.yxt.anrui.terminal.api.autoservice.distributor.*; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DeptVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorApplyVo; import com.yxt.anrui.terminal.api.autoservice.distributor.apply.DistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.CompleteDistributorDto; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorFlowableQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.DistributorTaskQuery; -import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.SubmitDistributorApplyDto; +import com.yxt.anrui.terminal.api.autoservice.distributor.flowable.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -382,4 +380,12 @@ public class DistributorService { } return rb.success().setData(data); } + + public ResultBean delegate(AppDistributorDelegateQuery appDistributorDelegateQuery) { + ResultBean rb = ResultBean.fireFail(); + DistributorDelegateQuery distributorDelegateQuery = new DistributorDelegateQuery(); + BeanUtil.copyProperties(appDistributorDelegateQuery, distributorDelegateQuery); + ResultBean delegate = baseDistributorApplyFeign.delegate(distributorDelegateQuery); + return rb.success(); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index 1451ba5297..bf5a7c53b8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -124,6 +124,9 @@ public class CreditReviewService { creditReviewDetailsVo.setLegalPersonName(busSalesOrder.getCustomerName()); creditReviewDetailsVo.setLegalPersonMobile(busSalesOrder.getMobile()); SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(query.getSourceSid()).getData(); + if (StringUtils.isBlank(solutionsDetailsVo.getPolicySid())){ + return rb.setMsg("缺少金融方案产品政策信息"); + } LoanFinPolicyVo loanFinPolicyVo = loanFinPolicyFeign.details(solutionsDetailsVo.getPolicySid()).getData(); creditReviewDetailsVo.setManagementSid(loanFinPolicyVo.getBankSid()); creditReviewDetailsVo.setManagementName(loanFinPolicyVo.getBankShortName());