付款管理

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/controller/PaymentController.java

@@ -0,0 +1,83 @@
+package com.jeeplus.business.payment.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.business.borrow.service.dto.BorrowDTO;
+import com.jeeplus.business.payment.service.PaymentService;
+import com.jeeplus.business.payment.service.dto.PaymentDTO;
+import com.jeeplus.common.utils.ResponseUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Api("付款管理")
+@RestController
+@RequestMapping(value = "/payment")
+public class PaymentController {
+
+    @Resource
+    private PaymentService paymentService;
+
+
+    /**
+     * 付款管理列表
+     */
+    @ApiOperation(value = "付款管理列表")
+    @GetMapping(value = "/findList")
+    public ResponseEntity<IPage<PaymentDTO>> applyList(PaymentDTO paymentDTO, Page<PaymentDTO> page) throws Exception {
+        IPage<PaymentDTO> pageList=paymentService.findPageList(paymentDTO,page);
+        return ResponseEntity.ok(pageList);
+    }
+
+    /**
+     * 根据id查询数据
+     */
+    @ApiOperation(value = "根据id查询数据")
+    @GetMapping(value = "findById")
+    public ResponseEntity<PaymentDTO> findById(@RequestParam String id){
+        PaymentDTO paymentDTO=paymentService.findById(id);
+        return ResponseEntity.ok(paymentDTO);
+    }
+
+    /**
+     * 新增或修改
+     */
+    @ApiOperation(value = "新增或修改")
+    @PostMapping(value = "/saveForm")
+    public ResponseEntity saveForm(@RequestBody PaymentDTO paymentDTO) throws Exception {
+        String id=paymentService.save(paymentDTO);
+        return ResponseUtil.newInstance().add("businessTable","jy_payment").add("businessId",id).ok("操作成功");
+    }
+
+    /**
+     * 根据id修改状态status
+     * @param
+     */
+    @ApiOperation(value = "根据id修改状态status")
+    @PostMapping(value = "/updateStatusById")
+    public void updateStatusById(@RequestBody PaymentDTO paymentDTO) {
+        paymentService.updateStatusById(paymentDTO);
+    }
+
+    /**
+     * 根据id进行删除
+     */
+    @ApiOperation(value = "根据id进行删除")
+    @DeleteMapping(value = "/delete")
+    public ResponseEntity<String> deleteById(@RequestParam String id){
+        String s = paymentService.deleteById(id);
+        return ResponseEntity.ok(s);
+    }
+
+    /**
+     * 管理员修改
+     */
+    @ApiOperation(value = "管理员修改")
+    @PostMapping(value = "/adminEditForm")
+    public void adminEditForm(@RequestBody PaymentDTO paymentDTO){
+        paymentService.adminEditForm(paymentDTO);
+    }
+}

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/domain/Payment.java

@@ -0,0 +1,81 @@
+package com.jeeplus.business.payment.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@TableName("jy_payment")
+public class Payment extends BaseEntity {
+
+    /**
+     * 项目id
+     */
+    private String projectId;
+
+    /**
+     * 付款编号
+     */
+    private String no;
+
+    /**
+     * 收款类别
+     */
+    private String proceedType;
+
+    //税号
+    private String dutyNumber;
+
+    //累计已支付金额
+    private String amountPaid;
+
+    //付款理由或用途
+    private String reason;
+
+    //付款金额(小写)
+    private String paymentLower;
+
+    //付款金额(大写)
+    private String payment;
+
+    //付款方式
+    private String paymentType;
+
+    //付款摘要
+    private String remarks;
+
+    //状态
+    private String status;
+
+    //流程
+    private String procInsId;
+    private String processDefinitionId;
+
+    //对冲金额
+    private String refund;
+
+    //剩余付款额度
+    private String finalMoney;
+
+    //收款单位
+    private String proceedOfficeId;
+
+    //付款人
+    private String paymentUser;
+
+    //付款时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date paymentTime;
+
+    /**
+     * 开户银行及银行账号
+     */
+    private String ourBank;
+    private String bankNumber;
+
+}

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/mapper/PaymentMapper.java

