Jelajahi Sumber

修改任务

syh 4 tahun lalu
induk
melakukan
acd13a4790

+ 5 - 1
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/entity/ActZprocess.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.activiti.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -26,7 +27,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value="act_z_process对象", description="流程定义扩展表")
 public class ActZprocess {
-    
+
 	/**id*/
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "id")
@@ -103,4 +104,7 @@ public class ActZprocess {
 	@Excel(name = "授权的角色", width = 15)
     @ApiModelProperty(value = "授权的角色")
 	private String roles;
+
+	@Dict(dicCode = "id", dictTable = "ctop_act_custom_form", dicText = "name")
+	private Long customTableId;
 }

+ 3 - 0
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActivitiProcessController.java

@@ -97,6 +97,9 @@ public class ActivitiProcessController {
             }).collect(Collectors.toList());
 
         }
+        if(null!=list&&!list.isEmpty()){
+            List<ActZprocess> getList = new ArrayList<>();
+        }
         return Result.ok(list);
     }
 

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActFormDataController.java

@@ -79,6 +79,7 @@ public class ActFormDataController {
 	public Result<ActFormData> add(@RequestBody ActFormData actFormData) {
 		Result<ActFormData> result = new Result<>();
 		try {
+			actFormData.setStatus(1);
 			actFormDataService.save(actFormData);
 			result.success("添加成功!");
 		} catch (Exception e) {

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -161,7 +161,6 @@ public class ProjectMemberController {
             result.setSuccess(false);
             result.setMessage("未获取到用户信息");
             return result;
-
         }
         String projectName = projectMember.getProjectName();
         projectMember.setUserId(null);

+ 0 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java

@@ -47,7 +47,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	 */
 	@Override
 	public List<DictModel> queryDictItemsByCode(String code) {
-		log.info("无缓存dictCache的时候调用这里!");
 		return sysDictMapper.queryDictItemsByCode(code);
 	}
 
@@ -82,7 +81,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 
 	@Override
 	public String queryDictTextByKey(String code, String key,String extendsKey,String extendsValue) {
-		log.info("无缓存dictText的时候调用这里!");
 		return sysDictMapper.queryDictTextByKey(code, key,extendsKey,extendsValue);
 	}
 
@@ -101,7 +99,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 
 	@Override
 	public List<DictModel> queryTableDictItemsByCodeAndFilter(String table, String text, String code, String filterSql) {
-		log.info("无缓存dictTableList的时候调用这里!");
 		return sysDictMapper.queryTableDictItemsByCodeAndFilter(table,text,code,filterSql);
 	}
 

+ 3 - 5
module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormData.java

@@ -3,7 +3,6 @@ package cn.com.ctop.common.module.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,15 +19,14 @@ import java.util.Date;
 @TableName("ctop_act_form_data")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="ctop_act_form_data对象", description="自定义表单存储数据")
 public class ActFormData {
 
 	@TableId(type = IdType.AUTO)
 	private Long id;
 	private Long formId;
-	private String processId;
-	private String key;
-	private String value;
+	private String userId;
+	private String bussinessId;
+	private String content;
 	private Integer status;
 	private Date createTime;
 	private Date updateTime;