Browse Source

修改实体类get,set方法

阿伏兔 4 years ago
parent
commit
abc0f8f94c

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/finance/FTmsaccbillsController.java

@@ -41,7 +41,7 @@ public class FTmsaccbillsController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(FTmsaccbills fTmsaccbills)
     {
-        fTmsaccbills.setFBilltype("SFDZ");
+        fTmsaccbills.setfBilltype("SFDZ");
         startPage();
         List<Map<String, Object>> list = fTmsaccbillsService.selectFTmsaccbillsMapList(fTmsaccbills);
         return getDataTable(list);

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/finance/TChargesController.java

@@ -41,7 +41,7 @@ public class TChargesController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(FTmsaccbills fTmsaccbills)
     {
-        fTmsaccbills.setFBilltype("JSSF");
+        fTmsaccbills.setfBilltype("JSSF");
         startPage();
         List<Map<String, Object>> list = fTmsaccbillsService.selectFTmsaccbillsMapList(fTmsaccbills);
         return getDataTable(list);

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/finance/TPaymentsController.java

@@ -41,7 +41,7 @@ public class TPaymentsController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(FTmsaccbills fTmsaccbills)
     {
-        fTmsaccbills.setFBilltype("JSFF");
+        fTmsaccbills.setfBilltype("JSFF");
         startPage();
         List<Map<String, Object>> list = fTmsaccbillsService.selectFTmsaccbillsMapList(fTmsaccbills);
         return getDataTable(list);

+ 255 - 4
ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/domain/FTmsaccbills.java

@@ -18,7 +18,6 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-03-12
  */
-@Data
 public class FTmsaccbills extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -220,10 +219,262 @@ public class FTmsaccbills extends BaseEntity {
      * 查询时间区间
      */
     private List<String> timeInterval;
-    public void settimeInterval(List<String> timeInterval) {
-        this.timeInterval = timeInterval;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getAccYear() {
+        return accYear;
+    }
+
+    public void setAccYear(Long accYear) {
+        this.accYear = accYear;
+    }
+
+    public Long getAccMonth() {
+        return accMonth;
+    }
+
+    public void setAccMonth(Long accMonth) {
+        this.accMonth = accMonth;
+    }
+
+    public Long getActId() {
+        return actId;
+    }
+
+    public void setActId(Long actId) {
+        this.actId = actId;
+    }
+
+    public Date getfFromDate() {
+        return fFromDate;
+    }
+
+    public void setfFromDate(Date fFromDate) {
+        this.fFromDate = fFromDate;
+    }
+
+    public BigDecimal getAmt() {
+        return amt;
+    }
+
+    public void setAmt(BigDecimal amt) {
+        this.amt = amt;
+    }
+
+    public Date getfToDate() {
+        return fToDate;
+    }
+
+    public void setfToDate(Date fToDate) {
+        this.fToDate = fToDate;
+    }
+
+    public String getRefNo() {
+        return refNo;
+    }
+
+    public void setRefNo(String refNo) {
+        this.refNo = refNo;
+    }
+
+    public Date getPostDate() {
+        return postDate;
+    }
+
+    public void setPostDate(Date postDate) {
+        this.postDate = postDate;
+    }
+
+    public BigDecimal getfAmtcr() {
+        return fAmtcr;
+    }
+
+    public void setfAmtcr(BigDecimal fAmtcr) {
+        this.fAmtcr = fAmtcr;
+    }
+
+    public BigDecimal getfAmtdr() {
+        return fAmtdr;
+    }
+
+    public void setfAmtdr(BigDecimal fAmtdr) {
+        this.fAmtdr = fAmtdr;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getfCtrlcorpid() {
+        return fCtrlcorpid;
+    }
+
+    public void setfCtrlcorpid(String fCtrlcorpid) {
+        this.fCtrlcorpid = fCtrlcorpid;
+    }
+
+    public String gettMblno() {
+        return tMblno;
+    }
+
+    public void settMblno(String tMblno) {
+        this.tMblno = tMblno;
+    }
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+
+    public Date getfAccbilldate() {
+        return fAccbilldate;
+    }
+
+    public void setfAccbilldate(Date fAccbilldate) {
+        this.fAccbilldate = fAccbilldate;
+    }
+
+    public String getfRefNo() {
+        return fRefNo;
+    }
+
+    public void setfRefNo(String fRefNo) {
+        this.fRefNo = fRefNo;
+    }
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
+
+    public Long getfDeptid() {
+        return fDeptid;
+    }
+
+    public void setfDeptid(Long fDeptid) {
+        this.fDeptid = fDeptid;
+    }
+
+    public String getChargingMethod() {
+        return chargingMethod;
+    }
+
+    public void setChargingMethod(String chargingMethod) {
+        this.chargingMethod = chargingMethod;
+    }
+
+    public Long getfBillstatus() {
+        return fBillstatus;
+    }
+
+    public void setfBillstatus(Long fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
     }
-    public List<String> gettimeInterval() {
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public String getBank() {
+        return bank;
+    }
+
+    public void setBank(String bank) {
+        this.bank = bank;
+    }
+
+    public String getWaterBillNo() {
+        return waterBillNo;
+    }
+
+    public void setWaterBillNo(String waterBillNo) {
+        this.waterBillNo = waterBillNo;
+    }
+
+    public Long getfCorpid() {
+        return fCorpid;
+    }
+
+    public void setfCorpid(Long fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    public String getfSystemType() {
+        return fSystemType;
+    }
+
+    public void setfSystemType(String fSystemType) {
+        this.fSystemType = fSystemType;
+    }
+
+    public String getfRemarks() {
+        return fRemarks;
+    }
+
+    public void setfRemarks(String fRemarks) {
+        this.fRemarks = fRemarks;
+    }
+
+    public List<String> getTimeInterval() {
         return timeInterval;
     }
+
+    public void setTimeInterval(List<String> timeInterval) {
+        this.timeInterval = timeInterval;
+    }
+
+    @Override
+    public String toString() {
+        return "FTmsaccbills{" +
+                "id=" + id +
+                ", accYear=" + accYear +
+                ", accMonth=" + accMonth +
+                ", actId=" + actId +
+                ", fFromDate=" + fFromDate +
+                ", amt=" + amt +
+                ", fToDate=" + fToDate +
+                ", refNo='" + refNo + '\'' +
+                ", postDate=" + postDate +
+                ", fAmtcr=" + fAmtcr +
+                ", fAmtdr=" + fAmtdr +
+                ", delFlag='" + delFlag + '\'' +
+                ", fCtrlcorpid='" + fCtrlcorpid + '\'' +
+                ", tMblno='" + tMblno + '\'' +
+                ", fBilltype='" + fBilltype + '\'' +
+                ", fAccbilldate=" + fAccbilldate +
+                ", fRefNo='" + fRefNo + '\'' +
+                ", fBillno='" + fBillno + '\'' +
+                ", fDeptid=" + fDeptid +
+                ", chargingMethod='" + chargingMethod + '\'' +
+                ", fBillstatus=" + fBillstatus +
+                ", invoiceNo='" + invoiceNo + '\'' +
+                ", bank='" + bank + '\'' +
+                ", waterBillNo='" + waterBillNo + '\'' +
+                ", fCorpid=" + fCorpid +
+                ", fSystemType='" + fSystemType + '\'' +
+                ", fRemarks='" + fRemarks + '\'' +
+                ", timeInterval=" + timeInterval +
+                '}';
+    }
 }

+ 13 - 13
ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/impl/FTmsaccbillsServiceImpl.java

@@ -80,8 +80,8 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
         // 费用
         List<Long> feesId = new ArrayList<>();
         FTmsaccbills fTmsaccbills = fTmsaccbillsMapper.selectFTmsaccbillsById(fId);
-        if (StringUtils.isNotNull(fTmsaccbills.getFCorpid())) {
-            corpsId.add(fTmsaccbills.getFCorpid());
+        if (StringUtils.isNotNull(fTmsaccbills.getfCorpid())) {
+            corpsId.add(fTmsaccbills.getfCorpid());
         }
         // 查询从表数据
         FTmsaccbillsitems fTmsaccbillsitems = new FTmsaccbillsitems();
@@ -212,16 +212,16 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
             if (StringUtils.isNotEmpty(billnoDels)) {
                 // 如果有数据在删除列表
                 billnoDelMapper.deleteBillnoDelById(billnoDels.get(0).getId());
-                fTmsaccbills.setFBillno(billnoDels.get(0).getBillNo());
+                fTmsaccbills.setfBillno(billnoDels.get(0).getBillNo());
             } else {
                 // 生成流水号
                 Date time = new Date();
                 String billNo = billnoSerialServiceImpl.getBillNo(fBilltype, time);
-                fTmsaccbills.setFBillno(billNo);
+                fTmsaccbills.setfBillno(billNo);
             }
-            fTmsaccbills.setFBillstatus(2L);
-            fTmsaccbills.setFBilltype(fBilltype);
-            fTmsaccbills.setFDeptid(SecurityUtils.getLoginUser().getUser().getDeptId());
+            fTmsaccbills.setfBillstatus(2L);
+            fTmsaccbills.setfBilltype(fBilltype);
+            fTmsaccbills.setfDeptid(SecurityUtils.getLoginUser().getUser().getDeptId());
             fTmsaccbillsMapper.insertFTmsaccbills(fTmsaccbills);
             fPid = fTmsaccbills.getId();
         } else {
@@ -267,7 +267,7 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
     @Transactional
     public AjaxResult confirm(String tfee, String tfeeDo, LoginUser loginUser, String fBilltype) {
         FTmsaccbills fTmsaccbills = JSONArray.parseObject(tfee, FTmsaccbills.class);
-        fTmsaccbills.setFBillstatus(4L);
+        fTmsaccbills.setfBillstatus(4L);
         if (StringUtils.isNull(fTmsaccbills.getId())) {
             // 如果是新数据
             // 业务编码
@@ -277,16 +277,16 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
             if (StringUtils.isNotEmpty(billnoDels)) {
                 // 如果有数据在删除列表
                 billnoDelMapper.deleteBillnoDelById(billnoDels.get(0).getId());
-                fTmsaccbills.setFBillno(billnoDels.get(0).getBillNo());
+                fTmsaccbills.setfBillno(billnoDels.get(0).getBillNo());
             } else {
                 // 生成流水号
                 Date time = new Date();
                 String billNo = billnoSerialServiceImpl.getBillNo(fBilltype, time);
-                fTmsaccbills.setFBillno(billNo);
+                fTmsaccbills.setfBillno(billNo);
             }
-            fTmsaccbills.setFBilltype(fBilltype);
+            fTmsaccbills.setfBilltype(fBilltype);
             fTmsaccbills.setCreateTime(new Date());
-            fTmsaccbills.setFDeptid(loginUser.getUser().getDeptId());
+            fTmsaccbills.setfDeptid(loginUser.getUser().getDeptId());
             fTmsaccbills.setCreateBy(loginUser.getUser().getUserName());
             fTmsaccbillsMapper.insertFTmsaccbills(fTmsaccbills);
         } else {
@@ -340,7 +340,7 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
         }
         FTmsaccbills tFee = new FTmsaccbills();
         tFee.setId(fPid);
-        tFee.setFBillstatus(fettle);
+        tFee.setfBillstatus(fettle);
         int tFeeUpdateResult = fTmsaccbillsMapper.updateFTmsaccbills(tFee);
         if (tFeeUpdateResult <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();