bug修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusSygj.java

@@ -37,6 +37,17 @@ public class BusSygj extends BaseEntity {
      */
     private String gjUrl;
 
+
+    /**
+     * 图片id
+     *
+     * */
+   private Long  imgId;
+    /**
+     * 图片路径
+     * */
+   private String  imgUrl;
+
     /**
      * 审核标志
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusSygjBo.java

@@ -36,6 +36,13 @@ public class BusSygjBo extends BaseEntity {
      */
     private String gjUrl;
 
+    private Long  imgId;
+
+    /**
+     * 图片路径
+     * */
+    private String  imgUrl;
+
     /**
      * 审核标志
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusSygjVo.java

@@ -52,6 +52,13 @@ public class BusSygjVo implements Serializable {
     @ExcelProperty(value = "审核标志")
     private String auditStatus;
 
+    private Long  imgId;
+
+    /**
+     * 图片路径
+     * */
+    private String  imgUrl;
+
     /**
      * 工具类型 1内部 ，2外部
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusSygjServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.bigscreen.domain.BusWjzx;
 import org.dromara.bigscreen.domain.dto.BusSygjBo;
+import org.dromara.bigscreen.domain.vo.BusWjzxVo;
 import org.dromara.common.core.domain.event.ProcessDeleteEvent;
 import org.dromara.common.core.domain.event.ProcessEvent;
 import org.dromara.common.core.domain.event.ProcessTaskEvent;
@@ -15,6 +16,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.service.impl.SysOssServiceImpl;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.dromara.bigscreen.domain.vo.BusSygjVo;
@@ -22,6 +24,7 @@ import org.dromara.bigscreen.domain.BusSygj;
 import org.dromara.bigscreen.mapper.BusSygjMapper;
 import org.dromara.bigscreen.service.IBusSygjService;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -39,6 +42,8 @@ public class BusSygjServiceImpl extends ServiceImpl<BusSygjMapper, BusSygj> impl
 
     private final BusSygjMapper baseMapper;
 
+    private final SysOssServiceImpl sysOssService;
+
     /**
      * 查询实用工具
      *
@@ -138,6 +143,13 @@ public class BusSygjServiceImpl extends ServiceImpl<BusSygjMapper, BusSygj> impl
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+
+        ArrayList<Long> temp = new ArrayList<>();
+        for (Long id : ids) {
+            BusSygjVo busSygjVo = baseMapper.selectVoById(id);
+            temp.add(busSygjVo.getImgId());
+        }
+        sysOssService.deleteWithValidByIds(temp, false);
         return baseMapper.deleteByIds(ids) > 0;
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java

@@ -207,7 +207,9 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
         LambdaQueryWrapper<XzdSubcontract> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdSubcontract::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), XzdSubcontract::getContractCode, bo.getContractCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), XzdSubcontract::getAuditStatus, bo.getAuditStatus());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdSubcontract::getContractName, bo.getContractName());
+        lqw.like(StringUtils.isNotBlank(bo.getSfzz()), XzdSubcontract::getSfzz, bo.getSfzz());
         lqw.eq(bo.getDocumentDate() != null, XzdSubcontract::getDocumentDate, bo.getDocumentDate());
         lqw.eq(bo.getDeptId() != null, XzdSubcontract::getDeptId, bo.getDeptId());
         lqw.ge(bo.getStartDate() != null, XzdSubcontract::getDocumentDate, bo.getStartDate());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java

@@ -34,6 +34,7 @@ import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.XzdPurchas
 import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.vo.XzdPurchaseContractAlterationVo;
 import org.dromara.xzd.contractManagement.caigouhetongbiangeng.service.IXzdPurchaseContractAlterationService;
 import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange;
+import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract;
 import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.domain.XzdSubcontractTermination;
 import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseContractInformation;
 import org.dromara.xzd.contractManagement.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo;
@@ -166,6 +167,8 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
         LambdaQueryWrapper<XzdPurchaseContractInformation> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdPurchaseContractInformation::getId);
         lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), XzdPurchaseContractInformation::getContractCode, bo.getContractCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSfzz()), XzdPurchaseContractInformation::getSfzz, bo.getSfzz());
+        lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), XzdPurchaseContractInformation::getAuditStatus, bo.getAuditStatus());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdPurchaseContractInformation::getContractName, bo.getContractName());
         lqw.eq(bo.getDocumentDate() != null, XzdPurchaseContractInformation::getDocumentDate, bo.getDocumentDate());
         lqw.eq(bo.getDeptId() != null, XzdPurchaseContractInformation::getDeptId, bo.getDeptId());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/contractBackletter/domain/vo/XzdGuaranteeInfoVo.java

@@ -131,7 +131,7 @@ public class XzdGuaranteeInfoVo implements Serializable {
      * 甲方单位名称
      */
     @ExcelProperty(value = "甲方单位名称")
-    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "applicationOrganization")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyAUnit")
     private String partyAUnitName;
 
     /**
@@ -144,7 +144,7 @@ public class XzdGuaranteeInfoVo implements Serializable {
      * 乙方单位名称
      */
     @ExcelProperty(value = "乙方单位名称")