@@ -0,0 +1,24 @@
+package com.jeeplus.business.payment.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.business.payment.domain.Payment;
+import com.jeeplus.business.payment.service.dto.PaymentDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface PaymentMapper extends BaseMapper<Payment> {
+    @InterceptorIgnore(tenantLine = "true")
+    IPage<PaymentDTO> findPageList(@Param(Constants.WRAPPER) QueryWrapper<PaymentDTO> queryWrapper, Page<PaymentDTO> page);
+    @InterceptorIgnore(tenantLine = "true")
+    PaymentDTO findById(@Param("id") String id);
+
+    void updateStatusById(@Param("id") String id, @Param("status") String status);
+    @InterceptorIgnore(tenantLine = "true")
+    void updateInfoById(@Param("payment") Payment payment);
+}

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/mapper/xml/PaymentMapper.xml

@@ -0,0 +1,96 @@
+<?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.jeeplus.business.payment.mapper.PaymentMapper">
+
+    <select id="findPageList" resultType="com.jeeplus.business.payment.service.dto.PaymentDTO">
+        select
+            a.id,
+            a.create_by_id,
+            a.no,
+            a.project_id,
+            a.proceed_type,
+            a.duty_number,
+            a.amount_paid,
+            a.reason,
+            a.payment_lower,
+            a.payment,
+            a.payment_type,
+            a.remarks,
+            a.status,
+            a.proc_ins_id,
+            a.process_definition_id,
+            a.refund,
+            a.final_money,
+            a.proceed_office_id,
+            su.name as paymentUser,
+            a.payment_time,
+            so.name as paymentOffice,
+            art1.ID_ as task_id
+        from jy_payment a
+        left join sys_user su on a.payment_user = su.id and su.del_flag = '0'
+        left join sys_office so on su.office_id = so.id and so.del_flag = '0'
+        LEFT JOIN act_ru_task art1 ON a.proc_ins_id = art1.PROC_INST_ID_
+        ${ew.customSqlSegment}
+        ORDER BY a.update_time DESC
+    </select>
+
+
+    <select id="findById" resultType="com.jeeplus.business.payment.service.dto.PaymentDTO">
+        select
+            a.id,
+            a.create_by_id,
+            a.no,
+            a.project_id,
+            a.proceed_type,
+            a.duty_number,
+            a.amount_paid,
+            a.reason,
+            a.payment_lower,
+            a.payment,
+            a.payment_type,
+            a.remarks,
+            a.status,
+            a.proc_ins_id,
+            a.process_definition_id,
+            a.refund,
+            a.final_money,
+            a.proceed_office_id,
+            a.payment_user as paymentUser,
+            a.payment_time,
+            so.name as paymentOffice,
+            art1.ID_ as task_id
+        from jy_payment a
+        left join sys_user su on a.payment_user = su.id and su.del_flag = '0'
+        left join sys_office so on su.office_id = so.id and so.del_flag = '0'
+        LEFT JOIN act_ru_task art1 ON a.proc_ins_id = art1.PROC_INST_ID_
+        where a.id = #{id}
+    </select>
+
+    <update id="updateStatusById">
+        update jy_payment set status = #{status} where id = #{id}
+    </update>
+
+    <update id="updateInfoById">
+        update
+            jy_payment
+        set
+            project_id = #{payment.projectId},
+            proceed_type = #{payment.proceedType},
+            duty_number = #{payment.dutyNumber},
+            amount_paid = #{payment.amountPaid},
+            reason = #{payment.reason},
+            payment_lower = #{payment.paymentLower},
+            payment = #{payment.payment},
+            payment_type = #{payment.paymentType},
+            remarks = #{payment.remarks},
+            proceed_office_id = #{payment.proceedOfficeId},
+            payment_user = #{payment.paymentUser},
+            payment_time = #{payment.paymentTime},
+            our_bank = #{payment.ourBank},
+            bank_number = #{payment.bankNumber}
+        where id = #{payment.id}
+    </update>
+
+</mapper>

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/service/PaymentService.java

