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 14:27:32 +08:00
parent 42cf396e93
commit 5be571cc30
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,13 +314,15 @@ public class XzdSupplierInfoBo extends BaseEntity {
/** /**
* 合格有效期开始时间 * 合格有效期开始时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime; private Date startTime;
/** /**
* 合格有效期结束时间 * 合格有效期结束时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/** /**

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

@ -427,11 +427,13 @@ public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeM
//通过合同编码拿到合同信息 //通过合同编码拿到合同信息
if (vo.getContractCodeId() != null){ if (vo.getContractCodeId() != null){
XzdContractDetailsVo xzdContractDetailsVo = xzdContractDetailsService.queryById(vo.getContractCodeId()); XzdContractDetailsVo xzdContractDetailsVo = xzdContractDetailsService.queryById(vo.getContractCodeId());
List<XzdContractDetailsVo> xzdContractDetailsVo1 = List.of(xzdContractDetailsVo); if (xzdContractDetailsVo != null) {
xzdContractDetailsService.setValue(xzdContractDetailsVo1); List<XzdContractDetailsVo> xzdContractDetailsVo1 = List.of(xzdContractDetailsVo);
xzdContractDetailsVo = xzdContractDetailsVo1.getFirst(); xzdContractDetailsService.setValue(xzdContractDetailsVo1);
xzdContractDetailsVo = xzdContractDetailsVo1.getFirst();
vo.setContract(xzdContractDetailsVo); vo.setContract(xzdContractDetailsVo);
}
} }
//所属组织 //所属组织

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

@ -93,6 +93,9 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
@Override @Override
public XzdContractDetailsVo queryById(Long id){ public XzdContractDetailsVo queryById(Long id){
XzdContractDetailsVo xzdContractDetailsVo = baseMapper.selectVoById(id); XzdContractDetailsVo xzdContractDetailsVo = baseMapper.selectVoById(id);
if (xzdContractDetailsVo == null) {
return null;
}
List<XzdContractDetailsVo> xzdContractDetailsVo1 = List.of(xzdContractDetailsVo); List<XzdContractDetailsVo> xzdContractDetailsVo1 = List.of(xzdContractDetailsVo);
setValue(xzdContractDetailsVo1); setValue(xzdContractDetailsVo1);
return xzdContractDetailsVo1.getFirst(); return xzdContractDetailsVo1.getFirst();

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

@ -54,11 +54,11 @@
</if> </if>
<if test='bo.startTime != null'> <if test='bo.startTime != null'>
AND supplement.create_date &gt;= #{bo.startTime} AND supplement.qualification_validity &gt;= #{bo.startTime}
</if> </if>
<if test='bo.endTime != null'> <if test='bo.endTime != null'>
AND supplement.create_date &lt;= #{bo.endTime} AND supplement.qualification_validity &lt;= #{bo.endTime}
</if> </if>
<if test='bo.shzt != null and bo.shzt != ""'> <if test='bo.shzt != null and bo.shzt != ""'>