-    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "applicationOrganization")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyBUnit")
     private String partyBUnitName;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 
 import java.io.Serial;
 import java.math.BigDecimal;

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSettlementInfoBo.java

@@ -5,8 +5,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.xzd.domain.XzdSettlementInfo;
+import org.dromara.xzd.domain.XzdSupplierOpenBank;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 客户信息-结算信息6业务对象 xzd_settlement_info
@@ -139,5 +141,11 @@ public class XzdSettlementInfoBo extends BaseEntity {
      */
     private Long enableContractCreditControl;
 
+    /**
+     * 开户银行信息
+     */
+    private List<XzdSupplierOpenBank> openBanks;
+
+
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/dto/AddCorrespondentDto.java

@@ -1,6 +1,7 @@
 package org.dromara.xzd.domain.dto;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.xzd.domain.*;

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/dto/QuerCorrespondentDto.java

@@ -6,6 +6,7 @@ import org.dromara.xzd.domain.*;
 import org.dromara.xzd.domain.bo.*;
 import org.dromara.xzd.domain.vo.XzdCustomerDetailVo;
 import org.dromara.xzd.domain.vo.XzdCustomerinformationVo;
+import org.dromara.xzd.domain.vo.XzdSettlementInfoVo;
 
 import java.util.List;
 
@@ -31,7 +32,7 @@ public class QuerCorrespondentDto {
     private List<XzdQualificationInfo> xzdQualificationInfo;
 
     //    结算信息
-    private XzdSettlementInfo xzdSettlementInfo;
+    private XzdSettlementInfoVo xzdSettlementInfo;
 
     //    业务信息
     private XzdBusinessInfo xzdBusinessInfo;

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSettlementInfoVo.java

@@ -6,12 +6,15 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.xzd.domain.XzdSettlementInfo;
+import org.dromara.xzd.domain.XzdSupplierOpenBank;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-
+import java.util.List;
 
 
 /**
@@ -52,6 +55,12 @@ public class XzdSettlementInfoVo implements Serializable {
     @ExcelProperty(value = "结算单位")
     private String settlementUnit;
 
+    /**
+     * 结算单位
+     */
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "settlementUnit")
+    private String settlementUnitName;
+
     /**
      * 结算方式
      */
@@ -175,4 +184,9 @@ public class XzdSettlementInfoVo implements Serializable {
     private Long enableContractCreditControl;
 
 
+    /**
+     * 开户银行信息
+     */
+    private List<XzdSupplierOpenBank> openBanks;
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/domain/vo/XzdSfkCaigouFkVo.java

@@ -2,6 +2,8 @@ package org.dromara.xzd.paymentsReceipts.domain.vo;
 
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
@@ -135,6 +137,17 @@ public class XzdSfkCaigouFkVo extends BaseEntity {
     @Translation(type = TransConstant.XZD_SUPPLIER_OPEN_BANK_ID_TO_NAME, mapper = "receiptBank")
     private String receiptBankName;
 
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建者
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+    private String createByName;
+
     /**
      * 收款银行账号
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/domain/vo/XzdSfkZonhefuwuFkVo.java

@@ -2,6 +2,8 @@ package org.dromara.xzd.paymentsReceipts.domain.vo;
 
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
@@ -110,6 +112,19 @@ public class XzdSfkZonhefuwuFkVo extends BaseEntity {
     @Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "project")
     private String projectName;
 
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+
+    /**
+     * 创建者
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+    private String createByName;
+
     /**
      * 付款单位
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCorrespondentListImp.java

@@ -62,6 +62,9 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
     @Autowired
     private SysOssServiceImpl sysOssService;
 
+    @Autowired
+    private XzdSupplierOpenBankServiceImpl xzdSupplierOpenBankService;
+
 
     //        联系人信息
     private final IXzdContactService xzdContactService;
@@ -258,6 +261,14 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
             xzdSettlementInfoService.save(info);
             }
 
+        //开户银行
+        if(dto.getXzdSettlementInfo().getOpenBanks() != null && !dto.getXzdSettlementInfo().getOpenBanks().isEmpty()){
+            for (XzdSupplierOpenBank openBank : dto.getXzdSettlementInfo().getOpenBanks()) {
+                openBank.setSupplierId(id);
+            }
+            xzdSupplierOpenBankService.saveBatch(dto.getXzdSettlementInfo().getOpenBanks());
+        }
+
 
         //      业务信息添加
         XzdBusinessInfoBo xzdBusinessInfo = dto.getXzdBusinessInfo();
@@ -441,10 +452,18 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
         //      结算信息
         XzdSettlementInfoBo xzdSettlementInfo = dto.getXzdSettlementInfo();
+        xzdSupplierOpenBankService.getBaseMapper().delete(new LambdaQueryWrapper<XzdSupplierOpenBank>().eq(XzdSupplierOpenBank::getSupplierId, dto.getXzdCustomerinformation().getId()));
         if (xzdSettlementInfo != null) {
             xzdSettlementInfo.setType(ZxdEnum.TYPE_CORRESPONDENT.getTypeValue());
             xzdSettlementInfo.setCustomerinformationId(dto.getXzdCustomerinformation().getId());
             xzdSettlementInfoService.saveOrUpdate(MapstructUtils.convert(xzdSettlementInfo, XzdSettlementInfo.class));
+            //开户银行
+            if(dto.getXzdSettlementInfo().getOpenBanks() != null && !dto.getXzdSettlementInfo().getOpenBanks().isEmpty()){
+                for (XzdSupplierOpenBank openBank : dto.getXzdSettlementInfo().getOpenBanks()) {
+                    openBank.setSupplierId(dto.getXzdCustomerinformation().getId());
+                }
+                xzdSupplierOpenBankService.saveBatch(dto.getXzdSettlementInfo().getOpenBanks());
+            }
         }
 
 
@@ -537,7 +556,12 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
         //      结算信息
 
         XzdSettlementInfo xzdSettlementInfo = xzdSettlementInfoService.getBaseMapper().selectOne(new LambdaQueryWrapper<XzdSettlementInfo>().eq(XzdSettlementInfo::getCustomerinformationId, id));
-        dto.setXzdSettlementInfo(xzdSettlementInfo);
+        List<XzdSupplierOpenBank> xzdSupplierOpenBanks = xzdSupplierOpenBankService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdSupplierOpenBank>().eq(XzdSupplierOpenBank::getSupplierId, id));
+        dto.setXzdSettlementInfo(MapstructUtils.convert(xzdSettlementInfo, XzdSettlementInfoVo.class));
+        if ( dto.getXzdSettlementInfo() != null) {
+            dto.getXzdSettlementInfo().setOpenBanks(xzdSupplierOpenBanks);
+
+        }
 
 
         //      业务信息
@@ -655,7 +679,9 @@ public class XzdCorrespondentListImp implements IXzdCorrespondentList {
 
         //      结算信息
 
-            xzdSettlementInfoService.removeByMap(temp);
+        xzdSettlementInfoService.removeByMap(temp);
+        xzdSupplierOpenBankService.getBaseMapper().delete(new LambdaQueryWrapper<XzdSupplierOpenBank>().eq(XzdSupplierOpenBank::getSupplierId, dto));
+
 
 
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/biddingManagement/biaoqianlixiang/XzdBidPreProjectMapper.xml

@@ -22,7 +22,6 @@
         <result column="project_cost" property="projectCost"/>
         <result column="information_cost" property="informationCost"/>
         <result column="file_id" property="fileId"/>
-        <result column="remark" property="remark"/>
         <result column="audit_status" property="auditStatus"/>
         <result column="create_by" property="createBy"/>
         <result column="bill_date" property="billDate"/>
@@ -64,7 +63,7 @@
         <result column="default_finance" property="defaultFinance"/>
         <result column="involve_finance" property="involveFinance"/>
         <result column="file_id" property="fileId"/>
-        <result column="remark" property="remark"/>
+        <result column="remarks" property="remark"/>
         <result column="audit_status" property="auditStatus"/>
     </resultMap>
 
@@ -82,7 +81,8 @@
     <select id="queryPageListBy"  resultMap="ProjectWrapperResultMap">
         SELECT
             a.* ,
-            b.*
+            b.*,
+            b.remark AS remarks
         FROM
             xzd_bid_pre_project a
                 LEFT JOIN xzd_bqlx_project_info b ON a.id = b.bid_pre_project_id