Browse Source

项目审核修改passs判定条件为空的bug

user5 4 năm trước cách đây
mục cha
commit
85b7b7cf7b

+ 4 - 0
src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -787,6 +787,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 					if ("yes".equals(projectRecords.getAct().getFlag())) {
 						workActivityProcess.setIsApproval("1");
 						vars.put("pass", true);
+						vars.put("passs", true);
 						notifyRole = "审批通过";
 						//审批通过则需要给该项目添加一个报告前缀信息
 						String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), "92");
@@ -801,6 +802,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 					} else {
 						workActivityProcess.setIsApproval("2");
 						vars.put("pass", false);
+						vars.put("passs",false);
 						user = createUser;
 						notifyRole = "调整项目";
 					}
@@ -813,10 +815,12 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 					if("yes".equals(projectRecords.getAct().getFlag())){
 						workActivityProcess.setIsApproval("1");
 						vars.put("pass",true);
+						vars.put("passs",true);
 					}else{
 						workActivityProcess.setIsApproval("2");
 						projectRecords.setProjectStatus(ProjectStatusEnum.RECALL.getValue());
 						vars.put("pass",false);
+						vars.put("passs",false);
 					}
 					break;
 				}

+ 2 - 2
src/main/resources/jeeplus.properties

@@ -6,8 +6,8 @@
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
-#jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://127.0.0.1:3306/ah_total_process_master?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://192.168.2.4:3306/total_01?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/ah_total_process_master?useUnicode=true&characterEncoding=utf-8
 #jdbc.url=jdbc:mysql://127.0.0.1:3306/xs_total_process?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 #jdbc.password=123456