优化

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/BaseInvoiceInfoController.java

@@ -79,6 +79,8 @@ public class BaseInvoiceInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BaseInvoiceInfo baseInvoiceInfo)
     {
+        baseInvoiceInfo.setCreateBy(getLoginUser().getUser().getNickName());
+        baseInvoiceInfo.setSqr(getLoginUser().getUser().getNickName());
         return toAjax(baseInvoiceInfoService.insertBaseInvoiceInfo(baseInvoiceInfo));
     }
 
@@ -98,6 +100,7 @@ public class BaseInvoiceInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BaseInvoiceInfo baseInvoiceInfo)
     {
+        baseInvoiceInfo.setUpdateBy(getLoginUser().getUser().getNickName());
         return toAjax(baseInvoiceInfoService.updateBaseInvoiceInfo(baseInvoiceInfo,getLoginUser().getUser()));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -23,7 +23,7 @@ import com.ruoyi.framework.config.ServerConfig;
 
 /**
  * 通用请求处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -37,9 +37,11 @@ public class CommonController
 
     private static final String FILE_DELIMETER = ",";
 
+    private static final String SERVER_URL = "http://ly.yoloapp.cn/";
+
     /**
      * 通用下载请求
-     * 
+     *
      * @param fileName 文件名称
      * @param delete 是否删除
      */
@@ -81,7 +83,7 @@ public class CommonController
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+            String url = SERVER_URL + fileName;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", url);
             ajax.put("fileName", fileName);
@@ -113,7 +115,7 @@ public class CommonController
             {
                 // 上传并返回新文件名称
                 String fileName = FileUploadUtils.upload(filePath, file);
-                String url = serverConfig.getUrl() + fileName;
+                String url = SERVER_URL + fileName;
                 urls.add(url);
                 fileNames.add(fileName);
                 newFileNames.add(FileUtils.getName(fileName));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -24,7 +24,7 @@ import com.ruoyi.system.service.ISysDeptService;
 
 /**
  * 部门信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -37,7 +37,7 @@ public class SysDeptController extends BaseController
     /**
      * 获取部门列表
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+//    @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
     {
@@ -48,7 +48,7 @@ public class SysDeptController extends BaseController
     /**
      * 查询部门列表（排除节点）
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+//    @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
@@ -60,7 +60,7 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+//    @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -34,7 +34,7 @@ import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 用户信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -56,7 +56,7 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+//    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)
     {

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseContractInfo.java

@@ -144,6 +144,8 @@ public class BaseContractInfo extends BaseEntity
     @Excel(name = "合同总额")
     private BigDecimal htze;
 
+    private String htzedx;
+
     /** 回款金额 */
     @Excel(name = "回款金额")
     private BigDecimal hkje;

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseCustomInfo.java

@@ -32,10 +32,14 @@ public class BaseCustomInfo extends BaseEntity
     @Excel(name = "客户公司")
     private String khgs;
 
-    /** 客户类型 */
+    /** 客户来源 */
     @Excel(name = "客户来源" ,readConverterExp = "1=软艺,2=软通,3=网联,4=软盈,5=渠道")
     private Long khly;
 
+    /** 客户类型 */
+    @Excel(name = "客户类型" ,readConverterExp = "1=公司,2=个人")
+    private Long khlx;
+
     /** 产品类别 */
     @Excel(name = "产品类别",readConverterExp = "1=APP,2=PC,3=小程序,4=H5")
     private Long cplb;

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseInvoiceInfo.java

@@ -55,6 +55,9 @@ public class BaseInvoiceInfo extends BaseEntity
     @Excel(name = "合同名称")
     private String htmc;
 
+    /** 回款单id */
+    private Long paymentId;
+
     /** 回款金额 */
     @Excel(name = "回款金额")
     private BigDecimal hkje;
@@ -79,6 +82,10 @@ public class BaseInvoiceInfo extends BaseEntity
     @Excel(name = "开票金额")
     private BigDecimal kpje;
 
+    /** 付款方式 */
+    @Excel(name = "付款方式")
+    private Integer fkfs;
+
     /** 发票税额 */
     @Excel(name = "发票税额")
     private BigDecimal fpse;

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BasePaymentCollectionInfo.java

@@ -52,7 +52,11 @@ public class BasePaymentCollectionInfo extends BaseEntity
 
     /** 回款方式 */
     @Excel(name = "回款方式")
-    private Long hkfs;
+    private Integer hkfs;
+
+    /** 开票状态 */
+    @Excel(name = "开票状态")
+    private Integer kpzt;
 
     /** 回款凭证 */
     @Excel(name = "回款凭证")

ruoyi-system/src/main/java/com/ruoyi/system/service/business/impl/BaseContractInfoServiceImpl.java

@@ -7,9 +7,11 @@ import java.util.Date;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.MoneyConverter;
 import com.ruoyi.system.domain.business.BaseContractAuditRecord;
@@ -59,6 +61,9 @@ public class BaseContractInfoServiceImpl implements IBaseContractInfoService {
     public BaseContractInfo selectBaseContractInfoById(Long id) {
         BaseContractInfo baseContractInfo = baseContractInfoMapper.selectBaseContractInfoById(id);
 
+        if (ObjectUtil.isNull(baseContractInfo)) {
+            throw new ServiceException("关联合同已被删除！！");
+        }
         if (ObjectUtil.isNotEmpty(baseContractInfo)) {
             List<BaseContractPeriodsInfo> baseContractPeriodsInfos = baseContractPeriodsInfoMapper.selectBaseContractPeriodsInfoByContractId(baseContractInfo.getId());
             baseContractInfo.setBaseContractPeriodsInfos(baseContractPeriodsInfos);
@@ -66,6 +71,7 @@ public class BaseContractInfoServiceImpl implements IBaseContractInfoService {
             List<BaseContractAuditRecord> baseContractAuditRecords = baseContractAuditRecordMapper.selectBaseContractAuditRecordByContractId(baseContractInfo.getId());
             baseContractInfo.setBaseContractAuditRecords(baseContractAuditRecords);
         }
+        baseContractInfo.setHtzedx(MoneyConverter.convert(baseContractInfo.getHtze()));
         return baseContractInfo;
     }
 
@@ -219,7 +225,7 @@ public class BaseContractInfoServiceImpl implements IBaseContractInfoService {
                     baseContractPeriod.setQs("四期");
                     break;
             }
-            BigDecimal amount = baseContractInfo.getHtze().divide(BigDecimal.valueOf(100),RoundingMode.UP).multiply(new BigDecimal(split[i])).setScale(0, RoundingMode.UP);
+            BigDecimal amount = baseContractInfo.getHtze().divide(BigDecimal.valueOf(100)).multiply(new BigDecimal(split[i]));
             baseContractPeriod.setJe(amount);
             baseContractPeriod.setMs(MoneyConverter.convert(amount));
             result.add(baseContractPeriod);

ruoyi-system/src/main/java/com/ruoyi/system/service/business/impl/BaseInvoiceInfoServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -11,9 +12,11 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.business.BaseContractInfo;
 import com.ruoyi.system.domain.business.BaseInvoiceAuditRecord;
 import com.ruoyi.system.domain.business.BaseInvoiceInfo;
+import com.ruoyi.system.domain.business.BasePaymentCollectionInfo;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.business.BaseInvoiceAuditRecordMapper;
 import com.ruoyi.system.mapper.business.BaseInvoiceInfoMapper;
+import com.ruoyi.system.mapper.business.BasePaymentCollectionInfoMapper;
 import com.ruoyi.system.service.business.IBaseInvoiceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +39,9 @@ public class BaseInvoiceInfoServiceImpl implements IBaseInvoiceInfoService
     @Autowired
     private SysRoleMapper sysRoleMapper;
 
+    @Autowired
+    private BasePaymentCollectionInfoMapper basePaymentCollectionInfoMapper;
+
     /**
      * 查询开票信息
      *
@@ -77,6 +83,8 @@ public class BaseInvoiceInfoServiceImpl implements IBaseInvoiceInfoService
     public int insertBaseInvoiceInfo(BaseInvoiceInfo baseInvoiceInfo)
     {
         baseInvoiceInfo.setCreateTime(DateUtils.getNowDate());
+        BasePaymentCollectionInfo basePaymentCollectionInfo = basePaymentCollectionInfoMapper.selectBasePaymentCollectionInfoById(baseInvoiceInfo.getPaymentId());
+        baseInvoiceInfo.setFkfs(basePaymentCollectionInfo.getHkfs());
         return baseInvoiceInfoMapper.insertBaseInvoiceInfo(baseInvoiceInfo);
     }
 
@@ -117,6 +125,17 @@ public class BaseInvoiceInfoServiceImpl implements IBaseInvoiceInfoService
 
             baseInvoiceInfo.setShrId(user.getUserId());
             baseInvoiceInfo.setShrName(user.getNickName());
+
+            BasePaymentCollectionInfo basePayment = new BasePaymentCollectionInfo();
+            basePayment.setInvoiceId(baseInvoiceInfo.getId());
+            List<BasePaymentCollectionInfo> basePaymentCollectionInfos = basePaymentCollectionInfoMapper.selectBasePaymentCollectionInfoList(basePayment);
+            if (ObjectUtil.isNotEmpty(basePaymentCollectionInfos)) {
+                for (BasePaymentCollectionInfo basePaymentCollectionInfo : basePaymentCollectionInfos) {
+                    basePaymentCollectionInfo.setKpzt(1);
+                    basePaymentCollectionInfo.setUpdateBy(user.getNickName());
+                    basePaymentCollectionInfoMapper.updateBasePaymentCollectionInfo(basePaymentCollectionInfo);
+                }
+            }
         }
 
         if (baseInvoiceInfo.getFpzt() != null && baseInvoiceInfo.getFpzt() == 4) {

ruoyi-system/src/main/java/com/ruoyi/system/service/business/impl/BasePaymentCollectionInfoServiceImpl.java

 package com.ruoyi.system.service.business.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
+
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.business.BaseContractInfo;
 import com.ruoyi.system.domain.business.BasePaymentCollectionInfo;
+import com.ruoyi.system.mapper.business.BaseContractInfoMapper;
 import com.ruoyi.system.mapper.business.BasePaymentCollectionInfoMapper;
 import com.ruoyi.system.service.business.IBasePaymentCollectionInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,11 +20,13 @@ import org.springframework.stereotype.Service;
  * @date 2025-02-10
  */
 @Service
-public class BasePaymentCollectionInfoServiceImpl implements IBasePaymentCollectionInfoService
-{
+public class BasePaymentCollectionInfoServiceImpl implements IBasePaymentCollectionInfoService {
     @Autowired
     private BasePaymentCollectionInfoMapper basePaymentCollectionInfoMapper;
 
+    @Autowired
+    private BaseContractInfoMapper baseContractInfoMapper;
+
     /**
      * 查询回款信息
      *
@@ -28,8 +34,7 @@ public class BasePaymentCollectionInfoServiceImpl implements IBasePaymentCollect
      * @return 回款信息
      */
     @Override
-    public BasePaymentCollectionInfo selectBasePaymentCollectionInfoById(Long id)
-    {
+    public BasePaymentCollectionInfo selectBasePaymentCollectionInfoById(Long id) {
         return basePaymentCollectionInfoMapper.selectBasePaymentCollectionInfoById(id);
     }
 
@@ -40,8 +45,7 @@ public class BasePaymentCollectionInfoServiceImpl implements IBasePaymentCollect
      * @return 回款信息
      */
     @Override
-    public List<BasePaymentCollectionInfo> selectBasePaymentCollectionInfoList(BasePaymentCollectionInfo basePaymentCollectionInfo)
-    {
+    public List<BasePaymentCollectionInfo> selectBasePaymentCollectionInfoList(BasePaymentCollectionInfo basePaymentCollectionInfo) {
         return basePaymentCollectionInfoMapper.selectBasePaymentCollectionInfoList(basePaymentCollectionInfo);
     }
 
@@ -52,8 +56,18 @@ public class BasePaymentCollectionInfoServiceImpl implements IBasePaymentCollect
      * @return 结果
      */
     @Override
-    public int insertBasePaymentCollectionInfo(BasePaymentCollectionInfo basePaymentCollectionInfo)
-    {
+    public int insertBasePaymentCollectionInfo(BasePaymentCollectionInfo basePaymentCollectionInfo) {
+        BaseContractInfo baseContractInfo = baseContractInfoMapper.selectBaseContractInfoById(basePaymentCollectionInfo.getContractId());
+        if (baseContractInfo != null) {
+            if (basePaymentCollectionInfo.getDzFlag() == 1 && basePaymentCollectionInfo.getHkje() != null) {
+                BigDecimal hkje = baseContractInfo.getHkje();
+                if (hkje == null) {
+                    hkje = BigDecimal.ZERO;
+                }
+                baseContractInfo.setHkje(hkje.add(basePaymentCollectionInfo.getHkje()));
+                baseContractInfoMapper.updateBaseContractInfo(baseContractInfo);
+            }
+        }
         basePaymentCollectionInfo.setCreateTime(DateUtils.getNowDate());
         return basePaymentCollectionInfoMapper.insertBasePaymentCollectionInfo(basePaymentCollectionInfo);
     }
@@ -65,8 +79,7 @@ public class BasePaymentCollectionInfoServiceImpl implements IBasePaymentCollect
      * @return 结果
      */
     @Override
-    public int updateBasePaymentCollectionInfo(BasePaymentCollectionInfo basePaymentCollectionInfo)
-    {
+    public int updateBasePaymentCollectionInfo(BasePaymentCollectionInfo basePaymentCollectionInfo) {
         basePaymentCollectionInfo.setUpdateTime(DateUtils.getNowDate());
         return basePaymentCollectionInfoMapper.updateBasePaymentCollectionInfo(basePaymentCollectionInfo);
     }
@@ -78,8 +91,7 @@ public class BasePaymentCollectionInfoServiceImpl implements IBasePaymentCollect
      * @return 结果
      */
     @Override
-    public int deleteBasePaymentCollectionInfoByIds(Long[] ids)
-    {
+    public int deleteBasePaymentCollectionInfoByIds(Long[] ids) {
         return basePaymentCollectionInfoMapper.deleteBasePaymentCollectionInfoByIds(ids);
     }
 
@@ -90,8 +102,7 @@ public class BasePaymentCollectionInfoServiceImpl implements IBasePaymentCollect
      * @return 结果
      */
     @Override
-    public int deleteBasePaymentCollectionInfoById(Long id)
-    {
+    public int deleteBasePaymentCollectionInfoById(Long id) {
         return basePaymentCollectionInfoMapper.deleteBasePaymentCollectionInfoById(id);
     }
 }

ruoyi-system/src/main/resources/mapper/business/BaseContractInfoMapper.xml

@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qysj != null "> and qysj = #{qysj}</if>
             <if test="htzt != null "> and htzt = #{htzt}</if>
             <if test="fkfs != null "> and fkfs = #{fkfs}</if>
-            <if test="htsxsj != null "> and htsxsj = #{fkfs}</if>
+            <if test="htsxsj != null and htzzsj != null "> and qysj between #{htsxsj} and #{htzzsj}</if>
             <if test="qs != null "> and qs = #{qs}</if>
             <if test="htze != null "> and htze = #{htze}</if>
             <if test="fkbl != null  and fkbl != ''"> and fkbl = #{fkbl}</if>

ruoyi-system/src/main/resources/mapper/business/BaseCustomInfoMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBaseCustomInfoVo">
-        select id, khxm, khgs, khly, cplb, sjh, wx, khdz, khxq, khhy, yxdj, khzt, gs, fzr,bq,bz, delete_flag, create_time, create_by, update_time, update_by from base_custom_info
+        select id, khxm, khgs, khly,khlx, cplb, sjh, wx, khdz, khxq, khhy, yxdj, khzt, gs, fzr,bq,bz, delete_flag, create_time, create_by, update_time, update_by from base_custom_info
     </sql>
 
     <select id="selectBaseCustomInfoList" parameterType="BaseCustomInfo" resultMap="BaseCustomInfoResult">
@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khxm != null  and khxm != ''"> and a.khxm = #{khxm}</if>
             <if test="khgs != null  and khgs != ''"> and a.khgs = #{khgs}</if>
             <if test="khly != null "> and a.khly = #{khly}</if>
+            <if test="khlx != null "> and a.khlx = #{khlx}</if>
             <if test="cplb != null "> and a.cplb = #{cplb}</if>
             <if test="sjh != null  and sjh != ''"> and a.sjh like concat('%', #{sjh}, '%')</if>
             <if test="wx != null  and wx != ''"> and a.wx = #{wx}</if>
@@ -88,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rubbishFlag != null and rubbishFlag == 1"> and a.khzt = 7</if>
             <if test="rubbishFlag != null and rubbishFlag == 0"> and a.khzt not in (7)</if>
         </where>
+        group BY a.id
         ORDER BY
         CASE WHEN b.id IS NOT NULL THEN 0 ELSE 1 END,
         a.yxdj DESC,
@@ -105,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khxm != null">khxm,</if>
             <if test="khgs != null">khgs,</if>
             <if test="khly != null">khly,</if>
+            <if test="khlx != null">khlx,</if>
             <if test="cplb != null">cplb,</if>
             <if test="sjh != null">sjh,</if>
             <if test="wx != null">wx,</if>
@@ -127,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khxm != null">#{khxm},</if>
             <if test="khgs != null">#{khgs},</if>
             <if test="khly != null">#{khly},</if>
+            <if test="khlx != null">#{khlx},</if>
             <if test="cplb != null">#{cplb},</if>
             <if test="sjh != null">#{sjh},</if>
             <if test="wx != null">#{wx},</if>
@@ -153,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khxm != null">khxm = #{khxm},</if>
             <if test="khgs != null">khgs = #{khgs},</if>
             <if test="khly != null">khly = #{khly},</if>
+            <if test="khlx != null">khlx = #{khlx},</if>
             <if test="cplb != null">cplb = #{cplb},</if>
             <if test="sjh != null">sjh = #{sjh},</if>
             <if test="wx != null">wx = #{wx},</if>

ruoyi-system/src/main/resources/mapper/business/BaseInvoiceInfoMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBaseInvoiceInfoVo">
-        select id, contract_id, htbh, bm_id, bm, kh_id, khmc, htmc, hkje, hkqs, fpnr, fplx, fpsl, kpje, fpse, nsrsbh,fpdm,fphm, dz, sjh, khh, yhzh, sprxm, sprdh, spryx, bz, fpzt, sqr,shr_id,shr, kpsj, dfkxy, dzhd, fpfj, create_time, create_by, update_time, update_by from base_invoice_info
+        select id, contract_id, htbh, bm_id, bm, kh_id, khmc, htmc,payment_id, hkje, hkqs, fpnr, fplx, fpsl, kpje, fpse, nsrsbh,fpdm,fphm, dz, sjh, khh, yhzh, sprxm, sprdh, spryx, bz, fpzt, sqr,shr_id,shr, kpsj, dfkxy, dzhd, fpfj, create_time, create_by, update_time, update_by from base_invoice_info
     </sql>
 
     <select id="selectBaseInvoiceInfoList" parameterType="BaseInvoiceInfo" resultMap="BaseInvoiceInfoResult">
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khId != null "> and kh_id = #{khId}</if>
             <if test="khmc != null  and khmc != ''"> and khmc = #{khmc}</if>
             <if test="htmc != null  and htmc != ''"> and htmc = #{htmc}</if>
+            <if test="paymentId != null "> and payment_id = #{paymentId}</if>
             <if test="hkje != null "> and hkje = #{hkje}</if>
             <if test="hkqs != null "> and hkqs = #{hkqs}</if>
             <if test="fpnr != null  and fpnr != ''"> and fpnr = #{fpnr}</if>
@@ -116,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khId != null">kh_id,</if>
             <if test="khmc != null">khmc,</if>
             <if test="htmc != null">htmc,</if>
+            <if test="paymentId != null">payment_id,</if>
             <if test="hkje != null">hkje,</if>
             <if test="hkqs != null">hkqs,</if>
             <if test="fpnr != null">fpnr,</if>
@@ -156,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khId != null">#{khId},</if>
             <if test="khmc != null">#{khmc},</if>
             <if test="htmc != null">#{htmc},</if>
+            <if test="paymentId != null">#{paymentId},</if>
             <if test="hkje != null">#{hkje},</if>
             <if test="hkqs != null">#{hkqs},</if>
             <if test="fpnr != null">#{fpnr},</if>
@@ -199,6 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="khId != null">kh_id = #{khId},</if>
             <if test="khmc != null">khmc = #{khmc},</if>
             <if test="htmc != null">htmc = #{htmc},</if>
+            <if test="paymentId != null">payment_id = #{paymentId},</if>
             <if test="hkje != null">hkje = #{hkje},</if>
             <if test="hkqs != null">hkqs = #{hkqs},</if>
             <if test="fpnr != null">fpnr = #{fpnr},</if>

ruoyi-system/src/main/resources/mapper/business/BasePaymentCollectionInfoMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="hkqs"    column="hkqs"    />
         <result property="hkje"    column="hkje"    />
         <result property="hkfs"    column="hkfs"    />
+        <result property="kpzt"    column="kpzt"    />
         <result property="hkpz"    column="hkpz"    />
         <result property="skfs"    column="skfs"    />
         <result property="bz"    column="bz"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBasePaymentCollectionInfoVo">
-        select id, contract_id, invoice_id, dz_flag, hk_time, hkqs, hkje, hkfs, hkpz, skfs, bz, yjdz_time, delete_flag, create_time, create_by, update_time, update_by from base_payment_collection_info
+        select id, contract_id, invoice_id, dz_flag, hk_time, hkqs, hkje, hkfs, hkpz,kpzt, skfs, bz, yjdz_time, delete_flag, create_time, create_by, update_time, update_by from base_payment_collection_info
     </sql>
 
     <select id="selectBasePaymentCollectionInfoList" parameterType="BasePaymentCollectionInfo" resultMap="BasePaymentCollectionInfoResult">
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hkqs != null "> and hkqs = #{hkqs}</if>
             <if test="hkje != null "> and hkje = #{hkje}</if>
             <if test="hkfs != null "> and hkfs = #{hkfs}</if>
+            <if test="hkzt != null "> and hkzt = #{hkzt}</if>
             <if test="hkpz != null  and hkpz != ''"> and hkpz = #{hkpz}</if>
             <if test="skfs != null "> and skfs = #{skfs}</if>
             <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
@@ -62,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hkqs != null">hkqs,</if>
             <if test="hkje != null">hkje,</if>
             <if test="hkfs != null">hkfs,</if>
+            <if test="hkzt != null">hkzt,</if>
             <if test="hkpz != null">hkpz,</if>
             <if test="skfs != null">skfs,</if>
             <if test="bz != null">bz,</if>
@@ -80,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hkqs != null">#{hkqs},</if>
             <if test="hkje != null">#{hkje},</if>
             <if test="hkfs != null">#{hkfs},</if>
+            <if test="kpzt != null">#{kpzt},</if>
             <if test="hkpz != null">#{hkpz},</if>
             <if test="skfs != null">#{skfs},</if>
             <if test="bz != null">#{bz},</if>
@@ -102,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hkqs != null">hkqs = #{hkqs},</if>
             <if test="hkje != null">hkje = #{hkje},</if>
             <if test="hkfs != null">hkfs = #{hkfs},</if>
+            <if test="kpzt != null">kpzt = #{kpzt},</if>
             <if test="hkpz != null">hkpz = #{hkpz},</if>
             <if test="skfs != null">skfs = #{skfs},</if>
             <if test="bz != null">bz = #{bz},</if>