1.综合查询优化

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectMaterialManagerImpl.java

@@ -117,7 +117,7 @@ public class CostProjectMaterialManagerImpl extends BaseManagerImpl<CostProjectM
         wrapper.in("KEY_",list);
         List<DataDict> costDictDatas= dataDictManager.list(wrapper);
 
-        List<String> listRequire = records.stream().map(CostProjectMaterial::getInformationRequire).distinct().collect(Collectors.toList());
+        List<String> listRequire = records.stream().map(CostProjectMaterial::getFormatRequired).distinct().collect(Collectors.toList());
         QueryWrapper<DataDict> wrapperRequire = new QueryWrapper<>();
         wrapperRequire.eq("TYPE_ID_","1976558645202157568");
         wrapperRequire.in("KEY_",listRequire);
@@ -132,9 +132,9 @@ public class CostProjectMaterialManagerImpl extends BaseManagerImpl<CostProjectM
 
 
             listRequireDatas.stream()
-                    .filter(c -> costCatalogUnit.getInformationRequire() != null &&
-                            costCatalogUnit.getInformationRequire().equals(String.valueOf(c.getKey())))
-                    .findAny().ifPresent(costDictData -> costCatalogUnit.setInformationRequireName(costDictData.getName()));
+                    .filter(c -> costCatalogUnit.getFormatRequired() != null &&
+                            costCatalogUnit.getFormatRequired().equals(String.valueOf(c.getKey())))
+                    .findAny().ifPresent(costDictData -> costCatalogUnit.setFormatRequiredName(costDictData.getName()));
 
             if ("3".equals(costCatalogUnit.getFormatRequired())) {
                 if(fdTemplateMap!=null) {

assistMg/src/main/java/com/hotent/project/model/CostProjectMaterial.java

@@ -66,8 +66,8 @@ public class CostProjectMaterial extends BaseModel<CostProjectMaterial> {
 
     @ApiModelProperty(value = "资料类别名称")
     @TableField(exist = false)
-    @JsonProperty("informationRequireName")
-    private String informationRequireName;
+    @JsonProperty("formatRequiredName")
+    private String formatRequiredName;
 
     @ApiModelProperty(value = "资料排序")
     @TableField("order_num")
@@ -188,12 +188,12 @@ public class CostProjectMaterial extends BaseModel<CostProjectMaterial> {
         this.informationRequire = informationRequire;
     }
 
-    public String getInformationRequireName() {
-        return informationRequireName;
+    public String getFormatRequiredName() {
+        return formatRequiredName;
     }
 
-    public void setInformationRequireName(String informationRequireName) {
-        this.informationRequireName = informationRequireName;
+    public void setFormatRequiredName(String formatRequiredName) {
+        this.formatRequiredName = formatRequiredName;
     }
     public Integer getOrderNum() {
         return orderNum;