[email protected] 2 месяцев назад
Родитель
Сommit
581646b184
3 измененных файлов: 1346 добавлений и 1170 удалений
  1. +0
    -33
      src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java
  2. +1345
    -1136
      src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
  3. +1
    -1
      src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java

+ 0
- 33
src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java Просмотреть файл

@@ -419,15 +419,6 @@ public class CommonField extends BaseEntity<Long>{
@Column
private String insuranceCompany3_3;

@Column
private String insuranceSumInsured1;

@Column
private String insuranceSumInsured2;

@Column
private String insuranceSumInsured3;

@Column
private String insuranceLife1;

@@ -1761,30 +1752,6 @@ public class CommonField extends BaseEntity<Long>{
this.insuranceCompany3_3 = insuranceCompany3_3;
}

public String getInsuranceSumInsured1() {
return insuranceSumInsured1;
}

public void setInsuranceSumInsured1(String insuranceSumInsured1) {
this.insuranceSumInsured1 = insuranceSumInsured1;
}

public String getInsuranceSumInsured2() {
return insuranceSumInsured2;
}

public void setInsuranceSumInsured2(String insuranceSumInsured2) {
this.insuranceSumInsured2 = insuranceSumInsured2;
}

public String getInsuranceSumInsured3() {
return insuranceSumInsured3;
}

public void setInsuranceSumInsured3(String insuranceSumInsured3) {
this.insuranceSumInsured3 = insuranceSumInsured3;
}

public String getInsuranceLife1() {
return insuranceLife1;
}


+ 1345
- 1136
src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


+ 1
- 1
src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java Просмотреть файл

@@ -148,7 +148,7 @@ public class TemplateService extends AbstractBaseEntityService<Template, Long, T
if (args.containsKey("createDateTo"))
sql.append(" AND t.created <= :createDateTo ");
}
sql.append(" order by name like 'SL%', name like 'ML%', name like 'HSBC%' , name like 'Lioner%' ");
sql.append(" order by name like 'SL%', name like 'ML%', name like 'HSBC%' , name like 'Lioner%', name desc ");

return jdbcDao.queryForList(sql.toString(), args);
}


Загрузка…
Отмена
Сохранить