增加任务包--智能审批工具

dev
admin 1 year ago
parent be25406095
commit 7075278f54

@ -1,6 +1,7 @@
package cn.jyjz.xiaoyao.ocr.controller; package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -201,6 +202,33 @@ public class OcrTaskchildPictureController extends BaseController{
return ocrTaskchildPictureService.clearmark(taskchildpictureid,packageid); return ocrTaskchildPictureService.clearmark(taskchildpictureid,packageid);
} }
/**
*
*
* @param req
* @return
*/
@ApiOperation(value="当前任务包智能识别", notes="当前任务包智能识别")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键", required = true)
})
@PostMapping(value = "/markpoint")
public ResultVo markpoint(@RequestParam(name="packageid",required=true) String packageid,
HttpServletRequest req) {
//如果是历史图片,不允许进行设置
//如果是已经审批完成的图片不允许是指
OcrTaskchildPicture ocrTaskchildPicture = new OcrTaskchildPicture();
ocrTaskchildPicture.setPackageid(Long.parseLong(packageid));
List<OcrTaskchildPicture> list = ocrTaskchildPictureService.markpoint(packageid);
if(null != list && !list.isEmpty()){
return ResultVoUtil.success(list);
}
return ResultVoUtil.error();
}
/** /**
* *
*mail.zhangyong@gmail.com *mail.zhangyong@gmail.com

@ -39,153 +39,149 @@ import java.util.stream.Collectors;
@TableName(value = "ocr_taskchild_picture") @TableName(value = "ocr_taskchild_picture")
public class OcrTaskchildPicture implements BaseDto,java.io.Serializable { public class OcrTaskchildPicture implements BaseDto,java.io.Serializable {
private static final long serialVersionUID = 6403133754695702159L; private static final long serialVersionUID = -8018660053527763810L;
@ApiModelProperty(value ="主键") @ApiModelProperty(value = "主键")
@TableId(value = "id",type = IdType.ASSIGN_ID) @TableId(value = "id",type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@TableField(value="ID") @TableField(value="ID")
private Long id; private Long id;
@ApiModelProperty(value ="比对图片主键,多个数据使用英文逗号分隔") @ApiModelProperty(value = "比对图片主键,多个数据使用英文逗号分隔")
@TableField(value="OCPICTUREID") @TableField(value="OCPICTUREID")
private String ocpictureid; private String ocpictureid;
@ApiModelProperty(value ="图片比对结果,与图片主键一一对应记录比对结果使用英文逗号分隔例如99.6,98.1,97.2") @ApiModelProperty(value = "图片比对结果,与图片主键一一对应记录比对结果使用英文逗号分隔例如99.6,98.1,97.2")
@TableField(value="PICTURERESULT") @TableField(value="PICTURERESULT")
private String pictureresult; private String pictureresult;
@ApiModelProperty(value ="只记录主图,如果存在历史图片,不在这里记录") @ApiModelProperty(value = "只记录主图,如果存在历史图片,不在这里记录")
@TableField(value="PICTURECOMPARE") @TableField(value="PICTURECOMPARE")
private String picturecompare; private String picturecompare;
@ApiModelProperty(value ="所属部门") @ApiModelProperty(value = "所属部门")
@TableField(value="DEPTID") @TableField(value="DEPTID")
private String deptid; private String deptid;
@ApiModelProperty(value ="租户ID") @ApiModelProperty(value = "租户ID")
@TableField(value="TENANTID") @TableField(value="TENANTID")
@JsonSerialize(using = ToStringSerializer.class)
private Long tenantid; private Long tenantid;
@ApiModelProperty(value ="任务包主键") @ApiModelProperty(value = "任务包主键")
@TableField(value="PACKAGEID") @TableField(value="PACKAGEID")
@JsonSerialize(using = ToStringSerializer.class)
private Long packageid; private Long packageid;
@ApiModelProperty(value ="原图片主键") @ApiModelProperty(value = "原图片主键")
@TableField(value="PICTUREID") @TableField(value="PICTUREID")
@JsonSerialize(using = ToStringSerializer.class)
private Long pictureid; private Long pictureid;
@ApiModelProperty(value ="类型名称") @ApiModelProperty(value = "类型名称")
@TableField(value="CATEGORY") @TableField(value="CATEGORY")
private String category; private String category;
@ApiModelProperty(value ="项目ID") @ApiModelProperty(value = "项目ID")
@TableField(value="CATEGORYID") @TableField(value="CATEGORYID")
@JsonSerialize(using = ToStringSerializer.class)
private Long categoryid; private Long categoryid;
@ApiModelProperty(value ="明细单") @ApiModelProperty(value = "明细单")
@TableField(value="SPECIFICATION") @TableField(value="SPECIFICATION")
private String specification; private String specification;
@ApiModelProperty(value ="业务编码") @ApiModelProperty(value = "业务编码")
@TableField(value="BUESSINESSNO") @TableField(value="BUESSINESSNO")
private String buessinessno; private String buessinessno;
@ApiModelProperty(value ="状态,审批状态 1:未提交 2:审批中 3:审批通过 5拒绝") @ApiModelProperty(value = "状态,审批状态 1:未提交 2:审批中 3:审批通过 5拒绝")
@TableField(value="STATES") @TableField(value="STATES")
private Integer states; private Integer states;
@ApiModelProperty(value ="流程实例IdprocessInstanceId") @ApiModelProperty(value = "流程实例IdprocessInstanceId")
@TableField(value="PROCESSINSTANCEID") @TableField(value="PROCESSINSTANCEID")
private String processinstanceid; private String processinstanceid;
@ApiModelProperty(value ="流程定义id") @ApiModelProperty(value = "流程定义id")
@TableField(value="PROCESSDEFINITIONID") @TableField(value="PROCESSDEFINITIONID")
private String processdefinitionid; private String processdefinitionid;
@ApiModelProperty(value ="流程部署id") @ApiModelProperty(value = "流程部署id")
@TableField(value="DEPLOYMENTID") @TableField(value="DEPLOYMENTID")
private String deploymentid; private String deploymentid;
@ApiModelProperty(value ="审批人姓名") @ApiModelProperty(value = "审批人姓名")
@TableField(value="ASSIGNEENAME") @TableField(value="ASSIGNEENAME")
private String assigneename; private String assigneename;
@ApiModelProperty(value ="审批人") @ApiModelProperty(value = "审批人")
@TableField(value="ASSIGNEE") @TableField(value="ASSIGNEE")
private String assignee; private String assignee;
@ApiModelProperty(value ="修改人,记录创建人的帐号") @ApiModelProperty(value = "修改人,记录创建人的帐号")
@TableField(value="UPDATEUSER") @TableField(value="UPDATEUSER")
private String updateuser; private String updateuser;
@ApiModelProperty(value ="更新时间") @ApiModelProperty(value = "更新时间")
@TableField(value="UPDATETIME") @TableField(value="UPDATETIME")
@JsonSerialize(using = DateSerializer.class)
private Long updatetime; private Long updatetime;
@ApiModelProperty(value ="附件") @ApiModelProperty(value = "附件")
@TableField(value="FILEANNEX") @TableField(value="FILEANNEX")
private String fileannex; private String fileannex;
@ApiModelProperty(value ="是否归档0未归档1归档") @ApiModelProperty(value = "是否归档0未归档1归档")
@TableField(value="GUIDANG") @TableField(value="GUIDANG")
private Integer guidang; private Integer guidang;
@ApiModelProperty(value ="创建人") @ApiModelProperty(value = "创建人")
@TableField(value="CREATEUSER") @TableField(value="CREATEUSER")
private String createuser; private String createuser;
@ApiModelProperty(value ="创建人姓名") @ApiModelProperty(value = "创建人姓名")
@TableField(value="CREATEUSERNAME") @TableField(value="CREATEUSERNAME")
private String createusername; private String createusername;
@ApiModelProperty(value ="创建时间") @ApiModelProperty(value = "创建时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="CREATEDATE") @TableField(value="CREATEDATE")
private Long createdate; private Long createdate;
@ApiModelProperty(value ="员工主键") @ApiModelProperty(value = "员工主键")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="USERID") @TableField(value="USERID")
private Long userid; private Long userid;
@ApiModelProperty(value ="员工姓名") @ApiModelProperty(value = "员工姓名")
@TableField(value="USERNAME") @TableField(value="USERNAME")
private String username; private String username;
@ApiModelProperty(value ="任务id,来源于图片表") @ApiModelProperty(value = "任务id,来源于图片表")
@TableField(value="FROMTASKID") @TableField(value="FROMTASKID")
private String fromtaskid; private String fromtaskid;
@ApiModelProperty(value ="任务名称,来源于图片表") @ApiModelProperty(value = "任务名称,来源于图片表")
@TableField(value="FROMTASKNAME") @TableField(value="FROMTASKNAME")
private String fromtaskname; private String fromtaskname;
@ApiModelProperty(value ="提报人") @ApiModelProperty(value = "提报人")
@TableField(value="FROMUSERID") @TableField(value="FROMUSERID")
private String fromuserid; private String fromuserid;
@ApiModelProperty(value ="所属项目") @ApiModelProperty(value = "所属项目")
@TableField(value="FROMPROJECTID") @TableField(value="FROMPROJECTID")
private String fromprojectid; private String fromprojectid;
@ApiModelProperty(value ="所属计划") @ApiModelProperty(value = "所属计划")
@TableField(value="FROMPLANID") @TableField(value="FROMPLANID")
private String fromplanid; private String fromplanid;
@ApiModelProperty(value ="提报时间") @ApiModelProperty(value = "提报时间")
@TableField(value="FROMUPTIME") @TableField(value="FROMUPTIME")
@JsonSerialize(using = DateSerializer.class)
private Long fromuptime; private Long fromuptime;
@ApiModelProperty(value ="任务来源") @ApiModelProperty(value = "任务来源")
@TableField(value="FROMSOURCEID") @TableField(value="FROMSOURCEID")
private String fromsourceid; private String fromsourceid;
@ApiModelProperty(value = "是否为相似图片与其他图片对比为百分百的记录为10不相似1相似")
@TableField(value="HAVEPOINTS")
private Integer havepoints;
@ApiModelProperty(value = "项目对象") @ApiModelProperty(value = "项目对象")
@TableField(exist = false) @TableField(exist = false)
private Category categoryDto; private Category categoryDto;
@ -251,40 +247,41 @@ public class OcrTaskchildPicture implements BaseDto,java.io.Serializable {
@TableField(exist = false) @TableField(exist = false)
@JsonIgnore @JsonIgnore
private final Map<String,String> query = Stream.of( private final Map<String,String> query = Stream.of(
new SimpleEntry<>("ID","id"), new SimpleEntry<>("ID","id"),
new SimpleEntry<>("OCPICTUREID","ocpictureid"), new SimpleEntry<>("OCPICTUREID","ocpictureid"),
new SimpleEntry<>("PICTURERESULT","pictureresult"), new SimpleEntry<>("PICTURERESULT","pictureresult"),
new SimpleEntry<>("PICTURECOMPARE","picturecompare"), new SimpleEntry<>("PICTURECOMPARE","picturecompare"),
new SimpleEntry<>("DEPTID","deptid"), new SimpleEntry<>("DEPTID","deptid"),
new SimpleEntry<>("TENANTID","tenantid"), new SimpleEntry<>("TENANTID","tenantid"),
new SimpleEntry<>("PACKAGEID","packageid"), new SimpleEntry<>("PACKAGEID","packageid"),
new SimpleEntry<>("PICTUREID","pictureid"), new SimpleEntry<>("PICTUREID","pictureid"),
new SimpleEntry<>("CATEGORY","category"), new SimpleEntry<>("CATEGORY","category"),
new SimpleEntry<>("CATEGORYID","categoryid"), new SimpleEntry<>("CATEGORYID","categoryid"),
new SimpleEntry<>("SPECIFICATION","specification"), new SimpleEntry<>("SPECIFICATION","specification"),
new SimpleEntry<>("BUESSINESSNO","buessinessno"), new SimpleEntry<>("BUESSINESSNO","buessinessno"),
new SimpleEntry<>("STATES","states"), new SimpleEntry<>("STATES","states"),
new SimpleEntry<>("PROCESSINSTANCEID","processinstanceid"), new SimpleEntry<>("PROCESSINSTANCEID","processinstanceid"),
new SimpleEntry<>("PROCESSDEFINITIONID","processdefinitionid"), new SimpleEntry<>("PROCESSDEFINITIONID","processdefinitionid"),
new SimpleEntry<>("DEPLOYMENTID","deploymentid"), new SimpleEntry<>("DEPLOYMENTID","deploymentid"),
new SimpleEntry<>("ASSIGNEENAME","assigneename"), new SimpleEntry<>("ASSIGNEENAME","assigneename"),
new SimpleEntry<>("ASSIGNEE","assignee"), new SimpleEntry<>("ASSIGNEE","assignee"),
new SimpleEntry<>("UPDATEUSER","updateuser"), new SimpleEntry<>("UPDATEUSER","updateuser"),
new SimpleEntry<>("UPDATETIME","updatetime"), new SimpleEntry<>("UPDATETIME","updatetime"),
new SimpleEntry<>("FILEANNEX","fileannex"), new SimpleEntry<>("FILEANNEX","fileannex"),
new SimpleEntry<>("GUIDANG","guidang"), new SimpleEntry<>("GUIDANG","guidang"),
new SimpleEntry<>("CREATEUSER","createuser"), new SimpleEntry<>("CREATEUSER","createuser"),
new SimpleEntry<>("CREATEUSERNAME","createusername"), new SimpleEntry<>("CREATEUSERNAME","createusername"),
new SimpleEntry<>("CREATEDATE","createdate"), new SimpleEntry<>("CREATEDATE","createdate"),
new SimpleEntry<>("USERID","userid"), new SimpleEntry<>("USERID","userid"),
new SimpleEntry<>("USERNAME","username"), new SimpleEntry<>("USERNAME","username"),
new SimpleEntry<>("FROMTASKID","fromtaskid"), new SimpleEntry<>("FROMTASKID","fromtaskid"),
new SimpleEntry<>("FROMTASKNAME","fromtaskname"), new SimpleEntry<>("FROMTASKNAME","fromtaskname"),
new SimpleEntry<>("FROMUSERID","fromuserid"), new SimpleEntry<>("FROMUSERID","fromuserid"),
new SimpleEntry<>("FROMPROJECTID","fromprojectid"), new SimpleEntry<>("FROMPROJECTID","fromprojectid"),
new SimpleEntry<>("FROMPLANID","fromplanid"), new SimpleEntry<>("FROMPLANID","fromplanid"),
new SimpleEntry<>("FROMUPTIME","fromuptime"), new SimpleEntry<>("FROMUPTIME","fromuptime"),
new SimpleEntry<>("FROMSOURCEID","fromsourceid") new SimpleEntry<>("FROMSOURCEID","fromsourceid"),
new SimpleEntry<>("HAVEPOINTS","havepoints")
) )
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)); .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override @Override

@ -20,6 +20,20 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
public List<OcrTaskchildPicture> listAll(String tenantId, String createUser, QueryWrapper queryWrapper); public List<OcrTaskchildPicture> listAll(String tenantId, String createUser, QueryWrapper queryWrapper);
/**
*
* @param taskids
* @return
*/
public boolean markPoint(List<Long> taskids);
/**
*
* @param packageid
* @return
*/
public List<OcrTaskchildPicture> markpoint(String packageid);
/** /**
* *
* @param formid * @param formid

@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hpsf.Decimal;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
@ -33,6 +34,8 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@ -70,6 +73,9 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
StringBuffer errorProject = new StringBuffer(); StringBuffer errorProject = new StringBuffer();
//流程错误信息 //流程错误信息
StringBuffer errorFlow = new StringBuffer(); StringBuffer errorFlow = new StringBuffer();
//记录任务相似度为百分百的任务主键
List<Long> pointsList = new ArrayList<>();
//图片信息不能为空 //图片信息不能为空
if(null != ocrPictureList && !ocrPictureList.isEmpty()){ if(null != ocrPictureList && !ocrPictureList.isEmpty()){
//生成任务包 //生成任务包
@ -84,6 +90,8 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
return ResultVoUtil.error("失败。"); return ResultVoUtil.error("失败。");
} }
//用于标记相似度是否存在百分百的情况
List<OcrPicture> newList = new ArrayList<>(); List<OcrPicture> newList = new ArrayList<>();
for(OcrPicture ocrPicture:ocrPictureList){ for(OcrPicture ocrPicture:ocrPictureList){
@ -99,12 +107,16 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
//非历史图片主键集合 //非历史图片主键集合
List<String> picturecompareList = new ArrayList<>(); List<String> picturecompareList = new ArrayList<>();
boolean havePoint = false;
//二次遍历进行比对 //二次遍历进行比对
for(OcrPicture ocrPictureNext:ocrPictureList){ for(OcrPicture ocrPictureNext:ocrPictureList){
if(ocrPictureNext.getId().longValue() == ocrPicture.getId().longValue()){
continue;
}
//TODO 接口请求判断重复情况
//TODO 接口请求判断重复情况
logService.addLog(103,"AI获取图片相似度接口", sysUser, "sendParams"); logService.addLog(103,"AI获取图片相似度接口", sysUser, "sendParams");
@ -114,14 +126,25 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
System.out.println("responseDataXs--code = [" + jsonObjectSimi.get("code") + "]"); System.out.println("responseDataXs--code = [" + jsonObjectSimi.get("code") + "]");
System.out.println("responseDataXs--similarity = [" + jsonObjectSimi.get("similarity") + "]"); System.out.println("responseDataXs--similarity = [" + jsonObjectSimi.get("similarity") + "]");
String resultValue = "";
//返回内容为零,表示成功,否则表示失败 //返回内容为零,表示成功,否则表示失败
if(null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0")){ if(null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0")){
ocrPictureNext.setResult(jsonObjectSimi.getString("similarity"));
resultValue = jsonObjectSimi.getString("similarity");
ocrPictureNext.setResult(resultValue);
}else{ }else{
ocrPictureNext.setResult("0"); resultValue = "0";
ocrPictureNext.setResult(jsonObjectSimi.getString("similarity")); ocrPictureNext.setResult(resultValue);
}
BigDecimal b1 = new BigDecimal(resultValue);
BigDecimal b2 = new BigDecimal("100");
int val = b1.compareTo(b2);
if(val == 0){
havePoint = true;
} }
//如果当前图片未生成任务需要临时保存 //如果当前图片未生成任务需要临时保存
if(ocrPictureNext.getTaskstatus().equals("0")){ if(ocrPictureNext.getTaskstatus().equals("0")){
picturecompareList.add(ocrPictureNext.getId().toString()); picturecompareList.add(ocrPictureNext.getId().toString());
@ -176,6 +199,10 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
category.getServicename() category.getServicename()
); );
if(havePoint){
pointsList.add(ocrTaskchildPicture.getId());
}
//TODO 需要测试 //TODO 需要测试
ocrPicture.setTaskchildpictureid(ocrTaskchildPicture.getId().toString()); ocrPicture.setTaskchildpictureid(ocrTaskchildPicture.getId().toString());
ocrPicture.setWorkStatus("1"); ocrPicture.setWorkStatus("1");
@ -185,6 +212,12 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
newList.add(ocrPicture); newList.add(ocrPicture);
} }
//批量更新 pointsList 主键相似度为百分百的数据
if(null != pointsList && !pointsList.isEmpty()){
this.ocrTaskchildPictureService.markPoint(pointsList);
}
if(StringUtils.isNotBlank(search_month)){ if(StringUtils.isNotBlank(search_month)){
if(StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) <= 12 && Integer.parseInt(search_month) > 0){ if(StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) <= 12 && Integer.parseInt(search_month) > 0){

@ -13,6 +13,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -226,6 +227,35 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
return iPage.getRecords(); return iPage.getRecords();
} }
/**
*
* @param taskids
* @return
*/
public boolean markPoint(List<Long> taskids){
UpdateWrapper updateWrapper = new UpdateWrapper();
updateWrapper.set("HAVEPOINTS",1);
updateWrapper.in("ID",taskids);
return this.update(updateWrapper);
}
/**
*
* @param packageid
* @return
*/
public List<OcrTaskchildPicture> markpoint(String packageid){
QueryWrapper<OcrTaskchildPicture> queryWrapperNew = new QueryWrapper<>();
queryWrapperNew.eq("HAVEPOINTS","1");
queryWrapperNew.eq("PACKAGEID",packageid);
List<OcrTaskchildPicture> list = this.ocrtaskchildpicturemybatisdao.selectList(queryWrapperNew);
this.formatTask(list,packageid);
return list;
}
/** /**
* *
* @param fromid * @param fromid
@ -320,7 +350,19 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
IPage<OcrTaskchildPicture> iPage = this.page(page,queryWrapper); IPage<OcrTaskchildPicture> iPage = this.page(page,queryWrapper);
for(OcrTaskchildPicture ocrTaskchildPicture:iPage.getRecords()){ this.formatTask(iPage.getRecords(),packageid);
return iPage;
}
/**
*
* @param list
* @param packageid
*/
private void formatTask(List<OcrTaskchildPicture> list,String packageid){
for(OcrTaskchildPicture ocrTaskchildPicture:list){
//查询审批流节点信息 //查询审批流节点信息
List<Task> taskList = iFlowTaskService.nowRunTask(ocrTaskchildPicture.getProcessinstanceid(),ocrTaskchildPicture.getProcessdefinitionid()); List<Task> taskList = iFlowTaskService.nowRunTask(ocrTaskchildPicture.getProcessinstanceid(),ocrTaskchildPicture.getProcessdefinitionid());
@ -350,8 +392,6 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
ocrTaskchildPicture.setOcrPicture(ocrPicture); ocrTaskchildPicture.setOcrPicture(ocrPicture);
} }
return iPage;
} }
/** /**

@ -1,176 +1,176 @@
//package cn.jyjz.xiaoyao.ocr.util; package cn.jyjz.xiaoyao.ocr.util;
//
//import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
//import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
//import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
//import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
//import lombok.Data; import lombok.Data;
//import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
//
//import java.io.Serializable; import java.io.Serializable;
//import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
//import java.net.URLEncoder; import java.net.URLEncoder;
//import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
//import java.util.LinkedHashMap; import java.util.LinkedHashMap;
//import java.util.Map; import java.util.Map;
//
///** /**
// * <ol> * <ol>
// * <li> * <li>
// * GET/DELETE请求Query String * GET/DELETEQuery String
// * 参考:{@link } * {@link }
// * </li> * </li>
// * <li> * <li>
// * POST/PATCH/PUT请求JSON格式请求体 * POST/PATCH/PUTJSON
// * <pre> * <pre>
// * { * {
// * "tenantCode": “syxy”, * "tenantCode": syxy,
// * "accessKey": "syncuser", * "accessKey": "syncuser",
// * "data": { * "data": {
// * // 加密的业务数据 * // 加密的业务数据
// * }, * },
// * "timestamp": 1689837406368, * "timestamp": 1689837406368,
// * "signature": "eUk5kY-xR6XMjzjJRrl2T3EE_c5wztJNvdNWEY3vxfo" * "signature": "eUk5kY-xR6XMjzjJRrl2T3EE_c5wztJNvdNWEY3vxfo"
// * } * }
// * </pre> * </pre>
// * 参考:{@link #toString()} * {@link #toString()}
// * </li> * </li>
// * </ol> * </ol>
// * @author hdzhong * @author hdzhong
// * @date 2023/9/20 * @date 2023/9/20
// */ */
//@Data @Data
//@ApiModel(value = "请求统一Query/JSON封装",description = "接口统一请求报文") @ApiModel(value = "请求统一Query/JSON封装",description = "接口统一请求报文")
//public class RequestData implements Serializable { public class RequestData implements Serializable {
// public final static String TIMESTAMP = "_timestamp"; public final static String TIMESTAMP = "_timestamp";
// public final static String SIGNATURE = "_signature"; public final static String SIGNATURE = "_signature";
//
// /** /**
// * URL的Query参数 * URLQuery
// */ */
// @ApiModelProperty(value = "Query参数") @ApiModelProperty(value = "Query参数")
// private Map<String, String> parameters; private Map<String, String> parameters;
// /** /**
// * 租户代码 *
// */ */
// @ApiModelProperty(value = "租户代码") @ApiModelProperty(value = "租户代码")
// private String tenantCode; private String tenantCode;
// /** /**
// * 访问标识 * 访
// */ */
// @ApiModelProperty(value = "访问标识") @ApiModelProperty(value = "访问标识")
// private String accessKey; private String accessKey;
// /** /**
// * 进行加密后的业务数据 *
// * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper#encrypt(String, String, String) * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper#encrypt(String, String, String)
// */ */
// @ApiModelProperty(value = "加密的请求数据") @ApiModelProperty(value = "加密的请求数据")
// private String data; private String data;
// /** /**
// * 请求时间戳作为签名、加密的随机盐Salt * Salt
// * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper # combineSalt(String, String) * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper # combineSalt(String, String)
// */ */
// @ApiModelProperty(value = "请求时间戳") @ApiModelProperty(value = "请求时间戳")
// private long timestamp ; private long timestamp ;
// /** /**
// * 数据签名 *
// * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper # getSignature(String, String, Map) * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper # getSignature(String, String, Map)
// */ */
// @ApiModelProperty(value = "数据签名") @ApiModelProperty(value = "数据签名")
// private String signature; private String signature;
//
// /** /**
// * <pre> * <pre>
// * { * {
// * "tenantCode": “syxy”, * "tenantCode": syxy,
// * "accessKey": "syncuser", * "accessKey": "syncuser",
// * "data": { * "data": {
// * // 加密的业务数据 * // 加密的业务数据
// * }, * },
// * "timestamp": 1689837406368, * "timestamp": 1689837406368,
// * "signature": "eUk5kY-xR6XMjzjJRrl2T3EE_c5wztJNvdNWEY3vxfo" * "signature": "eUk5kY-xR6XMjzjJRrl2T3EE_c5wztJNvdNWEY3vxfo"
// * } * }
// * </pre> * </pre>
// * @return JSON string * @return JSON string
// */ */
// @Override @Override
// public String toString() { public String toString() {
// ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
// Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
// // tenant code // tenant code
// map.put("tenantCode", tenantCode); map.put("tenantCode", tenantCode);
// // access key // access key
// map.put("accessKey", accessKey); map.put("accessKey", accessKey);
// // data // data
// map.put("data", data); map.put("data", data);
// // timestamp // timestamp
// map.put("timestamp", timestamp); map.put("timestamp", timestamp);
// // signature // signature
// map.put("signature", signature); map.put("signature", signature);
//
// // return json // return json
// try { try {
// return objectMapper.writeValueAsString(map); return objectMapper.writeValueAsString(map);
// } catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
// throw new RuntimeException(e.getMessage(), e); throw new RuntimeException(e.getMessage(), e);
// } }
// } }
//
// /** /**
// * add tenantCode, accessKey, {@link #TIMESTAMP}, {@link #SIGNATURE} to parameters * add tenantCode, accessKey, {@link #TIMESTAMP}, {@link #SIGNATURE} to parameters
// * *
// * @return new query parameters * @return new query parameters
// */ */
// public Map<String, String> toQueryParameters() { public Map<String, String> toQueryParameters() {
// Map<String, String> map = new LinkedHashMap<>(); Map<String, String> map = new LinkedHashMap<>();
// // put parameters // put parameters
// map.putAll(parameters); map.putAll(parameters);
// // append tenant code // append tenant code
// map.put("tenantCode", tenantCode); map.put("tenantCode", tenantCode);
// // append access key // append access key
// map.put("accessKey", accessKey); map.put("accessKey", accessKey);
// // append timestamp & signature // append timestamp & signature
// map.put(TIMESTAMP, String.valueOf(timestamp)); map.put(TIMESTAMP, String.valueOf(timestamp));
// map.put(SIGNATURE, signature); map.put(SIGNATURE, signature);
//
// // return query parameters // return query parameters
// return map; return map;
// } }
//
// /** /**
// * combine parameters to query string * combine parameters to query string
// * @return query string * @return query string
// * @see #toQueryParameters() * @see #toQueryParameters()
// */ */
// public String toQuery() { public String toQuery() {
// // return query parameters // return query parameters
// return buildQuery(toQueryParameters()); return buildQuery(toQueryParameters());
// } }
//
// /** /**
// * convert parameters to query string * convert parameters to query string
// * *
// * @param parameters query parameters * @param parameters query parameters
// * @return query string kye1=value1&key2=value2 * @return query string kye1=value1&key2=value2
// */ */
// public static final String buildQuery(Map<String, String> parameters) { public static final String buildQuery(Map<String, String> parameters) {
// final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
// parameters.forEach((k, v) -> { parameters.forEach((k, v) -> {
// if (StringUtils.isEmpty(k)) { if (StringUtils.isEmpty(k)) {
// return; return;
// } }
//
// if (builder.length() > 0) { if (builder.length() > 0) {
// builder.append('&'); builder.append('&');
// } }
// try { try {
// builder.append(URLEncoder.encode(k, StandardCharsets.UTF_8.name())) builder.append(URLEncoder.encode(k, StandardCharsets.UTF_8.name()))
// .append('=') .append('=')
// .append(v == null ? "" : URLEncoder.encode(v, StandardCharsets.UTF_8.name())); .append(v == null ? "" : URLEncoder.encode(v, StandardCharsets.UTF_8.name()));
// } catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// throw new RuntimeException(e.getMessage(), e); throw new RuntimeException(e.getMessage(), e);
// } }
// }); });
// return builder.toString(); return builder.toString();
// } }
//} }

