旧件回收登记分页

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java

@@ -2,6 +2,9 @@ package com.yxt.anrui.as.api.asbusrepairbill;
 
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @description: 旧件回收登记
  * @author: dimengzhe
@@ -10,6 +13,8 @@ import lombok.Data;
 @Data
 public class AsBusrepairPageVo {
 
+    private String sid;
+
     //维修工单编号
     private String billNo;
     //工单创建日期
@@ -22,10 +27,12 @@ public class AsBusrepairPageVo {
     private String vehMark;
     //车架号
     private String vinNo;
+
+
     //旧件回收说明
     private String shortss;
     //旧件照片
-    private String photos;
+    private List<String> photos = new ArrayList<>();
 
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillVo;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -30,4 +31,8 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
     int selectBySid(String join);
 
     IPage<AsBusrepairBillVo> listPage(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+
+    IPage<AsBusrepairPageVo> pageBillList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+
+    AsBusrepairPageVo selectByBillNo(String sid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -9,15 +9,18 @@
                a.mobile,
                b.vinNo,
                b.vehMark,
-            DATE_FORMAT(a.entryTime,'%Y-%m-%d') as entryTime
+               DATE_FORMAT(a.entryTime, '%Y-%m-%d') as entryTime
         from as_busrepair_bill a
                  LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
         where nodeCode = 3
     </select>
 
     <select id="carOutFactory" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo">
-        select * from as_busrepair_bill
+        select *
-        <where>${ew.sqlSegment}</where>
+        from as_busrepair_bill
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
     <select id="selectNum" resultType="java.lang.Integer">
         select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
@@ -27,36 +30,67 @@
     <select id="selectBySid" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM as_busrepair_bill
-        WHERE nodeCode != '1' and find_in_set(sid, #{join})
+        WHERE nodeCode != '1'
+          and find_in_set(sid, #{join})
     </select>
     <select id="listPage" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillVo">
-        SELECT
+        SELECT b.sid,
-        b.sid,
+               b.billNo,
-        b.billNo,
+               b.nodeName,
-        b.nodeName,
+               b.useOrgName,
-        b.useOrgName,
+               b.dept,
-        b.dept,
+               b.createByName,
-        b.createByName,
+               b.createTime,
-        b.createTime,
+               b.billType,
-        b.billType,
+               b.`subject`,
-        b.`subject`,
+               b.entryTime,
-        b.entryTime,
+               b.estimatedFinishTime,
-        b.estimatedFinishTime,
+               b.customerName,
-        b.customerName,
+               b.mobile,
-        b.mobile,
+               b.customerOrg,
-        b.customerOrg,
+               v.vehMark,
-        v.vehMark,
+               v.vinNo,
-        v.vinNo,
+               v.vehModel,
-        v.vehModel,
+               b.waitorName,
-        b.waitorName,
+               b.groupName,
-        b.groupName,
+               b.mainRepairers,
-        b.mainRepairers,
+               b.remarks,
-        b.remarks,
+               i.isInvoicing
-        i.isInvoicing
+        FROM as_busrepair_bill AS b
-        FROM
+                 LEFT JOIN as_busrepair_bill_vech AS v ON b.sid = v.billSid
-        as_busrepair_bill AS b
+                 LEFT JOIN as_busrepair_bill_invoice AS i ON b.sid = i.billSid
-        LEFT JOIN as_busrepair_bill_vech AS v ON b.sid = v.billSid
+        <where>
-        LEFT JOIN as_busrepair_bill_invoice AS i ON b.sid = i.billSid
+            ${ew.sqlSegment}
-        <where>${ew.sqlSegment}</where>
+        </where>
+    </select>
+
+    <select id="pageBillList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">
+        select b.sid,
+               a.billNo,
+               a.billType,
+               DATE_FORMAT(a.createTime, '%Y-%m-%d') as billTime,
+               a.customerSid,
+               a.customerName,
+               a.mobile,
+               b.vinNo,
+               b.vehMark,
+               DATE_FORMAT(a.entryTime, '%Y-%m-%d')  as entryTime
+        from as_busrepair_bill a
+                 LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectByBillNo" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">
+        select a.billNo,
+               DATE_FORMAT(a.createTime, '%Y-%m-%d') as billTime,
+               a.customerSid,
+               a.customerName,
+               b.vehMark,
+               b.vinNo
+        from as_busrepair_bill a
+                 LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
+        where b.sid = #{sid}
     </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -108,8 +108,8 @@ public class AsBusrepairBillRest {
 
     @GetMapping("/getOneByBillNo")
     @ApiOperation("旧件回收登记初始化")
-    ResultBean<AsBusrepairPageVo> getOneByBillNo(@RequestParam("billNo") String billNo) {
+    ResultBean<AsBusrepairPageVo> getOneByBillNo(@RequestParam("sid") String sid) {
-        return asBusrepairBillService.getOneByBillNo(billNo);
+        return asBusrepairBillService.getOneByBillNo(sid);
     }
 
     @GetMapping("/detailsInit")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -585,12 +585,32 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     }
 
     public PagerVo<AsBusrepairPageVo> pageBillList(PagerQuery<AsBusrepairPageQuery> pagerQuery) {
-
+        AsBusrepairPageQuery query = pagerQuery.getParams();
-        return null;
+        QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
+        //ToDo:添加查询条件
+        //维修工单编号
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("a.billNo", query.getBillNo());
+        }
+        //单据日期开始时间-单据日期结束时间
+        qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
+                );
+        //车牌号
+        if (StringUtils.isNotBlank(query.getVehMark())) {
+            qw.like("b.vehMark", query.getVehMark());
+        }
+        qw.eq("a.nodeCode", 3);
+        IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AsBusrepairPageVo> pagging = baseMapper.pageBillList(page, qw);
+        PagerVo<AsBusrepairPageVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
     }
 
-    public ResultBean<AsBusrepairPageVo> getOneByBillNo(String billNo) {
+    public ResultBean<AsBusrepairPageVo> getOneByBillNo(String sid) {
-        return null;
+        ResultBean<AsBusrepairPageVo> rb = ResultBean.fireFail();
+        AsBusrepairPageVo asBusrepairPageVo = baseMapper.selectByBillNo(sid);
+        return rb.success().setData(asBusrepairPageVo);
     }
 
     public ResultBean<String> sureMaterialFee(AsBusrepairBillDto dto) {