无用代码去除

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

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

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

@@ -42,17 +42,7 @@ public class SltAgreementInfoController extends BaseController {
     @GetMapping("/getSltAgreementInfo")
     public TableDataInfo getSltAgreementInfo(AgreementInfo bean) {
         startPage();
-        List<AgreementInfo> list = new ArrayList<>();
-        //逻辑需要确认，当往来单位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);
-        }*/
+        List<AgreementInfo> list = sltAgreementInfoService.getSltAgreementInfo(bean);
         return getDataTable(list);
     }
 

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

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

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

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