流程相关功能bug修复

common-flow/src/main/java/com/tofly/flow/controller/FormController.java

@@ -110,44 +110,37 @@ public class FormController {
     				
     		if(null!=instance) {
   
-        			//获取审批节点所在流程信息
-            		List<ProcessTemplateNodeJudge> judgeList = processTemplateNodeJudgeService.list(Wrappers.<ProcessTemplateNodeJudge>lambdaQuery()
-            				.eq(ProcessTemplateNodeJudge::getProcessTemplateId,instance.getProcessTemplateId())
-            				.eq(ProcessTemplateNodeJudge::getProcessTemplateNodeAlias,processNodeAlias));
-            		
-            		String config = "";
-            		for(ProcessTemplateNodeJudge j:judgeList) {
-            			
-            			System.out.println("判定字段>>>>>>>>>>>"+j.getFormFieldName());
-            			System.out.println("表单值>>>>>>>>>>>"+formDataMap.get(j.getFormFieldName()));
-            			System.out.println("判定规则>>>>>>>>>>>"+j.getFormFieldJudge());
-            			System.out.println("判定值>>>>>>>>>>>"+j.getFormFieldValue());
-            			
-            			if(null!=formDataMap.get(j.getFormFieldName())) {
-            				Boolean configBoolean = formDataService.judgeValue(formDataMap.get(j.getFormFieldName()),j.getFormFieldJudge(),j.getFormFieldValue());
-            				System.out.println("最终结果>>>>>>>>>>>"+configBoolean);
-            				if(configBoolean) {
-            					config = config +  j.getTemplateTargetNodeAlias()+"|"+ j.getTemplateTargetNodeAction()+",";
-            				}    				
-            			}		
-            		}
-            		
-            		if(!config.equals("")) {
-            			ProcessInstance updateInstance = new ProcessInstance();    		
-                		updateInstance.setId(instance.getId());        		
-                		if(StringUtils.isEmpty(instance.getProcessConfig())) {
-                			System.out.println("新config！！！！！！！！！！！！！！"+config);
-                			updateInstance.setProcessConfig(config);
-                		}else {
-                			String existConfig = instance.getProcessConfig();
-                			System.out.println("已有config！！！！！！！！！！！！！！"+existConfig);
-                			updateInstance.setProcessConfig(existConfig+config);
-                			System.out.println("完成配置config！！！！！！！！！！！！！！"+existConfig+config);
-                		}
-                		processInstanceService.updateById(updateInstance);
+    			//获取审批节点所在流程信息
+        		List<ProcessTemplateNodeJudge> judgeList = processTemplateNodeJudgeService.list(Wrappers.<ProcessTemplateNodeJudge>lambdaQuery()
+        				.eq(ProcessTemplateNodeJudge::getProcessTemplateId,instance.getProcessTemplateId())
+        				.eq(ProcessTemplateNodeJudge::getProcessTemplateNodeAlias,processNodeAlias));
+        		
+        		String config = "";
+        		for(ProcessTemplateNodeJudge j:judgeList) {
+        			
+        			if(null!=formDataMap.get(j.getFormFieldName())) {
+        				Boolean configBoolean = formDataService.judgeValue(formDataMap.get(j.getFormFieldName()),j.getFormFieldJudge(),j.getFormFieldValue());
+        			
+        				if(configBoolean) {
+        					config = config +  j.getTemplateTargetNodeAlias()+"|"+ j.getTemplateTargetNodeAction()+",";
+        				}    				
+        			}		
+        		}
+        		
+        		if(!config.equals("")) {
+        			ProcessInstance updateInstance = new ProcessInstance();    		
+            		updateInstance.setId(instance.getId());        		
+            		if(StringUtils.isEmpty(instance.getProcessConfig())) {
+            			updateInstance.setProcessConfig(config);
+            		}else {
+            			String existConfig = instance.getProcessConfig();
+            			updateInstance.setProcessConfig(existConfig+config);
             		}
+            		processInstanceService.updateById(updateInstance);
         		}
+        	}
         	return ResultRespone.success("赋值成功");
+        	
     	}catch (Exception e) {
     		e.printStackTrace();
     		return ResultRespone.failed(e.getMessage());

common-flow/src/main/java/com/tofly/flow/controller/ProcessController.java

@@ -31,6 +31,7 @@ import com.tofly.flow.service.ProcessInstanceService;
 import com.tofly.flow.service.ProcessTemplateNodeService;
 import com.tofly.flow.service.ProcessTemplateService;
 import com.tofly.flow.vo.ApprovalNodeInfoVo;
+import com.tofly.flow.vo.ProcessNodeInfoChangeVo;
 import com.tofly.pojo.message.Messagepush;
 import com.tofly.pojo.message.Messagerecipient;
 
@@ -96,14 +97,14 @@ public class ProcessController {
      */
      @PostMapping("/changeApprovalPerson")
      @ApiOperation(value = "动态改变节点审批人")
-     public ResultRespone changeApprovalPerson(@RequestBody List<ProcessNodeInfoChangeDto> processNodeInfoChangeDto ) {
+     public ResultRespone changeApprovalPerson(@RequestBody ProcessNodeInfoChangeVo processNodeInfoChangeVo ) {
      	try {
      		
-     		
-     		if(processNodeInfoChangeDto.size()!=0) {
+     		if(processNodeInfoChangeVo.getChangeNodeInfo().size()!=0) {
      			List<ProcessInstanceNodeInfo> nodeInfoList= processInstanceNodeInfoService.list(Wrappers.<ProcessInstanceNodeInfo>lambdaQuery()
-        				.eq(ProcessInstanceNodeInfo::getProcessId,processNodeInfoChangeDto.get(0).getProcessId())
-        				.eq(ProcessInstanceNodeInfo::getNodeAlias,processNodeInfoChangeDto.get(0).getNodeAlias()));
+        				.eq(ProcessInstanceNodeInfo::getProcessId,processNodeInfoChangeVo.getChangeNodeInfo().get(0).getProcessId())
+        				.eq(ProcessInstanceNodeInfo::getNodeAlias,processNodeInfoChangeVo.getChangeNodeInfo().get(0).getNodeAlias()));
+
      			
      			if(nodeInfoList.size()!=0) {
      				Long formId = nodeInfoList.get(0).getFormId();
@@ -111,10 +112,10 @@ public class ProcessController {
      				String nodeName = nodeInfoList.get(0).getProcessNodeName();
      				
      				processInstanceNodeInfoService.remove(Wrappers.<ProcessInstanceNodeInfo>lambdaQuery()
-            				.eq(ProcessInstanceNodeInfo::getProcessId,processNodeInfoChangeDto.get(0).getProcessId())
-            				.eq(ProcessInstanceNodeInfo::getNodeAlias,processNodeInfoChangeDto.get(0).getNodeAlias()));
+            				.eq(ProcessInstanceNodeInfo::getProcessId,processNodeInfoChangeVo.getChangeNodeInfo().get(0).getProcessId())
+            				.eq(ProcessInstanceNodeInfo::getNodeAlias,processNodeInfoChangeVo.getChangeNodeInfo().get(0).getNodeAlias()));
      				
-     				for(ProcessNodeInfoChangeDto p:processNodeInfoChangeDto) {
+     				for(ProcessNodeInfoChangeDto p:processNodeInfoChangeVo.getChangeNodeInfo()) {
          				
          				ProcessInstanceNodeInfo nodeInfo =new ProcessInstanceNodeInfo();
          				
@@ -134,6 +135,8 @@ public class ProcessController {
          			}
      			}
      		}
+     		
+     		
      		return ResultRespone.success("节点配置审批人成功。");	    		
      	}catch (Exception e) {
      		return ResultRespone.failed(e.getMessage());

common-flow/src/main/java/com/tofly/flow/dto/ProcessNodeInfoChangeDto.java

@@ -19,13 +19,11 @@ import lombok.Data;
 @Data
 @ApiModel
 public class ProcessNodeInfoChangeDto {
-	
-	
-
-        @ApiModelProperty(value = "审批人ID")
+		
+        @ApiModelProperty(value = "审批人ID,以逗号隔开")
         private Long approvalPersonId;
         
-        @ApiModelProperty(value = "审批人姓名")
+        @ApiModelProperty(value = "审批人姓名,以逗号隔开")
         private String approvalPersonName;
 
         @ApiModelProperty(value = "流程实例ID")
@@ -34,15 +32,4 @@ public class ProcessNodeInfoChangeDto {
         @ApiModelProperty(value = "流程节点别名")
         private String nodeAlias;
         
-        
- 
-
-    
-	   
-	
-	
-
-
-	
-
-}
+}

common-flow/src/main/java/com/tofly/flow/vo/ProcessNodeInfoChangeVo.java

@@ -0,0 +1,21 @@
+package com.tofly.flow.vo;
+
+import java.util.List;
+
+import com.tofly.flow.dto.ProcessNodeInfoChangeDto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class ProcessNodeInfoChangeVo {
+	
+	
+	@ApiModelProperty(value = "审批人信息")
+    private List<ProcessNodeInfoChangeDto> changeNodeInfo;
+	
+	
+
+}

common-flow/src/main/resources/bootstrap-dev.yml

@@ -2,13 +2,9 @@ spring:
   cloud:
     nacos:
       config:
-        # nacos配置中心指定空间
         namespace: dcsw-dev
-        # nacos部署IP
-        server-addr: 221.182.8.141:10081
-        # 配置后缀
+        server-addr: 36.138.232.161:8848
         file-extension: yaml
-        #其他配置信息
         shared-configs[0]:
           dataId: public_config_public.yaml
         shared-configs[1]:
@@ -16,15 +12,11 @@ spring:
         shared-configs[2]:
           dataId: public_config_redis.yaml
         shared-configs[3]:
-          dataId: public_config_oracle_new.yaml
-
+          dataId: public_config_oracle.yaml
       discovery:
-        # nacos配置中心指定空间
         namespace: dcsw-dev
-        # nacos部署IP
-        server-addr: 221.182.8.141:10081
+        server-addr: 36.138.232.161:8848
   application:
-    # 该应用在nacos配置中的名称
     name: tofly-common-flow
 
 mybatis-plus:

common-flow/src/main/resources/bootstrap-loc.yml

@@ -3,7 +3,7 @@ spring:
     nacos:
       config:
         # nacos配置中心指定空间
-        namespace: dcsw
+        namespace: dcsw-dev
         # nacos部署IP
         server-addr: 192.168.2.15:10081
 
@@ -17,11 +17,11 @@ spring:
         shared-configs[2]:
           dataId: public_config_redis.yaml
         shared-configs[3]:
-          dataId: public_config_oracle_new.yaml
+          dataId: public_config_oracle_old.yaml
 
       discovery:
         # nacos配置中心指定空间
-        namespace: dcsw
+        namespace: dcsw-dev
         # nacos部署IP
         server-addr: 192.168.2.15:10081
   application:

common-flow/src/main/resources/bootstrap-pro.yml

@@ -1,15 +1,10 @@
-spring:
+spring:
   cloud:
     nacos:
       config:
-        # nacos配置中心指定空间
         namespace: dcsw
-        # nacos部署IP
-        server-addr: tofly-nacos:8848
-
-        # 配置后缀
+        server-addr: 36.138.232.161:8848
         file-extension: yaml
-        #其他配置信息
         shared-configs[0]:
           dataId: public_config_public.yaml
         shared-configs[1]:
@@ -18,16 +13,16 @@
           dataId: public_config_redis.yaml
         shared-configs[3]:
           dataId: public_config_oracle.yaml
-
       discovery:
-        # nacos配置中心指定空间
         namespace: dcsw
-        # nacos部署IP
-        server-addr: tofly-nacos:8848
+        server-addr: 36.138.232.161:8848
   application:
-    # 该应用在nacos配置中的名称
     name: tofly-common-flow
 
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
 logging:
   level:
     com.alibaba.nacos.client.config.impl: WARN

common-flow/src/main/resources/bootstrap.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: loc
+    active: pro

flow_project/src/main/resources/mapper/install/ApplyInstallMapper.xml

@@ -144,32 +144,34 @@
 	 and TFD.PROCESS_NODE_ALIAS = TPI.CURRENT_NODE
 	) as CURRENT_NODE_NAME,
 	
-	(select TFD.FIELD_DATA_VALUE FROM TF_FORM_DATA TFD 
+	(
+	select max(TFD.FIELD_DATA_VALUE) FROM TF_FORM_DATA TFD 
 	LEFT JOIN TF_PROCESS_INSTANCE_NODE_INFO TPINI ON TFD.FORM_ID = TPINI.FORM_ID
 	where 1=1
 	AND TPINI.PROCESS_ID = TYAI.PROCESS_INSTANCE_ID
-	AND TFD.FIELD_NAME = 'surveyDate'
+	AND TFD.FIELD_NAME = 'surveyDate' 
 	) as SURVEY_DATE,
 	
-	(select TFD.FIELD_DATA_VALUE FROM TF_FORM_DATA TFD 
+	(select max(TFD.FIELD_DATA_VALUE) FROM TF_FORM_DATA TFD 
 	LEFT JOIN TF_PROCESS_INSTANCE_NODE_INFO TPINI ON TFD.FORM_ID = TPINI.FORM_ID
 	where 1=1
 	AND TPINI.PROCESS_ID = TYAI.PROCESS_INSTANCE_ID
 	AND TFD.FIELD_NAME = 'checkTime'
 	) as CHECK_TIME,
 	
-	(select TFD.FIELD_DATA_VALUE FROM TF_FORM_DATA TFD 
+	(select max(TFD.FIELD_DATA_VALUE) FROM TF_FORM_DATA TFD 
 	LEFT JOIN TF_PROCESS_INSTANCE_NODE_INFO TPINI ON TFD.FORM_ID = TPINI.FORM_ID
 	where 1=1
 	AND TPINI.PROCESS_ID = TYAI.PROCESS_INSTANCE_ID
 	AND TFD.FIELD_NAME = 'chargeTime'
 	) as CHARGE_TIME,
 	
-	(select TFD.FIELD_DATA_VALUE FROM TF_FORM_DATA TFD  
+	(select max(TFD.FIELD_DATA_VALUE) FROM TF_FORM_DATA TFD  
 	LEFT JOIN TF_PROCESS_INSTANCE_NODE_INFO TPINI ON TFD.FORM_ID = TPINI.FORM_ID 
 	where 1=1 
 	AND TPINI.PROCESS_ID = TYAI.PROCESS_INSTANCE_ID 
 	AND TFD.FIELD_NAME = 'installTime' 
+	
 	) as INSTALL_TIME 
 	from TF_YWPN_APPLY_INSTALL TYAI	
 	LEFT JOIN TF_PROCESS_INSTANCE TPI ON TPI.ID =TYAI.PROCESS_INSTANCE_ID 

pom.xml

@@ -10,13 +10,6 @@
     </parent>
     <modules>
         <module>hnls-admin</module>
-        <module>hnls-gis</module>
-        <module>hnls-gps</module>
-        <module>hnls-mis</module>
-        <module>hnls-dc</module>
-        <module>hnls-scada</module>
-        <module>water-quality</module>
-        <module>dispatch-manage</module>
         <module>flow_project</module>
         <module>common-flow</module>
     </modules>