@ -1,133 +1,133 @@
//package cn.jyjz.xiaoyao.ocr.util; package cn.jyjz.xiaoyao.ocr.util;
//
//import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
//import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
//import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
//import lombok.Builder; import lombok.Builder;
//import lombok.Data; import lombok.Data;
//
//import java.io.Serializable; import java.io.Serializable;
//import java.util.Map; import java.util.Map;
//
///** /**
// * @ClassName ResultData * @ClassName ResultData
// * @Description TODO * @Description TODO
// * @Author wazngzezhen * @Author wazngzezhen
// * @Date 6:20 AM 3/6/22 * @Date 6:20 AM 3/6/22
// * @Version 1.0 * @Version 1.0
// **/ **/
//@Data @Data
//@ApiModel(value = "统一返回结果封装",description = "接口返回统一结果") @ApiModel(value = "统一返回结果封装",description = "接口返回统一结果")
//public class ResultData<T> implements Serializable { public class ResultData<T> implements Serializable {
// /** /**
// * 结果状态 *
// */ */
// @ApiModelProperty(value = "状态码") @ApiModelProperty(value = "状态码")
// private int status; private int status;
//
// /** /**
// * 响应信息 *
// */ */
// @ApiModelProperty(value = "响应信息") @ApiModelProperty(value = "响应信息")
// private String message; private String message;
//
// /** /**
// * 后端返回结果加密后为Base64字符串{@link String} * Base64{@link String}
// * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper#encrypt(String, String, String) * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper#encrypt(String, String, String)
// */ */
// @ApiModelProperty(value = "后端返回结果") @ApiModelProperty(value = "后端返回结果")
// private T data; private T data;
//
// /** /**
// * 后端响应状态 *
// */ */
// @ApiModelProperty(value = "后端响应状态") @ApiModelProperty(value = "后端响应状态")
// private boolean success; private boolean success;
// /** /**
// * 响应时间戳作为签名、加密的随机盐Salt * Salt
// * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper#combineSalt(String, String) * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper#combineSalt(String, String)
// */ */
// @ApiModelProperty(value = "响应时间戳") @ApiModelProperty(value = "响应时间戳")
// private long timestamp ; private long timestamp ;
// /** /**
// * 数据签名 *
// * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper#getSignature(String, String, Map) * @see cn.jyjz.xiaoyao.ocr.util.ApiHelper#getSignature(String, String, Map)
// */ */
// @ApiModelProperty(value = "数据签名") @ApiModelProperty(value = "数据签名")
// private String signature; private String signature;
//
// /** /**
// * 预留http状态 * http
// */ */
// private int httpStatus; private int httpStatus;
//
// public ResultData(){ public ResultData(){
// this.timestamp = System.currentTimeMillis(); this.timestamp = System.currentTimeMillis();
// } }
//
//
// public static <T> ResultData<T> success(String message) { public static <T> ResultData<T> success(String message) {
// ResultData<T> resultData = new ResultData<>(); ResultData<T> resultData = new ResultData<>();
// resultData.setStatus(ReturnCode.RC100.getCode()); resultData.setStatus(ReturnCode.RC100.getCode());
// resultData.setSuccess(true); resultData.setSuccess(true);
// resultData.setMessage(message); resultData.setMessage(message);
// return resultData; return resultData;
// } }
//
// public static <T> ResultData<T> success() { public static <T> ResultData<T> success() {
// ResultData<T> resultData = new ResultData<>(); ResultData<T> resultData = new ResultData<>();
// resultData.setStatus(ReturnCode.RC100.getCode()); resultData.setStatus(ReturnCode.RC100.getCode());
// resultData.setSuccess(true); resultData.setSuccess(true);
// resultData.setMessage(ReturnCode.RC100.getMessage()); resultData.setMessage(ReturnCode.RC100.getMessage());
// return resultData; return resultData;
// } }
//
// public static <T> ResultData<T> success(T data) { public static <T> ResultData<T> success(T data) {
// ResultData<T> resultData = new ResultData<>(); ResultData<T> resultData = new ResultData<>();
// resultData.setStatus(ReturnCode.RC100.getCode()); resultData.setStatus(ReturnCode.RC100.getCode());
// resultData.setSuccess(true); resultData.setSuccess(true);
// resultData.setMessage(ReturnCode.RC100.getMessage()); resultData.setMessage(ReturnCode.RC100.getMessage());
// resultData.setData(data); resultData.setData(data);
// return resultData; return resultData;
// } }
//
// public static <T> ResultData<T> success(String message, T data) { public static <T> ResultData<T> success(String message, T data) {
// ResultData<T> resultData = new ResultData<>(); ResultData<T> resultData = new ResultData<>();
// resultData.setStatus(ReturnCode.RC100.getCode()); resultData.setStatus(ReturnCode.RC100.getCode());
// resultData.setSuccess(true); resultData.setSuccess(true);
// resultData.setMessage(message); resultData.setMessage(message);
// resultData.setData(data); resultData.setData(data);
// return resultData; return resultData;
// } }
//
// public static <T> ResultData<T> fail(String message) { public static <T> ResultData<T> fail(String message) {
// ResultData<T> resultData = new ResultData<>(); ResultData<T> resultData = new ResultData<>();
// resultData.setStatus(ReturnCode.RC999.getCode()); resultData.setStatus(ReturnCode.RC999.getCode());
// resultData.setSuccess(false); resultData.setSuccess(false);
// resultData.setMessage(message); resultData.setMessage(message);
// return resultData; return resultData;
// } }
//
// public static <T> ResultData<T> fail(int code, String message) { public static <T> ResultData<T> fail(int code, String message) {
// ResultData<T> resultData = new ResultData<>(); ResultData<T> resultData = new ResultData<>();
// resultData.setStatus(code); resultData.setStatus(code);
// resultData.setSuccess(false); resultData.setSuccess(false);
// resultData.setMessage(message); resultData.setMessage(message);
// return resultData; return resultData;
// } }
//
// public static <T>ResultData<T> fail() { public static <T>ResultData<T> fail() {
// ResultData<T> resultData = new ResultData<>(); ResultData<T> resultData = new ResultData<>();
// resultData.setStatus(ReturnCode.RC999.getCode()); resultData.setStatus(ReturnCode.RC999.getCode());
// resultData.setSuccess(false); resultData.setSuccess(false);
// resultData.setMessage(ReturnCode.RC999.getMessage()); resultData.setMessage(ReturnCode.RC999.getMessage());
// return resultData; return resultData;
// } }
//
//
// @JsonIgnore @JsonIgnore
// public int getHttpStatus() { public int getHttpStatus() {
// return httpStatus; return httpStatus;
// } }
//} }
//

@ -6,13 +6,6 @@
<result column="OCPICTUREID" property="ocpictureid" jdbcType="LONGVARCHAR"/> <result column="OCPICTUREID" property="ocpictureid" jdbcType="LONGVARCHAR"/>
<result column="PICTURERESULT" property="pictureresult" jdbcType="LONGVARCHAR"/> <result column="PICTURERESULT" property="pictureresult" jdbcType="LONGVARCHAR"/>
<result column="PICTURECOMPARE" property="picturecompare" jdbcType="LONGVARCHAR"/> <result column="PICTURECOMPARE" property="picturecompare" jdbcType="LONGVARCHAR"/>
<result column="IZTRUEORFALSE" property="iztrueorfalse" jdbcType="VARCHAR"/>
<result column="JUDGEID" property="judgeid" jdbcType="VARCHAR"/>
<result column="IZPASS" property="izpass" jdbcType="VARCHAR"/>
<result column="JUDGEPASS" property="judgepass" jdbcType="BIGINT"/>
<result column="PASSDESC" property="passdesc" jdbcType="VARCHAR"/>
<result column="IZCLOSE" property="izclose" jdbcType="CHAR"/>
<result column="TASKTYPE" property="tasktype" jdbcType="INTEGER"/>
<result column="DEPTID" property="deptid" jdbcType="VARCHAR"/> <result column="DEPTID" property="deptid" jdbcType="VARCHAR"/>
<result column="TENANTID" property="tenantid" jdbcType="BIGINT"/> <result column="TENANTID" property="tenantid" jdbcType="BIGINT"/>
<result column="PACKAGEID" property="packageid" jdbcType="BIGINT"/> <result column="PACKAGEID" property="packageid" jdbcType="BIGINT"/>
@ -43,19 +36,13 @@
<result column="FROMPLANID" property="fromplanid" jdbcType="VARCHAR"/> <result column="FROMPLANID" property="fromplanid" jdbcType="VARCHAR"/>
<result column="FROMUPTIME" property="fromuptime" jdbcType="BIGINT"/> <result column="FROMUPTIME" property="fromuptime" jdbcType="BIGINT"/>
<result column="FROMSOURCEID" property="fromsourceid" jdbcType="VARCHAR"/> <result column="FROMSOURCEID" property="fromsourceid" jdbcType="VARCHAR"/>
<result column="HAVEPOINTS" property="havepoints" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
ID AS id, ID AS id,
OCPICTUREID AS ocpictureid, OCPICTUREID AS ocpictureid,
PICTURERESULT AS pictureresult, PICTURERESULT AS pictureresult,
PICTURECOMPARE AS picturecompare, PICTURECOMPARE AS picturecompare,
IZTRUEORFALSE AS iztrueorfalse,
JUDGEID AS judgeid,
IZPASS AS izpass,
JUDGEPASS AS judgepass,
PASSDESC AS passdesc,
IZCLOSE AS izclose,
TASKTYPE AS tasktype,
DEPTID AS deptid, DEPTID AS deptid,
TENANTID AS tenantid, TENANTID AS tenantid,
PACKAGEID AS packageid, PACKAGEID AS packageid,
@ -85,7 +72,8 @@
FROMPROJECTID AS fromprojectid, FROMPROJECTID AS fromprojectid,
FROMPLANID AS fromplanid, FROMPLANID AS fromplanid,
FROMUPTIME AS fromuptime, FROMUPTIME AS fromuptime,
FROMSOURCEID AS fromsourceid FROMSOURCEID AS fromsourceid,
HAVEPOINTS AS havepoints
</sql> </sql>
<sql id="Base_Where"> <sql id="Base_Where">
@ -95,13 +83,6 @@
<if test="ocpictureid != null"> and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}</if> <if test="ocpictureid != null"> and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}</if>
<if test="pictureresult != null"> and PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}</if> <if test="pictureresult != null"> and PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}</if>
<if test="picturecompare != null"> and PICTURECOMPARE ${picturecompare.dataOp} ${picturecompare.likestar}#{picturecompare.value}${picturecompare.likeend}</if> <if test="picturecompare != null"> and PICTURECOMPARE ${picturecompare.dataOp} ${picturecompare.likestar}#{picturecompare.value}${picturecompare.likeend}</if>
<if test="iztrueorfalse != null"> and IZTRUEORFALSE ${iztrueorfalse.dataOp} ${iztrueorfalse.likestar}#{iztrueorfalse.value}${iztrueorfalse.likeend}</if>
<if test="judgeid != null"> and JUDGEID ${judgeid.dataOp} ${judgeid.likestar}#{judgeid.value}${judgeid.likeend}</if>
<if test="izpass != null"> and IZPASS ${izpass.dataOp} ${izpass.likestar}#{izpass.value}${izpass.likeend}</if>
<if test="judgepass != null"> and JUDGEPASS ${judgepass.dataOp} ${judgepass.likestar}#{judgepass.value}${judgepass.likeend}</if>
<if test="passdesc != null"> and PASSDESC ${passdesc.dataOp} ${passdesc.likestar}#{passdesc.value}${passdesc.likeend}</if>
<if test="izclose != null"> and IZCLOSE ${izclose.dataOp} ${izclose.likestar}#{izclose.value}${izclose.likeend}</if>
<if test="tasktype != null"> and TASKTYPE ${tasktype.dataOp} ${tasktype.likestar}#{tasktype.value}${tasktype.likeend}</if>
<if test="deptid != null"> and DEPTID ${deptid.dataOp} ${deptid.likestar}#{deptid.value}${deptid.likeend}</if> <if test="deptid != null"> and DEPTID ${deptid.dataOp} ${deptid.likestar}#{deptid.value}${deptid.likeend}</if>
<if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if> <if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="packageid != null"> and PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend}</if> <if test="packageid != null"> and PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend}</if>
@ -124,9 +105,15 @@
<if test="createusername != null"> and CREATEUSERNAME ${createusername.dataOp} ${createusername.likestar}#{createusername.value}${createusername.likeend}</if> <if test="createusername != null"> and CREATEUSERNAME ${createusername.dataOp} ${createusername.likestar}#{createusername.value}${createusername.likeend}</if>
<if test="createdate != null"> and CREATEDATE ${createdate.dataOp} ${createdate.likestar}#{createdate.value}${createdate.likeend}</if> <if test="createdate != null"> and CREATEDATE ${createdate.dataOp} ${createdate.likestar}#{createdate.value}${createdate.likeend}</if>
<if test="username != null"> and USERNAME ${username.dataOp} ${username.likestar}#{username.value}${username.likeend}</if> <if test="username != null"> and USERNAME ${username.dataOp} ${username.likestar}#{username.value}${username.likeend}</if>
<if test="userid != null"> and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}</if>
<if test="fromtaskid != null"> and FROMTASKID ${fromtaskid.dataOp} ${fromtaskid.likestar}#{fromtaskid.value}${fromtaskid.likeend}</if> <if test="fromtaskid != null"> and FROMTASKID ${fromtaskid.dataOp} ${fromtaskid.likestar}#{fromtaskid.value}${fromtaskid.likeend}</if>
<if test="fromtaskname != null"> and FROMTASKNAME ${fromtaskname.dataOp} ${fromtaskname.likestar}#{fromtaskname.value}${fromtaskname.likeend}</if> <if test="fromtaskname != null"> and FROMTASKNAME ${fromtaskname.dataOp} ${fromtaskname.likestar}#{fromtaskname.value}${fromtaskname.likeend}</if>
<if test="fromuserid != null"> and FROMUSERID ${fromuserid.dataOp} ${fromuserid.likestar}#{fromuserid.value}${fromuserid.likeend}</if>
<if test="fromprojectid != null"> and FROMPROJECTID ${fromprojectid.dataOp} ${fromprojectid.likestar}#{fromprojectid.value}${fromprojectid.likeend}</if>
<if test="fromplanid != null"> and FROMPLANID ${fromplanid.dataOp} ${fromplanid.likestar}#{fromplanid.value}${fromplanid.likeend}</if>
<if test="fromuptime != null"> and FROMUPTIME ${fromuptime.dataOp} ${fromuptime.likestar}#{fromuptime.value}${fromuptime.likeend}</if>
<if test="fromsourceid != null"> and FROMSOURCEID ${fromsourceid.dataOp} ${fromsourceid.likestar}#{fromsourceid.value}${fromsourceid.likeend}</if>
<if test="havepoints != null"> and HAVEPOINTS ${havepoints.dataOp} ${havepoints.likestar}#{havepoints.value}${havepoints.likeend}</if>
<if test="userid != null"> and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}</if>
</trim> </trim>
</where> </where>
<if test="page != null"> <if test="page != null">
@ -137,46 +124,41 @@
<sql id="Base_Where_union"> <sql id="Base_Where_union">
<where> <where>
<trim prefixOverrides="and|or"> <trim prefixOverrides="and|or">
<if test="id != null"> and tcp.ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if> <if test="id != null"> and tcp.ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if>
<if test="ocpictureid != null"> and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}</if> <if test="ocpictureid != null"> and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}</if>
<if test="pictureresult != null"> and tcp.PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}</if> <if test="pictureresult != null"> and tcp.PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}</if>
<if test="picturecompare != null"> and tcp.PICTURECOMPARE ${picturecompare.dataOp} ${picturecompare.likestar}#{picturecompare.value}${picturecompare.likeend}</if> <if test="picturecompare != null"> and tcp.PICTURECOMPARE ${picturecompare.dataOp} ${picturecompare.likestar}#{picturecompare.value}${picturecompare.likeend}</if>
<if test="iztrueorfalse != null"> and tcp.IZTRUEORFALSE ${iztrueorfalse.dataOp} ${iztrueorfalse.likestar}#{iztrueorfalse.value}${iztrueorfalse.likeend}</if> <if test="deptid != null"> and tcp.DEPTID ${deptid.dataOp} ${deptid.likestar}#{deptid.value}${deptid.likeend}</if>
<if test="judgeid != null"> and tcp.JUDGEID ${judgeid.dataOp} ${judgeid.likestar}#{judgeid.value}${judgeid.likeend}</if> <if test="tenantid != null"> and tcp.TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="izpass != null"> and tcp.IZPASS ${izpass.dataOp} ${izpass.likestar}#{izpass.value}${izpass.likeend}</if> <if test="packageid != null"> and tcp.PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend}</if>
<if test="judgepass != null"> and tcp.JUDGEPASS ${judgepass.dataOp} ${judgepass.likestar}#{judgepass.value}${judgepass.likeend}</if> <if test="pictureid != null"> and tcp.PICTUREID ${pictureid.dataOp} ${pictureid.likestar}#{pictureid.value}${pictureid.likeend}</if>
<if test="passdesc != null"> and tcp.PASSDESC ${passdesc.dataOp} ${passdesc.likestar}#{passdesc.value}${passdesc.likeend}</if> <if test="category != null"> and tcp.CATEGORY ${category.dataOp} ${category.likestar}#{category.value}${category.likeend}</if>
<if test="izclose != null"> and tcp.IZCLOSE ${izclose.dataOp} ${izclose.likestar}#{izclose.value}${izclose.likeend}</if> <if test="categoryid != null"> and tcp.CATEGORYID ${categoryid.dataOp} ${categoryid.likestar}#{categoryid.value}${categoryid.likeend}</if>
<if test="tasktype != null"> and tcp.TASKTYPE ${tasktype.dataOp} ${tasktype.likestar}#{tasktype.value}${tasktype.likeend}</if> <if test="specification != null"> and tcp.SPECIFICATION ${specification.dataOp} ${specification.likestar}#{specification.value}${specification.likeend}</if>
<if test="deptid != null"> and tcp.DEPTID ${deptid.dataOp} ${deptid.likestar}#{deptid.value}${deptid.likeend}</if> <if test="buessinessno != null"> and tcp.BUESSINESSNO ${buessinessno.dataOp} ${buessinessno.likestar}#{buessinessno.value}${buessinessno.likeend}</if>
<if test="tenantid != null"> and tcp.TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if> <if test="states != null"> and tcp.STATES ${states.dataOp} ${states.likestar}#{states.value}${states.likeend}</if>
<if test="packageid != null"> and tcp.PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend}</if> <if test="processinstanceid != null"> and tcp.PROCESSINSTANCEID ${processinstanceid.dataOp} ${processinstanceid.likestar}#{processinstanceid.value}${processinstanceid.likeend}</if>
<if test="pictureid != null"> and tcp.PICTUREID ${pictureid.dataOp} ${pictureid.likestar}#{pictureid.value}${pictureid.likeend}</if> <if test="processdefinitionid != null"> and tcp.PROCESSDEFINITIONID ${processdefinitionid.dataOp} ${processdefinitionid.likestar}#{processdefinitionid.value}${processdefinitionid.likeend}</if>
<if test="category != null"> and tcp.CATEGORY ${category.dataOp} ${category.likestar}#{category.value}${category.likeend}</if> <if test="deploymentid != null"> and tcp.DEPLOYMENTID ${deploymentid.dataOp} ${deploymentid.likestar}#{deploymentid.value}${deploymentid.likeend}</if>
<if test="categoryid != null"> and tcp.CATEGORYID ${categoryid.dataOp} ${categoryid.likestar}#{categoryid.value}${categoryid.likeend}</if> <if test="assigneename != null"> and tcp.ASSIGNEENAME ${assigneename.dataOp} ${assigneename.likestar}#{assigneename.value}${assigneename.likeend}</if>
<if test="specification != null"> and tcp.SPECIFICATION ${specification.dataOp} ${specification.likestar}#{specification.value}${specification.likeend}</if> <if test="assignee != null"> and tcp.ASSIGNEE ${assignee.dataOp} ${assignee.likestar}#{assignee.value}${assignee.likeend}</if>
<if test="buessinessno != null"> and tcp.BUESSINESSNO ${buessinessno.dataOp} ${buessinessno.likestar}#{buessinessno.value}${buessinessno.likeend}</if> <if test="updateuser != null"> and tcp.UPDATEUSER ${updateuser.dataOp} ${updateuser.likestar}#{updateuser.value}${updateuser.likeend}</if>
<if test="states != null"> and tcp.STATES ${states.dataOp} ${states.likestar}#{states.value}${states.likeend}</if> <if test="updatetime != null"> and tcp.UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend}</if>
<if test="processinstanceid != null"> and tcp.PROCESSINSTANCEID ${processinstanceid.dataOp} ${processinstanceid.likestar}#{processinstanceid.value}${processinstanceid.likeend}</if> <if test="fileannex != null"> and tcp.FILEANNEX ${fileannex.dataOp} ${fileannex.likestar}#{fileannex.value}${fileannex.likeend}</if>
<if test="processdefinitionid != null"> and tcp.PROCESSDEFINITIONID ${processdefinitionid.dataOp} ${processdefinitionid.likestar}#{processdefinitionid.value}${processdefinitionid.likeend}</if> <if test="guidang != null"> and tcp.GUIDANG ${guidang.dataOp} ${guidang.likestar}#{guidang.value}${guidang.likeend}</if>
<if test="deploymentid != null"> and tcp.DEPLOYMENTID ${deploymentid.dataOp} ${deploymentid.likestar}#{deploymentid.value}${deploymentid.likeend}</if> <if test="createuser != null"> and tcp.CREATEUSER ${createuser.dataOp} ${createuser.likestar}#{createuser.value}${createuser.likeend}</if>
<if test="assigneename != null"> and tcp.ASSIGNEENAME ${assigneename.dataOp} ${assigneename.likestar}#{assigneename.value}${assigneename.likeend}</if> <if test="createusername != null"> and tcp.CREATEUSERNAME ${createusername.dataOp} ${createusername.likestar}#{createusername.value}${createusername.likeend}</if>
<if test="assignee != null"> and tcp.ASSIGNEE ${assignee.dataOp} ${assignee.likestar}#{assignee.value}${assignee.likeend}</if> <if test="createdate != null"> and tcp.CREATEDATE ${createdate.dataOp} ${createdate.likestar}#{createdate.value}${createdate.likeend}</if>
<if test="updateuser != null"> and tcp.UPDATEUSER ${updateuser.dataOp} ${updateuser.likestar}#{updateuser.value}${updateuser.likeend}</if> <if test="username != null"> and tcp.USERNAME ${username.dataOp} ${username.likestar}#{username.value}${username.likeend}</if>
<if test="updatetime != null"> and tcp.UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend}</if> <if test="fromtaskid != null"> and tcp.FROMTASKID ${fromtaskid.dataOp} ${fromtaskid.likestar}#{fromtaskid.value}${fromtaskid.likeend}</if>
<if test="fileannex != null"> and tcp.FILEANNEX ${fileannex.dataOp} ${fileannex.likestar}#{fileannex.value}${fileannex.likeend}</if> <if test="fromtaskname != null"> and tcp.FROMTASKNAME ${fromtaskname.dataOp} ${fromtaskname.likestar}#{fromtaskname.value}${fromtaskname.likeend}</if>
<if test="guidang != null"> and tcp.GUIDANG ${guidang.dataOp} ${guidang.likestar}#{guidang.value}${guidang.likeend}</if> <if test="fromuserid != null"> and tcp.FROMUSERID ${fromuserid.dataOp} ${fromuserid.likestar}#{fromuserid.value}${fromuserid.likeend}</if>
<if test="createuser != null"> and tcp.CREATEUSER ${createuser.dataOp} ${createuser.likestar}#{createuser.value}${createuser.likeend}</if> <if test="fromprojectid != null"> and tcp.FROMPROJECTID ${fromprojectid.dataOp} ${fromprojectid.likestar}#{fromprojectid.value}${fromprojectid.likeend}</if>
<if test="createusername != null"> and tcp.CREATEUSERNAME ${createusername.dataOp} ${createusername.likestar}#{createusername.value}${createusername.likeend}</if> <if test="fromplanid != null"> and tcp.FROMPLANID ${fromplanid.dataOp} ${fromplanid.likestar}#{fromplanid.value}${fromplanid.likeend}</if>
<if test="createdate != null"> and tcp.CREATEDATE ${createdate.dataOp} ${createdate.likestar}#{createdate.value}${createdate.likeend}</if> <if test="fromuptime != null"> and tcp.FROMUPTIME ${fromuptime.dataOp} ${fromuptime.likestar}#{fromuptime.value}${fromuptime.likeend}</if>
<if test="username != null"> and tcp.USERNAME ${username.dataOp} ${username.likestar}#{username.value}${username.likeend}</if> <if test="fromsourceid != null"> and tcp.FROMSOURCEID ${fromsourceid.dataOp} ${fromsourceid.likestar}#{fromsourceid.value}${fromsourceid.likeend}</if>
<if test="fromtaskid != null"> and tcp.FROMTASKID ${fromtaskid.dataOp} ${fromtaskid.likestar}#{fromtaskid.value}${fromtaskid.likeend}</if> <if test="havepoints != null"> and tcp.HAVEPOINTS ${havepoints.dataOp} ${havepoints.likestar}#{havepoints.value}${havepoints.likeend}</if>
<if test="fromtaskname != null"> and tcp.FROMTASKNAME ${fromtaskname.dataOp} ${fromtaskname.likestar}#{fromtaskname.value}${fromtaskname.likeend}</if> <if test="userid != null"> and tcp.USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}</if>
<if test="fromuserid != null"> and tcp.FROMUSERID ${fromuserid.dataOp} ${fromuserid.likestar}#{fromuserid.value}${fromuserid.likeend}</if>
<if test="fromprojectid != null"> and tcp.FROMPROJECTID ${fromprojectid.dataOp} ${fromprojectid.likestar}#{fromprojectid.value}${fromprojectid.likeend}</if>
<if test="fromplanid != null"> and tcp.FROMPLANID ${fromplanid.dataOp} ${fromplanid.likestar}#{fromplanid.value}${fromplanid.likeend}</if>
<if test="fromuptime != null"> and tcp.FROMUPTIME ${fromuptime.dataOp} ${fromuptime.likestar}#{fromuptime.value}${fromuptime.likeend}</if>
<if test="fromsourceid != null"> and tcp.FROMSOURCEID ${fromsourceid.dataOp} ${fromsourceid.likestar}#{fromsourceid.value}${fromsourceid.likeend}</if>
</trim> </trim>
</where> </where>
</sql> </sql>

