修改更新字段逻辑

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值
+                    // 过滤掉null值
-                        attributes.add(name.substring(3) + "=" + value); // 去掉"get"并添加等号和值
+                    if (value != null&&StringUtils.isNotBlank(value.toString())) {
+                        // 去掉"get"并添加等号和值
+                        attributes.add(name.substring(3) + "=" + value);
                     }
                 }
             } catch (Exception e) {

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;

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.*;
-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.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<HuzhouField
 
     @Autowired
     private HuzhouUserprojectMapper userprojectMapper;
+
+    @Autowired
+    private ProjectManagerService projectManagerService;
     @Override
     public void submitChangeFieldManage(MultipartFile[] multipartFiles, String projectid, String fieldValue, HuzhouProjectinfo newProjectinfo) throws Exception {
         String id = UUID.randomUUID().toString().replace("-","");
@@ -174,6 +175,17 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
                 projectinfoMapper.updateById(newProjectinfo);
             }
         }else{
+            String projectId = projectinfo.getId();
+            ProjectManager projectManager = projectManagerService.getById(projectId);
+            //projectinfo.setManager(projectManager.getManager());
+            if("manager".equals(fieldValue)){
+                projectinfo.setManager(projectManager.getManager());
+            }
+            if("managerPhone".equals(fieldValue)){
+                //projectinfo.setManagerPhone(projectManager.getPhone());
+                projectinfo.setManagerPhone("18797992302");
+            }
+            //projectinfo.setManagerPhone("18797992307");
             List<String> oldstrings = HuzhouCommonUtils.extractObjectAttributes(projectinfo);
             for (String s:oldstrings) {
                 if(s.contains(fieldValue.substring(0,1).toUpperCase()+fieldValue.substring(1))){

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@@ -110,8 +110,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
     private HuzhouProjectinfoMoneyMapper projectinfoMoneyMapper;
     @Autowired
     private ProjectManagerService projectManagerService;
-    @Override
 
+    @Override
     public void submitProject(MultipartFile[] multipartFile, HuzhouProjectinfo info) throws IOException {
         //保存项目信息
         info.setStage("1");//最开始的状态。项目入库中
@@ -121,6 +121,11 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             this.updateById(info);
         } else {
             this.save(info);//保存项目信息
+            ProjectManager projectManager = new ProjectManager();
+            projectManager.setManager(info.getManager());
+            projectManager.setPhone(info.getManagerPhone());
+            projectManager.setProjectName(info.getProjectName());
+            projectManagerService.save(projectManager);
         }
         WorkFlow workFlow = workflowService.createFlow("creatProjectinfo", info.getId());//创建流程
         Task task = workFlow.getTask();