Merge remote-tracking branch 'origin/master'

precision-effect-admin/src/main/java/com/zehong/web/controller/debit/TDebitCreditController.java

+package com.zehong.web.controller.debit;
+
+import java.util.List;
+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.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TDebitCredit;
+import com.zehong.system.service.ITDebitCreditService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 借贷Controller
+ * 
+ * @author zehong
+ * @date 2023-06-20
+ */
+@RestController
+@RequestMapping("/debit/credit")
+public class TDebitCreditController extends BaseController
+{
+    @Autowired
+    private ITDebitCreditService tDebitCreditService;
+
+    /**
+     * 查询借贷列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:credit:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TDebitCredit tDebitCredit)
+    {
+        startPage();
+        List<TDebitCredit> list = tDebitCreditService.selectTDebitCreditList(tDebitCredit);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出借贷列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:credit:export')")
+    @Log(title = "借贷", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TDebitCredit tDebitCredit)
+    {
+        List<TDebitCredit> list = tDebitCreditService.selectTDebitCreditList(tDebitCredit);
+        ExcelUtil<TDebitCredit> util = new ExcelUtil<TDebitCredit>(TDebitCredit.class);
+        return util.exportExcel(list, "借贷数据");
+    }
+
+    /**
+     * 获取借贷详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:credit:query')")
+    @GetMapping(value = "/{debitId}")
+    public AjaxResult getInfo(@PathVariable("debitId") Long debitId)
+    {
+        return AjaxResult.success(tDebitCreditService.selectTDebitCreditById(debitId));
+    }
+
+    /**
+     * 新增借贷
+     */
+    @PreAuthorize("@ss.hasPermi('system:credit:add')")
+    @Log(title = "借贷", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TDebitCredit tDebitCredit)
+    {
+        return toAjax(tDebitCreditService.insertTDebitCredit(tDebitCredit));
+    }
+
+    /**
+     * 修改借贷
+     */
+    @PreAuthorize("@ss.hasPermi('system:credit:edit')")
+    @Log(title = "借贷", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TDebitCredit tDebitCredit)
+    {
+        return toAjax(tDebitCreditService.updateTDebitCredit(tDebitCredit));
+    }
+
+    /**
+     * 删除借贷
+     */
+    @PreAuthorize("@ss.hasPermi('system:credit:remove')")
+    @Log(title = "借贷", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{debitIds}")
+    public AjaxResult remove(@PathVariable Long[] debitIds)
+    {
+        return toAjax(tDebitCreditService.deleteTDebitCreditByIds(debitIds));
+    }
+}

precision-effect-system/src/main/java/com/zehong/system/domain/TDebitCredit.java

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 借贷对象 t_debit_credit
+ * 
+ * @author zehong
+ * @date 2023-06-20
+ */
+public class TDebitCredit extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 借贷主键 */
+    private Long debitId;
+
+    /** 借贷部门 */
+    @Excel(name = "借贷部门")
+    private Long debitDeptId;
+
+    /** 经办人/申领人 */
+    @Excel(name = "经办人/申领人")
+    private Long operatorId;
+
+    /** 出借部门 */
+    @Excel(name = "出借部门")
+    private Long lendDeptId;
+
+    /** 登记日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "登记日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date registerTime;
+
+    /** 使用说明 */
+    @Excel(name = "使用说明")
+    private String useDescribe;
+
+    /** 使用人 */
+    @Excel(name = "使用人")
+    private Long useId;
+
+    /** 大写合计 */
+    @Excel(name = "大写合计")
+    private String capitalTotal;
+
+    /** 小写合计 */
+    @Excel(name = "小写合计")
+    private BigDecimal littleTotal;
+
+    /** 日利率 */
+    @Excel(name = "日利率")
+    private BigDecimal dayRate;
+
+    /** 计息日 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "计息日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date sumInterestDate;
+
+    /** 预计还款日 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "预计还款日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date expectedRepaymentDate;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private Long approvalId;
+
+    /** 借贷状态：0待借贷部门确认 1待核算部审核 2完成 3驳回 */
+    @Excel(name = "借贷状态：0待借贷部门确认 1待核算部审核 2完成 3驳回")
+    private String debitStatus;
+
+    /** 附件 */
+    @Excel(name = "附件")
+    private String attachmentUrl;
+
+    /** 实际还款日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "实际还款日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date realPaymentDate;
+
+    /** 实际还款金额 */
+    @Excel(name = "实际还款金额")
+    private Long realPaymentAcount;
+
+    /** 是否删除：0否，1是 */
+    @Excel(name = "是否删除：0否，1是")
+    private String isDel;
+
+    private String debitDeptName;
+
+    private String operatorName;
+
+    private String lendDeptName;
+
+    private String useName;
+
+    private String approvalName;
+
+    public void setDebitId(Long debitId) 
+    {
+        this.debitId = debitId;
+    }
+
+    public Long getDebitId() 
+    {
+        return debitId;
+    }
+    public void setDebitDeptId(Long debitDeptId) 
+    {
+        this.debitDeptId = debitDeptId;
+    }
+
+    public Long getDebitDeptId() 
+    {
+        return debitDeptId;
+    }
+    public void setOperatorId(Long operatorId) 
+    {
+        this.operatorId = operatorId;
+    }
+
+    public Long getOperatorId() 
+    {
+        return operatorId;
+    }
+    public void setLendDeptId(Long lendDeptId) 
+    {
+        this.lendDeptId = lendDeptId;
+    }
+
+    public Long getLendDeptId() 
+    {
+        return lendDeptId;
+    }
+    public void setRegisterTime(Date registerTime) 
+    {
+        this.registerTime = registerTime;
+    }
+
+    public Date getRegisterTime() 
+    {
+        return registerTime;
+    }
+    public void setUseDescribe(String useDescribe) 
+    {
+        this.useDescribe = useDescribe;
+    }
+
+    public String getUseDescribe() 
+    {
+        return useDescribe;
+    }
+    public void setUseId(Long useId) 
+    {
+        this.useId = useId;
+    }
+
+    public Long getUseId() 
+    {
+        return useId;
+    }
+    public void setCapitalTotal(String capitalTotal)
+    {
+        this.capitalTotal = capitalTotal;
+    }
+
+    public String getCapitalTotal()
+    {
+        return capitalTotal;
+    }
+    public void setLittleTotal(BigDecimal littleTotal) 
+    {
+        this.littleTotal = littleTotal;
+    }
+
+    public BigDecimal getLittleTotal() 
+    {
+        return littleTotal;
+    }
+    public void setDayRate(BigDecimal dayRate) 
+    {
+        this.dayRate = dayRate;
+    }
+
+    public BigDecimal getDayRate() 
+    {
+        return dayRate;
+    }
+    public void setSumInterestDate(Date sumInterestDate) 
+    {
+        this.sumInterestDate = sumInterestDate;
+    }
+
+    public Date getSumInterestDate() 
+    {
+        return sumInterestDate;
+    }
+    public void setExpectedRepaymentDate(Date expectedRepaymentDate) 
+    {
+        this.expectedRepaymentDate = expectedRepaymentDate;
+    }
+
+    public Date getExpectedRepaymentDate() 
+    {
+        return expectedRepaymentDate;
+    }
+    public void setApprovalId(Long approvalId) 
+    {
+        this.approvalId = approvalId;
+    }
+
+    public Long getApprovalId() 
+    {
+        return approvalId;
+    }
+    public void setDebitStatus(String debitStatus) 
+    {
+        this.debitStatus = debitStatus;
+    }
+
+    public String getDebitStatus() 
+    {
+        return debitStatus;
+    }
+    public void setAttachmentUrl(String attachmentUrl) 
+    {
+        this.attachmentUrl = attachmentUrl;
+    }
+
+    public String getAttachmentUrl() 
+    {
+        return attachmentUrl;
+    }
+    public void setRealPaymentDate(Date realPaymentDate) 
+    {
+        this.realPaymentDate = realPaymentDate;
+    }
+
+    public Date getRealPaymentDate() 
+    {
+        return realPaymentDate;
+    }
+    public void setRealPaymentAcount(Long realPaymentAcount) 
+    {
+        this.realPaymentAcount = realPaymentAcount;
+    }
+
+    public Long getRealPaymentAcount() 
+    {
+        return realPaymentAcount;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getDebitDeptName() {
+        return debitDeptName;
+    }
+
+    public void setDebitDeptName(String debitDeptName) {
+        this.debitDeptName = debitDeptName;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public String getLendDeptName() {
+        return lendDeptName;
+    }
+
+    public void setLendDeptName(String lendDeptName) {
+        this.lendDeptName = lendDeptName;
+    }
+
+    public String getUseName() {
+        return useName;
+    }
+
+    public void setUseName(String useName) {
+        this.useName = useName;
+    }
+
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("debitId", getDebitId())
+            .append("debitDeptId", getDebitDeptId())
+            .append("operatorId", getOperatorId())
+            .append("lendDeptId", getLendDeptId())
+            .append("registerTime", getRegisterTime())
+            .append("useDescribe", getUseDescribe())
+            .append("useId", getUseId())
+            .append("capitalTotal", getCapitalTotal())
+            .append("littleTotal", getLittleTotal())
+            .append("dayRate", getDayRate())
+            .append("sumInterestDate", getSumInterestDate())
+            .append("expectedRepaymentDate", getExpectedRepaymentDate())
+            .append("approvalId", getApprovalId())
+            .append("debitStatus", getDebitStatus())
+            .append("attachmentUrl", getAttachmentUrl())
+            .append("realPaymentDate", getRealPaymentDate())
+            .append("realPaymentAcount", getRealPaymentAcount())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

precision-effect-system/src/main/java/com/zehong/system/mapper/TDebitCreditMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TDebitCredit;
+
+/**
+ * 借贷Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-06-20
+ */
+public interface TDebitCreditMapper 
+{
+    /**
+     * 查询借贷
+     * 
+     * @param debitId 借贷ID
+     * @return 借贷
+     */
+    public TDebitCredit selectTDebitCreditById(Long debitId);
+
+    /**
+     * 查询借贷列表
+     * 
+     * @param tDebitCredit 借贷
+     * @return 借贷集合
+     */
+    public List<TDebitCredit> selectTDebitCreditList(TDebitCredit tDebitCredit);
+
+    /**
+     * 新增借贷
+     * 
+     * @param tDebitCredit 借贷
+     * @return 结果
+     */
+    public int insertTDebitCredit(TDebitCredit tDebitCredit);
+
+    /**
+     * 修改借贷
+     * 
+     * @param tDebitCredit 借贷
+     * @return 结果
+     */
+    public int updateTDebitCredit(TDebitCredit tDebitCredit);
+
+    /**
+     * 删除借贷
+     * 
+     * @param debitId 借贷ID
+     * @return 结果
+     */
+    public int deleteTDebitCreditById(Long debitId);
+
+    /**
+     * 批量删除借贷
+     * 
+     * @param debitIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTDebitCreditByIds(Long[] debitIds);
+}

precision-effect-system/src/main/java/com/zehong/system/service/ITDebitCreditService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TDebitCredit;
+
+/**
+ * 借贷Service接口
+ * 
+ * @author zehong
+ * @date 2023-06-20
+ */
+public interface ITDebitCreditService 
+{
+    /**
+     * 查询借贷
+     * 
+     * @param debitId 借贷ID
+     * @return 借贷
+     */
+    public TDebitCredit selectTDebitCreditById(Long debitId);
+
+    /**
+     * 查询借贷列表
+     * 
+     * @param tDebitCredit 借贷
+     * @return 借贷集合
+     */
+    public List<TDebitCredit> selectTDebitCreditList(TDebitCredit tDebitCredit);
+
+    /**
+     * 新增借贷
+     * 
+     * @param tDebitCredit 借贷
+     * @return 结果
+     */
+    public int insertTDebitCredit(TDebitCredit tDebitCredit);
+
+    /**
+     * 修改借贷
+     * 
+     * @param tDebitCredit 借贷
+     * @return 结果
+     */
+    public int updateTDebitCredit(TDebitCredit tDebitCredit);
+
+    /**
+     * 批量删除借贷
+     * 
+     * @param debitIds 需要删除的借贷ID
+     * @return 结果
+     */
+    public int deleteTDebitCreditByIds(Long[] debitIds);
+
+    /**
+     * 删除借贷信息
+     * 
+     * @param debitId 借贷ID
+     * @return 结果
+     */
+    public int deleteTDebitCreditById(Long debitId);
+}

precision-effect-system/src/main/java/com/zehong/system/service/impl/TDebitCreditServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TDebitCreditMapper;
+import com.zehong.system.domain.TDebitCredit;
+import com.zehong.system.service.ITDebitCreditService;
+
+/**
+ * 借贷Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-06-20
+ */
+@Service
+public class TDebitCreditServiceImpl implements ITDebitCreditService 
+{
+    @Autowired
+    private TDebitCreditMapper tDebitCreditMapper;
+
+    /**
+     * 查询借贷
+     * 
+     * @param debitId 借贷ID
+     * @return 借贷
+     */
+    @Override
+    public TDebitCredit selectTDebitCreditById(Long debitId)
+    {
+        return tDebitCreditMapper.selectTDebitCreditById(debitId);
+    }
+
+    /**
+     * 查询借贷列表
+     * 
+     * @param tDebitCredit 借贷
+     * @return 借贷
+     */
+    @Override
+    public List<TDebitCredit> selectTDebitCreditList(TDebitCredit tDebitCredit)
+    {
+        return tDebitCreditMapper.selectTDebitCreditList(tDebitCredit);
+    }
+
+    /**
+     * 新增借贷
+     * 
+     * @param tDebitCredit 借贷
+     * @return 结果
+     */
+    @Override
+    public int insertTDebitCredit(TDebitCredit tDebitCredit)
+    {
+        tDebitCredit.setCreateTime(DateUtils.getNowDate());
+        return tDebitCreditMapper.insertTDebitCredit(tDebitCredit);
+    }
+
+    /**
+     * 修改借贷
+     * 
+     * @param tDebitCredit 借贷
+     * @return 结果
+     */
+    @Override
+    public int updateTDebitCredit(TDebitCredit tDebitCredit)
+    {
+        tDebitCredit.setUpdateTime(DateUtils.getNowDate());
+        return tDebitCreditMapper.updateTDebitCredit(tDebitCredit);
+    }
+
+    /**
+     * 批量删除借贷
+     * 
+     * @param debitIds 需要删除的借贷ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDebitCreditByIds(Long[] debitIds)
+    {
+        return tDebitCreditMapper.deleteTDebitCreditByIds(debitIds);
+    }
+
+    /**
+     * 删除借贷信息
+     * 
+     * @param debitId 借贷ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDebitCreditById(Long debitId)
+    {
+        return tDebitCreditMapper.deleteTDebitCreditById(debitId);
+    }
+}

precision-effect-web/src/api/debit/credit.js

+import request from '@/utils/request'
+
+// 查询借贷列表
+export function listCredit(query) {
+  return request({
+    url: '/debit/credit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询借贷详细
+export function getCredit(debitId) {
+  return request({
+    url: '/debit/credit/' + debitId,
+    method: 'get'
+  })
+}
+
+// 新增借贷
+export function addCredit(data) {
+  return request({
+    url: '/debit/credit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改借贷
+export function updateCredit(data) {
+  return request({
+    url: '/debit/credit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除借贷
+export function delCredit(debitId) {
+  return request({
+    url: '/debit/credit/' + debitId,
+    method: 'delete'
+  })
+}
+
+// 导出借贷
+export function exportCredit(query) {
+  return request({
+    url: '/debit/credit/export',
+    method: 'get',
+    params: query
+  })
+}