@ -6,13 +6,6 @@
<result column="OCPICTUREID" property="ocpictureid" jdbcType="LONGVARCHAR"/> <result column="OCPICTUREID" property="ocpictureid" jdbcType="LONGVARCHAR"/>
<result column="PICTURERESULT" property="pictureresult" jdbcType="LONGVARCHAR"/> <result column="PICTURERESULT" property="pictureresult" jdbcType="LONGVARCHAR"/>
<result column="PICTURECOMPARE" property="picturecompare" jdbcType="LONGVARCHAR"/> <result column="PICTURECOMPARE" property="picturecompare" jdbcType="LONGVARCHAR"/>
<result column="IZTRUEORFALSE" property="iztrueorfalse" jdbcType="VARCHAR"/>
<result column="JUDGEID" property="judgeid" jdbcType="VARCHAR"/>
<result column="IZPASS" property="izpass" jdbcType="VARCHAR"/>
<result column="JUDGEPASS" property="judgepass" jdbcType="BIGINT"/>
<result column="PASSDESC" property="passdesc" jdbcType="VARCHAR"/>
<result column="IZCLOSE" property="izclose" jdbcType="CHAR"/>
<result column="TASKTYPE" property="tasktype" jdbcType="INTEGER"/>
<result column="DEPTID" property="deptid" jdbcType="VARCHAR"/> <result column="DEPTID" property="deptid" jdbcType="VARCHAR"/>
<result column="TENANTID" property="tenantid" jdbcType="BIGINT"/> <result column="TENANTID" property="tenantid" jdbcType="BIGINT"/>
<result column="PACKAGEID" property="packageid" jdbcType="BIGINT"/> <result column="PACKAGEID" property="packageid" jdbcType="BIGINT"/>
@ -43,19 +36,13 @@
<result column="FROMPLANID" property="fromplanid" jdbcType="VARCHAR"/> <result column="FROMPLANID" property="fromplanid" jdbcType="VARCHAR"/>
<result column="FROMUPTIME" property="fromuptime" jdbcType="BIGINT"/> <result column="FROMUPTIME" property="fromuptime" jdbcType="BIGINT"/>
<result column="FROMSOURCEID" property="fromsourceid" jdbcType="VARCHAR"/> <result column="FROMSOURCEID" property="fromsourceid" jdbcType="VARCHAR"/>
<result column="HAVEPOINTS" property="havepoints" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
ID AS id, ID AS id,
OCPICTUREID AS ocpictureid, OCPICTUREID AS ocpictureid,
PICTURERESULT AS pictureresult, PICTURERESULT AS pictureresult,
PICTURECOMPARE AS picturecompare, PICTURECOMPARE AS picturecompare,
IZTRUEORFALSE AS iztrueorfalse,
JUDGEID AS judgeid,
IZPASS AS izpass,
JUDGEPASS AS judgepass,
PASSDESC AS passdesc,
IZCLOSE AS izclose,
TASKTYPE AS tasktype,
DEPTID AS deptid, DEPTID AS deptid,
TENANTID AS tenantid, TENANTID AS tenantid,
PACKAGEID AS packageid, PACKAGEID AS packageid,
@ -85,7 +72,8 @@
FROMPROJECTID AS fromprojectid, FROMPROJECTID AS fromprojectid,
FROMPLANID AS fromplanid, FROMPLANID AS fromplanid,
FROMUPTIME AS fromuptime, FROMUPTIME AS fromuptime,
FROMSOURCEID AS fromsourceid FROMSOURCEID AS fromsourceid,
HAVEPOINTS AS havepoints
</sql> </sql>
<sql id="Base_Where"> <sql id="Base_Where">
@ -95,13 +83,6 @@
<if test="ocpictureid != null"> and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}</if> <if test="ocpictureid != null"> and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}</if>
<if test="pictureresult != null"> and PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}</if> <if test="pictureresult != null"> and PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}</if>
<if test="picturecompare != null"> and PICTURECOMPARE ${picturecompare.dataOp} ${picturecompare.likestar}#{picturecompare.value}${picturecompare.likeend}</if> <if test="picturecompare != null"> and PICTURECOMPARE ${picturecompare.dataOp} ${picturecompare.likestar}#{picturecompare.value}${picturecompare.likeend}</if>
<if test="iztrueorfalse != null"> and IZTRUEORFALSE ${iztrueorfalse.dataOp} ${iztrueorfalse.likestar}#{iztrueorfalse.value}${iztrueorfalse.likeend}</if>
<if test="judgeid != null"> and JUDGEID ${judgeid.dataOp} ${judgeid.likestar}#{judgeid.value}${judgeid.likeend}</if>
<if test="izpass != null"> and IZPASS ${izpass.dataOp} ${izpass.likestar}#{izpass.value}${izpass.likeend}</if>
<if test="judgepass != null"> and JUDGEPASS ${judgepass.dataOp} ${judgepass.likestar}#{judgepass.value}${judgepass.likeend}</if>
<if test="passdesc != null"> and PASSDESC ${passdesc.dataOp} ${passdesc.likestar}#{passdesc.value}${passdesc.likeend}</if>
<if test="izclose != null"> and IZCLOSE ${izclose.dataOp} ${izclose.likestar}#{izclose.value}${izclose.likeend}</if>
<if test="tasktype != null"> and TASKTYPE ${tasktype.dataOp} ${tasktype.likestar}#{tasktype.value}${tasktype.likeend}</if>
<if test="deptid != null"> and DEPTID ${deptid.dataOp} ${deptid.likestar}#{deptid.value}${deptid.likeend}</if> <if test="deptid != null"> and DEPTID ${deptid.dataOp} ${deptid.likestar}#{deptid.value}${deptid.likeend}</if>
<if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if> <if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="packageid != null"> and PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend}</if> <if test="packageid != null"> and PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend}</if>
@ -124,9 +105,15 @@
<if test="createusername != null"> and CREATEUSERNAME ${createusername.dataOp} ${createusername.likestar}#{createusername.value}${createusername.likeend}</if> <if test="createusername != null"> and CREATEUSERNAME ${createusername.dataOp} ${createusername.likestar}#{createusername.value}${createusername.likeend}</if>
<if test="createdate != null"> and CREATEDATE ${createdate.dataOp} ${createdate.likestar}#{createdate.value}${createdate.likeend}</if> <if test="createdate != null"> and CREATEDATE ${createdate.dataOp} ${createdate.likestar}#{createdate.value}${createdate.likeend}</if>
<if test="username != null"> and USERNAME ${username.dataOp} ${username.likestar}#{username.value}${username.likeend}</if> <if test="username != null"> and USERNAME ${username.dataOp} ${username.likestar}#{username.value}${username.likeend}</if>
<if test="userid != null"> and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}</if>
<if test="fromtaskid != null"> and FROMTASKID ${fromtaskid.dataOp} ${fromtaskid.likestar}#{fromtaskid.value}${fromtaskid.likeend}</if> <if test="fromtaskid != null"> and FROMTASKID ${fromtaskid.dataOp} ${fromtaskid.likestar}#{fromtaskid.value}${fromtaskid.likeend}</if>
<if test="fromtaskname != null"> and FROMTASKNAME ${fromtaskname.dataOp} ${fromtaskname.likestar}#{fromtaskname.value}${fromtaskname.likeend}</if> <if test="fromtaskname != null"> and FROMTASKNAME ${fromtaskname.dataOp} ${fromtaskname.likestar}#{fromtaskname.value}${fromtaskname.likeend}</if>
<if test="fromuserid != null"> and FROMUSERID ${fromuserid.dataOp} ${fromuserid.likestar}#{fromuserid.value}${fromuserid.likeend}</if>
<if test="fromprojectid != null"> and FROMPROJECTID ${fromprojectid.dataOp} ${fromprojectid.likestar}#{fromprojectid.value}${fromprojectid.likeend}</if>
<if test="fromplanid != null"> and FROMPLANID ${fromplanid.dataOp} ${fromplanid.likestar}#{fromplanid.value}${fromplanid.likeend}</if>
<if test="fromuptime != null"> and FROMUPTIME ${fromuptime.dataOp} ${fromuptime.likestar}#{fromuptime.value}${fromuptime.likeend}</if>
<if test="fromsourceid != null"> and FROMSOURCEID ${fromsourceid.dataOp} ${fromsourceid.likestar}#{fromsourceid.value}${fromsourceid.likeend}</if>
<if test="havepoints != null"> and HAVEPOINTS ${havepoints.dataOp} ${havepoints.likestar}#{havepoints.value}${havepoints.likeend}</if>
<if test="userid != null"> and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}</if>
</trim> </trim>
</where> </where>
<if test="page != null"> <if test="page != null">
@ -137,46 +124,41 @@
<sql id="Base_Where_union"> <sql id="Base_Where_union">
<where> <where>
<trim prefixOverrides="and|or"> <trim prefixOverrides="and|or">
<if test="id != null"> and tcp.ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if> <if test="id != null"> and tcp.ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if>
<if test="ocpictureid != null"> and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}</if> <if test="ocpictureid != null"> and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}</if>
<if test="pictureresult != null"> and tcp.PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}</if> <if test="pictureresult != null"> and tcp.PICTURERESULT ${pictureresult.dataOp} ${pictureresult.likestar}#{pictureresult.value}${pictureresult.likeend}</if>
<if test="picturecompare != null"> and tcp.PICTURECOMPARE ${picturecompare.dataOp} ${picturecompare.likestar}#{picturecompare.value}${picturecompare.likeend}</if> <if test="picturecompare != null"> and tcp.PICTURECOMPARE ${picturecompare.dataOp} ${picturecompare.likestar}#{picturecompare.value}${picturecompare.likeend}</if>
<if test="iztrueorfalse != null"> and tcp.IZTRUEORFALSE ${iztrueorfalse.dataOp} ${iztrueorfalse.likestar}#{iztrueorfalse.value}${iztrueorfalse.likeend}</if> <if test="deptid != null"> and tcp.DEPTID ${deptid.dataOp} ${deptid.likestar}#{deptid.value}${deptid.likeend}</if>
<if test="judgeid != null"> and tcp.JUDGEID ${judgeid.dataOp} ${judgeid.likestar}#{judgeid.value}${judgeid.likeend}</if> <if test="tenantid != null"> and tcp.TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="izpass != null"> and tcp.IZPASS ${izpass.dataOp} ${izpass.likestar}#{izpass.value}${izpass.likeend}</if> <if test="packageid != null"> and tcp.PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend}</if>
<if test="judgepass != null"> and tcp.JUDGEPASS ${judgepass.dataOp} ${judgepass.likestar}#{judgepass.value}${judgepass.likeend}</if> <if test="pictureid != null"> and tcp.PICTUREID ${pictureid.dataOp} ${pictureid.likestar}#{pictureid.value}${pictureid.likeend}</if>
<if test="passdesc != null"> and tcp.PASSDESC ${passdesc.dataOp} ${passdesc.likestar}#{passdesc.value}${passdesc.likeend}</if> <if test="category != null"> and tcp.CATEGORY ${category.dataOp} ${category.likestar}#{category.value}${category.likeend}</if>
<if test="izclose != null"> and tcp.IZCLOSE ${izclose.dataOp} ${izclose.likestar}#{izclose.value}${izclose.likeend}</if> <if test="categoryid != null"> and tcp.CATEGORYID ${categoryid.dataOp} ${categoryid.likestar}#{categoryid.value}${categoryid.likeend}</if>
<if test="tasktype != null"> and tcp.TASKTYPE ${tasktype.dataOp} ${tasktype.likestar}#{tasktype.value}${tasktype.likeend}</if> <if test="specification != null"> and tcp.SPECIFICATION ${specification.dataOp} ${specification.likestar}#{specification.value}${specification.likeend}</if>
<if test="deptid != null"> and tcp.DEPTID ${deptid.dataOp} ${deptid.likestar}#{deptid.value}${deptid.likeend}</if> <if test="buessinessno != null"> and tcp.BUESSINESSNO ${buessinessno.dataOp} ${buessinessno.likestar}#{buessinessno.value}${buessinessno.likeend}</if>
<if test="tenantid != null"> and tcp.TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if> <if test="states != null"> and tcp.STATES ${states.dataOp} ${states.likestar}#{states.value}${states.likeend}</if>
<if test="packageid != null"> and tcp.PACKAGEID ${packageid.dataOp} ${packageid.likestar}#{packageid.value}${packageid.likeend}</if> <if test="processinstanceid != null"> and tcp.PROCESSINSTANCEID ${processinstanceid.dataOp} ${processinstanceid.likestar}#{processinstanceid.value}${processinstanceid.likeend}</if>
<if test="pictureid != null"> and tcp.PICTUREID ${pictureid.dataOp} ${pictureid.likestar}#{pictureid.value}${pictureid.likeend}</if> <if test="processdefinitionid != null"> and tcp.PROCESSDEFINITIONID ${processdefinitionid.dataOp} ${processdefinitionid.likestar}#{processdefinitionid.value}${processdefinitionid.likeend}</if>
<if test="category != null"> and tcp.CATEGORY ${category.dataOp} ${category.likestar}#{category.value}${category.likeend}</if> <if test="deploymentid != null"> and tcp.DEPLOYMENTID ${deploymentid.dataOp} ${deploymentid.likestar}#{deploymentid.value}${deploymentid.likeend}</if>
<if test="categoryid != null"> and tcp.CATEGORYID ${categoryid.dataOp} ${categoryid.likestar}#{categoryid.value}${categoryid.likeend}</if> <if test="assigneename != null"> and tcp.ASSIGNEENAME ${assigneename.dataOp} ${assigneename.likestar}#{assigneename.value}${assigneename.likeend}</if>
<if test="specification != null"> and tcp.SPECIFICATION ${specification.dataOp} ${specification.likestar}#{specification.value}${specification.likeend}</if> <if test="assignee != null"> and tcp.ASSIGNEE ${assignee.dataOp} ${assignee.likestar}#{assignee.value}${assignee.likeend}</if>
<if test="buessinessno != null"> and tcp.BUESSINESSNO ${buessinessno.dataOp} ${buessinessno.likestar}#{buessinessno.value}${buessinessno.likeend}</if> <if test="updateuser != null"> and tcp.UPDATEUSER ${updateuser.dataOp} ${updateuser.likestar}#{updateuser.value}${updateuser.likeend}</if>
<if test="states != null"> and tcp.STATES ${states.dataOp} ${states.likestar}#{states.value}${states.likeend}</if> <if test="updatetime != null"> and tcp.UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend}</if>
<if test="processinstanceid != null"> and tcp.PROCESSINSTANCEID ${processinstanceid.dataOp} ${processinstanceid.likestar}#{processinstanceid.value}${processinstanceid.likeend}</if> <if test="fileannex != null"> and tcp.FILEANNEX ${fileannex.dataOp} ${fileannex.likestar}#{fileannex.value}${fileannex.likeend}</if>
<if test="processdefinitionid != null"> and tcp.PROCESSDEFINITIONID ${processdefinitionid.dataOp} ${processdefinitionid.likestar}#{processdefinitionid.value}${processdefinitionid.likeend}</if> <if test="guidang != null"> and tcp.GUIDANG ${guidang.dataOp} ${guidang.likestar}#{guidang.value}${guidang.likeend}</if>
<if test="deploymentid != null"> and tcp.DEPLOYMENTID ${deploymentid.dataOp} ${deploymentid.likestar}#{deploymentid.value}${deploymentid.likeend}</if> <if test="createuser != null"> and tcp.CREATEUSER ${createuser.dataOp} ${createuser.likestar}#{createuser.value}${createuser.likeend}</if>
<if test="assigneename != null"> and tcp.ASSIGNEENAME ${assigneename.dataOp} ${assigneename.likestar}#{assigneename.value}${assigneename.likeend}</if> <if test="createusername != null"> and tcp.CREATEUSERNAME ${createusername.dataOp} ${createusername.likestar}#{createusername.value}${createusername.likeend}</if>
<if test="assignee != null"> and tcp.ASSIGNEE ${assignee.dataOp} ${assignee.likestar}#{assignee.value}${assignee.likeend}</if> <if test="createdate != null"> and tcp.CREATEDATE ${createdate.dataOp} ${createdate.likestar}#{createdate.value}${createdate.likeend}</if>
<if test="updateuser != null"> and tcp.UPDATEUSER ${updateuser.dataOp} ${updateuser.likestar}#{updateuser.value}${updateuser.likeend}</if> <if test="username != null"> and tcp.USERNAME ${username.dataOp} ${username.likestar}#{username.value}${username.likeend}</if>
<if test="updatetime != null"> and tcp.UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend}</if> <if test="fromtaskid != null"> and tcp.FROMTASKID ${fromtaskid.dataOp} ${fromtaskid.likestar}#{fromtaskid.value}${fromtaskid.likeend}</if>
<if test="fileannex != null"> and tcp.FILEANNEX ${fileannex.dataOp} ${fileannex.likestar}#{fileannex.value}${fileannex.likeend}</if> <if test="fromtaskname != null"> and tcp.FROMTASKNAME ${fromtaskname.dataOp} ${fromtaskname.likestar}#{fromtaskname.value}${fromtaskname.likeend}</if>
<if test="guidang != null"> and tcp.GUIDANG ${guidang.dataOp} ${guidang.likestar}#{guidang.value}${guidang.likeend}</if> <if test="fromuserid != null"> and tcp.FROMUSERID ${fromuserid.dataOp} ${fromuserid.likestar}#{fromuserid.value}${fromuserid.likeend}</if>
<if test="createuser != null"> and tcp.CREATEUSER ${createuser.dataOp} ${createuser.likestar}#{createuser.value}${createuser.likeend}</if> <if test="fromprojectid != null"> and tcp.FROMPROJECTID ${fromprojectid.dataOp} ${fromprojectid.likestar}#{fromprojectid.value}${fromprojectid.likeend}</if>
<if test="createusername != null"> and tcp.CREATEUSERNAME ${createusername.dataOp} ${createusername.likestar}#{createusername.value}${createusername.likeend}</if> <if test="fromplanid != null"> and tcp.FROMPLANID ${fromplanid.dataOp} ${fromplanid.likestar}#{fromplanid.value}${fromplanid.likeend}</if>
<if test="createdate != null"> and tcp.CREATEDATE ${createdate.dataOp} ${createdate.likestar}#{createdate.value}${createdate.likeend}</if> <if test="fromuptime != null"> and tcp.FROMUPTIME ${fromuptime.dataOp} ${fromuptime.likestar}#{fromuptime.value}${fromuptime.likeend}</if>
<if test="username != null"> and tcp.USERNAME ${username.dataOp} ${username.likestar}#{username.value}${username.likeend}</if> <if test="fromsourceid != null"> and tcp.FROMSOURCEID ${fromsourceid.dataOp} ${fromsourceid.likestar}#{fromsourceid.value}${fromsourceid.likeend}</if>
<if test="fromtaskid != null"> and tcp.FROMTASKID ${fromtaskid.dataOp} ${fromtaskid.likestar}#{fromtaskid.value}${fromtaskid.likeend}</if> <if test="havepoints != null"> and tcp.HAVEPOINTS ${havepoints.dataOp} ${havepoints.likestar}#{havepoints.value}${havepoints.likeend}</if>
<if test="fromtaskname != null"> and tcp.FROMTASKNAME ${fromtaskname.dataOp} ${fromtaskname.likestar}#{fromtaskname.value}${fromtaskname.likeend}</if> <if test="userid != null"> and tcp.USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}</if>
<if test="fromuserid != null"> and tcp.FROMUSERID ${fromuserid.dataOp} ${fromuserid.likestar}#{fromuserid.value}${fromuserid.likeend}</if>
<if test="fromprojectid != null"> and tcp.FROMPROJECTID ${fromprojectid.dataOp} ${fromprojectid.likestar}#{fromprojectid.value}${fromprojectid.likeend}</if>
<if test="fromplanid != null"> and tcp.FROMPLANID ${fromplanid.dataOp} ${fromplanid.likestar}#{fromplanid.value}${fromplanid.likeend}</if>
<if test="fromuptime != null"> and tcp.FROMUPTIME ${fromuptime.dataOp} ${fromuptime.likestar}#{fromuptime.value}${fromuptime.likeend}</if>
<if test="fromsourceid != null"> and tcp.FROMSOURCEID ${fromsourceid.dataOp} ${fromsourceid.likestar}#{fromsourceid.value}${fromsourceid.likeend}</if>
</trim> </trim>
</where> </where>
</sql> </sql>

