bug修改

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/ExecuteTypeEnum.java

@@ -10,9 +10,9 @@ public enum ExecuteTypeEnum {
     /**
      * 未执行
      */
-    未执行("未执行", 1),
-    通过("通过", 2),
-    驳回("驳回", 3);
+    未执行("未执行", 1, ""),
+    通过("通过", 2, "0"),
+    驳回("驳回", 3, "1");
 
     /**
      * 名称，描述
@@ -23,11 +23,15 @@ public enum ExecuteTypeEnum {
      */
     private Integer code;
 
+    /**
+     * 工作流条件（0通过1驳回）
+     */
+    private String condition;
 
-
-    ExecuteTypeEnum(String name, Integer code) {
+    ExecuteTypeEnum(String name, Integer code, String condition) {
         this.name = name;
         this.code = code;
+        this.condition = condition;
     }
 
     public String getName() {
@@ -46,6 +50,14 @@ public enum ExecuteTypeEnum {
         this.code = code;
     }
 
+    public String getCondition() {
+        return condition;
+    }
+
+    public void setCode(String condition) {
+        this.condition = condition;
+    }
+
     public static ExecuteTypeEnum getByCode(Integer code) {
         for (ExecuteTypeEnum e : ExecuteTypeEnum.values()) {
             if (code.equals(e.getCode())) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -1450,13 +1450,8 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 	private RedisUtils redisUtils;
 	public BaseEntity getCurrentInfo() {
 		BaseEntity userModel= new BaseEntity();
-			String keyString=	RequestContext.getExeUserId();
-	String token=RequestContext.getToken();
-		ReginParams params = JSONObject.parseObject(redisUtils
-				.get(RedisKey.buildReginKey(keyString, token)).toString(),
-				ReginParams.class);
-		userModel.setRecUserId(params.getUserModel().getUserId());		
-		userModel.setRecUserName(params.getUserModel().getUserName());
+		userModel.setRecUserId("3141675");
+		userModel.setRecUserName("admin_jcs");
 		userModel.setRecDate( new Date());
 		return userModel;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -352,6 +352,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             latentDanger.setDiscovererUserId(userId);
             latentDanger.setOrgCode(orgCode);
             latentDanger.setDangerType(dangerTypeEnum.getCode());
+            latentDanger.setDangerTypeName(dangerTypeEnum.getName());
             if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
                 latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
                 latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
@@ -1220,7 +1221,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 !ValidationUtil.isEmpty(latentDanger.getInstanceId()) && ExecuteTypeEnum.驳回.getCode().equals(preRecord.getExecuteState())) {
             condition = planType;
         } else {
-            condition = param.getExecuteType().toString();
+            ExecuteTypeEnum executeTypeEnum = ExecuteTypeEnum.getByCode(param.getExecuteType());
+            condition = executeTypeEnum.getCondition();
         }
 
         // 执行任务(带权限校验)