feat: 审核任务列表(包含历史审批) id为long导致丢失精度问题修改

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/controller/CategoryController.java

@@ -62,7 +62,7 @@ public class CategoryController extends BaseController{
 		QueryWrapper<Category> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,category);
 		IPage<Category> page = this.categoryService.selectSearchListPage(paramterPage,queryWrapper);
 		for(Category category1:page.getRecords()){
-			category1.setTenant(tenantService.selectDtoById(category1.getTenantid()));
+			category1.setTenant(tenantService.selectDtoById(Long.parseLong(category1.getTenantid())));
 		}
 		return ResultVoUtil.success(page);
 	}
@@ -77,7 +77,7 @@ public class CategoryController extends BaseController{
 	})
 	@GetMapping("/listall")
 	public ResultVo<IPage<Category>> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{
-		
+
 		//租户主键，由前端页面传送
 		String tenantId = request.getHeader("X-Tenant-Id");
 		if(StringUtils.isBlank(tenantId)){
@@ -86,7 +86,7 @@ public class CategoryController extends BaseController{
 
 		QueryWrapper<Category> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("tenantid",tenantId);
-		
+
 		List<Category> list = this.categoryService.getCategoryAll(queryWrapper);
 
 		return ResultVoUtil.success(list);
@@ -99,11 +99,11 @@ public class CategoryController extends BaseController{
 	@PostMapping("/save")
 	public ResultVo saveCategory(HttpServletResponse response,HttpServletRequest request,Category tab) throws IOException{
 		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		
+
 		//查询流程定义id不为空的数据
 		Category category = this.categoryService.getCategoryNotNull();
 		tab.setProcessdefinitionid(category.getProcessdefinitionid());
-		
+
 		tab.setCreateuser(userToken.getLoginname());
 		tab.setCreatedate(System.currentTimeMillis());
 		this.categoryService.save(tab);
@@ -118,17 +118,17 @@ public class CategoryController extends BaseController{
 	@PostMapping("/edit")
 	public ResultVo editCategory(HttpServletResponse response,HttpServletRequest request,Category tab) throws IOException{
 		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		
+
 		//查询流程定义id不为空的数据
 		Category category = this.categoryService.getCategoryNotNull();
 		tab.setProcessdefinitionid(category.getProcessdefinitionid());
-		
+
 		tab.setUpdateuser(userToken.getLoginname());
 		tab.setUpdatetime(System.currentTimeMillis());
 		this.categoryService.updateById(tab);
 		return ResultVoUtil.success();
 	}
-	
+
 	/**
 	 *方法描述：根据页面form传来的对象修改数据
 	 *创建人：mail.zhangyong@gmail.com
@@ -138,11 +138,11 @@ public class CategoryController extends BaseController{
 	public ResultVo update(HttpServletResponse response,HttpServletRequest request) throws IOException{
 		String categoryid = request.getParameter("categoryid");
 		String processdefinitionid = request.getParameter("processdefinitionid");
-		
+
-		
+
 		Category tab = this.categoryService.getById(categoryid);
 		tab.setProcessdefinitionid(processdefinitionid);
-		
+
 		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
 		tab.setUpdateuser(userToken.getLoginname());
 		tab.setUpdatetime(System.currentTimeMillis());

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataobject/Category.java

@@ -20,8 +20,8 @@ import java.util.Map;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.stream.Stream;
 import java.util.stream.Collectors;
- 
+
- 
+
 
 @Data
 @Builder
@@ -30,95 +30,95 @@ import java.util.stream.Collectors;
 @Schema(name = "流程类型", title = "流程类型")
 @TableName(value = "OA_CATEGORY_T")
 public class Category implements BaseDto,java.io.Serializable {
-	
+
 	private static final long serialVersionUID = 3650775877135330041L;
 	@Schema(description = "流水号")
 	@TableId(value = "id",type = IdType.ASSIGN_ID)
 	@JsonSerialize(using = ToStringSerializer.class)
 	@TableField(value="ID")
 	private Long id;
-	
+
 	@Schema(description = "项目名称")
 	@TableField(value="CATEGORYNAME")
 	private String categoryname;
-	
+
 	@Schema(description = "项目编码")
 	@TableField(value="CATEGORY")
 	private String category;
-	
+
 	@Schema(description = "对应的Service名，主要是spring的service名")
 	@TableField(value="SERVICENAME")
 	private String servicename;
-	
+
 	@Schema(description = "内置表单，使用flowable表单，0：使用本地数据，1：使用flowable表单，3:外置表单，4：其他自定义表单")
 	@TableField(value="BUILTFORM")
 	private Integer builtform;
-	
+
 	@Schema(description = "表单地址，用户展示用户表单使用")
 	@TableField(value="FORMURL")
 	private String formurl;
-	
+
 	@Schema(description = "表单详情")
 	@TableField(value="FORMDETAIL")
 	private String formdetail;
-	
+
 	@Schema(description = "是否启用，0：禁用，1：启用")
 	@TableField(value="HAVEUSE")
 	private Integer haveuse;
-	
+
 	@Schema(description = "表单分类")
 	@TableField(value="FORMTYPE")
 	private String formtype;
-	
+
 	@Schema(description = "流程定义id")
 	@TableField(value="PROCESSDEFINITIONID")
 	private String processdefinitionid;
-	
+
 	@Schema(description = "排序")
 	@TableField(value="FORMNO")
 	private Integer formno;
-	
+
 	@Schema(description = "创建人，记录创建人的帐号")
 	@TableField(value="CREATEUSER")
 	private String createuser;
-	
+
 	@Schema(description = "创建时间")
 	@TableField(value="CREATEDATE")
 	private Long createdate;
-	
+
 	@Schema(description = "修改人，记录创建人的帐号")
 	@TableField(value="UPDATEUSER")
 	private String updateuser;
-	
+
 	@Schema(description = "更新时间")
 	@TableField(value="UPDATETIME")
 	private Long updatetime;
-	
+
 	@Schema(description = "隶属机构")
 	@TableField(value="DEPTID")
 	private Long deptid;
-	
+
 	@Schema(description = "租户主键")
 	@TableField(value="TENANTID")
-	private Long tenantid;
+	private String tenantid;
-	
+
 	//租户对象
 	@TableField(exist = false)
 	private Tenant tenant;
-	
+
 	//业务表主键
 	@Schema(description = "业务表主键")
 	@TableField(exist = false)
 	private String formid;
-	
+
 	//节点描述信息，用于判断是否存在多个下级界面
 	@TableField(exist = false)
 	String documentation;
-	
+
 	@Schema(description = "状态，审批状态 1:未提交 2:审批中 3:审批通过 ")
 	@TableField(exist = false)
 	private Integer states;
-	
+
 	//保存当前登录用户的数据权限范围的搜索条件
 	@TableField(exist = false)
 	@JsonIgnore

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java

@@ -33,140 +33,141 @@ import java.util.stream.Stream;
 @AllArgsConstructor
 @ApiModel(value="任务信息", description="任务信息")
 public class OcrTaskchildPictureAppro implements java.io.Serializable {
-	
+
 	private static final long serialVersionUID = -8018660053527763810L;
 	@ApiModelProperty(value =  "主键")
-	private Long id;
+	private String id;
+
 	@ApiModelProperty(value =  "比对图片主键，多个数据使用英文逗号分隔")
 	private String ocpictureid;
-	
+
 	@ApiModelProperty(value =  "图片比对结果,与图片主键一一对应，记录比对结果，使用英文逗号分隔，例如99.6,98.1,97.2")
 	private String pictureresult;
-	
+
 	@ApiModelProperty(value =  "只记录主图，如果存在历史图片，不在这里记录")
 	private String picturecompare;
-	
+
 	@ApiModelProperty(value =  "所属部门")
 	private String deptid;
-	
+
 	@ApiModelProperty(value =  "租户ID")
-	private Long tenantid;
+	private String tenantid;
-	
+
 	@ApiModelProperty(value =  "任务包主键")
-	private Long packageid;
+	private String packageid;
-	
+
 	@ApiModelProperty(value =  "原图片主键")
-	private Long pictureid;
+	private String pictureid;
-	
+
 	@ApiModelProperty(value =  "类型名称")
 	private String category;
-	
+
 	@ApiModelProperty(value =  "项目ID")
-	private Long categoryid;
+	private String categoryid;
-	
+
 	@ApiModelProperty(value =  "明细单")
 	private String specification;
-	
+
 	@ApiModelProperty(value =  "业务编码")
 	private String buessinessno;
-	
+
 	@ApiModelProperty(value =  "状态，审批状态 1:未提交 2:审批中 3:审批通过 ，5：拒绝")
 	private Integer states;
-	
+
 	@ApiModelProperty(value =  "流程实例IdprocessInstanceId")
 	private String processinstanceid;
-	
+
 	@ApiModelProperty(value =  "流程定义id")
 	private String processdefinitionid;
-	
+
 	@ApiModelProperty(value =  "流程部署id")
 	private String deploymentid;
-	
+
 	@ApiModelProperty(value =  "审批人姓名")
 	private String assigneename;
-	
+
 	@ApiModelProperty(value =  "审批人")
 	private String assignee;
-	
+
 	@ApiModelProperty(value =  "修改人，记录创建人的帐号")
 	private String updateuser;
-	
+
 	@ApiModelProperty(value =  "更新时间")
 	private Long updatetime;
-	
+
 	@ApiModelProperty(value =  "附件")
 	private String fileannex;
-	
+
 	@ApiModelProperty(value =  "是否归档，0：未归档，1：归档")
 	private Integer guidang;
-	
+
 	@ApiModelProperty(value =  "创建人")
 	private String createuser;
-	
+
 	@ApiModelProperty(value =  "创建人姓名")
 	private String createusername;
-	
+
 	@ApiModelProperty(value =  "创建时间")
 	private Long createdate;
-	
+
 	@ApiModelProperty(value =  "员工主键")
 	private Long userid;
-	
+
 	@ApiModelProperty(value =  "员工姓名")
 	private String username;
-	
+
 	@ApiModelProperty(value =  "任务id,来源于图片表")
 	private String fromtaskid;
-	
+
 	@ApiModelProperty(value =  "任务名称,来源于图片表")
 	private String fromtaskname;
-	
+
 	@ApiModelProperty(value =  "提报人")
 	private String fromuserid;
-	
+
 	@ApiModelProperty(value =  "所属项目")
 	private String fromprojectid;
-	
+
 	@ApiModelProperty(value =  "所属计划")
 	private String fromplanid;
-	
+
 	@ApiModelProperty(value =  "提报时间")
 	private Long fromuptime;
-	
+
 	@ApiModelProperty(value =  "任务来源")
 	private String fromsourceid;
-	
+
 	@ApiModelProperty(value =  "是否为相似图片，与其他图片对比为百分百的，记录为1，0：不相似，1：相似")
 	private Integer havepoints;
-	
+
 	@ApiModelProperty(value = "当前节点名称")
 	private String taskname;
-	
+
 	@ApiModelProperty(value = "历史-审批节点名称")
 	private String tasknamehis;
-	
+
 	@ApiModelProperty(value = "历史-审批状态，记录当前节点审批状态，1：.待审批 (只针对前端返回 库中逻辑上不存在) 2.通过 3.不通过")
 	private Integer statshis;
-	
+
 	@ApiModelProperty(value = "历史-审批意见")
 	private String commenthis;
-	
+
 	@ApiModelProperty(value = "历史-节点位置，待定字段，")
 	private Integer taskindex;
-	
+
 	@ApiModelProperty(value = "历史-节点编号")
 	private String taskno;
-	
+
 	@ApiModelProperty(value = "项目对象")
 	private Category categoryDto;
-	
+
 	@ApiModelProperty(value = "节点主键")
 	private String taskId;
-	
+
 	@ApiModelProperty(value = "节点描述")
 	private String documentation;
-	
+
 	@ApiModelProperty(value = "审批记录")
 	private List<HistoricTaskInstanceDto> transferRecords;
-	
+
 }