bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

无用代码去除

This commit is contained in:
liang.chao 2024-07-23 18:04:19 +08:00
parent 96271ea0c3
commit 499c5be476
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
View File

@ -221,6 +221,7 @@
rad.status as status, rad.status as status,
su.nick_name as repairer, su.nick_name as repairer,
rad.update_time as updateTime, rad.update_time as updateTime,
rad.commit as commit,
rad.type_id as typeId, rad.type_id as typeId,
rad.remark as remark rad.remark as remark
from repair_apply_details rad from repair_apply_details rad

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java
View File

@ -42,17 +42,7 @@ public class SltAgreementInfoController extends BaseController {
@GetMapping("/getSltAgreementInfo") @GetMapping("/getSltAgreementInfo")
public TableDataInfo getSltAgreementInfo(AgreementInfo bean) { public TableDataInfo getSltAgreementInfo(AgreementInfo bean) {
startPage(); startPage();
List<AgreementInfo> list = new ArrayList<>(); List<AgreementInfo> list = sltAgreementInfoService.getSltAgreementInfo(bean);
//逻辑需要确认，当往来单位id，工程标段ID，结算状态为空时是否返回异常，如果返回异常前端配合改造
if (bean.getUnitId() == null && bean.getProjectId() == null && bean.getSltStatus()== null){
}else {
list = sltAgreementInfoService.getSltAgreementInfo(bean);
}
//上面代码可以改造为
/*if(bean.getUnitId() != null || bean.getProjectId() != null || bean.getSltStatus()!= null){
list = sltAgreementInfoService.getSltAgreementInfo(bean);
}*/
return getDataTable(list); return getDataTable(list);
} }

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
View File

@ -258,6 +258,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
} }
BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice()); BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice());
BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal num = new BigDecimal(bean.getNum());
// 原价 x 数量
BigDecimal costs = buyPrice.multiply(num); BigDecimal costs = buyPrice.multiply(num);
//计算租赁费用 //计算租赁费用
/*BigDecimal costs = BigDecimal.ZERO; /*BigDecimal costs = BigDecimal.ZERO;

5
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
View File

@ -117,11 +117,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<when test="sltStatus == '3'.toString()"> <when test="sltStatus == '3'.toString()">
and sar.status = '1' and sar.status = '1'
</when> </when>
<otherwise>
</otherwise>
</choose> </choose>
ORDER BY bai.agreement_id desc ORDER BY sltStatus,bai.agreement_id desc
</select> </select>
<select id="getLeaseList" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo"> <select id="getLeaseList" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo">