lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10-25-修改

Browse Source
This commit is contained in:
青云
2025-10-25 22:16:00 +08:00
parent 5d8af1cab8
commit 4b37a7327f
9 changed files with 62 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java
View File

@ -32,6 +32,11 @@ public class XzdProject extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 区域码
*/
private Long cityCode;
/**
* 项目编号
*/

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProjectManagerApproval.java
View File

@ -1,13 +1,13 @@
package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.util.Date;
/**
* 项目经理推荐及审批对象 xzd_project_manager_approval
@ -29,6 +29,11 @@ public class XzdProjectManagerApproval extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 区域码
*/
private Long cityCode;
/**
* 单据编号
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java
View File

@ -28,6 +28,11 @@ public class XzdProjectBo extends BaseEntity {
*/
private Long id;
/**
* 区域码
*/
private Long cityCode;
/**
* 项目编号
*/

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectManagerApprovalBo.java
View File

@ -1,15 +1,16 @@
package org.dromara.xzd.domain.bo;
import org.dromara.xzd.domain.XzdProjectManagerApproval;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdProjectManagerApproval;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 项目经理推荐及审批业务对象 xzd_project_manager_approval
@ -28,6 +29,11 @@ public class XzdProjectManagerApprovalBo extends BaseEntity {
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 区域码
*/
private Long cityCode;
/**
* 单据编号
*/

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectManagerApprovalVo.java
View File

@ -1,14 +1,10 @@
package org.dromara.xzd.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdProjectManagerApproval;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.xzd.domain.XzdProjectManagerApproval;
import java.io.Serial;
import java.io.Serializable;
@ -36,6 +32,11 @@ public class XzdProjectManagerApprovalVo implements Serializable {
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 区域码
*/
private Long cityCode;
/**
* 单据编号
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java
View File

@ -37,6 +37,11 @@ public class XzdProjectVo implements Serializable {
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 区域码
*/
private Long cityCode;
/**
* 项目编号
*/

25
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java
View File

@ -1,28 +1,30 @@
package org.dromara.xzd.service.impl;
import cn.hutool.core.util.HashUtil;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.dromara.xzd.domain.XzdProjectManagerApproval;
import org.dromara.xzd.domain.bo.XzdProjectManagerApprovalBo;
import org.dromara.xzd.domain.vo.XzdProjectManagerApprovalVo;
import org.dromara.xzd.domain.XzdProjectManagerApproval;
import org.dromara.xzd.mapper.XzdProjectManagerApprovalMapper;
import org.dromara.xzd.service.IXzdProjectManagerApprovalService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 项目经理推荐及审批Service业务层处理
@ -80,6 +82,7 @@ public class XzdProjectManagerApprovalServiceImpl extends ServiceImpl<XzdProject
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<XzdProjectManagerApproval> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getId() != null, XzdProjectManagerApproval::getId, bo.getId());
lqw.eq(bo.getCityCode() != null, XzdProjectManagerApproval::getCityCode, bo.getCityCode());
lqw.orderByDesc(XzdProjectManagerApproval::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDocumentNumber()), XzdProjectManagerApproval::getDocumentNumber, bo.getDocumentNumber());
lqw.between(params.get("beginRecordDate") != null && params.get("endRecordDate") != null,

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml
View File

@ -7,6 +7,7 @@
<select id="search" resultType="org.dromara.xzd.domain.vo.XzdProjectVo">
SELECT
project.id,
project.city_code as cityCode,
project.project_attribute as projectAttribute,
project.project_number as projectNumber,
project.project_name as projectName,
@ -53,6 +54,10 @@
AND project.project_number LIKE CONCAT('%',#{projectNumber},'%')
</if>
<if test="cityCode != null and cityCode != ''">
AND project.city_code = #{cityCode}
</if>
<if test='projectName != null and projectName != ""'>
AND project.project_name LIKE CONCAT('%',#{projectName},'%')
</if>

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
View File

@ -47,7 +47,7 @@
</if>
<if test='bo.cityCode != null and bo.cityCode != ""'>
AND info.city_code = #{cityCode}
AND info.city_code = #{bo.cityCode}
</if>
<if test='bo.fgbm != null and bo.fgbm != ""'>