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

10-23-修复

Browse Source
This commit is contained in:
青云
2025-10-23 22:35:04 +08:00
parent d934abf0fe
commit 9e366554b7
5 changed files with 170 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,16 @@
package org.dromara.xzd.domain; package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.math.BigDecimal; import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 项目信息对象 xzd_project * 项目信息对象 xzd_project
@ -59,21 +60,29 @@ public class XzdProject extends BaseEntity {
/** /**
* 计划开工日期 * 计划开工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedStartDate; private Date plannedStartDate;
/** /**
* 计划竣工日期 * 计划竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedCompletionDate; private Date plannedCompletionDate;
/** /**
* 实际开工日期 * 实际开工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date actualStartDate; private Date actualStartDate;
/** /**
* 实际竣工日期 * 实际竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date actualCompletionDate; private Date actualCompletionDate;
/** /**
@ -159,6 +168,8 @@ public class XzdProject extends BaseEntity {
/** /**
* 立项日期 * 立项日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date projectEstablishmentDate; private Date projectEstablishmentDate;
/** /**

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

@ -1,25 +1,17 @@
package org.dromara.xzd.domain.bo; package org.dromara.xzd.domain.bo;
import org.dromara.xzd.domain.XzdProject; import com.fasterxml.jackson.annotation.JsonFormat;
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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.xzd.domain.XzdProject;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdProjectInternalAccounts;
import org.dromara.xzd.domain.vo.XzdProjectPersonnelVo;
import org.dromara.xzd.domain.vo.XzdProjectProfileVo;
import org.dromara.xzd.domain.vo.XzdProjectTaxInfoVo;
import org.dromara.xzd.domain.vo.XzdProjectWarehousesVo;
/** /**
* 项目信息业务对象 xzd_project * 项目信息业务对象 xzd_project
* *
@ -68,24 +60,28 @@ public class XzdProjectBo extends BaseEntity {
/** /**
* 计划开工日期 * 计划开工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedStartDate; private Date plannedStartDate;
/** /**
* 计划竣工日期 * 计划竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedCompletionDate; private Date plannedCompletionDate;
/** /**
* 实际开工日期 * 实际开工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualStartDate; private Date actualStartDate;
/** /**
* 实际竣工日期 * 实际竣工日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualCompletionDate; private Date actualCompletionDate;
@ -188,6 +184,8 @@ public class XzdProjectBo extends BaseEntity {
/** /**
* 立项日期 * 立项日期
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date projectEstablishmentDate; private Date projectEstablishmentDate;
/** /**

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

@ -1,19 +1,16 @@
package org.dromara.xzd.domain.vo; package org.dromara.xzd.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdProject;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.xzd.domain.bo.*; import org.dromara.xzd.domain.XzdProject;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -74,6 +71,7 @@ public class XzdProjectVo implements Serializable {
* 计划开工日期 * 计划开工日期
*/ */
@ExcelProperty(value = "计划开工日期") @ExcelProperty(value = "计划开工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedStartDate; private Date plannedStartDate;
@ -81,6 +79,7 @@ public class XzdProjectVo implements Serializable {
* 计划竣工日期 * 计划竣工日期
*/ */
@ExcelProperty(value = "计划竣工日期") @ExcelProperty(value = "计划竣工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date plannedCompletionDate; private Date plannedCompletionDate;
@ -88,6 +87,7 @@ public class XzdProjectVo implements Serializable {
* 实际开工日期 * 实际开工日期
*/ */
@ExcelProperty(value = "实际开工日期") @ExcelProperty(value = "实际开工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualStartDate; private Date actualStartDate;
@ -95,6 +95,7 @@ public class XzdProjectVo implements Serializable {
* 实际竣工日期 * 实际竣工日期
*/ */
@ExcelProperty(value = "实际竣工日期") @ExcelProperty(value = "实际竣工日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date actualCompletionDate; private Date actualCompletionDate;
@ -227,6 +228,8 @@ public class XzdProjectVo implements Serializable {
* 立项日期 * 立项日期
*/ */
@ExcelProperty(value = "立项日期") @ExcelProperty(value = "立项日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date projectEstablishmentDate; private Date projectEstablishmentDate;
/** /**

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

@ -59,6 +59,8 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
private XzdProjectParticipatingUnitsServiceImpl xzdProjectParticipatingUnitsService; private XzdProjectParticipatingUnitsServiceImpl xzdProjectParticipatingUnitsService;
@Autowired @Autowired
private IXzdCorrespondentList iXzdCorrespondentList; private IXzdCorrespondentList iXzdCorrespondentList;
@Autowired
private XzdProjectManagerApprovalServiceImpl xzdProjectManagerApprovalService;
@Autowired @Autowired
private SysOssServiceImpl sysOssService; private SysOssServiceImpl sysOssService;
@ -508,7 +510,7 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
} }
public void setValue(XzdProjectVo entity){ public void setValue(XzdProjectVo entity){
if (entity != null) {
//项目概况 //项目概况
LambdaQueryWrapper<XzdProjectProfile> profileLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<XzdProjectProfile> profileLambdaQueryWrapper = new LambdaQueryWrapper<>();
profileLambdaQueryWrapper.eq(XzdProjectProfile::getXzdProjectId, entity.getId()); profileLambdaQueryWrapper.eq(XzdProjectProfile::getXzdProjectId, entity.getId());
@ -546,35 +548,43 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
//建设单位 //建设单位
R<QuerCorrespondentDto> byId = iXzdCorrespondentList.getCustomerByid(entity.getConstructionUnit()); R<QuerCorrespondentDto> byId = iXzdCorrespondentList.getCustomerByid(entity.getConstructionUnit());
if (byId!=null){ if (byId != null) {
if (byId.getData().getXzdCustomerinformation()!=null){ if (byId.getData().getXzdCustomerinformation() != null) {
entity.setConstructionUnitName(byId.getData().getXzdCustomerinformation().getUnitName()); entity.setConstructionUnitName(byId.getData().getXzdCustomerinformation().getUnitName());
} }
} }
// entity.setConstructionUnitName(iXzdCorrespondentList); // entity.setConstructionUnitName(iXzdCorrespondentList);
//备案项目经理 //备案项目经理
SysUserVo userVo = sysUserService.selectUserById(entity.getFilingManager()); if (entity.getFilingManager() != null) {
if (userVo!=null){ XzdProjectManagerApproval approvalVo = xzdProjectManagerApprovalService.getBaseMapper().selectById(entity.getFilingManager());
entity.setFilingManagerName(userVo.getNickName()); if (approvalVo != null) {
entity.setFilingManagerName(approvalVo.getProspectiveManagerName());
approvalVo.setProjectName(entity.getProjectName());
xzdProjectManagerApprovalService.updateById(approvalVo);
}
} }
//执行经理 //执行经理
SysUserVo userVo1 = sysUserService.selectUserById(entity.getManagerExecution()); if (entity.getManagerExecution() != null) {
if (userVo1!=null){ XzdProjectManagerApproval approvalVo = xzdProjectManagerApprovalService.getBaseMapper().selectById(entity.getManagerExecution());
entity.setManagerExecutionName(userVo1.getNickName()); if (approvalVo != null) {
entity.setManagerExecutionName(approvalVo.getProspectiveManagerName());
approvalVo.setProjectName(entity.getProjectName());
xzdProjectManagerApprovalService.updateById(approvalVo);
}
} }
//责任人 //责任人
SysUserVo userVo2 = sysUserService.selectUserById(entity.getManagerResponsible()); SysUserVo userVo2 = sysUserService.selectUserById(entity.getManagerResponsible());
if (userVo2!=null){ if (userVo2 != null) {
entity.setManagerResponsibleName(userVo2.getNickName()); entity.setManagerResponsibleName(userVo2.getNickName());
} }
//项目类型 //项目类型
if (entity.getProjectType() != null){ if (entity.getProjectType() != null) {
XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(entity.getProjectType()); XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(entity.getProjectType());
if (xzdProjectTypeVo != null){ if (xzdProjectTypeVo != null) {
entity.setProjectTypeName(xzdProjectTypeVo.getTypeName()); entity.setProjectTypeName(xzdProjectTypeVo.getTypeName());
} }
} }
@ -582,9 +592,9 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
/** /**
* 管理组织 * 管理组织
*/ */
if (entity.getManagementOrganization() != null){ if (entity.getManagementOrganization() != null) {
SysDeptVo sysDeptVo = iSysDeptService.selectDeptById(entity.getManagementOrganization()); SysDeptVo sysDeptVo = iSysDeptService.selectDeptById(entity.getManagementOrganization());
if (sysDeptVo != null){ if (sysDeptVo != null) {
entity.setManagementOrganizationName(sysDeptVo.getDeptName()); entity.setManagementOrganizationName(sysDeptVo.getDeptName());
} }
} }
@ -592,9 +602,9 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
/** /**
* 默认财务 组织 * 默认财务 组织
*/ */
if (entity.getDefaultFinancialOrganization() != null){ if (entity.getDefaultFinancialOrganization() != null) {
SysDeptVo sysDeptVo = iSysDeptService.selectDeptById(entity.getDefaultFinancialOrganization()); SysDeptVo sysDeptVo = iSysDeptService.selectDeptById(entity.getDefaultFinancialOrganization());
if (sysDeptVo != null){ if (sysDeptVo != null) {
entity.setDefaultFinancialOrganizationName(sysDeptVo.getDeptName()); entity.setDefaultFinancialOrganizationName(sysDeptVo.getDeptName());
} }
} }
@ -602,7 +612,7 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
/** /**
* 涉及财务组织 * 涉及财务组织
*/ */
if (entity.getInvolvedFinancialOrganization() != null && !entity.getInvolvedFinancialOrganization().isEmpty()){ if (entity.getInvolvedFinancialOrganization() != null && !entity.getInvolvedFinancialOrganization().isEmpty()) {
List<String> list = Arrays.stream(entity.getInvolvedFinancialOrganization().split(",")).toList(); List<String> list = Arrays.stream(entity.getInvolvedFinancialOrganization().split(",")).toList();
@ -616,7 +626,7 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
} }
if (!name.isEmpty()){ if (!name.isEmpty()) {
entity.setInvolvedFinancialOrganizationName(String.join(",", name)); entity.setInvolvedFinancialOrganizationName(String.join(",", name));
} }
} }
@ -624,7 +634,7 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
/** /**
* 共享组织 * 共享组织
*/ */
if (entity.getSharingOrganization() != null && !entity.getSharingOrganization().isEmpty()){ if (entity.getSharingOrganization() != null && !entity.getSharingOrganization().isEmpty()) {
List<String> list = Arrays.stream(entity.getSharingOrganization().split(",")).toList(); List<String> list = Arrays.stream(entity.getSharingOrganization().split(",")).toList();
@ -638,7 +648,7 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
} }
if (!name.isEmpty()){ if (!name.isEmpty()) {
entity.setSharingOrganizationName(String.join(",", name)); entity.setSharingOrganizationName(String.join(",", name));
} }
@ -647,7 +657,7 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
// entity.setSharingOrganizationName(sysDeptVo.getDeptName()); // entity.setSharingOrganizationName(sysDeptVo.getDeptName());
// } // }
} }
}
} }
} }

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

@ -20,8 +20,8 @@
project.planned_completion_date as plannedCompletionDate, project.planned_completion_date as plannedCompletionDate,
project.actual_start_date as actualStartDate, project.actual_start_date as actualStartDate,
project.actual_completion_date as actualCompletionDate, project.actual_completion_date as actualCompletionDate,
user.nick_name as managerExecutionName, approval1.prospective_manager_name as filingManagerName,
user2.nick_name as filingManagerName, approval2.prospective_manager_name as managerExecutionName,
profile.project_address as xmdz, profile.project_address as xmdz,
project.management_organization as managementOrganization, project.management_organization as managementOrganization,
project.construction_unit as constructionUnit, project.construction_unit as constructionUnit,
@ -40,10 +40,12 @@
FROM xzd_project as project FROM xzd_project as project
LEFT JOIN xzd_project_profile as profile ON project.id = profile.xzd_project_id LEFT JOIN xzd_project_profile as profile ON project.id = profile.xzd_project_id
LEFT JOIN sys_user as user ON project.manager_execution = user.user_id # LEFT JOIN sys_user as user ON project.manager_execution = user.user_id
LEFT JOIN sys_user as user2 ON project.filing_manager = user2.user_id # LEFT JOIN sys_user as user2 ON project.filing_manager = user2.user_id
LEFT JOIN sys_user as user3 ON project.create_by = user3.user_id LEFT JOIN sys_user as user3 ON project.create_by = user3.user_id
LEFT JOIN xzd_project_type as type ON project.project_type = type.id LEFT JOIN xzd_project_type as type ON project.project_type = type.id
LEFT JOIN xzd_project_manager_approval as approval1 ON project.filing_manager = approval1.id
LEFT JOIN xzd_project_manager_approval as approval2 ON project.manager_execution = approval2.id
<where> <where>