From 08b030a4cb662725c4f73e3b8a531de2c593369b Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 16:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementLogController.java | 108 ++++++++++++
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 11
service/src/main/resources/mapper/cwgl/ReceivableFeeManagementLogMapper.xml | 120 +++++++++++++
ui/admin-ui3/src/api/cwgl/receivableFeeManagementLog.ts | 67 +++++++
service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillCreateVo.java | 8
service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml | 41 ++--
ui/admin-ui3/src/views/cwgl/receivableFeeManagementLog/index.vue | 150 ++++++++++++++++
7 files changed, 481 insertions(+), 24 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementLogController.java b/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementLogController.java
new file mode 100644
index 0000000..3fe4ff5
--- /dev/null
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementLogController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.cwgl.controller;
+
+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.ruoyi.common.utils.file.DownloadExportUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.cwgl.domain.ReceivableFeeManagementLog;
+import com.ruoyi.cwgl.service.IReceivableFeeManagementLogService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織Controller
+ *
+ * @author ruoyi
+ * @date 2025-12-22
+ */
+@RestController
+@RequestMapping("/cwgl/receivableFeeManagementLog")
+public class ReceivableFeeManagementLogController extends BaseController
+{
+ @Autowired
+ private IReceivableFeeManagementLogService receivableFeeManagementLogService;
+
+
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:receivableFeeManagementLog:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ReceivableFeeManagementLog receivableFeeManagementLog)
+ {
+ startPage();
+ List<ReceivableFeeManagementLog> list = receivableFeeManagementLogService.selectReceivableFeeManagementLogList(receivableFeeManagementLog);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織鍒楄〃
+ * @param receivableFeeManagementLog 鏌ヨ鏉′欢瀵硅薄
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:receivableFeeManagementLog:export')")
+ @Log(title = "搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ReceivableFeeManagementLog receivableFeeManagementLog,String exportKey)
+ {
+ receivableFeeManagementLogService.export(receivableFeeManagementLog,exportKey);
+ return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
+ }
+
+
+
+ /**
+ * 鑾峰彇搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:receivableFeeManagementLog:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Integer id)
+ {
+ return AjaxResult.success(receivableFeeManagementLogService.selectReceivableFeeManagementLogById(id));
+ }
+
+ /**
+ * 鏂板搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:receivableFeeManagementLog:add')")
+ @Log(title = "搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ReceivableFeeManagementLog receivableFeeManagementLog)
+ {
+ return toAjax(receivableFeeManagementLogService.insertReceivableFeeManagementLog(receivableFeeManagementLog));
+ }
+
+ /**
+ * 淇敼搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:receivableFeeManagementLog:edit')")
+ @Log(title = "搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ReceivableFeeManagementLog receivableFeeManagementLog)
+ {
+ return toAjax(receivableFeeManagementLogService.updateReceivableFeeManagementLog(receivableFeeManagementLog));
+ }
+
+ /**
+ * 鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:receivableFeeManagementLog:remove')")
+ @Log(title = "搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Integer[] ids)
+ {
+ return toAjax(receivableFeeManagementLogService.deleteReceivableFeeManagementLogByIds(ids));
+ }
+}
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillCreateVo.java b/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillCreateVo.java
index 4e1f75c..01c625f 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillCreateVo.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableBillCreateVo.java
@@ -13,6 +13,14 @@
* 璐﹀崟绫诲瀷锛�0=浜烘皯甯佽处鍗曪紝1=娓竵璐﹀崟
*/
private Integer billType;
+
+ private String billName;
+
+ private String customerName;
+
+ private String isInternalSettlement;
+
+ private String internalSettlementUnit;
/**
* 搴旀敹璐圭敤缁熻鏁版嵁
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
index 130c9ee..7e7c7ef 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
@@ -333,7 +333,10 @@
billManagement.setExchangeRate(statisticsVo.getRate());
billManagement.setStatus("0"); // 榛樿鑽夌鐘舵��
billManagement.setCreateTime(DateUtils.getNowDate());
-
+ billManagement.setBillName(billCreateVo.getBillName());
+ billManagement.setCustomerName(billCreateVo.getCustomerName());
+ billManagement.setIsInternalSettlement(billCreateVo.getIsInternalSettlement());
+ billManagement.setInternalSettlementUnit(billCreateVo.getInternalSettlementUnit());
// 3. 鏍规嵁璐﹀崟绫诲瀷璁剧疆甯佺鍜屾�婚噾棰�
if (billType == 0) {
// 浜烘皯甯佽处鍗�
@@ -357,16 +360,16 @@
String billSystemNo = billManagement.getSystemNo();
// 鎵归噺鏇存柊搴旀敹璐圭敤涓昏〃鐨勫叧鑱旇处鍗曠紪鍙�
- List<ReceivableFeeManagement> feeManagements = new ArrayList<>();
for (Integer feeId : statisticsVo.getIds()) {
ReceivableFeeManagement feeManagement = new ReceivableFeeManagement();
feeManagement.setId(feeId);
feeManagement.setRelatedBillNo(billSystemNo);
- feeManagements.add(feeManagement);
+ feeManagement.setStatus("1");
+ receivableFeeManagementMapper.updateReceivableFeeManagement(feeManagement);
}
// 璋冪敤鎵归噺鏇存柊鏂规硶
- updateReceivableFeeManagementBatch(feeManagements);
+
}
return i;
diff --git a/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementLogMapper.xml b/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementLogMapper.xml
new file mode 100644
index 0000000..c9e0f0e
--- /dev/null
+++ b/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementLogMapper.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cwgl.mapper.ReceivableFeeManagementLogMapper">
+
+ <resultMap type="com.ruoyi.cwgl.domain.ReceivableFeeManagementLog" id="ReceivableFeeManagementLogResult">
+ <result property="id" column="id" />
+ <result property="receivableFeeId" column="receivable_fee_id" />
+ <result property="operator" column="operator" />
+ <result property="operationTime" column="operation_time" />
+ <result property="operationDesc" column="operation_desc" />
+ <result property="createTime" column="create_time" />
+ </resultMap>
+
+ <sql id="selectReceivableFeeManagementLogVo">
+ select thisTab.id, thisTab.receivable_fee_id, thisTab.operator, thisTab.operation_time, thisTab.operation_desc, thisTab.create_time from receivable_fee_management_log AS thisTab
+ </sql>
+ <sql id="selectReceivableFeeManagementLogVoCount">
+ select count(0) from receivable_fee_management_log as thisTab
+ </sql>
+
+ <sql id="whereCondition">
+ <if test="receivableFeeId != null "> and thisTab.receivable_fee_id = #{receivableFeeId}</if>
+ <if test="operator != null and operator != ''"> and thisTab.operator = #{operator}</if>
+ <if test="operationTime != null "> and thisTab.operation_time = #{operationTime}</if>
+ <if test="operationDesc != null and operationDesc != ''"> and thisTab.operation_desc = #{operationDesc}</if>
+ </sql>
+
+ <!--鏌ヨ-->
+ <select id="selectReceivableFeeManagementLogById" parameterType="Integer" resultMap="ReceivableFeeManagementLogResult">
+ <include refid="selectReceivableFeeManagementLogVo"/>
+ where id = #{id}
+ </select>
+
+ <select id="selectReceivableFeeManagementLogCount" parameterType="com.ruoyi.cwgl.domain.ReceivableFeeManagementLog" resultType="int">
+ <include refid="selectReceivableFeeManagementLogVoCount"/>
+ <where>
+ <include refid="whereCondition"/>
+ </where>
+ </select>
+
+ <select id="selectReceivableFeeManagementLogList" parameterType="com.ruoyi.cwgl.domain.ReceivableFeeManagementLog" resultMap="ReceivableFeeManagementLogResult">
+ <include refid="selectReceivableFeeManagementLogVo"/>
+ <where>
+ <include refid="whereCondition"/>
+ </where>
+ order by thisTab.id desc
+ </select>
+
+ <!-- 鏂板 -->
+ <insert id="insertReceivableFeeManagementLog" parameterType="com.ruoyi.cwgl.domain.ReceivableFeeManagementLog" useGeneratedKeys="true" keyProperty="id">
+ insert into receivable_fee_management_log
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="receivableFeeId != null">receivable_fee_id,</if>
+ <if test="operator != null and operator != ''">operator,</if>
+ <if test="operationTime != null">operation_time,</if>
+ <if test="operationDesc != null and operationDesc != ''">operation_desc,</if>
+ <if test="createTime != null">create_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="receivableFeeId != null">#{receivableFeeId},</if>
+ <if test="operator != null and operator != ''">#{operator},</if>
+ <if test="operationTime != null">#{operationTime},</if>
+ <if test="operationDesc != null and operationDesc != ''">#{operationDesc},</if>
+ <if test="createTime != null">#{createTime},</if>
+ </trim>
+ </insert>
+
+ <insert id="insertReceivableFeeManagementLogBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+ insert into receivable_fee_management_log
+ <trim prefix="(" suffix=") values" suffixOverrides=",">
+ id,receivable_fee_id,operator,operation_time,operation_desc,create_time,
+ </trim>
+ <foreach item="item" index="index" collection="list" separator=",">
+ <trim prefix="(" suffix=") " suffixOverrides=",">
+ #{item.id},#{item.receivableFeeId},#{item.operator},#{item.operationTime},#{item.operationDesc},#{item.createTime},
+ </trim>
+ </foreach>
+ </insert>
+
+ <!-- 淇敼 -->
+ <update id="updateReceivableFeeManagementLog" parameterType="com.ruoyi.cwgl.domain.ReceivableFeeManagementLog">
+ update receivable_fee_management_log
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="receivableFeeId != null">receivable_fee_id = #{receivableFeeId},</if>
+ <if test="operator != null and operator != ''">operator = #{operator},</if>
+ <if test="operationTime != null">operation_time = #{operationTime},</if>
+ <if test="operationDesc != null and operationDesc != ''">operation_desc = #{operationDesc},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+ <!-- 淇敼 -->
+ <update id="updateReceivableFeeManagementLogBatch" parameterType="java.util.List">
+ <foreach collection="list" item="item" index="index" separator=";">
+ update receivable_fee_management_log
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="item.receivableFeeId != null">receivable_fee_id = #{item.receivableFeeId},</if>
+ <if test="item.operator != null and item.operator != ''">operator = #{item.operator},</if>
+ <if test="item.operationTime != null">operation_time = #{item.operationTime},</if>
+ <if test="item.operationDesc != null and item.operationDesc != ''">operation_desc = #{item.operationDesc},</if>
+ <if test="item.createTime != null">create_time = #{item.createTime},</if>
+ </trim>
+ where id = #{item.id}
+ </foreach>
+ </update>
+
+ <!--鍒犻櫎-->
+ <delete id="deleteReceivableFeeManagementLogById" parameterType="Integer">
+ delete from receivable_fee_management_log where id = #{id}
+ </delete>
+ <delete id="deleteReceivableFeeManagementLogByIds" parameterType="Integer">
+ delete from receivable_fee_management_log where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml b/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
index 4d1a067..421070e 100644
--- a/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.cwgl.mapper.ReceivableFeeManagementMapper">
<resultMap type="com.ruoyi.cwgl.domain.ReceivableFeeManagement" id="ReceivableFeeManagementResult">
@@ -15,7 +15,6 @@
<result property="isInternalSettlement" column="is_internal_settlement" />
<result property="internalSettlementUnit" column="internal_settlement_unit" />
<result property="customerName" column="customer_name" />
- <result property="customerId" column="customer_id" />
<result property="projectName" column="project_name" />
<result property="businessTime" column="business_time" />
<result property="receivableConfirmTime" column="receivable_confirm_time" />
@@ -27,10 +26,11 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="deleted" column="deleted" />
+ <result property="customerId" column="customer_id" />
</resultMap>
<sql id="selectReceivableFeeManagementVo">
- select thisTab.id, thisTab.system_no, thisTab.related_bill_no, thisTab.source_system, thisTab.business_sector, thisTab.document_type, thisTab.document_no, thisTab.is_internal_settlement, thisTab.internal_settlement_unit, thisTab.customer_name, thisTab.customer_id, thisTab.project_name, thisTab.business_time, thisTab.receivable_confirm_time, thisTab.receivable_amount, thisTab.status, thisTab.remark, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.deleted from receivable_fee_management AS thisTab
+ select thisTab.id, thisTab.system_no, thisTab.related_bill_no, thisTab.source_system, thisTab.business_sector, thisTab.document_type, thisTab.document_no, thisTab.is_internal_settlement, thisTab.internal_settlement_unit, thisTab.customer_name, thisTab.project_name, thisTab.business_time, thisTab.receivable_confirm_time, thisTab.receivable_amount, thisTab.status, thisTab.remark, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.deleted, thisTab.customer_id from receivable_fee_management AS thisTab
</sql>
<sql id="selectReceivableFeeManagementVoCount">
select count(0) from receivable_fee_management as thisTab
@@ -46,13 +46,13 @@
<if test="isInternalSettlement != null and isInternalSettlement != ''"> and thisTab.is_internal_settlement = #{isInternalSettlement}</if>
<if test="internalSettlementUnit != null and internalSettlementUnit != ''"> and thisTab.internal_settlement_unit = #{internalSettlementUnit}</if>
<if test="customerName != null and customerName != ''"> and thisTab.customer_name like concat('%', #{customerName}, '%')</if>
- <if test="customerId != null and customerId != ''"> and thisTab.customer_id = #{customerId}</if>
<if test="projectName != null and projectName != ''"> and thisTab.project_name like concat('%', #{projectName}, '%')</if>
<if test="businessTime != null "> and thisTab.business_time = #{businessTime}</if>
<if test="receivableConfirmTime != null "> and thisTab.receivable_confirm_time = #{receivableConfirmTime}</if>
<if test="receivableAmount != null "> and thisTab.receivable_amount = #{receivableAmount}</if>
<if test="status != null and status != ''"> and thisTab.status = #{status}</if>
<if test="deleted != null "> and thisTab.deleted = #{deleted}</if>
+ <if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
</sql>
<!--鏌ヨ-->
@@ -89,7 +89,6 @@
<if test="isInternalSettlement != null and isInternalSettlement != ''">is_internal_settlement,</if>
<if test="internalSettlementUnit != null">internal_settlement_unit,</if>
<if test="customerName != null and customerName != ''">customer_name,</if>
- <if test="customerId != null">customer_id,</if>
<if test="projectName != null">project_name,</if>
<if test="businessTime != null">business_time,</if>
<if test="receivableConfirmTime != null">receivable_confirm_time,</if>
@@ -101,7 +100,8 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="deleted != null">deleted,</if>
- </trim>
+ <if test="customerId != null">customer_id,</if>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemNo != null and systemNo != ''">#{systemNo},</if>
<if test="relatedBillNo != null and relatedBillNo != ''">#{relatedBillNo},</if>
@@ -112,7 +112,6 @@
<if test="isInternalSettlement != null and isInternalSettlement != ''">#{isInternalSettlement},</if>
<if test="internalSettlementUnit != null">#{internalSettlementUnit},</if>
<if test="customerName != null and customerName != ''">#{customerName},</if>
- <if test="customerId != null">#{customerId},</if>
<if test="projectName != null">#{projectName},</if>
<if test="businessTime != null">#{businessTime},</if>
<if test="receivableConfirmTime != null">#{receivableConfirmTime},</if>
@@ -124,15 +123,19 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="deleted != null">#{deleted},</if>
- </trim>
+ <if test="customerId != null">#{customerId},</if>
+ </trim>
</insert>
- <!-- 鎵归噺鏂板 -->
- <insert id="insertReceivableFeeManagementBatch" parameterType="com.ruoyi.cwgl.domain.ReceivableFeeManagement" useGeneratedKeys="true" keyProperty="id">
- insert into receivable_fee_management (system_no, related_bill_no, source_system, business_sector, document_type, document_no, is_internal_settlement, internal_settlement_unit, customer_name, customer_id, project_name, business_time, receivable_confirm_time, receivable_amount, status, remark, create_by, create_time, update_by, update_time, deleted)
- values
+ <insert id="insertReceivableFeeManagementBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+ insert into receivable_fee_management
+ <trim prefix="(" suffix=") values" suffixOverrides=",">
+ id,system_no,related_bill_no,source_system,business_sector,document_type,document_no,is_internal_settlement,internal_settlement_unit,customer_name,project_name,business_time,receivable_confirm_time,receivable_amount,status,remark,create_by,create_time,update_by,update_time,deleted,customer_id,
+ </trim>
<foreach item="item" index="index" collection="list" separator=",">
- (#{item.systemNo}, #{item.relatedBillNo}, #{item.sourceSystem}, #{item.businessSector}, #{item.documentType}, #{item.documentNo}, #{item.isInternalSettlement}, #{item.internalSettlementUnit}, #{item.customerName}, #{item.customerId}, #{item.projectName}, #{item.businessTime}, #{item.receivableConfirmTime}, #{item.receivableAmount}, #{item.status}, #{item.remark}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.deleted})
+ <trim prefix="(" suffix=") " suffixOverrides=",">
+ #{item.id},#{item.systemNo},#{item.relatedBillNo},#{item.sourceSystem},#{item.businessSector},#{item.documentType},#{item.documentNo},#{item.isInternalSettlement},#{item.internalSettlementUnit},#{item.customerName},#{item.projectName},#{item.businessTime},#{item.receivableConfirmTime},#{item.receivableAmount},#{item.status},#{item.remark},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.deleted},#{item.customerId},
+ </trim>
</foreach>
</insert>
@@ -149,7 +152,6 @@
<if test="isInternalSettlement != null and isInternalSettlement != ''">is_internal_settlement = #{isInternalSettlement},</if>
<if test="internalSettlementUnit != null">internal_settlement_unit = #{internalSettlementUnit},</if>
<if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
- <if test="customerId != null">customer_id = #{customerId},</if>
<if test="projectName != null">project_name = #{projectName},</if>
<if test="businessTime != null">business_time = #{businessTime},</if>
<if test="receivableConfirmTime != null">receivable_confirm_time = #{receivableConfirmTime},</if>
@@ -161,12 +163,13 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="deleted != null">deleted = #{deleted},</if>
+ <if test="customerId != null">customer_id = #{customerId},</if>
</trim>
where id = #{id}
</update>
<!-- 淇敼 -->
<update id="updateReceivableFeeManagementBatch" parameterType="java.util.List">
- <foreach collection="list" item="item" index="index" separator=",">
+ <foreach collection="list" item="item" index="index" separator=";">
update receivable_fee_management
<trim prefix="SET" suffixOverrides=",">
<if test="item.systemNo != null and item.systemNo != ''">system_no = #{item.systemNo},</if>
@@ -178,7 +181,6 @@
<if test="item.isInternalSettlement != null and item.isInternalSettlement != ''">is_internal_settlement = #{item.isInternalSettlement},</if>
<if test="item.internalSettlementUnit != null">internal_settlement_unit = #{item.internalSettlementUnit},</if>
<if test="item.customerName != null and item.customerName != ''">customer_name = #{item.customerName},</if>
- <if test="item.customerId != null">customer_id = #{item.customerId},</if>
<if test="item.projectName != null">project_name = #{item.projectName},</if>
<if test="item.businessTime != null">business_time = #{item.businessTime},</if>
<if test="item.receivableConfirmTime != null">receivable_confirm_time = #{item.receivableConfirmTime},</if>
@@ -190,8 +192,9 @@
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.deleted != null">deleted = #{item.deleted},</if>
+ <if test="item.customerId != null">customer_id = #{item.customerId},</if>
</trim>
- where id = #{item.id}
+ where id = #{item.id}
</foreach>
</update>
@@ -205,7 +208,6 @@
#{id}
</foreach>
</delete>
-
<!--鏍规嵁ID鏁扮粍鏌ヨ-->
<select id="selectReceivableFeeManagementByIds" parameterType="Integer" resultMap="ReceivableFeeManagementResult">
<include refid="selectReceivableFeeManagementVo"/>
@@ -214,5 +216,4 @@
#{id}
</foreach>
</select>
-
</mapper>
\ No newline at end of file
diff --git a/ui/admin-ui3/src/api/cwgl/receivableFeeManagementLog.ts b/ui/admin-ui3/src/api/cwgl/receivableFeeManagementLog.ts
new file mode 100644
index 0000000..484fd79
--- /dev/null
+++ b/ui/admin-ui3/src/api/cwgl/receivableFeeManagementLog.ts
@@ -0,0 +1,67 @@
+import request,{download,requestType} from "@/utils/request";
+import {BaseEntityInterface} from "@/utils/globalInterface";
+export interface ReceivableFeeManagementLogI extends BaseEntityInterface{
+ id ?: number , receivableFeeId ?: number , operator ?: string , operationTime ?: string , operationDesc ?: string , createTime ?: string }
+
+
+/**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織鍒楄〃
+ */
+export const listReceivableFeeManagementLog:requestType = (query) => {
+ return request({
+ url: '/cwgl/receivableFeeManagementLog/list',
+ method:'get',
+ params:query
+ })
+}
+/**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織璇︾粏
+ */
+export const getReceivableFeeManagementLog:requestType = (id) => {
+ return request({
+ url: '/cwgl/receivableFeeManagementLog/' + id,
+ method:'get'
+ })
+}
+
+/**
+ * 鏂板搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+export const addReceivableFeeManagementLog:requestType = (data) => {
+ return request({
+ url: '/cwgl/receivableFeeManagementLog',
+ method: 'post',
+ data
+ })
+}
+
+/**
+ * 淇敼搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+export const updateReceivableFeeManagementLog:requestType = (data) => {
+ return request({
+ url: '/cwgl/receivableFeeManagementLog',
+ method: 'put',
+ data
+ })
+}
+
+/**
+ * 鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+export const delReceivableFeeManagementLog:requestType = (id) => {
+ return request({
+ url: '/cwgl/receivableFeeManagementLog/' + id,
+ method: 'delete'
+ })
+}
+
+
+/**
+ * 瀵煎嚭搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+export const exportReceivableFeeManagementLog:requestType = (query) => {
+ return new Promise<any>(()=>{
+ download('/cwgl/receivableFeeManagementLog/export',query);
+ })
+}
diff --git a/ui/admin-ui3/src/views/cwgl/receivableFeeManagementLog/index.vue b/ui/admin-ui3/src/views/cwgl/receivableFeeManagementLog/index.vue
new file mode 100644
index 0000000..7041084
--- /dev/null
+++ b/ui/admin-ui3/src/views/cwgl/receivableFeeManagementLog/index.vue
@@ -0,0 +1,150 @@
+<template>
+ <basicContainer >
+ <avue-crud
+ :option="option"
+ :table-loading="pageF.loading"
+ :data="tableData"
+ :page="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crudRef"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @refresh-change="refreshChange"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @on-load="onLoad"
+ >
+ <template #menu-left>
+ <el-button
+ type="success"
+ icon="Edit"
+ :disabled="pageF.single"
+ v-hasPermi="['cwgl:receivableFeeManagementLog:edit']"
+ @click="handleUpdate">淇敼
+ </el-button>
+ <el-button
+ type="danger"
+ icon="Delete"
+ :disabled="pageF.multiple"
+ @click="handleDelete"
+ v-hasPermi="['cwgl:receivableFeeManagementLog:remove']"
+ >鍒犻櫎
+ </el-button>
+ <el-button
+ type="warning"
+ plain
+ icon="Download"
+ @click="handleExport"
+ v-hasPermi="['cwgl:receivableFeeManagementLog:export']"
+ >瀵煎嚭
+ </el-button>
+ </template>
+ </avue-crud>
+ </basicContainer>
+</template>
+
+<script setup name="receivableFeeManagementLog" lang="ts">
+ import {ReceivableFeeManagementLogI,addReceivableFeeManagementLog, delReceivableFeeManagementLog, exportReceivableFeeManagementLog, getReceivableFeeManagementLog, listReceivableFeeManagementLog, updateReceivableFeeManagementLog} from "@/api/cwgl/receivableFeeManagementLog";
+ import useCurrentInstance from "@/utils/useCurrentInstance";
+ import {computed,reactive, ref, toRefs} from "vue";
+ import {PagesInterface, PageQueryInterface} from "@/utils/globalInterface";
+ import {usePagePlus} from "@/hooks/usePagePlus";
+ import {hasPermission} from "@/utils/permissionUtils";
+
+ const { proxy } = useCurrentInstance();
+ const crudRef = ref();
+
+ const permissionList = computed(()=>{
+ return {
+ addBtn: hasPermission(["cwgl:receivableFeeManagementLog:add"]),
+ delBtn: hasPermission(["cwgl:receivableFeeManagementLog:remove"]),
+ editBtn: hasPermission(["cwgl:receivableFeeManagementLog:edit"]),
+ viewBtn: hasPermission(["cwgl:receivableFeeManagementLog:query"]),
+ }
+ })
+
+ const data = reactive({
+ form:<ReceivableFeeManagementLogI>{},
+ queryParams:<ReceivableFeeManagementLogI&PageQueryInterface>{},
+ page: <PagesInterface>{
+ pageSize: 10,
+ total: 0,
+ currentPage: 1,
+ },
+ selectionList:[],
+ })
+ const {queryParams,form,page,selectionList} = toRefs(data);
+ const option = ref({
+ pageKey: 'ReceivableFeeManagementLog',
+ rowKey: 'id',
+ column: {
+ id: {
+ label: '鏃ュ織ID',
+ },
+ receivableFeeId: {
+ label: '鍏宠仈鐨勫簲鏀惰垂鐢ㄧ鐞咺D',
+ rules: [
+ {
+ required: true,
+ message: "鍏宠仈鐨勫簲鏀惰垂鐢ㄧ鐞咺D涓嶈兘涓虹┖", trigger: "blur" }
+ ], },
+ operator: {
+ label: '鎿嶄綔浜�',
+ rules: [
+ {
+ required: true,
+ message: "鎿嶄綔浜轰笉鑳戒负绌�", trigger: "blur" }
+ ], },
+ operationTime: {
+ label: '鎿嶄綔鏃堕棿',
+ rules: [
+ {
+ required: true,
+ message: "鎿嶄綔鏃堕棿涓嶈兘涓虹┖", trigger: "blur" }
+ ], },
+ operationDesc: {
+ label: '鎿嶄綔鎻忚堪',
+ rules: [
+ {
+ required: true,
+ message: "鎿嶄綔鎻忚堪涓嶈兘涓虹┖", trigger: "blur" }
+ ], },
+ createTime: {
+ label: '璁板綍鍒涘缓鏃堕棿',
+ rules: [
+ {
+ required: true,
+ message: "璁板綍鍒涘缓鏃堕棿涓嶈兘涓虹┖", trigger: "blur" }
+ ] },
+ }
+ })
+
+ const { tableData,pageF,rowSave,rowUpdate,rowDel,beforeOpen,searchChange,
+ searchReset,selectionChange,onLoad,currentChange,sizeChange,handleDelete,handleExport,handleUpdate,refreshChange} = usePagePlus({
+ form:form,
+ option:option,
+ queryParams:queryParams,
+ idKey:'id',
+ page:page.value,
+ getListApi:listReceivableFeeManagementLog,
+ getDetailApi:getReceivableFeeManagementLog,
+ exportApi:exportReceivableFeeManagementLog,
+ deleteApi:delReceivableFeeManagementLog,
+ addApi:addReceivableFeeManagementLog,
+ updateApi:updateReceivableFeeManagementLog,
+ handleUpdateFunc:()=>{
+ crudRef.value.rowEdit(selectionList.value[0]);
+ },
+ handleSelectionChangeFunc:(selection:any)=>{
+ selectionList.value = selection;
+ }
+ })
+
+
+</script>
--
Gitblit v1.8.0