@@ -0,0 +1,233 @@
+package com.jeeplus.business.payment.service;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.business.borrow.service.dto.BorrowDTO;
+import com.jeeplus.business.payment.domain.Payment;
+import com.jeeplus.business.payment.mapper.PaymentMapper;
+import com.jeeplus.business.payment.service.dto.PaymentDTO;
+import com.jeeplus.business.project.domain.JyProject;
+import com.jeeplus.business.project.mapper.JyProjectMapper;
+import com.jeeplus.business.workClientInfo.domain.dto.JyWorkClientInfosDto;
+import com.jeeplus.business.workClientInfo.mapper.JyWorkClientBankMapper;
+import com.jeeplus.business.workClientInfo.mapper.JyWorkClientInfoMapper;
+import com.jeeplus.business.workClientInfo.service.JyWorkClientService;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.utils.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.UUID;
+
+@Service
+public class PaymentService {
+
+    @Resource
+    private PaymentMapper paymentMapper;
+
+    @Resource
+    private JyProjectMapper jyProjectMapper;
+
+    @Resource
+    private JyWorkClientService jyWorkClientService;
+
+
+    /*
+    列表
+     */
+    public IPage<PaymentDTO> findPageList(PaymentDTO paymentDTO, Page<PaymentDTO> page) throws Exception {
+        QueryWrapper<PaymentDTO> queryWrapper = QueryWrapperGenerator.buildQueryCondition(paymentDTO, PaymentDTO.class);
+        queryWrapper.eq("a.del_flag",0);
+        //编号
+        if (StringUtils.isNotBlank(paymentDTO.getNo())){
+            queryWrapper.like("a.no",paymentDTO.getNo());
+        }
+        //用途
+        if (StringUtils.isNotBlank(paymentDTO.getReason())){
+            queryWrapper.like("a.reason",paymentDTO.getReason());
+        }
+        //付款人
+        if (StringUtils.isNotBlank(paymentDTO.getPaymentUser())){
+            queryWrapper.eq("a.payment_user",paymentDTO.getPaymentUser());
+        }
+        //付款人部门
+        if (StringUtils.isNotBlank(paymentDTO.getPaymentOffice())){
+            queryWrapper.eq("so.id",paymentDTO.getPaymentOffice());
+        }
+        //付款时间
+        if (paymentDTO.getCreateDates() != null && paymentDTO.getCreateDates().length > 0) {
+            queryWrapper.between("a.payment_time", paymentDTO.getCreateDates()[0], paymentDTO.getCreateDates()[1]);
+        }
+        //付款金额
+        if (paymentDTO.getPaymentAmounts() != null) {
+            if (StringUtils.isNotEmpty(paymentDTO.getPaymentAmounts()[0])) {
+                queryWrapper.ge("a.payment_lower", Double.parseDouble(paymentDTO.getPaymentAmounts()[0]));
+            }
+            if (paymentDTO.getPaymentAmounts().length>1 && StringUtils.isNotEmpty(paymentDTO.getPaymentAmounts()[1])) {
+                queryWrapper.le("a.payment_lower", Double.parseDouble(paymentDTO.getPaymentAmounts()[1]));
+            }
+        }
+        IPage<PaymentDTO> pageList=paymentMapper.findPageList(queryWrapper,page);
+        return pageList;
+
+
+    }
+
+    /**
+     * 根据id查询数据
+     * @param id
+     * @return
+     */
+    public PaymentDTO findById(String id) {
+        PaymentDTO paymentDTO=paymentMapper.findById(id);
+        //查找项目信息
+        if (StringUtils.isNotBlank(paymentDTO.getProjectId())){
+            String[] split = paymentDTO.getProjectId().split(",");
+            ArrayList<JyProject> projects = new ArrayList<>();
+            for (String s : split) {
+                JyProject project = jyProjectMapper.getById(s);
+                projects.add(project);
+            }
+            paymentDTO.setProjectDTOList(projects);
+        }
+        return paymentDTO;
+    }
+
+    /*
+    新增或修改
+     */
+    public String save(PaymentDTO paymentDTO) throws Exception {
+        if (StringUtils.isNotBlank(paymentDTO.getId())){
+            return update(paymentDTO);
+        }
+        return add(paymentDTO);
+    }
+
+    private String add(PaymentDTO paymentDTO) throws Exception {
+        //获取当前登录人信息
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
+        //生成付款编号
+        String No = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), PaymentDTO.BIZ_CODE, TokenProvider.getCurrentToken());
+        //生成id
+        String id = UUID.randomUUID().toString().replace("-", "");
+
+        Payment payment = new Payment();
+        //获取项目id
+        String projectId="";
+        if (ObjectUtils.isNotEmpty(paymentDTO.getProjectDTOList())){
+            for (JyProject jyProject : paymentDTO.getProjectDTOList()) {
+                projectId+=jyProject.getProjectId()+",";
+            }
+        }
+        payment.setProjectId(projectId);
+        payment.setNo(No);
+        payment.setId(id);
+        payment.setProceedType(paymentDTO.getProceedType());//收款类别
+        payment.setProceedOfficeId(paymentDTO.getProceedOfficeId());//收款单位
+        payment.setDutyNumber(paymentDTO.getDutyNumber()); //税号
+        payment.setAmountPaid(paymentDTO.getAmountPaid());//累计已支付金额
+        payment.setReason(paymentDTO.getReason());//用途
+        payment.setPaymentLower(paymentDTO.getPaymentLower());//付款金额  小写
+        payment.setPayment(paymentDTO.getPayment()); //大写
+        payment.setPaymentType(paymentDTO.getPaymentType());//付款方式
+        payment.setRemarks(paymentDTO.getRemarks()); //付款摘要
+        payment.setPaymentUser(paymentDTO.getPaymentUser()); //付款人
+        payment.setPaymentTime(paymentDTO.getPaymentTime());//付款时间
+        payment.setOurBank(paymentDTO.getOurBank());//开户银行
+        payment.setBankNumber(paymentDTO.getBankNumber());//银行账号
+        payment.setStatus(paymentDTO.getStatus());
+        payment.setRemarks(paymentDTO.getRemarks());//摘要
+        paymentMapper.insert(payment);
+        return id;
+    }
+
+    private String update(PaymentDTO paymentDTO){
+        Payment payment = new Payment();
+        //获取项目id
+        String projectId="";
+        if (ObjectUtils.isNotEmpty(paymentDTO.getProjectDTOList())){
+            for (JyProject jyProject : paymentDTO.getProjectDTOList()) {
+                projectId+=jyProject.getProjectId()+",";
+            }
+        }
+        payment.setProjectId(projectId);//项目
+        payment.setProceedType(paymentDTO.getProceedType());//收款类别
+        payment.setProceedOfficeId(paymentDTO.getProceedOfficeId());//收款单位
+        payment.setDutyNumber(paymentDTO.getDutyNumber()); //税号
+        payment.setAmountPaid(paymentDTO.getAmountPaid());//累计已支付金额
+        payment.setReason(paymentDTO.getReason());//用途
+        payment.setPaymentLower(paymentDTO.getPaymentLower());//付款金额  小写
+        payment.setPayment(paymentDTO.getPayment()); //大写
+        payment.setPaymentType(paymentDTO.getPaymentType());//付款方式
+        payment.setRemarks(paymentDTO.getRemarks()); //付款摘要
+        payment.setPaymentUser(paymentDTO.getPaymentUser()); //付款人
+        payment.setPaymentTime(paymentDTO.getPaymentTime());//付款时间
+        payment.setOurBank(paymentDTO.getOurBank());//开户银行
+        payment.setBankNumber(paymentDTO.getBankNumber());//银行账号
+        payment.setId(paymentDTO.getId());
+        payment.setStatus(paymentDTO.getStatus());
+        payment.setRemarks(paymentDTO.getRemarks());//摘要
+        paymentMapper.updateById(payment);
+
+        return paymentDTO.getId();
+    }
+
+    /**
+     * 根据id修改状态
+     * @param paymentDTO
+     */
+    public void updateStatusById(PaymentDTO paymentDTO) {
+        paymentMapper.updateStatusById(paymentDTO.getId(),paymentDTO.getStatus());
+    }
+
+    /**
+     * 根据id进行删除
+     * @param id
+     * @return
+     */
+    public String deleteById(String id) {
+        paymentMapper.deleteById(id);
+        return "操作成功";
+    }
+
+    /**
+     * 管理员修改
+     * @param paymentDTO
+     */
+    public void adminEditForm(PaymentDTO paymentDTO) {
+        Payment payment = new Payment();
+        //获取项目id
+        String projectId="";
+        if (ObjectUtils.isNotEmpty(paymentDTO.getProjectDTOList())){
+            for (JyProject jyProject : paymentDTO.getProjectDTOList()) {
+                projectId+=jyProject.getProjectId()+",";
+            }
+        }
+        payment.setProjectId(projectId);//项目
+        payment.setProceedType(paymentDTO.getProceedType());//收款类别
+        payment.setProceedOfficeId(paymentDTO.getProceedOfficeId());//收款单位
+        payment.setDutyNumber(paymentDTO.getDutyNumber()); //税号
+        payment.setAmountPaid(paymentDTO.getAmountPaid());//累计已支付金额
+        payment.setReason(paymentDTO.getReason());//用途
+        payment.setPaymentLower(paymentDTO.getPaymentLower());//付款金额  小写
+        payment.setPayment(paymentDTO.getPayment()); //大写
+        payment.setPaymentType(paymentDTO.getPaymentType());//付款方式
+        payment.setRemarks(paymentDTO.getRemarks()); //付款摘要
+        payment.setPaymentUser(paymentDTO.getPaymentUser()); //付款人
+        payment.setPaymentTime(paymentDTO.getPaymentTime());//付款时间
+        payment.setOurBank(paymentDTO.getOurBank());//开户银行
+        payment.setBankNumber(paymentDTO.getBankNumber());//银行账号
+        payment.setId(paymentDTO.getId());
+
+        paymentMapper.updateInfoById(payment);
+    }
+}

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/service/dto/PaymentDTO.java

