From dabb94df77ad70cf0ffa9a965f1e6db85cb11be0 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 20 Jan 2025 10:42:05 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=8B=9B=E8=81=98=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/oa/api/HrHireApplyRest.java | 7 +++++++ .../biz/hrhireapply/HrHireApplyService.java | 19 +++++++++++++++++++ .../oa/biz/hrhireapply/HrHireApplyVo.java | 4 ++++ 3 files changed, 30 insertions(+) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java index 03bc4fd1bb..dbb883307a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java @@ -3,6 +3,7 @@ package com.yxt.anrui.oa.api; import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDto; import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyService; import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyVo; +import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; @@ -53,4 +54,10 @@ public class HrHireApplyRest { return hrHireApplyService.reject(dto); } + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody CompleteDto dto) { + return hrHireApplyService.complete(dto); + } + } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java index 674a6e0237..b18e30931c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java @@ -9,6 +9,8 @@ import com.yxt.anrui.oa.biz.oaform.FormCommon; import com.yxt.anrui.oa.biz.oaform.OaForm; import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum; import com.yxt.anrui.oa.biz.oaform.OaFormService; +import com.yxt.anrui.oa.biz.oaform.flowable.BusinessVariablesDto; +import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; import com.yxt.anrui.oa.biz.oaform.flowable.SubmitDto; import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; @@ -58,6 +60,8 @@ public class HrHireApplyService extends MybatisBaseService formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto(); + BeanUtil.copyProperties(dto, businessVariablesDto); + return oaFormService.complete(businessVariablesDto); + } + public Map getMap(Map formVariables, String sid) { Map appMap = new HashMap<>(); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java index c4ae16bd06..1f89adff04 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java @@ -25,4 +25,8 @@ public class HrHireApplyVo { private String isFinanceValue; private List list = new ArrayList<>(); + + private String taskId; + @ApiModelProperty("流程实例id") + private String procInsId; } From 4eb09d8252a0341b65270fee85ab5a33c1e69d91 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 20 Jan 2025 10:57:31 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=8B=9B=E8=81=98=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/oa/api/HrHireApplyRest.java | 9 ++++ .../com/yxt/anrui/oa/api/OaMendApplyRest.java | 7 ++++ .../biz/hrhireapply/HrHireApplyService.java | 35 ++++++++++++++-- .../oa/biz/oaform/flowable/NodeQuery.java | 5 +++ .../biz/oamendapply/OaMendApplyService.java | 41 +++++++++++++++++-- 5 files changed, 90 insertions(+), 7 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java index dbb883307a..44d7e7ba8b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java @@ -4,10 +4,12 @@ import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDto; import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyService; import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyVo; import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; +import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery; import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -60,4 +62,11 @@ public class HrHireApplyRest { return hrHireApplyService.complete(dto); } + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap NodeQuery query) { + return hrHireApplyService.getFlowOperateTitle(query); + } + } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java index ab3827c71c..44af80b84f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java @@ -122,4 +122,11 @@ public class OaMendApplyRest { public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap NodeQuery query) { return oaMendApplyService.getNextNodesForSubmit(query); } + + @ApiOperation("移动端获取上一环节获取下一环节") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap NodeQuery query) { + return oaMendApplyService.getFlowOperateTitle(query); + } } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java index b18e30931c..30f0b3a000 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java @@ -9,10 +9,7 @@ import com.yxt.anrui.oa.biz.oaform.FormCommon; import com.yxt.anrui.oa.biz.oaform.OaForm; import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum; import com.yxt.anrui.oa.biz.oaform.OaFormService; -import com.yxt.anrui.oa.biz.oaform.flowable.BusinessVariablesDto; -import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; -import com.yxt.anrui.oa.biz.oaform.flowable.SubmitDto; -import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; +import com.yxt.anrui.oa.biz.oaform.flowable.*; import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; @@ -174,6 +171,36 @@ public class HrHireApplyService extends MybatisBaseService getFlowOperateTitle(NodeQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + Map formVariables = query.getFormVariables(); + formVariables = getMap(formVariables, query.getBusinessSid()); + query.setFormVariables(formVariables); + String data = ""; + if (next == 0) { + ResultBean> resultBean = oaFormService.getPreviousNodesForReject(query); + if (resultBean.getSuccess()) { + resultBean.getData().removeAll(Collections.singleton(null)); + data = resultBean.getData().get(0).getName(); + } else { + return rb.setMsg(resultBean.getMsg()); + } + } else if (next == 1) { + ResultBean> resultBean = oaFormService.getNextNodesForSubmit(query); + if (resultBean.getSuccess()) { + resultBean.getData().removeAll(Collections.singleton(null)); + data = resultBean.getData().get(0).getName(); + } else { + return rb.setMsg(resultBean.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } + public Map getMap(Map formVariables, String sid) { Map appMap = new HashMap<>(); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/NodeQuery.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/NodeQuery.java index 8d3c397140..add1cdcd99 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/NodeQuery.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/NodeQuery.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.HashMap; import java.util.Map; @@ -22,4 +23,8 @@ public class NodeQuery { private String businessSid; private Map formVariables = new HashMap<>(); + + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java index 410b0a52dc..0a4b562e56 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java @@ -158,15 +158,15 @@ public class OaMendApplyService extends MybatisBaseService files, String attachType,String fileType) { + private void saveFiles(String sid, List files, String attachType, String fileType) { files.removeAll(Collections.singleton(null)); - oaAppendixService.saveFile(sid, files, attachType,fileType); + oaAppendixService.saveFile(sid, files, attachType, fileType); } public OaMendApplyVo fetchDetailsVoBySid(String sid) { @@ -294,6 +294,41 @@ public class OaMendApplyService extends MybatisBaseService getFlowOperateTitle(NodeQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + Map formVariables = query.getFormVariables(); + //添加网关 +// formVariables.put("", ""); + //若有移动端，则需和移动端沟通具体参数，若没有删去即可。 + Map appMap = new HashMap<>(); + appMap.put("sid", query.getBusinessSid()); + formVariables.put("app", appMap); + query.setFormVariables(formVariables); + String data = ""; + if (next == 0) { + ResultBean> resultBean = oaFormService.getPreviousNodesForReject(query); + if (resultBean.getSuccess()) { + resultBean.getData().removeAll(Collections.singleton(null)); + data = resultBean.getData().get(0).getName(); + } else { + return rb.setMsg(resultBean.getMsg()); + } + } else if (next == 1) { + ResultBean> resultBean = oaFormService.getNextNodesForSubmit(query); + if (resultBean.getSuccess()) { + resultBean.getData().removeAll(Collections.singleton(null)); + data = resultBean.getData().get(0).getName(); + } else { + return rb.setMsg(resultBean.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } + /** * 具体申请设置网关参数的统一方法 */ From 123ea743fe9214efa306aa4e1db99fb2e247e4c1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 20 Jan 2025 11:26:25 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0yxt-oa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-gateway/src/main/resources/application.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/anrui-gateway/src/main/resources/application.yml b/anrui-gateway/src/main/resources/application.yml index 705bc32451..e4c2f1f3a9 100644 --- a/anrui-gateway/src/main/resources/application.yml +++ b/anrui-gateway/src/main/resources/application.yml @@ -133,6 +133,12 @@ spring: uri: lb://yxt-vehfleet filters: - StripPrefix=1 + - id: yxt-vehfleet + predicates: + - Path= /oa/** + uri: lb://yxt-oa + filters: + - StripPrefix=1 ignore: whites: From 99dba28400362f9e1d63616581ca2b3c1ddb8cfc Mon Sep 17 00:00:00 2001 From: myTest383
Date: Mon, 20 Jan 2025 13:51:41 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=20=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statement/monthlyReport/claimFormRate.js | 25 ++ .../monthlyReport/essentialDetails.js | 17 ++ .../statement/monthlyReport/oneTimeRate.js | 25 ++ .../claimFormRate/claimFormRate.vue | 205 +++++++++++++++- .../claimFormRate/claimFormRateDetail.vue | 91 +++++++ .../essentialDetails/essentialDetails.vue | 223 +++++++++++++++++- .../inventoryManagement.vue | 6 +- .../inventoryManagementDetail.vue | 88 ++++++- .../monthlyReport/oneTimeRate/oneTimeRate.vue | 205 +++++++++++++++- .../oneTimeRate/oneTimeRateDetail.vue | 218 +++++++++++++++++ 10 files changed, 1081 insertions(+), 22 deletions(-) create mode 100644 yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js create mode 100644 yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js create mode 100644 yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js create mode 100644 yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue create mode 100644 yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue diff --git a/yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js b/yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js new file mode 100644 index 0000000000..46ee2943d9 --- /dev/null +++ b/yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' +// 月度报表 三包索赔单生效率统计表 +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/claimFormRate/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 查询详情 + getDetail: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/claimFormRate/getDetail/' + params, + method: 'get', + + }) + } +} diff --git a/yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js b/yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js new file mode 100644 index 0000000000..bb2eea89c6 --- /dev/null +++ b/yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' +// 月度报表 必备件明细 +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/essentialDetails/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + +} diff --git a/yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js b/yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js new file mode 100644 index 0000000000..a7961b1c7c --- /dev/null +++ b/yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' +// 月度报表 配件库房一次性满足率统计表 +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/oneTimeRate/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 查询详情 + getDetail: function(params) { + return request({ + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + url: '/as/v1/oneTimeRate/getDetail/' + params, + method: 'get', + + }) + } +} diff --git a/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue b/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue index 02409e35d2..cf2ac47074 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue @@ -1,8 +1,207 @@ + import Pagination from '@/components/pagination' + import pageye from '@/components/pagination/pageye' + import ButtonBar from '@/components/ButtonBar' + import req from '@/api/statement/monthlyReport/claimFormRate' + import divinfo from './claimFormRateDetail.vue' + + export default { + name: 'claimFormRate', + components: { + Pagination, + pageye, + ButtonBar, + divinfo + }, + data() { + return { + btndisabled: false, + btnList: [{ + type: 'info', + size: 'small', + icon: 'cross', + btnKey: 'doClose', + btnLabel: '关闭' + }], + isSearchShow: false, + searchxianshitit: '显示查询条件', + viewState: 1, // 1、列表 2、新增 3、编辑 4、查看 + tableKey: 0, + list: [], + sids: [], // 用于导出的时候保存已选择的SIDs + listLoading: false, + // 翻页 + listQuery: { + current: 1, + size: 10, + total: 0, + params: { + createStartTime: '', + createEndTime: '', + deptName: '', + userSid: '', + orgPath: '', + menuUrl: '' + } + } + } + }, + created() { + // 初始化变量 + this.getList() + }, + mounted() { + this.$refs['btnbar'].setButtonList(this.btnList) + }, + methods: { + handle(row) { + console.log('handle ' + row.sid) - \ No newline at end of file + this.viewState = 4 + this.$refs['divinfo'].showAdd(row) + + }, + resetState() { + this.viewState = 1 + this.getList() + }, + // 搜索条件效果 + clicksearchShow() { + this.isSearchShow = !this.isSearchShow + if (this.isSearchShow) { + this.searchxianshitit = '隐藏查询条件' + } else { + this.searchxianshitit = '显示查询条件' + } + }, + btnHandle(btnKey) { + console.log('XXXXXXXXXXXXXXX ' + btnKey) + switch (btnKey) { + case 'doClose': + this.doClose() + break + default: + break + } + }, + // 信息条数 获取点击时当前的sid + handleSelectionChange(row) { + const aa = [] + row.forEach(element => { + aa.push(element.sid) + }) + this.sids = aa + }, + // 表中序号 + indexMethod(index) { + var pagestart = (this.listQuery.current - 1) * this.listQuery.size + var pageindex = index + 1 + pagestart + return pageindex + }, + // 查询列表信息 + getList() { + this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path + req.listPage(this.listQuery).then((response) => { + this.listLoading = false + if (response.success) { + this.list = response.data.records + this.listQuery.total = response.data.total + } else { + this.list = [] + this.listQuery.total = 0 + } + }) + }, + // 查询按钮 + handleFilter() { + this.listQuery.current = 1 + this.getList() + }, + // 点击重置 + handleReset() { + this.listQuery = { + current: 1, + size: 10, + total: 0, + params: { + createStartTime: '', + createEndTime: '', + deptName: '', + userSid: '', + orgPath: '', + menuUrl: '' + } + } + this.getList() + }, + doClose() { + this.$store.dispatch('tagsView/delView', this.$route) + this.$router.go(-1) + } + + } + } + + diff --git a/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue b/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue new file mode 100644 index 0000000000..7c2045c267 --- /dev/null +++ b/yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue b/yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue index 02409e35d2..859c66699d 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue @@ -1,8 +1,225 @@ + import Pagination from '@/components/pagination' + import pageye from '@/components/pagination/pageye' + import ButtonBar from '@/components/ButtonBar' + import req from '@/api/statement/monthlyReport/essentialDetails' + + export default { + name: 'essentialDetails', + components: { + Pagination, + pageye, + ButtonBar, + }, + data() { + return { + btndisabled: false, + btnList: [{ + type: 'success', + size: 'small', + icon: '', + btnKey: 'doExport', + btnLabel: '导出' + }, { + type: 'info', + size: 'small', + icon: 'cross', + btnKey: 'doClose', + btnLabel: '关闭' + }], + isSearchShow: false, + searchxianshitit: '显示查询条件', + viewState: 1, // 1、列表 2、新增 3、编辑 4、查看 + tableKey: 0, + list: [], + sids: [], // 用于导出的时候保存已选择的SIDs + listLoading: false, + // 翻页 + listQuery: { + current: 1, + size: 10, + total: 0, + params: { + "createOrgName": "", + "deptName": "", + "accessoryName": "", + "goodsCode": "", + "userSid": "", + "orgPath": "", + "menuUrl": "" + } + } + } + }, + created() { + // 初始化变量 + this.getList() + }, + mounted() { + this.$refs['btnbar'].setButtonList(this.btnList) + }, + methods: { + handle(row) { + console.log('handle ' + row.sid) - \ No newline at end of file + this.viewState = 4 + this.$refs['divinfo'].showAdd(row) + + }, + resetState() { + this.viewState = 1 + this.getList() + }, + // 搜索条件效果 + clicksearchShow() { + this.isSearchShow = !this.isSearchShow + if (this.isSearchShow) { + this.searchxianshitit = '隐藏查询条件' + } else { + this.searchxianshitit = '显示查询条件' + } + }, + btnHandle(btnKey) { + console.log('XXXXXXXXXXXXXXX ' + btnKey) + switch (btnKey) { + case 'doClose': + this.doClose() + break + default: + break + } + }, + // 信息条数 获取点击时当前的sid + handleSelectionChange(row) { + const aa = [] + row.forEach(element => { + aa.push(element.sid) + }) + this.sids = aa + }, + // 表中序号 + indexMethod(index) { + var pagestart = (this.listQuery.current - 1) * this.listQuery.size + var pageindex = index + 1 + pagestart + return pageindex + }, + // 查询列表信息 + getList() { + this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path + req.listPage(this.listQuery).then((response) => { + this.listLoading = false + if (response.success) { + this.list = response.data.records + this.listQuery.total = response.data.total + } else { + this.list = [] + this.listQuery.total = 0 + } + }) + }, + // 查询按钮 + handleFilter() { + this.listQuery.current = 1 + this.getList() + }, + // 点击重置 + handleReset() { + this.listQuery = { + current: 1, + size: 10, + total: 0, + params: { + "createOrgName": "", + "deptName": "", + "accessoryName": "", + "goodsCode": "", + "userSid": "", + "orgPath": "", + "menuUrl": "" + } + } + this.getList() + }, + doClose() { + this.$store.dispatch('tagsView/delView', this.$route) + this.$router.go(-1) + } + + } + } + + diff --git a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue index ae127a234a..653d70091e 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue @@ -11,10 +11,10 @@ + type="month" placeholder="开始月份"> 至 + type="month" placeholder="结束月份"> @@ -28,7 +28,7 @@
-
指标完成情况
+
服务站列表
diff --git a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue index 2887ec0dad..04951f695f 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue @@ -153,8 +153,8 @@ list: [], title: "", mergeObj: {}, // 用来记录需要合并行的下标 - // mergeArr: ['品牌', '服务站名称', '软件系统', '品名', '库存当量出库金额', '库存当量出库占比', '库存当量入库金额', '库存当量入库占比'], // 表格中的列名 - mergeArr: ['品牌', '服务站名称', '软件系统', '品名'], // 表格中的列名 + mergeArr: ['品牌', '服务站名称', '软件系统', '品名', '库存当量出库金额', '库存当量出库占比', '库存当量入库金额', '库存当量入库占比'], // 表格中的列名 + // mergeArr: ['品牌', '服务站名称', '软件系统', '品名'], // 表格中的列名 } }, @@ -178,7 +178,6 @@ } } - // 判断列的属性 if (this.mergeArr.indexOf(column.property) !== -1) { // 判断其值是不是为0 @@ -190,6 +189,43 @@ } } + // var columnIndex1 = 1 + // var columnIndex2 = 1 + // var columnIndex3 = 1 + + // for (var i = 0; i < this.list.length; i++) { + // for (var j = 0; j < this.list.length; j++) { + + // if (this.list[i].品牌 == this.list[j].品牌) { + // columnIndex1 += 1 + // } + // if (this.list[i].服务站名称 == this.list[j].服务站名称) { + // columnIndex2 += 1 + // } + // if (this.list[i].软件系统 == this.list[j].软件系统) { + // columnIndex3 += 1 + // } + // } + // } + + // console.log('>>>>>>>>>1', columnIndex1) + // console.log('>>>>>>>>>2', columnIndex2) + // console.log('>>>>>>>>>3', columnIndex3) + + // if (columnIndex === 1) { + // //定位到6行4列的ID，告诉该单元格合并1行2列 + // return [columnIndex1, 1] + // } + + // if (columnIndex === 2) { + // //定位到6行4列的ID，告诉该单元格合并1行2列 + // return [columnIndex2, 1] + // } + // if (columnIndex === 3) { + // //定位到6行4列的ID，告诉该单元格合并1行2列 + // return [columnIndex3, 1] + // } + }, @@ -218,19 +254,51 @@ if (index === 0) { this.mergeObj[key].push(1); } else { - console.log('>>>>>>>>>commodityCurrentChange', item) - console.log('>>>>>>>>>commodityCurrentChange', key) - console.log('>>>>>>>>>commodityCurrentChange', item[key]) - console.log('>>>>>>>>>commodityCurrentChange', data[index - 1][key]) + // console.log('>>>>>>>>>commodityCurrentChange', item) + // console.log('>>>>>>>>>commodityCurrentChange', key) + // console.log('>>>>>>>>>commodityCurrentChange', item[key]) + // console.log('>>>>>>>>>commodityCurrentChange', data[index - 1][key]) // 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位 - if (item[key] === data[index - 1][key]) { - this.mergeObj[key][count] += 1; - this.mergeObj[key].push(0); + if (item.品牌 == data[index - 1].品牌) { + + if (item.服务站名称 == data[index - 1].服务站名称) { + + if (item.软件系统 == data[index - 1].软件系统) { + if (item.品名 == data[index - 1].品名) { + if (item[key] === data[index - 1][key]) { + this.mergeObj[key][count] += 1; + this.mergeObj[key].push(0); + } else { + // 如果当前行和上一行其值不相等 + count = index; // 记录当前位置 + this.mergeObj[key].push(1); // 重新push 一个 1 + } + } else { + // 如果当前行和上一行其值不相等 + count = index; // 记录当前位置 + this.mergeObj[key].push(1); // 重新push 一个 1 + } + } else { + // 如果当前行和上一行其值不相等 + count = index; // 记录当前位置 + this.mergeObj[key].push(1); // 重新push 一个 1 + } + + } else { + // 如果当前行和上一行其值不相等 + count = index; // 记录当前位置 + this.mergeObj[key].push(1); // 重新push 一个 1 + } + } else { // 如果当前行和上一行其值不相等 count = index; // 记录当前位置 this.mergeObj[key].push(1); // 重新push 一个 1 } + + + + } }) }) diff --git a/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue b/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue index 02409e35d2..dbd3e01261 100644 --- a/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue +++ b/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue @@ -1,8 +1,207 @@ + import Pagination from '@/components/pagination' + import pageye from '@/components/pagination/pageye' + import ButtonBar from '@/components/ButtonBar' + import req from '@/api/statement/monthlyReport/oneTimeRate' + import divinfo from './oneTimeRateDetail.vue' + + export default { + name: 'oneTimeRate', + components: { + Pagination, + pageye, + ButtonBar, + divinfo + }, + data() { + return { + btndisabled: false, + btnList: [{ + type: 'info', + size: 'small', + icon: 'cross', + btnKey: 'doClose', + btnLabel: '关闭' + }], + isSearchShow: false, + searchxianshitit: '显示查询条件', + viewState: 1, // 1、列表 2、新增 3、编辑 4、查看 + tableKey: 0, + list: [], + sids: [], // 用于导出的时候保存已选择的SIDs + listLoading: false, + // 翻页 + listQuery: { + current: 1, + size: 10, + total: 0, + params: { + createStartTime: '', + createEndTime: '', + deptName: '', + userSid: '', + orgPath: '', + menuUrl: '' + } + } + } + }, + created() { + // 初始化变量 + this.getList() + }, + mounted() { + this.$refs['btnbar'].setButtonList(this.btnList) + }, + methods: { + handle(row) { + console.log('handle ' + row.sid) - \ No newline at end of file + this.viewState = 4 + this.$refs['divinfo'].showAdd(row) + + }, + resetState() { + this.viewState = 1 + this.getList() + }, + // 搜索条件效果 + clicksearchShow() { + this.isSearchShow = !this.isSearchShow + if (this.isSearchShow) { + this.searchxianshitit = '隐藏查询条件' + } else { + this.searchxianshitit = '显示查询条件' + } + }, + btnHandle(btnKey) { + console.log('XXXXXXXXXXXXXXX ' + btnKey) + switch (btnKey) { + case 'doClose': + this.doClose() + break + default: + break + } + }, + // 信息条数 获取点击时当前的sid + handleSelectionChange(row) { + const aa = [] + row.forEach(element => { + aa.push(element.sid) + }) + this.sids = aa + }, + // 表中序号 + indexMethod(index) { + var pagestart = (this.listQuery.current - 1) * this.listQuery.size + var pageindex = index + 1 + pagestart + return pageindex + }, + // 查询列表信息 + getList() { + this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path + req.listPage(this.listQuery).then((response) => { + this.listLoading = false + if (response.success) { + this.list = response.data.records + this.listQuery.total = response.data.total + } else { + this.list = [] + this.listQuery.total = 0 + } + }) + }, + // 查询按钮 + handleFilter() { + this.listQuery.current = 1 + this.getList() + }, + // 点击重置 + handleReset() { + this.listQuery = { + current: 1, + size: 10, + total: 0, + params: { + createStartTime: '', + createEndTime: '', + deptName: '', + userSid: '', + orgPath: '', + menuUrl: '' + } + } + this.getList() + }, + doClose() { + this.$store.dispatch('tagsView/delView', this.$route) + this.$router.go(-1) + } + + } + } + + diff --git a/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue b/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue new file mode 100644 index 0000000000..f67b23da76 --- /dev/null +++ b/yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue @@ -0,0 +1,218 @@ + + + + + From 23036b2dfd1d279581f4fd987c24565724562e0e Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 20 Jan 2025 14:00:10 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyDetailsVo.java | 8 +- .../finpaymentapply/FinPaymentapplyDto.java | 12 +- .../FinPaymentapplyDetailsBelowEve.java | 4 + ...nPaymentapplyDetailsBelowEveDetailsVo.java | 26 ++-- .../FinPaymentapplyDetailsBelowEveDto.java | 4 + .../FinPaymentapplyDetailsBelowEveFeign.java | 5 + ...mentapplyDetailsBelowEveFeignFallback.java | 5 + .../FinPaymentapplyEve.java | 76 ++++++++++ .../FinPaymentapplyEveDetailsVo.java | 77 ++++++++++ .../FinPaymentapplyEveDto.java | 77 ++++++++++ .../FinPaymentapplyEveFeign.java | 41 +++++ .../finpaymentapply/FinPaymentapplyRest.java | 2 +- .../FinPaymentapplyService.java | 37 ++++- .../FinPaymentapplyDetailsService.java | 8 +- .../FinPaymentapplyDetailsBelowEveMapper.java | 6 +- .../FinPaymentapplyDetailsBelowEveMapper.xml | 5 +- .../FinPaymentapplyDetailsBelowEveRest.java | 7 + ...FinPaymentapplyDetailsBelowEveService.java | 143 ++++++++++++------ .../FinPaymentapplyEveMapper.java | 45 ++++++ .../FinPaymentapplyEveMapper.xml | 5 + .../FinPaymentapplyEveRest.java | 38 +++++ .../FinPaymentapplyEveService.java | 54 +++++++ 22 files changed, 609 insertions(+), 76 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveFeign.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveRest.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java index 7bde24f907..44ea819d59 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java @@ -27,6 +27,8 @@ package com.yxt.anrui.fin.api.finpaymentapply; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto; import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo; import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto; import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo; @@ -84,12 +86,14 @@ public class FinPaymentapplyDetailsVo implements Vo { @ApiModelProperty(value = "备注") private String remarks; + private List eveList = new ArrayList<>(); + private List detailsList = new ArrayList<>(); private List vehicleList = new ArrayList<>(); - private List trailerList; - private List topList; + private List trailerList = new ArrayList<>(); + private List topList = new ArrayList<>(); private String isVeh; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java index 6992ecd5fd..e483ccb569 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java @@ -27,6 +27,7 @@ package com.yxt.anrui.fin.api.finpaymentapply; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto; import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto; import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto; @@ -36,6 +37,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.ArrayList; import java.util.List; /** @@ -77,12 +79,14 @@ public class FinPaymentapplyDto implements Dto { @ApiModelProperty(value = "业务关联:编号") private String busSid; - private List detailsList; + private List eveList = new ArrayList<>(); - private List vehicleList; + private List detailsList = new ArrayList<>(); - private List trailerList; - private List topList; + private List vehicleList = new ArrayList<>(); + + private List trailerList = new ArrayList<>(); + private List topList = new ArrayList<>(); @ApiModelProperty("是否涉及车辆，1是，0否") @NotBlank(message = "请选择是否涉及车辆") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java index 7260c3bed9..6228b8d12d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java @@ -67,6 +67,10 @@ public class FinPaymentapplyDetailsBelowEve extends BaseEntity { private String exePayDate; @ApiModelProperty("平仓付款金额") private BigDecimal exePayPrice; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门") + private String deptName; @ApiModelProperty("分公司sid") private String useOrgSid; @ApiModelProperty("分公司名称") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java index 4938bdf788..c23e5beabf 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java @@ -61,26 +61,34 @@ public class FinPaymentapplyDetailsBelowEveDetailsVo implements Vo { private String costTypeKey; @ApiModelProperty("款项类别") private String costTypeValue; - @ApiModelProperty("付款申请明细的明细sid") + @ApiModelProperty("付款申请明细的明细sid") private String detailSid; // 付款申请明细的明细sid - @ApiModelProperty("融资付款开通日期") + @ApiModelProperty("融资付款开通日期") private String openDate; // 融资付款开通日期 - @ApiModelProperty("期数") + @ApiModelProperty("期数") private String period; // 期数 - @ApiModelProperty("付款单位sid") + @ApiModelProperty("付款单位sid") private String payCompanySid; // 付款单位sid - @ApiModelProperty("付款单位名称") + @ApiModelProperty("付款单位名称") private String payCompany; // 付款单位名称 - @ApiModelProperty("收款单位名称") + @ApiModelProperty("收款单位名称") private String receiveCompany; // 收款单位名称 - @ApiModelProperty("收款单位sid") + @ApiModelProperty("收款单位sid") private String receiveCompanySid; // 收款单位sid - @ApiModelProperty("收款银行账号") + @ApiModelProperty("收款银行账号") private String receivingAccount; // 收款银行账号 - @ApiModelProperty("开户行") + @ApiModelProperty("开户行") private String bank; // 开户行 @ApiModelProperty("平仓付款日期") private String exePayDate; @ApiModelProperty("平仓付款金额") private BigDecimal exePayPrice; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门") + private String deptName; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java index 69887ce0de..e030f2c37f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java @@ -85,6 +85,10 @@ public class FinPaymentapplyDetailsBelowEveDto implements Dto { private String exePayDate; @ApiModelProperty("平仓付款金额") private BigDecimal exePayPrice; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门") + private String deptName; @ApiModelProperty("分公司sid") private String useOrgSid; @ApiModelProperty("分公司名称") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java index 70c2acd01b..5861e0fc97 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java @@ -61,6 +61,11 @@ public interface FinPaymentapplyDetailsBelowEveFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("选择平仓信息") + @PostMapping("/chooseEve") + @ResponseBody + public ResultBean> chooseEve(@RequestBody PagerQuery pq); + @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java index a6472633cf..3033e6efae 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeignFallback.java @@ -54,6 +54,11 @@ public class FinPaymentapplyDetailsBelowEveFeignFallback implements FinPaymentap return rb.setMsg("接口anrui-fin/finpaymentapplydetailsbeloweve/listPage无法访问"); } + @Override + public ResultBean> chooseEve(PagerQuery pq) { + return null; + } + @Override public ResultBean save(FinPaymentapplyDetailsBelowEveDto dto){ return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentapplydetailsbeloweve/save无法访问"); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java new file mode 100644 index 0000000000..4633acd4aa --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEve.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finpaymentapplyeve; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-fin(付款申请平仓)
+ * File: FinPaymentapplyEve.java
+ * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve
+ * Description: 付款申请-平仓.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 11:20:11
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "付款申请-平仓", description = "付款申请-平仓") +@TableName("fin_paymentapply_eve") +public class FinPaymentapplyEve extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("付款申请sid") + private String applySid; // 付款申请sid + @ApiModelProperty("平仓款名称") + private String costTitleValue; // 平仓款名称 + @ApiModelProperty("融资付款开通日期") + private String openDate; // 融资付款开通日期 + @ApiModelProperty("期数") + private String period; // 期数 + @ApiModelProperty("付款方式Key") + private String payWayKey; // 付款方式Key + @ApiModelProperty("付款方式Value") + private String payWayValue; // 付款方式Value + @ApiModelProperty("收款单位名称") + private String receiveCompany; // 收款单位名称 + @ApiModelProperty("收款银行账号") + private String receivingAccount; // 收款银行账号 + @ApiModelProperty("开户行") + private String bank; // 开户行 + @ApiModelProperty("平仓付款金额") + private BigDecimal exePayPrice; // 平仓付款金额 + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java new file mode 100644 index 0000000000..fc85aa650f --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finpaymentapplyeve; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-fin(付款申请平仓)
+ * File: FinPaymentapplyEveVo.java
+ * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveVo
+ * Description: 付款申请-平仓 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 11:20:12
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "付款申请-平仓 视图数据详情", description = "付款申请-平仓 视图数据详情") +public class FinPaymentapplyEveDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("付款申请sid") + private String applySid; // 付款申请sid + @ApiModelProperty("平仓款名称") + private String costTitleValue; // 平仓款名称 + @ApiModelProperty("融资付款开通日期") + private String openDate; // 融资付款开通日期 + @ApiModelProperty("期数") + private String period; // 期数 + @ApiModelProperty("付款方式Key") + private String payWayKey; // 付款方式Key + @ApiModelProperty("付款方式Value") + private String payWayValue; // 付款方式Value + @ApiModelProperty("收款单位名称") + private String receiveCompany; // 收款单位名称 + @ApiModelProperty("收款银行账号") + private String receivingAccount; // 收款银行账号 + @ApiModelProperty("开户行") + private String bank; // 开户行 + @ApiModelProperty("平仓付款金额") + private BigDecimal exePayPrice; // 平仓付款金额 + +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java new file mode 100644 index 0000000000..ea708944e6 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finpaymentapplyeve; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-fin(付款申请平仓)
+ * File: FinPaymentapplyEveDto.java
+ * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto
+ * Description: 付款申请-平仓 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 11:20:11
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "付款申请-平仓 数据传输对象", description = "付款申请-平仓 数据传输对象") +public class FinPaymentapplyEveDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("付款申请sid") + private String applySid; // 付款申请sid + @ApiModelProperty("平仓款名称") + private String costTitleValue; // 平仓款名称 + @ApiModelProperty("融资付款开通日期") + private String openDate; // 融资付款开通日期 + @ApiModelProperty("期数") + private String period; // 期数 + @ApiModelProperty("付款方式Key") + private String payWayKey; // 付款方式Key + @ApiModelProperty("付款方式Value") + private String payWayValue; // 付款方式Value + @ApiModelProperty("收款单位名称") + private String receiveCompany; // 收款单位名称 + @ApiModelProperty("收款银行账号") + private String receivingAccount; // 收款银行账号 + @ApiModelProperty("开户行") + private String bank; // 开户行 + @ApiModelProperty("平仓付款金额") + private BigDecimal exePayPrice; // 平仓付款金额 + +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveFeign.java new file mode 100644 index 0000000000..aece1f236e --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveFeign.java @@ -0,0 +1,41 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finpaymentapplyeve; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.result.ResultBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "付款申请-平仓") +@FeignClient( + contextId = "anrui-fin-FinPaymentapplyEve", + name = "anrui-fin", + path = "v1/finpaymentapplyeve") +public interface FinPaymentapplyEveFeign { + +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java index 4828d08181..bfcfd54fc8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java @@ -75,7 +75,7 @@ public class FinPaymentapplyRest implements FinPaymentapplyFeign { @Override public ResultBean delBySids(String[] sids) { - return finPaymentapplyService.deleteAllBySid(sids); + return finPaymentapplyService.deleteAllBySid(sids); } @Override diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index ecd019ec91..5adf68676f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -48,6 +48,8 @@ import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo; import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto; import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo; import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto; import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo; @@ -61,6 +63,7 @@ import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService; import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService; import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService; import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService; +import com.yxt.anrui.fin.biz.finpaymentapplyeve.FinPaymentapplyEveService; import com.yxt.anrui.fin.biz.finpaymentapplytop.FinPaymentapplyTopService; import com.yxt.anrui.fin.biz.finpaymentapplytrailer.FinPaymentapplyTrailerService; import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService; @@ -140,6 +143,8 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); if (detailsList != null && detailsList.size() > 0) { - String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(),finPaymentapply); finPaymentapply.setPaymentTotal(new BigDecimal(i)); } + if ("004".equals(dto.getCostTypeKey())){//融资付款 + List eveList = dto.getEveList(); + for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) { + finPaymentapplyEveDto.setApplySid(finPaymentapply.getSid()); + finPaymentapplyEveService.insertByDto(finPaymentapplyEveDto); + } + } + if ("1".equals(dto.getIsVeh())) { List vehicleDtoList = dto.getVehicleList(); if (vehicleDtoList != null && vehicleDtoList.size() > 0) { @@ -313,7 +326,7 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); if (detailsList != null && detailsList.size() > 0) { - String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(),finPaymentapply); finPaymentapply.setPaymentTotal(new BigDecimal(i)); } @@ -329,6 +342,15 @@ public class FinPaymentapplyService extends MybatisBaseService eveList = dto.getEveList(); + for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) { + finPaymentapplyEveDto.setApplySid(dtoSid); + finPaymentapplyEveService.insertByDto(finPaymentapplyEveDto); + } + } if ("002".equals(dto.getCostTypeKey())){//挂车采购 List trailerList = dto.getTrailerList(); @@ -384,8 +406,10 @@ public class FinPaymentapplyService extends MybatisBaseService vehicleList = finPaymentapplyVehicleService.getVehicleList(sid); vo.setDetailsList(detailsList); vo.setVehicleList(vehicleList); + List finPaymentapplyEveDetailsVos = finPaymentapplyEveService.fetchByMainSid(sid); List finPaymentapplyTrailerDetailsVos = finPaymentapplyTrailerService.fetchByMainSid(sid); List finPaymentapplyTopDetailsVos = finPaymentapplyTopService.fetchByMainSid(sid); + vo.setEveList(finPaymentapplyEveDetailsVos); vo.setTrailerList(finPaymentapplyTrailerDetailsVos); vo.setTopList(finPaymentapplyTopDetailsVos); return vo; @@ -636,8 +660,6 @@ public class FinPaymentapplyService extends MybatisBaseService detailVoList = vo.getDetailsList(); detailVoList.removeAll(Collections.singleton(null)); if (!detailVoList.isEmpty()) { @@ -670,6 +692,8 @@ public class FinPaymentapplyService extends MybatisBaseService finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid()); for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) { @@ -695,6 +719,8 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList, String sid) { + public String saveDetailsList(List detailsList, String sid, FinPaymentapply finPaymentapply) { //删除 baseMapper.deleteDetail(sid); BigDecimal bigDecimal = new BigDecimal("0"); @@ -55,6 +56,11 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDto.getFinPaymentapplyDetailsBelowEveList(); for (FinPaymentapplyDetailsBelowEveDto finPaymentapplyDetailsBelowEveDto : finPaymentapplyDetailsBelowEveList) { + finPaymentapplyDetailsBelowEveDto.setCreateBySid(finPaymentapply.getCreateBySid()); + finPaymentapplyDetailsBelowEveDto.setDeptSid(finPaymentapply.getDeptSid()); + finPaymentapplyDetailsBelowEveDto.setDeptName(finPaymentapply.getDeptName()); + finPaymentapplyDetailsBelowEveDto.setUseOrgSid(finPaymentapply.getUseOrgSid()); + finPaymentapplyDetailsBelowEveDto.setUseOrgName(finPaymentapply.getUseOrgName()); finPaymentapplyDetailsBelowEveDto.setDetailSid(belowSid); finPaymentapplyDetailsBelowEveDto.setCostTypeKey("004"); finPaymentapplyDetailsBelowEveDto.setCostTypeValue("融资付款"); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java index 0431564d6c..c576bae76d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java @@ -54,8 +54,8 @@ import java.util.List; @Mapper public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}") + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}") List selByMainSid(String mainSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml index b3faad32a4..0f6a794e51 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml @@ -4,9 +4,8 @@ \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java index 2f8ff2e5df..fa2ee0be95 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java @@ -72,6 +72,13 @@ public class FinPaymentapplyDetailsBelowEveRest implements FinPaymentapplyDetail return rb.success().setData(pv); } + @Override + public ResultBean> chooseEve(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finPaymentapplyDetailsBelowEveService.chooseEve(pq); + return rb.success().setData(pv); + } + @Override @ApiOperation("新增或修改") @PostMapping("/save") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java index f8c2dbcec6..4cf454e3dd 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java @@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import org.apache.commons.lang3.StringUtils; @@ -67,78 +68,122 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); //========================================数据授权开始 - /*if (StringUtils.isNotBlank(query.getMenuUrl())) { - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("fp.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("fp.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("fp.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("fp.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("fp.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - }*/ + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("fe.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getPayCompany())) { + qw.like("fe.payCompany", query.getPayCompany()); + } + if (StringUtils.isNotBlank(query.getCostTitleValue())) { + qw.like("fe.costTitleValue", query.getCostTitleValue()); + } + if (StringUtils.isNotBlank(query.getReceiveCompany())) { + qw.like("fe.receiveCompany", query.getReceiveCompany()); + } + if (StringUtils.isNotBlank(query.getPeriod())) { + qw.like("fe.period", query.getPeriod()); + } + if (StringUtils.isNotBlank(query.getRemarks())) { + qw.like("fe.remarks", query.getRemarks()); + } + if (StringUtils.isNotBlank(query.getPayCompany())) { + qw.like("fe.payCompany", query.getPayCompany()); + } + if (StringUtils.isNotBlank(query.getState())) { + qw.eq("fe.state", query.getState()); + } + //融资付款开通日期 + qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (fe.openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fe.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')" + ); + //平仓付款日期 + qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')" + ); + qw.orderByDesc("fe.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo chooseEve(PagerQuery pq) { + FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("fe.useOrgSid", useOrgSid); if (StringUtils.isNotBlank(query.getPayCompany())) { - qw.like("payCompany", query.getPayCompany()); + qw.like("fe.payCompany", query.getPayCompany()); } if (StringUtils.isNotBlank(query.getCostTitleValue())) { - qw.like("costTitleValue", query.getCostTitleValue()); + qw.like("fe.costTitleValue", query.getCostTitleValue()); } if (StringUtils.isNotBlank(query.getReceiveCompany())) { - qw.like("receiveCompany", query.getReceiveCompany()); + qw.like("fe.receiveCompany", query.getReceiveCompany()); } if (StringUtils.isNotBlank(query.getPeriod())) { - qw.like("period", query.getPeriod()); + qw.like("fe.period", query.getPeriod()); } if (StringUtils.isNotBlank(query.getRemarks())) { - qw.eq("remarks", query.getRemarks()); + qw.like("fe.remarks", query.getRemarks()); } if (StringUtils.isNotBlank(query.getPayCompany())) { - qw.like("fp.payCompany", query.getPayCompany()); + qw.like("fe.payCompany", query.getPayCompany()); } if (StringUtils.isNotBlank(query.getState())) { - qw.eq("fp.state", query.getState()); + qw.eq("fe.state", query.getState()); } //融资付款开通日期 - qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (fe.openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fe.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')" ); //平仓付款日期 - qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') <= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')" ); + qw.orderByDesc("fe.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java new file mode 100644 index 0000000000..f653af8342 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finpaymentapplyeve; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface FinPaymentapplyEveMapper extends BaseMapper { + + @Delete("delete from fin_paymentapply_eve where applySid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from fin_paymentapply_eve where applySid = #{mainSid}") + List fetchByMainSid(String sid); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml new file mode 100644 index 0000000000..2c00bd7d4a --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveRest.java new file mode 100644 index 0000000000..bc43606f9d --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveRest.java @@ -0,0 +1,38 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finpaymentapplyeve; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.*; + +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveFeign; + +@Api(tags = "付款申请-平仓") +@RestController +@RequestMapping("v1/finpaymentapplyeve") +public class FinPaymentapplyEveRest implements FinPaymentapplyEveFeign { + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java new file mode 100644 index 0000000000..c901749d19 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java @@ -0,0 +1,54 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finpaymentapplyeve; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve; +import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto; + +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class FinPaymentapplyEveService extends MybatisBaseService { + + public void insertByDto(FinPaymentapplyEveDto dto) { + FinPaymentapplyEve entity = new FinPaymentapplyEve(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } +} \ No newline at end of file From c6524f2f51a1cb8e3caf72764c92478a20b9f1d1 Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 20 Jan 2025 15:31:59 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyDetailsBelowEveQuery.java | 1 + .../api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java | 2 ++ .../fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java | 2 ++ .../FinPaymentapplyDetailsBelowEveService.java | 3 +-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java index 680e4af7ef..37741e6ebc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java @@ -69,6 +69,7 @@ public class FinPaymentapplyDetailsBelowEveQuery implements Query { private String remarks; @ApiModelProperty("支付状态") private String state; + private String useOrgSid; private String orgPath; private String userSid; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java index fc85aa650f..8bf2d1f0fb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java @@ -53,6 +53,8 @@ public class FinPaymentapplyEveDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("付款申请sid") private String applySid; // 付款申请sid @ApiModelProperty("平仓款名称") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java index ea708944e6..acced7a426 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java @@ -53,6 +53,8 @@ public class FinPaymentapplyEveDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("付款申请sid") private String applySid; // 付款申请sid @ApiModelProperty("平仓款名称") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java index 4cf454e3dd..583e34d187 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java @@ -152,8 +152,7 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService chooseEve(PagerQuery pq) { FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); - qw.eq("fe.useOrgSid", useOrgSid); + qw.eq("fe.useOrgSid", query.getUseOrgSid()); if (StringUtils.isNotBlank(query.getPayCompany())) { qw.like("fe.payCompany", query.getPayCompany()); } From fa5ce5c3bc43271f758df9963d0d3d4fccd852c3 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 20 Jan 2025 15:42:05 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=8B=9B=E8=81=98=E9=9C=80=E6=B1=82appMa?= =?UTF-8?q?p=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java index 30f0b3a000..9b3a3e4df4 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java @@ -207,6 +207,13 @@ public class HrHireApplyService extends MybatisBaseService Date: Mon, 20 Jan 2025 15:51:26 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/oa/api/AdExpatriatesApplyRest.java | 2 +- .../anrui/oa/api/AdExpatriatesDetailRest.java | 36 +++++++++ .../AdExpatriatesApplyDto.java | 3 + .../AdExpatriatesApplyMapper.java | 2 + .../AdExpatriatesApplyMapper.xml | 12 ++- .../AdExpatriatesApplyService.java | 32 +++++++- .../AdExpatriatesApplyVo.java | 4 + .../AdExpatriatesDetail.java | 74 ++++++++++++++++++ .../AdExpatriatesDetailDto.java | 75 +++++++++++++++++++ .../AdExpatriatesDetailMapper.java | 43 +++++++++++ .../AdExpatriatesDetailMapper.xml | 5 ++ .../AdExpatriatesDetailQuery.java | 73 ++++++++++++++++++ .../AdExpatriatesDetailService.java | 51 +++++++++++++ .../AdExpatriatesDetailVo.java | 75 +++++++++++++++++++ 14 files changed, 481 insertions(+), 6 deletions(-) create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesDetailRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetail.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailQuery.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java index 9ae465f5c0..02620ee559 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java @@ -69,7 +69,7 @@ public class AdExpatriatesApplyRest { @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids) { ResultBean rb = ResultBean.fireFail(); - adExpatriatesApplyService.delBySids(sids); + adExpatriatesApplyService.delAll(sids); return rb.success(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesDetailRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesDetailRest.java new file mode 100644 index 0000000000..036acc7605 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesDetailRest.java @@ -0,0 +1,36 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.api; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "驻外人员认定列表") +@RestController +@RequestMapping("v1/adexpatriatesdetail") +public class AdExpatriatesDetailRest { + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java index f54be3493c..936d82f01c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java @@ -26,6 +26,7 @@ package com.yxt.anrui.oa.biz.adexpatriatesapply; +import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto; import com.yxt.anrui.oa.biz.oaform.OaFormDto; import com.yxt.common.core.dto.Dto; @@ -65,4 +66,6 @@ public class AdExpatriatesApplyDto extends OaFormDto { private List files = new ArrayList<>(); @ApiModelProperty("文件") private List appes = new ArrayList<>(); + + private List adExpatriatesDetailList = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.java index be35a49446..3e16c17d5a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.java @@ -49,4 +49,6 @@ import org.apache.ibatis.annotations.Param; public interface AdExpatriatesApplyMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + int selectBySid(String join); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.xml index 3e4570a856..8457c3d22f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyMapper.xml @@ -6,10 +6,6 @@ + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java index 47412a1546..0f3dc6231e 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java @@ -28,6 +28,9 @@ package com.yxt.anrui.oa.biz.adexpatriatesapply; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto; +import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailService; +import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo; import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum; import com.yxt.anrui.oa.biz.oaform.OaFormService; @@ -57,6 +60,8 @@ public class AdExpatriatesApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { AdExpatriatesApplyQuery query = pq.getParams(); @@ -77,7 +82,7 @@ public class AdExpatriatesApplyService extends MybatisBaseService files = dto.getFiles(); List appes = dto.getAppes(); - + List adExpatriatesDetailList = dto.getAdExpatriatesDetailList(); if (StringUtils.isBlank(sid)) { // 新建操作 AdExpatriatesApply entity = new AdExpatriatesApply(); @@ -94,11 +99,23 @@ public class AdExpatriatesApplyService extends MybatisBaseService adExpatriatesDetailList = adExpatriatesDetailService.fetchByMainSid(sid); + vo.setAdExpatriatesDetailList(adExpatriatesDetailList); return vo; } @@ -224,4 +243,15 @@ public class AdExpatriatesApplyService extends MybatisBaseService 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + return rb.success(); + } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyVo.java index afb01ded8a..e0d689d2e2 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyVo.java @@ -26,6 +26,8 @@ package com.yxt.anrui.oa.biz.adexpatriatesapply; +import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto; +import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -96,4 +98,6 @@ public class AdExpatriatesApplyVo implements Vo { private List files = new ArrayList<>(); @ApiModelProperty("附件") private List appes = new ArrayList<>(); + + private List adExpatriatesDetailList = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetail.java new file mode 100644 index 0000000000..5a64e9049d --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetail.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adexpatriatesdetail; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-oa(认定人员)
+ * File: AdExpatriatesDetail.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetail
+ * Description: 驻外人员认定列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 15:35:08
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "驻外人员认定列表", description = "驻外人员认定列表") +@TableName("ad_expatriates_detail") +public class AdExpatriatesDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请sid") + private String mainSid; // 申请sid + @ApiModelProperty("驻外人员sid") + private String expatriatesSid; // 驻外人员sid + @ApiModelProperty("驻外人员姓名") + private String expatriatesName; // 驻外人员姓名 + @ApiModelProperty("驻外人员部门sid") + private String expatriatesDeptSid; // 驻外人员部门sid + @ApiModelProperty("驻外人员部门名称") + private String expatriatesDeptName; // 驻外人员部门名称 + @ApiModelProperty("驻外人员职位sid") + private String expatriatesPostSid; // 驻外人员职位sid + @ApiModelProperty("驻外人员职位名称") + private String expatriatesPostName; // 驻外人员职位名称 + @ApiModelProperty("驻外人员家庭常住地址") + private String expatriatesHomeAddress; // 驻外人员家庭常住地址 + @ApiModelProperty("驻外人员工作地址") + private String expatriatesWorkAddress; // 驻外人员工作地址 + @ApiModelProperty("驻外人员开始驻外时间") + private String expatriatesDate; // 驻外人员开始驻外时间 + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java new file mode 100644 index 0000000000..c1c2bdd0d1 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adexpatriatesdetail; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-oa(认定人员)
+ * File: AdExpatriatesDetailDto.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailDto
+ * Description: 驻外人员认定列表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 15:35:08
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "驻外人员认定列表 数据传输对象", description = "驻外人员认定列表 数据传输对象") +public class AdExpatriatesDetailDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("申请sid") + private String mainSid; // 申请sid + @ApiModelProperty("驻外人员sid") + private String expatriatesSid; // 驻外人员sid + @ApiModelProperty("驻外人员姓名") + private String expatriatesName; // 驻外人员姓名 + @ApiModelProperty("驻外人员部门sid") + private String expatriatesDeptSid; // 驻外人员部门sid + @ApiModelProperty("驻外人员部门名称") + private String expatriatesDeptName; // 驻外人员部门名称 + @ApiModelProperty("驻外人员职位sid") + private String expatriatesPostSid; // 驻外人员职位sid + @ApiModelProperty("驻外人员职位名称") + private String expatriatesPostName; // 驻外人员职位名称 + @ApiModelProperty("驻外人员家庭常住地址") + private String expatriatesHomeAddress; // 驻外人员家庭常住地址 + @ApiModelProperty("驻外人员工作地址") + private String expatriatesWorkAddress; // 驻外人员工作地址 + @ApiModelProperty("驻外人员开始驻外时间") + private String expatriatesDate; // 驻外人员开始驻外时间 + +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.java new file mode 100644 index 0000000000..1819ecf583 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.java @@ -0,0 +1,43 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adexpatriatesdetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface AdExpatriatesDetailMapper extends BaseMapper { + + @Delete("delete from ad_expatriates_detail where mainSid = #{mainSid}") + void delByMainSid(String mainSid); + + @Select("select * from ad_expatriates_detail where mainSid = #{mainSid}") + List fetchByMainSid(String mainSid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.xml new file mode 100644 index 0000000000..439c1af05f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailQuery.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailQuery.java new file mode 100644 index 0000000000..443c54abac --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailQuery.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adexpatriatesdetail; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-oa(认定人员)
+ * File: AdExpatriatesDetailQuery.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailQuery
+ * Description: 驻外人员认定列表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 15:35:08
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "驻外人员认定列表 查询条件", description = "驻外人员认定列表 查询条件") +public class AdExpatriatesDetailQuery implements Query { + + @ApiModelProperty("申请sid") + private String mainSid; // 申请sid + @ApiModelProperty("驻外人员sid") + private String expatriatesSid; // 驻外人员sid + @ApiModelProperty("驻外人员姓名") + private String expatriatesName; // 驻外人员姓名 + @ApiModelProperty("驻外人员部门sid") + private String expatriatesDeptSid; // 驻外人员部门sid + @ApiModelProperty("驻外人员部门名称") + private String expatriatesDeptName; // 驻外人员部门名称 + @ApiModelProperty("驻外人员职位sid") + private String expatriatesPostSid; // 驻外人员职位sid + @ApiModelProperty("驻外人员职位名称") + private String expatriatesPostName; // 驻外人员职位名称 + @ApiModelProperty("驻外人员家庭常住地址") + private String expatriatesHomeAddress; // 驻外人员家庭常住地址 + @ApiModelProperty("驻外人员工作地址") + private String expatriatesWorkAddress; // 驻外人员工作地址 + @ApiModelProperty("驻外人员开始驻外时间") + private String expatriatesDate; // 驻外人员开始驻外时间 + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailService.java new file mode 100644 index 0000000000..a9ed250863 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailService.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adexpatriatesdetail; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; + +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class AdExpatriatesDetailService extends MybatisBaseService { + + public void insertByDto(AdExpatriatesDetailDto dto) { + AdExpatriatesDetail entity = new AdExpatriatesDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String mainSid) { + baseMapper.delByMainSid(mainSid); + } + + public List fetchByMainSid(String mainSid) { + return baseMapper.fetchByMainSid(mainSid); + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java new file mode 100644 index 0000000000..44ca92b631 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adexpatriatesdetail; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-oa(认定人员)
+ * File: AdExpatriatesDetailVo.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
+ * Description: 驻外人员认定列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 15:35:08
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象") +public class AdExpatriatesDetailVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请sid") + private String mainSid; // 申请sid + @ApiModelProperty("驻外人员sid") + private String expatriatesSid; // 驻外人员sid + @ApiModelProperty("驻外人员姓名") + private String expatriatesName; // 驻外人员姓名 + @ApiModelProperty("驻外人员部门sid") + private String expatriatesDeptSid; // 驻外人员部门sid + @ApiModelProperty("驻外人员部门名称") + private String expatriatesDeptName; // 驻外人员部门名称 + @ApiModelProperty("驻外人员职位sid") + private String expatriatesPostSid; // 驻外人员职位sid + @ApiModelProperty("驻外人员职位名称") + private String expatriatesPostName; // 驻外人员职位名称 + @ApiModelProperty("驻外人员家庭常住地址") + private String expatriatesHomeAddress; // 驻外人员家庭常住地址 + @ApiModelProperty("驻外人员工作地址") + private String expatriatesWorkAddress; // 驻外人员工作地址 + @ApiModelProperty("驻外人员开始驻外时间") + private String expatriatesDate; // 驻外人员开始驻外时间 + +} From ae7401fed128863f24cf4ea32140c1288f55b626 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 20 Jan 2025 16:06:02 +0800 Subject: [PATCH 09/12] =?UTF-8?q?POST=E8=AF=B7=E6=B1=82=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BAput?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/oa/api/HrHireApplyRest.java | 6 +++--- .../src/main/java/com/yxt/anrui/oa/api/OaFormRest.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java index 44d7e7ba8b..763a776697 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java @@ -45,19 +45,19 @@ public class HrHireApplyRest { } @ApiOperation("提交审批流程") - @PostMapping("/submit") + @PutMapping("/submit") public ResultBean submit(@RequestBody HrHireApplyDto dto) { return hrHireApplyService.submit(dto); } @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject") + @PutMapping(value = "/reject") public ResultBean reject(@Valid @RequestBody TaskDto dto) { return hrHireApplyService.reject(dto); } @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") + @PutMapping("/complete") public ResultBean complete(@Valid @RequestBody CompleteDto dto) { return hrHireApplyService.complete(dto); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java index b3e4160969..36ba330ccb 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java @@ -56,7 +56,7 @@ public class OaFormRest { } @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") + @PutMapping("/complete") public ResultBean complete(@Valid @RequestBody CompleteDto dto) { BusinessVariablesDto businessVariables = new BusinessVariablesDto(); BeanUtil.copyProperties(dto, businessVariables); @@ -76,25 +76,25 @@ public class OaFormRest { } @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject") + @PutMapping(value = "/reject") public ResultBean reject(@Valid @RequestBody TaskDto dto) { return oaFormService.reject(dto); } @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess") + @PutMapping(value = "/revokeProcess") public ResultBean revokeProcess(@Valid @RequestBody TaskDto dto) { return oaFormService.revokeProcess(dto); } @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess") + @PutMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody TaskDto dto) { return oaFormService.breakProcess(dto); } @ApiOperation(value = "加签") - @PostMapping(value = "/delegate") + @PutMapping(value = "/delegate") public ResultBean delegate(@RequestBody DelegateDto dto) { return oaFormService.delegate(dto); } From efead886e2e45d974313bf83b46bd3b0bdca7362 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 20 Jan 2025 16:14:32 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java index 10fcc97e1a..b962aa79ad 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java @@ -381,6 +381,7 @@ public class OaFormService extends MybatisBaseService { if (businessTaskId.equals(dto.getTaskId())) { FlowTaskVo flowTaskVo = new FlowTaskVo(); BeanUtil.copyProperties(dto, flowTaskVo); + flowTaskVo.setInstanceId(dto.getProcInsId()); ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); From 308ad0677bb4e824c3f185100e7ad067f23eb94f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 20 Jan 2025 16:18:31 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java index b962aa79ad..55b5fa55d8 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java @@ -418,6 +418,7 @@ public class OaFormService extends MybatisBaseService { if (dto.getUserSid().equals(oaForm.getCreateBySid())) { FlowTaskVo flowTaskVo = new FlowTaskVo(); BeanUtil.copyProperties(dto, flowTaskVo); + flowTaskVo.setInstanceId(dto.getProcInsId()); ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); From 8942de08e3c7ec0a3ecf8d6e795ce495d60e1e4f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 20 Jan 2025 16:20:43 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java index 763a776697..bf5a4f57a0 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java @@ -45,7 +45,7 @@ public class HrHireApplyRest { } @ApiOperation("提交审批流程") - @PutMapping("/submit") + @PostMapping("/submit") public ResultBean submit(@RequestBody HrHireApplyDto dto) { return hrHireApplyService.submit(dto); }