@ -23,6 +23,7 @@ cn\jyjz\xiaoyao\ocr\controller\OcrAreaHtmlController.class
cn\jyjz\xiaoyao\ocr\dataDao\OcrPictureclassMybatisDao.class cn\jyjz\xiaoyao\ocr\dataDao\OcrPictureclassMybatisDao.class
cn\jyjz\xiaoyao\ocr\dataobject\OcrUsersearchchild.class cn\jyjz\xiaoyao\ocr\dataobject\OcrUsersearchchild.class
cn\jyjz\xiaoyao\ocr\service\impl\OcrConfigurationServiceImpl.class cn\jyjz\xiaoyao\ocr\service\impl\OcrConfigurationServiceImpl.class
cn\jyjz\xiaoyao\ocr\util\ReturnCode.class
cn\jyjz\flowable\utils\Constant.class cn\jyjz\flowable\utils\Constant.class
cn\jyjz\xiaoyao\ocr\controller\OcrSearchmanagerController.class cn\jyjz\xiaoyao\ocr\controller\OcrSearchmanagerController.class
cn\jyjz\xiaoyao\ocr\util\httputil\HttpClient$1.class cn\jyjz\xiaoyao\ocr\util\httputil\HttpClient$1.class
@ -63,16 +64,19 @@ cn\jyjz\xiaoyao\ocr\service\OcrUsersearchService.class
cn\jyjz\xiaoyao\ocr\service\impl\OcrUsersearchchildServiceImpl.class cn\jyjz\xiaoyao\ocr\service\impl\OcrUsersearchchildServiceImpl.class
cn\jyjz\xiaoyao\ocr\controller\OcrPictureController.class cn\jyjz\xiaoyao\ocr\controller\OcrPictureController.class
cn\jyjz\xiaoyao\oa\from\dataobject\Candidateuser.class cn\jyjz\xiaoyao\oa\from\dataobject\Candidateuser.class
cn\jyjz\xiaoyao\ocr\util\ImageClassUtil.class
cn\jyjz\xiaoyao\ocr\service\impl\OcrTaskchildPictureServiceImpl.class cn\jyjz\xiaoyao\ocr\service\impl\OcrTaskchildPictureServiceImpl.class
cn\jyjz\flowable\config\MyAuthenticationContext.class cn\jyjz\flowable\config\MyAuthenticationContext.class
cn\jyjz\xiaoyao\oa\from\cache\CacheOaConstants.class cn\jyjz\xiaoyao\oa\from\cache\CacheOaConstants.class
cn\jyjz\xiaoyao\ocr\dataDao\OcrUsersearchMybatisDao.class cn\jyjz\xiaoyao\ocr\dataDao\OcrUsersearchMybatisDao.class
cn\jyjz\xiaoyao\ocr\util\RequestData.class
cn\jyjz\xiaoyao\oa\from\controller\UserdistionaryController.class cn\jyjz\xiaoyao\oa\from\controller\UserdistionaryController.class
cn\jyjz\xiaoyao\oa\from\controller\UserdistionaryHtmlController.class cn\jyjz\xiaoyao\oa\from\controller\UserdistionaryHtmlController.class
cn\jyjz\flowable\entity\ReDeployment.class cn\jyjz\flowable\entity\ReDeployment.class
cn\jyjz\flowable\domain\vo\WorkFlowNodeVO.class cn\jyjz\flowable\domain\vo\WorkFlowNodeVO.class
cn\jyjz\flowable\entity\ReDeployment$ReDeploymentBuilder.class cn\jyjz\flowable\entity\ReDeployment$ReDeploymentBuilder.class
cn\jyjz\xiaoyao\ocr\dataDao\OcrUpuserMybatisDao.class cn\jyjz\xiaoyao\ocr\dataDao\OcrUpuserMybatisDao.class
cn\jyjz\xiaoyao\ocr\util\ResultData.class
cn\jyjz\xiaoyao\ocr\service\OcrPicturejobService.class cn\jyjz\xiaoyao\ocr\service\OcrPicturejobService.class
cn\jyjz\xiaoyao\oa\from\dataobject\Candidate$CandidateBuilder.class cn\jyjz\xiaoyao\oa\from\dataobject\Candidate$CandidateBuilder.class
cn\jyjz\flowable\config\AutoJumpTaskListener.class cn\jyjz\flowable\config\AutoJumpTaskListener.class
@ -113,6 +117,7 @@ cn\jyjz\xiaoyao\ocr\util\DataUtil.class
cn\jyjz\xiaoyao\ocr\dataDao\OcrPictureNotesMybatisDao.class cn\jyjz\xiaoyao\ocr\dataDao\OcrPictureNotesMybatisDao.class
cn\jyjz\xiaoyao\ocr\dataobject\OcrPicture$OcrPictureBuilder.class cn\jyjz\xiaoyao\ocr\dataobject\OcrPicture$OcrPictureBuilder.class
cn\jyjz\xiaoyao\ocr\dataDao\OcrPackagetaskMybatisDao.class cn\jyjz\xiaoyao\ocr\dataDao\OcrPackagetaskMybatisDao.class
cn\jyjz\xiaoyao\ocr\util\ApiHelper.class
cn\jyjz\flowable\modeler\services\FlowableUserLoginServiceImpl.class cn\jyjz\flowable\modeler\services\FlowableUserLoginServiceImpl.class
cn\jyjz\xiaoyao\oa\from\controller\CategoryController.class cn\jyjz\xiaoyao\oa\from\controller\CategoryController.class
cn\jyjz\flowable\domain\form\FormObject.class cn\jyjz\flowable\domain\form\FormObject.class

