修改上海民航合同定制化

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ContractController.java

@@ -2,10 +2,7 @@ package com.management.platform.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.Contract;
-import com.management.platform.entity.ContractCustom;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.User;
+import com.management.platform.entity.*;
 import com.management.platform.mapper.ProjectMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ContractService;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ContractPayCustomizedController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-23
+ */
+@RestController
+@RequestMapping("/contract-pay-customized")
+public class ContractPayCustomizedController {
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ContractPaymentController.java

@@ -2,14 +2,19 @@ package com.management.platform.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.ContractPayCustomized;
 import com.management.platform.entity.ContractPayment;
+import com.management.platform.entity.User;
+import com.management.platform.service.ContractPayCustomizedService;
 import com.management.platform.service.ContractPaymentService;
+import com.management.platform.service.UserService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
@@ -26,10 +31,22 @@ public class ContractPaymentController {
     @Resource
     private ContractPaymentService contractPaymentService;
 
+    @Resource
+    private UserService userService;
+
+    @Resource
+    private ContractPayCustomizedService payCustomizedService;
+
     @RequestMapping("/getList")
-    public HttpRespMsg getList(Integer contractId) {
+    public HttpRespMsg getList(HttpServletRequest request,Integer contractId) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = contractPaymentService.list(new QueryWrapper<ContractPayment>().eq("contract_id", contractId));
+        String token = request.getHeader("token");
+        User user = userService.getById(token);
+        if (user.getCompanyId()!=4215){
+            msg.data = contractPaymentService.list(new QueryWrapper<ContractPayment>().eq("contract_id", contractId));
+        }else {
+            msg.data = payCustomizedService.list(new QueryWrapper<ContractPayCustomized>().eq("contract_id", contractId));
+        }
         return msg;
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Contract.java

@@ -163,6 +163,9 @@ public class Contract extends Model<Contract> {
     @TableField(exist = false)
     public ContractCustom customData;
 
+    @TableField(exist = false)
+    public ContractPayCustomized payCustomizedData;
+
     /**
      * 二级分类id
      */

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ContractPayCustomized.java

@@ -0,0 +1,99 @@
+package com.management.platform.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ContractPayCustomized extends Model<ContractPayCustomized> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 合同id
+     */
+    @TableId("contract_id")
+    private Integer contractId;
+
+    /**
+     * 付款日期
+     */
+    @TableField("pay_date")
+    private String payDate;
+
+    /**
+     * 已付款金额（元）
+     */
+    @TableField("payed_amount")
+    private BigDecimal payedAmount;
+
+    /**
+     * 付款类型:1-预付，2-报账
+     */
+    @TableField("pay_way")
+    private Integer payWay;
+
+    /**
+     * 凭证号
+     */
+    @TableField("bill_number")
+    private String billNumber;
+
+    /**
+     * 已冲销金额
+     */
+    @TableField("reserved_amounts")
+    private BigDecimal reservedAmounts;
+
+    /**
+     * 冲销凭证号
+     */
+    @TableField("reserved_bill_number")
+    private String reservedBillNumber;
+
+    /**
+     * 付款总金额
+     */
+    @TableField("total_payed_amounts")
+    private BigDecimal totalPayedAmounts;
+
+    /**
+     * 待付款金额
+     */
+    @TableField("pending_amounts")
+    private BigDecimal pendingAmounts;
+
+    /**
+     * 是否已付款
+     */
+    @TableField("is_payed")
+    private Boolean isPayed;
+
+    /**
+     * 付款类型：0报账,1预付
+     */
+    @TableField("pay_type")
+    private Boolean payType;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.contractId;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ContractPayCustomizedMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ContractPayCustomized;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-23
+ */
+public interface ContractPayCustomizedMapper extends BaseMapper<ContractPayCustomized> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ContractPayCustomizedService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ContractPayCustomized;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-23
+ */
+public interface ContractPayCustomizedService extends IService<ContractPayCustomized> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ContractService.java

@@ -3,6 +3,7 @@ package com.management.platform.service;
 import com.management.platform.entity.Contract;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.entity.ContractCustom;
+import com.management.platform.entity.ContractPayCustomized;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractPayCustomizedServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ContractPayCustomized;
+import com.management.platform.mapper.ContractPayCustomizedMapper;
+import com.management.platform.service.ContractPayCustomizedService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-09-23
+ */
+@Service
+public class ContractPayCustomizedServiceImpl extends ServiceImpl<ContractPayCustomizedMapper, ContractPayCustomized> implements ContractPayCustomizedService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -10,6 +10,7 @@ import com.management.platform.entity.vo.ContractPageVO;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
 import com.management.platform.service.ContractDocumentService;
+import com.management.platform.service.ContractPayCustomizedService;
 import com.management.platform.service.ContractService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.service.ExcelExportService;
@@ -56,6 +57,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
     @Resource
     private ContractCustomMapper contractCustomMapper;
     @Resource
+    private ContractPayCustomizedMapper payCustomizedMapper;
+    @Resource
     private ContractMapper contractMapper;
     @Resource
     private ContractPaymentMapper contractPaymentMapper;
@@ -364,17 +367,32 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
 
 
         if (StringUtils.isNotBlank(paymentListStr)){
-            List<ContractPayment> contractPaymentList = JSON.parseArray(paymentListStr, ContractPayment.class);
-            BigDecimal bg = new BigDecimal("0");
-            for (ContractPayment contractPayment:contractPaymentList) {
-                contractPayment.setContractId(contract.getId());
-                contractPaymentMapper.insert(contractPayment);
-                if (contractPayment.getIsPayed()) {
-                    bg = bg.add(contractPayment.getAmount());
+            if (user.getCompanyId()==4215){
+                List<ContractPayCustomized> payCustomizedList = JSON.parseArray(paymentListStr, ContractPayCustomized.class);
+                BigDecimal bg = new BigDecimal("0");
+                for (ContractPayCustomized payCustomized:payCustomizedList) {
+                    payCustomized.setContractId(contract.getId());
+                    payCustomizedMapper.insert(payCustomized);
+                    if (payCustomized.getIsPayed()) {
+                        bg = bg.add(payCustomized.getPayedAmount());
+                    }
+                }
+                contract.setPayment(bg);
+                contractMapper.updateById(contract);
+            }else {
+                List<ContractPayment> contractPaymentList = JSON.parseArray(paymentListStr, ContractPayment.class);
+                BigDecimal bg = new BigDecimal("0");
+                for (ContractPayment contractPayment:contractPaymentList) {
+                    contractPayment.setContractId(contract.getId());
+                    contractPaymentMapper.insert(contractPayment);
+                    if (contractPayment.getIsPayed()) {
+                        bg = bg.add(contractPayment.getAmount());
+                    }
                 }
+                contract.setPayment(bg);
+                contractMapper.updateById(contract);
             }
-            contract.setPayment(bg);
-            contractMapper.updateById(contract);
+
         }
 
         ContractLog contractLog = new ContractLog();
@@ -437,17 +455,31 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             contract.setIndate(null);
             //更新回款计划
             if (StringUtils.isNotBlank(paymentListStr)){
-                List<ContractPayment> contractPaymentList = JSON.parseArray(paymentListStr, ContractPayment.class);
-                contractPaymentMapper.delete(new QueryWrapper<ContractPayment>().eq("contract_id",contract.getId()));
-                BigDecimal bg = new BigDecimal("0");
-                for (ContractPayment contractPayment:contractPaymentList) {
-                    contractPaymentMapper.insert(contractPayment);
-                    if (contractPayment.getIsPayed()) {
-                        bg = bg.add(contractPayment.getAmount());
+                if (user.getCompanyId()==4215){
+                    List<ContractPayCustomized> payCustomizedList = JSON.parseArray(paymentListStr, ContractPayCustomized.class);
+                    payCustomizedMapper.delete(new QueryWrapper<ContractPayCustomized>().eq("contract_id",contract.getId()));
+                    BigDecimal bg = new BigDecimal("0");
+                    for (ContractPayCustomized payCustomized:payCustomizedList) {
+                        payCustomized.setContractId(contract.getId());
+                        payCustomizedMapper.insert(payCustomized);
+                        if (payCustomized.getIsPayed()) {
+                            bg = bg.add(payCustomized.getPayedAmount());
+                        }
                     }
+                    contract.setPayment(bg);
+                }else {
+                    List<ContractPayment> contractPaymentList = JSON.parseArray(paymentListStr, ContractPayment.class);
+                    contractPaymentMapper.delete(new QueryWrapper<ContractPayment>().eq("contract_id",contract.getId()));
+                    BigDecimal bg = new BigDecimal("0");
+                    for (ContractPayment contractPayment:contractPaymentList) {
+                        contractPaymentMapper.insert(contractPayment);
+                        if (contractPayment.getIsPayed()) {
+                            bg = bg.add(contractPayment.getAmount());
+                        }
+                    }
+                    System.out.println("回款金额： " + bg);
+                    contract.setPayment(bg);
                 }
-                System.out.println("回款金额： " + bg);
-                contract.setPayment(bg);
             }
             contractMapper.updateById(contract);
             boolean flag = false;
@@ -834,7 +866,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                 if (StringUtils.isNotBlank(s4)){
                     customItem.setPendingAmounts(new BigDecimal(s4));
                 }*/
-                String status = row.getCell(27)==null?null:row.getCell(27).getStringCellValue();
+                String status = row.getCell(20)==null?null:row.getCell(20).getStringCellValue();
                 if (StringUtils.isNotBlank(status)){
                     if ("履约中".equals(status)) {
                         customItem.setFinishStatus(1);
@@ -842,8 +874,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                         customItem.setFinishStatus(2);
                     }
                 }
-                String remarks = row.getCell(28)==null?null:row.getCell(28).getStringCellValue();
-                customItem.setStampDutyItems(row.getCell(29)==null?null:row.getCell(29).getStringCellValue());
+                String remarks = row.getCell(21)==null?null:row.getCell(21).getStringCellValue();
+                customItem.setStampDutyItems(row.getCell(22)==null?null:row.getCell(22).getStringCellValue());
                 Contract item = new Contract();
                 //检查合同编号是否存在
                 if (StringUtils.isNotBlank(No)){

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ContractPayCustomizedMapper.xml

@@ -0,0 +1,25 @@
+<?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.management.platform.mapper.ContractPayCustomizedMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ContractPayCustomized">
+        <id column="contract_id" property="contractId" />
+        <result column="pay_date" property="payDate" />
+        <result column="payed_amount" property="payedAmount" />
+        <result column="pay_way" property="payWay" />
+        <result column="bill_number" property="billNumber" />
+        <result column="reserved_amounts" property="reservedAmounts" />
+        <result column="reserved_bill_number" property="reservedBillNumber" />
+        <result column="total_payed_amounts" property="totalPayedAmounts" />
+        <result column="pending_amounts" property="pendingAmounts" />
+        <result column="is_payed" property="isPayed" />
+        <result column="pay_type" property="payType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        contract_id, pay_date, payed_amount, pay_way, bill_number, reserved_amounts, reserved_bill_number, total_payed_amounts, pending_amounts, is_payed, pay_type
+    </sql>
+
+</mapper>