@@ -0,0 +1,108 @@
+package com.jeeplus.business.payment.service.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.business.project.domain.JyProject;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class PaymentDTO extends BaseEntity {
+
+    //付款编号（字典值）
+    public static final String BIZ_CODE = "39";
+
+    /**
+     * 项目id
+     */
+    private String projectId;
+
+    /**
+     * 付款编号
+     */
+    private String no;
+
+    /**
+     * 收款类别
+     */
+    private String proceedType;
+
+    //税号
+    private String dutyNumber;
+
+    //累计已支付金额
+    private String amountPaid;
+
+    //付款理由或用途
+    private String reason;
+
+    //付款金额(小写)
+    private String paymentLower;
+
+    //付款金额(大写)
+    private String payment;
+
+    //付款方式
+    private String paymentType;
+
+    //付款摘要
+    private String remarks;
+
+    //状态
+    private String status;
+
+    //流程
+    private String procInsId;
+    private String processDefinitionId;
+    private String taskId;
+
+    //对冲金额
+    private String refund;
+
+    //剩余付款额度
+    private String finalMoney;
+
+    //收款单位
+    private String proceedOfficeId;
+
+    /**
+     * 部门名称
+     */
+    private String officeName;
+    private String officeId;
+
+    //付款人
+    private String createName;
+
+    //付款时间
+    private String[] createDates;
+
+    //付款金额
+    private String[] paymentAmounts;
+
+    //关联项目
+    private List<JyProject> projectDTOList;
+
+    //付款人
+    private String paymentUser;
+
+    //付款时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date paymentTime;
+
+    //付款人部门
+    private String paymentOffice;
+
+    /**
+     * 开户银行及银行账号
+     */
+    private String ourBank;
+    private String bankNumber;
+
+
+
+}

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/domain/JyProject.java