@ -7,6 +7,7 @@ D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\fl
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\utils\PageUtils.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\utils\PageUtils.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\common\ProcessConstant.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\common\ProcessConstant.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\modeler\constants\FlowableConstants.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\modeler\constants\FlowableConstants.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\util\ImageClassUtil.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\dataDao\IRunFlowableActinstDao.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\dataDao\IRunFlowableActinstDao.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\service\impl\CandidateServiceImpl.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\service\impl\CandidateServiceImpl.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataDao\OcrTaskchildPictureMybatisDao.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataDao\OcrTaskchildPictureMybatisDao.java
@ -34,6 +35,7 @@ D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xi
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\OcrAreaService.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\OcrAreaService.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrPictureNotes.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrPictureNotes.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrSearchmanager.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrSearchmanager.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\util\ReturnCode.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\controller\OcrTaskchildPictureHtmlController.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\controller\OcrTaskchildPictureHtmlController.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\dataDao\UserapproveMybatisDao.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\dataDao\UserapproveMybatisDao.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\utils\Constant.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\utils\Constant.java
@ -71,6 +73,7 @@ D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xi
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\OcrTaskchildPictureService.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\OcrTaskchildPictureService.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\controller\OcrPicturejobHtmlController.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\controller\OcrPicturejobHtmlController.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\util\httputil\HttpHeader.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\util\httputil\HttpHeader.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\util\ResultData.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\controller\CandidateController.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\controller\CandidateController.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\dataDao\UserdistionaryMybatisDao.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\dataDao\UserdistionaryMybatisDao.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataDao\OcrPlanMybatisDao.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataDao\OcrPlanMybatisDao.java
@ -86,6 +89,7 @@ D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xi
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\OcrPictureclassService.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\OcrPictureclassService.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\dataobject\UserViewapproe.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\dataobject\UserViewapproe.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\modeler\configurations\AbstractMybatisPlusConfiguration.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\modeler\configurations\AbstractMybatisPlusConfiguration.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\util\ApiHelper.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\impl\OcrUpuserServiceImpl.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\impl\OcrUpuserServiceImpl.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataDao\OcrPicturetypeMybatisDao.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataDao\OcrPicturetypeMybatisDao.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrUsersearch.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrUsersearch.java
@ -206,6 +210,7 @@ D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xi
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\config\GlobalEntityInitListener.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\config\GlobalEntityInitListener.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\vo\FlowUnionVo.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\oa\from\vo\FlowUnionVo.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\domain\dto\FlowTaskDto.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\flowable\domain\dto\FlowTaskDto.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\util\RequestData.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\impl\OcrSearchmanagerServiceImpl.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\service\impl\OcrSearchmanagerServiceImpl.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrPictureclass.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrPictureclass.java
D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrBooknote.java D:\ideaWork\jeecg\ocrproject\jyjz-system\jyjz-system-oa\src\main\java\cn\jyjz\xiaoyao\ocr\dataobject\OcrBooknote.java

Loading…
Cancel
Save