From 7bfb3217445c370858ed9742e77b189fdb3a6e1f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 10 五月 2023 10:20:56 +0800
Subject: [PATCH] 添加分享表数据
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 12 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java | 41 +++++++-------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java | 17 --------
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayeeShared.java | 5 ++
4 files changed, 26 insertions(+), 49 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 0d00995..6eb5f0f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -210,9 +210,9 @@
public AjaxResult add(@RequestBody ServiceReimbursement serviceReimbursement) {
boolean b = serviceReimbursementService.save(serviceReimbursement);
- if (b) {
- addReiSharedDatd(serviceReimbursement, 1);
- }
+// if (b) {
+// addReiSharedDatd(serviceReimbursement, 1);
+// }
Long id = serviceReimbursement.getId();
return AjaxResult.success(id);
}
@@ -629,9 +629,9 @@
@PostMapping("/editMoney")
public AjaxResult editMoney(@RequestBody List<ReimbursementService> serviceReimbursement) {
boolean b = serviceReimbursementService.updateById(null);
- if (b) {
- addReiSharedDatd(null, 2);
- }
+// if (b) {
+// addReiSharedDatd(null, 2);
+// }
return toAjax(b);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
index 703deed..ac0ea3e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -4,8 +4,6 @@
import java.util.Arrays;
import java.util.List;
-import com.ruoyi.common.utils.bean.DtoConversionUtils;
-import com.ruoyi.project.domain.ServiceReimbursementdetailShared;
import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,15 +29,14 @@
/**
* 鎶ラ攢鐢宠鏄庣粏Controller
- *
+ *
* @author ruoyi
* @date 2022-01-24
*/
@Api("鎶ラ攢鐢宠鏄庣粏")
@RestController
@RequestMapping("/project/reimbursementdetail")
-public class ServiceReimbursementdetailController extends BaseController
-{
+public class ServiceReimbursementdetailController extends BaseController {
@Autowired
private IServiceReimbursementdetailService serviceReimbursementdetailService;
@Autowired
@@ -51,8 +48,7 @@
@ApiOperation("鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceReimbursementdetail serviceReimbursementdetail)
- {
+ public TableDataInfo list(ServiceReimbursementdetail serviceReimbursementdetail) {
startPage();
//List<ServiceReimbursementdetail> list = serviceReimbursementdetailService.queryList(serviceReimbursementdetail);
List<ServiceReimbursementdetail> list = serviceReimbursementdetailService.selectServiceReimbursementdetailList(serviceReimbursementdetail);
@@ -66,8 +62,7 @@
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:export')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceReimbursementdetail serviceReimbursementdetail)
- {
+ public AjaxResult export(ServiceReimbursementdetail serviceReimbursementdetail) {
List<ServiceReimbursementdetail> list = serviceReimbursementdetailService.queryList(serviceReimbursementdetail);
ExcelUtil<ServiceReimbursementdetail> util = new ExcelUtil<ServiceReimbursementdetail>(ServiceReimbursementdetail.class);
return util.exportExcel(list, "鎶ラ攢鐢宠鏄庣粏鏁版嵁");
@@ -75,9 +70,9 @@
@DeleteMapping("/deleteByRBId/{rbid}")
- public AjaxResult removeAllDetail(@PathVariable("rbid") Long rbid){
+ public AjaxResult removeAllDetail(@PathVariable("rbid") Long rbid) {
List<Long> ids = serviceReimbursementdetailService.getAllIds(rbid);
- Long[] arr = (Long[])ids.toArray(new Long[ids.size()]);
+ Long[] arr = (Long[]) ids.toArray(new Long[ids.size()]);
return remove(arr);
}
@@ -88,8 +83,7 @@
@ApiOperation("鑾峰彇鎶ラ攢鐢宠鏄庣粏璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceReimbursementdetailService.getById(id));
}
@@ -101,8 +95,7 @@
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceReimbursementdetail serviceReimbursementdetail)
- {
+ public AjaxResult add(@RequestBody ServiceReimbursementdetail serviceReimbursementdetail) {
return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
}
@@ -113,13 +106,10 @@
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
@Log(title = "淇敼鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
@PostMapping("/updateRDlList")
- public AjaxResult updateRDlList(@RequestBody List<ServiceReimbursementdetail> serviceReimbursementdetails)
- {
- for (ServiceReimbursementdetail serviceReimbursementdetail:serviceReimbursementdetails) {
+ public AjaxResult updateRDlList(@RequestBody List<ServiceReimbursementdetail> serviceReimbursementdetails) {
+ for (ServiceReimbursementdetail serviceReimbursementdetail : serviceReimbursementdetails) {
serviceReimbursementdetailService.saveOrUpdate(serviceReimbursementdetail);
- //鏂板鎴栦慨鏀规姤閿�鐢宠鏄庣粏鍒嗕韩琛�
- ServiceReimbursementdetailShared serviceReimbursementdetailShared = DtoConversionUtils.sourceToTarget(serviceReimbursementdetail, ServiceReimbursementdetailShared.class);
- detailSharedService.saveOrUpdate(serviceReimbursementdetailShared);
+
}
return null;
}
@@ -132,8 +122,7 @@
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
@PutMapping
//@RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceReimbursementdetail serviceReimbursementdetail)
- {
+ public AjaxResult edit(@RequestBody ServiceReimbursementdetail serviceReimbursementdetail) {
return toAjax(serviceReimbursementdetailService.updateById(serviceReimbursementdetail));
}
@@ -144,8 +133,7 @@
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:remove')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceReimbursementdetailService.removeByIds(Arrays.asList(ids)));
}
@@ -156,8 +144,7 @@
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏骞朵慨鏀归噾棰�")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
@DeleteMapping("/deleteDetail/{id}")
- public AjaxResult deleteDetail(@PathVariable Long id)
- {
+ public AjaxResult deleteDetail(@PathVariable Long id) {
return AjaxResult.success(serviceReimbursementdetailService.deleteDetail(id));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
index 1b6811a..2954c53 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
@@ -57,21 +57,7 @@
public TableDataInfo list(ServiceReimbursementpayee serviceReimbursementpayee) {
startPage();
List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee);
- List<Reimbursementpayee> reimbursementpayees = new ArrayList<>();
- for (int i = 0; i < list.size(); i++) {
- Reimbursementpayee reimbursementpayee = new Reimbursementpayee();
- reimbursementpayee.setCol_personname(list.get(i).getPersonname());
- reimbursementpayee.setCol_personType(list.get(i).getPersontype());
- reimbursementpayee.setCol_accounts(list.get(i).getBankcardno());
- reimbursementpayee.setCol_date(list.get(i).getPaiddate());
- reimbursementpayee.setCol_illustrate(list.get(i).getRemark());
- reimbursementpayee.setId(list.get(i).getId());
- reimbursementpayee.setRbid(list.get(i).getRbid());
- reimbursementpayee.setCol_bank(list.get(i).getBankname());
- reimbursementpayee.setCol_money(list.get(i).getAmount());
- reimbursementpayees.add(reimbursementpayee);
- }
- return getDataTable(reimbursementpayees);
+ return getDataTable(list);
}
/**
@@ -134,7 +120,6 @@
}
boolean b = false;
b = serviceReimbursementpayeeService.saveOrUpdateBatch(payees);
- b = serviceReimbursementpayeeSharedService.saveOrUpdateBatch(payeeSareds);
return toAjax(b);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayeeShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayeeShared.java
index 471d389..b06dba2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayeeShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayeeShared.java
@@ -59,6 +59,11 @@
@Excel(name = "寮�鎴烽摱琛�")
private String bankname;
+ /** 澶囨敞 */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
/** 鍗″彿 */
@ApiModelProperty("鍗″彿")
@Excel(name = "鍗″彿")
--
Gitblit v1.9.3