diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java index 0f81ed0c..9ed00008 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java @@ -15,6 +15,10 @@ import java.util.Map; */ @Data public class PictureSourceResult { + /** + * id + */ + Long id; /** * 租户no */ @@ -204,4 +208,9 @@ public class PictureSourceResult { */ Long submitTime; + /** + * 备注 + */ + String comment; + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java index 66ca3182..f9f042c1 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java @@ -13,4 +13,6 @@ public interface OcrPictureMybatisDao extends BaseMapper { OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId); OcrPicture selectByRemark(@Param("remark") String remark); + + String getPictureApproveResult(Long id); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index e785e50c..8ff3ff36 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -364,6 +364,11 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(value = "location") private String location; + @ApiModelProperty(value = "备注") + @Schema(description = "备注") + @TableField(value = "comment") + private String comment; + @ApiModelProperty(value = "拍照时间") @TableField(value = "photo_date_timestamp") @JsonSerialize(using = DateSerializer.class) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java index 6484ec03..ef6d5684 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java @@ -4,6 +4,7 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -32,6 +33,9 @@ public interface OcrPictureService extends BaseService { public ResultVo createTaskChild(List ocrPictureList, String tenantId, HttpServletRequest request); + String getPictureApproveResult(Long id); + + void deletePictureInfo(Long id); /** * 查询工单图片信息 * @@ -86,4 +90,5 @@ public interface OcrPictureService extends BaseService { */ OcrPicture selectByRemark(String remark); + OcrTaskchildPicture getOcrTaskChildPictureByPictureId(String pictureId); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index 63bb0b60..153034b9 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -13,6 +13,8 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; import cn.jyjz.xiaoyao.oa.from.dataobject.Category; import cn.jyjz.xiaoyao.oa.from.service.CategoryService; +import cn.jyjz.xiaoyao.oa.from.service.UserapproveService; +import cn.jyjz.xiaoyao.oa.from.service.impl.UserapproveServiceImpl; import cn.jyjz.xiaoyao.ocr.api.utils.ApiConfig; import cn.jyjz.xiaoyao.ocr.dataDao.OcrPictureMybatisDao; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPackagetask; @@ -83,6 +85,8 @@ public class OcrPictureServiceImpl extends BaseServiceImpl ocrPictureList, String tenantId, UserToken sysUser, String search_month, HttpServletRequest request, String buessinessno) { @@ -343,6 +349,11 @@ public class OcrPictureServiceImpl extends BaseServiceImpl().eq(OcrTaskchildPicture::getPictureid,pictureId)); + } + // @Override // public Long getPhotoDateTime(OcrPicture picture) { // long timestamp = 0L; @@ -504,6 +515,24 @@ public class OcrPictureServiceImpl extends BaseServiceImpl().eq(OcrPictureInfo::getPictureId,id)); + OcrTaskchildPicture taskchildPicture = ocrTaskchildPictureService.getOne(new LambdaQueryWrapper().eq(OcrTaskchildPicture::getPictureid, id)); + //删除任务表 + ocrTaskchildPictureService.remove(new LambdaQueryWrapper().eq(OcrTaskchildPicture::getPictureid,id)); + //删除审批记录表 + userapproveService.delete(taskchildPicture.getId().toString()); + } + public void bubbleSortOpt(List compareList) { if (null == compareList) { @@ -695,7 +724,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl> livePhoto = pictureSourceResult.getLivePhoto(); + List> livePhoto = pictureSourceResult.getLivePhoto(); //定义新增集合对象 List ocrPictureList = new ArrayList<>(); - int index =0; + int index = 0; for (Map map : livePhoto) { - if(index>0){ + if (index > 0) { continue; } //检查图片地址是否为空 - if(map.get("imgUrl")!=null && !StringUtils.isEmpty(map.get("imgUrl").toString())){ + if (map.get("imgUrl") != null && !StringUtils.isEmpty(map.get("imgUrl").toString())) { //判断该任务是否存在，判断依据是任务ID相同，提报时间不同则可以插入 // LambdaQueryWrapper ocrPictureLambdaQueryWrapper = new LambdaQueryWrapper<>(); // ocrPictureLambdaQueryWrapper.eq(OcrPicture::getRemark,pictureSourceResult.getTaskId()); @@ -66,8 +66,16 @@ public class PictureDisposeTask implements Runnable{ // } //不为空开始组装参数 入库 OcrPicture picture = new OcrPicture(); + //id + if (pictureSourceResult.getId() != null) { + picture.setId(pictureSourceResult.getId()); + } + //备注 + if (pictureSourceResult.getComment() != null) { + picture.setComment(pictureSourceResult.getComment()); + } //定位信息 - if(pictureSourceResult.getLocation()!=null){ + if (pictureSourceResult.getLocation() != null) { picture.setLocation(JSONObject.toJSONString(pictureSourceResult.getLocation())); } //业务主体 @@ -75,21 +83,21 @@ public class PictureDisposeTask implements Runnable{ //业务主体名称 picture.setTenantname(pictureSourceResult.getAccountName()); //业务主体状态 - if(pictureSourceResult.getAccountStatus()!=null){ + if (pictureSourceResult.getAccountStatus() != null) { picture.setTenantstatus(pictureSourceResult.getAccountStatus().toString()); } //租户编号 - if(pictureSourceResult.getAccountNo()!=null){ + if (pictureSourceResult.getAccountNo() != null) { picture.setPictureid(pictureSourceResult.getAccountNo().toString()); } //租户名称 picture.setPicturename(pictureSourceResult.getAccountName()); //租户状态 - if(pictureSourceResult.getAccountStatus()!=null) { + if (pictureSourceResult.getAccountStatus() != null) { picture.setPicturestatus(pictureSourceResult.getAccountStatus().toString()); } //项目编号 - if(pictureSourceResult.getProjectNo()!=null){ + if (pictureSourceResult.getProjectNo() != null) { picture.setProjectid(pictureSourceResult.getProjectNo().toString()); } //项目id @@ -98,19 +106,19 @@ public class PictureDisposeTask implements Runnable{ //项目名称 picture.setProjectidname(pictureSourceResult.getProjectName()); //项目状态 - if(pictureSourceResult.getProjectNo()!=null) { + if (pictureSourceResult.getProjectNo() != null) { picture.setProjectstatus(pictureSourceResult.getProjectNo().toString()); } //所属主计划id - if(pictureSourceResult.getPlanNo()!=null) { + if (pictureSourceResult.getPlanNo() != null) { picture.setPlanid(pictureSourceResult.getPlanNo().toString()); } //所属计划名称 picture.setPlanname(pictureSourceResult.getPlanName()); //所属计划状态 - picture.setPlanstatus( pictureSourceResult.getPlanstatus()); + picture.setPlanstatus(pictureSourceResult.getPlanstatus()); //所属子计划id - if(pictureSourceResult.getPlanChildNo()!=null) { + if (pictureSourceResult.getPlanChildNo() != null) { picture.setPlanchildid(pictureSourceResult.getPlanChildNo().toString()); } //所属子计划名称 @@ -124,7 +132,7 @@ public class PictureDisposeTask implements Runnable{ //任务来源名称 picture.setField4("无量云2.0"); //所属任务状态 - if(pictureSourceResult.getTenantStatus()!=null) { + if (pictureSourceResult.getTenantStatus() != null) { picture.setTaskstatus(pictureSourceResult.getTenantStatus().toString()); } //提报人id @@ -138,78 +146,78 @@ public class PictureDisposeTask implements Runnable{ //拜访详细地址 StringBuilder addressDetails = new StringBuilder(); //拜访省份 - if(pictureSourceResult.getProvince()!=null){ - if(pictureSourceResult.getProvince().get("name")!=null){ + if (pictureSourceResult.getProvince() != null) { + if (pictureSourceResult.getProvince().get("name") != null) { addressDetails.append(pictureSourceResult.getProvince().get("name").toString()); picture.setReleaseprovince(pictureSourceResult.getProvince().get("name").toString()); } } //拜访城市 - if(pictureSourceResult.getCity()!=null){ - if(pictureSourceResult.getCity().get("name")!=null){ + if (pictureSourceResult.getCity() != null) { + if (pictureSourceResult.getCity().get("name") != null) { addressDetails.append(pictureSourceResult.getCity().get("name").toString()); picture.setReleasearea(pictureSourceResult.getCity().get("name").toString()); } } //拜访定位信息 - if(pictureSourceResult.getLocation()!=null){ - if(pictureSourceResult.getCity().get("address")!=null){ + if (pictureSourceResult.getLocation() != null) { + if (pictureSourceResult.getCity().get("address") != null) { addressDetails.append(pictureSourceResult.getCity().get("address").toString()); } } picture.setField10(addressDetails.toString()); //拜访客户类型 - if(pictureSourceResult.getTerminalType()!=null){ - if(pictureSourceResult.getTerminalType().get("name")!=null){ + if (pictureSourceResult.getTerminalType() != null) { + if (pictureSourceResult.getTerminalType().get("name") != null) { picture.setField2(pictureSourceResult.getTerminalType().get("name").toString()); } } //拜访客户名称 - if(pictureSourceResult.getCustomerName()!=null){ - if(pictureSourceResult.getCustomerName().get("name")!=null){ + if (pictureSourceResult.getCustomerName() != null) { + if (pictureSourceResult.getCustomerName().get("name") != null) { picture.setField3(pictureSourceResult.getCustomerName().get("name").toString()); } } //拜访客户级别 - if(pictureSourceResult.getTerminalLevel()!=null){ - if(pictureSourceResult.getTerminalLevel().get("name")!=null){ + if (pictureSourceResult.getTerminalLevel() != null) { + if (pictureSourceResult.getTerminalLevel().get("name") != null) { picture.setField6(pictureSourceResult.getTerminalLevel().get("name").toString()); } } //拜访项目类别 - if(pictureSourceResult.getProjectType()!=null){ - if(pictureSourceResult.getProjectType().get("name")!=null){ + if (pictureSourceResult.getProjectType() != null) { + if (pictureSourceResult.getProjectType().get("name") != null) { picture.setField17(pictureSourceResult.getProjectType().get("name").toString()); } } //拜访品种 - if(pictureSourceResult.getProductName()!=null){ - if(pictureSourceResult.getProductName().get("name")!=null){ + if (pictureSourceResult.getProductName() != null) { + if (pictureSourceResult.getProductName().get("name") != null) { picture.setField9(pictureSourceResult.getProductName().get("name").toString()); } } //厂商 - if(pictureSourceResult.getManufacturer()!=null){ - if(pictureSourceResult.getManufacturer().get("name")!=null){ + if (pictureSourceResult.getManufacturer() != null) { + if (pictureSourceResult.getManufacturer().get("name") != null) { picture.setField5(pictureSourceResult.getManufacturer().get("name").toString()); } } //拜访科室 - if(StringUtils.isNotBlank(pictureSourceResult.getCompanyDepartment())){ + if (StringUtils.isNotBlank(pictureSourceResult.getCompanyDepartment())) { picture.setField7(pictureSourceResult.getCompanyDepartment()); } //拜访小结 - if(StringUtils.isNotBlank(pictureSourceResult.getDiscoveredIssues())){ + if (StringUtils.isNotBlank(pictureSourceResult.getDiscoveredIssues())) { picture.setField8(pictureSourceResult.getDiscoveredIssues()); } //拜访日期 - if(StringUtils.isNotBlank(pictureSourceResult.getVisitDate())){ + if (StringUtils.isNotBlank(pictureSourceResult.getVisitDate())) { picture.setField11(pictureSourceResult.getVisitDate()); } @@ -219,18 +227,18 @@ public class PictureDisposeTask implements Runnable{ //图片创建时间 // picture.setPhotoDateTimestamp(System.currentTimeMillis()); - System.out.println("SubmitDateTimestamp1=================>>>>>>>"+pictureSourceResult.getSubmitTime()); - System.out.println("SubmitDateTimestamp2=================>>>>>>>"+picture.getSubmitDateTimestamp()); + System.out.println("SubmitDateTimestamp1=================>>>>>>>" + pictureSourceResult.getSubmitTime()); + System.out.println("SubmitDateTimestamp2=================>>>>>>>" + picture.getSubmitDateTimestamp()); //定位距离 - if(StringUtils.isNotBlank(pictureSourceResult.getDistance())){ + if (StringUtils.isNotBlank(pictureSourceResult.getDistance())) { picture.setField12(pictureSourceResult.getDistance()); } //设置图片信息 - if(map.get("imgName")!=null){ + if (map.get("imgName") != null) { picture.setImgname(map.get("imgName").toString()); } - if(map.get("imgUrl")!=null){ + if (map.get("imgUrl") != null) { picture.setImgurl(map.get("imgUrl").toString()); } //默认为创建人为admin diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml index df711837..ef868c40 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml @@ -250,11 +250,20 @@ +