diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/common/HuzhouCommonUtils.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/common/HuzhouCommonUtils.java index bf102ec..75123af 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/common/HuzhouCommonUtils.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/common/HuzhouCommonUtils.java @@ -23,10 +23,13 @@ public class HuzhouCommonUtils { for (Method method : methods) { try { String name = method.getName(); - if (name.startsWith("get")) { // 假设所有的getter方法都不带参数,并且返回一个基本数据类型或其包装类 + if (name.startsWith("get")) { + // 假设所有的getter方法都不带参数,并且返回一个基本数据类型或其包装类 Object value = method.invoke(object); - if (value != null&&StringUtils.isNotBlank(value.toString())) { // 过滤掉null值 - attributes.add(name.substring(3) + "=" + value); // 去掉"get"并添加等号和值 + // 过滤掉null值 + if (value != null&&StringUtils.isNotBlank(value.toString())) { + // 去掉"get"并添加等号和值 + attributes.add(name.substring(3) + "=" + value); } } } catch (Exception e) { diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java index 353591b..cbec6c6 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java @@ -165,9 +165,11 @@ public class HuzhouProjectinfo extends BaseEntity { * 造价建议金额 */ private Double suggestedCostAmount; + @TableField(exist = false) @ExcelProperty(value = "项目负责人") private String manager; + @TableField(exist = false) @ExcelProperty(value = "联系方式") private String managerPhone; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java index 2ccc183..5a5e639 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java @@ -12,14 +12,12 @@ import com.easy.admin.common.util.CommonUtils; import com.easy.admin.modules.huzhou.common.HuzhouCommonUtils; import com.easy.admin.modules.huzhou.dao.*; import com.easy.admin.modules.huzhou.entity.*; -import com.easy.admin.modules.huzhou.service.IHuzhouFieldchangehistoryService; -import com.easy.admin.modules.huzhou.service.IHuzhouProcessinfoService; -import com.easy.admin.modules.huzhou.service.IHuzhouUploadfileinfoService; -import com.easy.admin.modules.huzhou.service.IWorkflowService; +import com.easy.admin.modules.huzhou.service.*; import com.easy.admin.modules.huzhou.vo.ProjectInfoAuthSelect; import com.easy.admin.sys.model.SysDict; import com.easy.admin.sys.service.SysDictService; import com.easy.admin.util.ShiroUtil; +import org.activiti.engine.ManagementService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.runtime.ProcessInstance; @@ -65,6 +63,9 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl oldstrings = HuzhouCommonUtils.extractObjectAttributes(projectinfo); for (String s:oldstrings) { if(s.contains(fieldValue.substring(0,1).toUpperCase()+fieldValue.substring(1))){ diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index b06f650..f402882 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -110,8 +110,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl