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

订单录入添加成交时间选项

Browse Source
This commit is contained in:
huangdeliang
2020-10-24 12:00:10 +08:00
parent ca26281832
commit 378b6ef815
8 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/pom.xml
View File

@ -130,11 +130,6 @@
<artifactId>layout</artifactId>
<version>7.1.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.30</version>
</dependency>
</dependencies>

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java
View File

@ -102,7 +102,7 @@ public class SysCommisionController extends BaseController {
@GetMapping(value = "/{ruleId}")
public AjaxResult getInfo(@PathVariable("ruleId") Long ruleId, SysCommision sysCommision) {
sysCommision.setRuleId(ruleId);
System.out.println(sysCommision);
// System.out.println(sysCommision);
return AjaxResult.success(sysCommisionService.selectSysCommisionById(sysCommision));
}

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

@ -1,26 +1,19 @@
package com.ruoyi.web.controller.custom;
import java.util.List;
import com.ruoyi.common.core.domain.model.Contract;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.Contract;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.custom.domain.SysContract;
import com.ruoyi.custom.service.ISysContractService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 合同Controller
@ -96,6 +89,12 @@ public class SysContractController extends BaseController {
return toAjax(sysContractService.deleteSysContractByIds(ids));
}
@GetMapping("/file/{id}")
public String getContract(@PathVariable long id) {
return redirect("/swagger-ui.html");
}
/**
* 合同签单
*/

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java
View File

@ -56,6 +56,9 @@ public class SysOrderController extends OrderBaseController {
List<SysOrder> list = sysOrderService.selectSysOrderList(sysOrder);
List<SysUser> userList = userService.selectAllUser();
BigDecimal totalAmount = sysOrderService.selectAllOrderAmount(sysOrder);
if(totalAmount == null) {
totalAmount = new BigDecimal(0);
}
for (SysOrder order : list) {
for (SysUser user : userList) {