@@ -10,7 +10,8 @@ import java.util.List;
 
 @Data
 @TableName("jy_project_record")
-public class JyProject extends BaseEntity implements Serializable {
+public class
+JyProject extends BaseEntity implements Serializable {
     //项目编号（字典值）
     public static final String BIZ_CODE = "36";
 
@@ -319,7 +320,8 @@ public class JyProject extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String taskIdEia;
 
-
+    //合同编号
+    private String contractNo;
 
 
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/ProjectListMapper.xml

@@ -99,6 +99,8 @@
            art.ID_ as taskId,
            wci.primary_linkman as primaryLinkman,
            wci.contract_type_first as contractTypeFirst,
+           wci.no as contractNo,
+           wci.contract_amount as contractAmount,
            pa1.status as firstInstanceStatus,
            pa1.id as auditId1,
            pa1.proc_ins_id as procInsId1,
@@ -183,6 +185,7 @@
            wci.primary_linkman as primaryLinkman,
            wci.contract_amount,
            wci.contract_type,
+           wci.no as contractNo,
            wci.name as contractName,
            (SELECT dv.label FROM `sys_dict_value` dv
 			LEFT JOIN sys_dict_type dt on dt.id=dv.dict_type_id
@@ -708,12 +711,15 @@
            (SELECT su.name from sys_user su where a.project_leader = su.id) as projectLeader,
            a.proc_ins_id,
            a.process_definition_id,
+           wci.no as contractNo,
+           wci.contract_amount as contractAmount,
            b.name AS create_by_id
         FROM
             jy_project_record a
             LEFT JOIN sys_user b ON a.create_by_id = b.id
             LEFT JOIN sys_user c ON a.project_leader = c.id
             left join jy_project_audit pa on a.id=pa.project_id and pa.audit_level = '3'
+            LEFT JOIN jy_work_contract_info wci ON wci.id = a.contract_id and wci.del_flag = '0'
              ${ew.customSqlSegment}
             ORDER BY a.update_time DESC
     </select>

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/mapper/JyWorkClientBankMapper.java

@@ -1,10 +1,18 @@
 package com.jeeplus.business.workClientInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.jeeplus.business.workClientInfo.domain.JyWorkClientBank;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface JyWorkClientBankMapper extends BaseMapper<JyWorkClientBank> {
+    @InterceptorIgnore(tenantLine = "true")
+    List<JyWorkClientBank> selectByClientId(@Param(Constants.WRAPPER) LambdaQueryWrapper<JyWorkClientBank> wrapper);
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/mapper/JyWorkClientInfoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.business.workClientInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,7 +18,7 @@ import java.util.List;
 public interface JyWorkClientInfoMapper extends BaseMapper<JyWorkClientInfo> {
 
     JyWorkClientInfo getByName(@Param("clientName")String clientName);
-
+    @InterceptorIgnore(tenantLine = "true")
     IPage<JyWorkClientInfo> findPageList(Page<JyWorkClientInfo> page, @Param(Constants.WRAPPER)QueryWrapper queryWrapper);
 
     Integer isExist(@Param("value") String value);
@@ -25,4 +26,6 @@ public interface JyWorkClientInfoMapper extends BaseMapper<JyWorkClientInfo> {
     IPage<JyWorkClientInfo> componentList(Page<JyWorkClientInfo> page, @Param(Constants.WRAPPER)QueryWrapper queryWrapper);
 
     List<JyWorkClientLinkman> getByNameInfo(@Param("LinkmanId")String LinkmanId);
+    @InterceptorIgnore(tenantLine = "true")
+    JyWorkClientInfo findById(@Param("id") String id);
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/mapper/xml/JyWorkClientBankMapper.xml

@@ -0,0 +1,20 @@
+<?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.jeeplus.business.workClientInfo.mapper.JyWorkClientBankMapper">
+    <select id="selectByClientId" resultType="com.jeeplus.business.workClientInfo.domain.JyWorkClientBank">
+        select
+            a.id,
+            a.update_by_id,
+            a.create_by_id,
+            a.update_time,
+            a.create_time,
+            a.our_bank,
+            a.bank_number
+        from jy_work_client_bank a
+        left join jy_work_client_info ci on a.client_id = ci.id
+        ${ew.customSqlSegment}
+    </select>
+
+
+
+</mapper>

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/mapper/xml/JyWorkClientInfoMapper.xml

@@ -158,4 +158,54 @@
 		where client_id=#{LinkmanId}
 		order by update_time DESC limit 1
 	</select>
+
+	<select id="findById" resultType="com.jeeplus.business.workClientInfo.domain.JyWorkClientInfo">
+		SELECT
+			a.id,
+			su.name create_by_id,
+			a.create_time,
+			a.update_by_id,
+			a.update_time,
+			a.del_flag,
+			a.name,
+			a.lawer_presint,
+			a.or_unicode,
+			a.company_type,
+			a.company_industry,
+			a.client_type,
+			a.credit_rank,
+			b.`name` AS area_id,
+			b.`name` AS areaName,
+			a.zip_code,
+			a.fax,
+			a.tax_id,
+			a.email,
+			a.address,
+			a.register_address,
+			a.company_url,
+			a.remarks,
+			a.company_id,
+			a.office_id,
+			a.area_parent_ids,
+			a.telephone,
+			a.has_uscc,
+			a.usc_code,
+			a.number,
+			(SELECT GROUP_CONCAT(d.label SEPARATOR ',' )
+				FROM
+					work_client_job_type_info c,
+					sys_dict_value d,
+					sys_dict_type e
+				WHERE
+					c.job_type_id = d.VALUE
+					AND e.id = d.dict_type_id
+					AND e.type = 'representative'
+					AND c.work_client_id = a.id) AS deputy
+		FROM
+			jy_work_client_info a
+		LEFT JOIN sys_area b ON a.area_id = b.`code`
+		LEFT JOIN sys_user su ON su.id = a.create_by_id
+		LEFT JOIN work_client_job_type_info f ON a.id = f.work_client_id
+		where  a.id = #{id}
+	</select>
 </mapper>

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/service/JyWorkClientService.java

@@ -228,7 +228,7 @@ public class JyWorkClientService {
      */
     public JyWorkClientInfosDto findById (String id) {
         JyWorkClientInfosDto dto = new JyWorkClientInfosDto();
-        JyWorkClientInfo workClientInfo = jyWorkClientInfoMapper.selectById(id);
+        JyWorkClientInfo workClientInfo = jyWorkClientInfoMapper.findById(id);
         //从字典中找出客户性质名称
         String companyTypeName = SpringUtil.getBean ( IDictApi.class ).getDictLabel(workClientInfo.getCompanyType(), "customer_nature", "");
         workClientInfo.setCompanyTypeName(companyTypeName);
@@ -257,7 +257,7 @@ public class JyWorkClientService {
         LambdaQueryWrapper<JyWorkClientBank> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(JyWorkClientBank::getClientId, id);
         wrapper.orderByDesc(JyWorkClientBank::getUpdateTime);
-        dto.setWorkClientBank(jyWorkClientBankMapper.selectList(wrapper));
+        dto.setWorkClientBank(jyWorkClientBankMapper.selectByClientId(wrapper));
         //客户关联紧急联系人信息查询
         LambdaQueryWrapper<JyWorkClientLinkman> wrapper1 = new LambdaQueryWrapper<>();
         wrapper1.eq(JyWorkClientLinkman::getClientId, id);