Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更新新的合同

Browse Source
This commit is contained in:
huangdeliang
2020-11-04 20:53:56 +08:00
parent ed07eaad43
commit 676e08cdce
5 changed files with 176 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java
View File

@ -37,6 +37,11 @@ public class SysContractController extends BaseController {
public TableDataInfo list(SysContract sysContract) {
startPage();
List<SysContract> list = sysContractService.selectSysContractList(sysContract);
for (SysContract contract : list) {
if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().equals(contract.getSignName())) {
contract.setName(contract.getName() + "（" + contract.getSignName() + "）");
}
}
return getDataTable(list);
}
@ -101,7 +106,6 @@ public class SysContractController extends BaseController {
} else {
Map<String, String> data = new HashMap<>();
data.put("id", contract.getId().toString());
data.put("name", contract.getName());
data.put("amount", contract.getAmount().toString());
data.put("serveTime", contract.getServeTime() + "");
data.put("tutor", contract.getTutor());