Merge branch 'zcwy-master' into zcwy0912

This commit is contained in:
joshen@zcwytd.com
2023-10-26 10:39:22 +08:00
4 changed files with 92 additions and 60 deletions

View File

@@ -249,14 +249,15 @@ public class Cases extends BaseEntity {
private String caseValue;
// 种类字段1
@Column(name = "sys_type1")
private String sysType1;
// 暂不上线
// @Column(name = "sys_type1")
// private String sysType1;
//种类字段2
@Column(name = "sys_type2")
private String sysType2;
// @Column(name = "sys_type2")
// private String sysType2;
//种类字段3
@Column(name = "sys_type3")
private String sysType3;
// @Column(name = "sys_type3")
// private String sysType3;
/**
* 最佳案例标识

View File

@@ -79,23 +79,23 @@ public class CasesRecommendPushRecord extends BaseEntity {
@Column(name = "read_start_time")
private Date readStartTime;
/**
* sysType1
*/
@Column(name = "sys_type1")
private String sysType1;
/**
* sysType2
*/
@Column(name = "sys_type2")
private String sysType2;
/**
* sysType3
*/
@Column(name = "sys_type3")
private String sysType3;
// /**
// * sysType1
// */
// @Column(name = "sys_type1")
// private String sysType1;
//
// /**
// * sysType2
// */
// @Column(name = "sys_type2")
// private String sysType2;
//
// /**
// * sysType3
// */
// @Column(name = "sys_type3")
// private String sysType3;

View File

@@ -228,22 +228,23 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
@Override
public boolean update(Cases cases) {
String sysType1 = "";
String sysType2 = "";
String sysType3 = "";
if(StringUtils.isNotEmpty(cases.getSysType1())){
sysType1 = cases.getSysType1();
}
if(StringUtils.isNotEmpty(cases.getSysType2())){
sysType2 = cases.getSysType2();
}
if(StringUtils.isNotEmpty(cases.getSysType3())){
sysType3 = cases.getSysType3();
}
// String sysType1 = "";
// String sysType2 = "";
// String sysType3 = "";
// if(StringUtils.isNotEmpty(cases.getSysType1())){
// sysType1 = cases.getSysType1();
// }
// if(StringUtils.isNotEmpty(cases.getSysType2())){
// sysType2 = cases.getSysType2();
// }
// if(StringUtils.isNotEmpty(cases.getSysType3())){
// sysType3 = cases.getSysType3();
// }
// .addUpdateField("sys_type1",sysType1)
// .addUpdateField("sys_type2",sysType2)
// .addUpdateField("sys_type3",sysType3)
return casesRecommendPushRecordDao.update(UpdateBuilder.from(CasesRecommendPushRecord.class)
.addUpdateField("sys_type1",sysType1)
.addUpdateField("sys_type2",sysType2)
.addUpdateField("sys_type3",sysType3)
.addFilter(FieldFilters.eq("id",cases.getId())).builder()
) > 0;
}