Commit 96feba11 authored by hongguangwu's avatar hongguangwu

MVP1.7.11- isSign

parent 31151e19
...@@ -249,7 +249,7 @@ public class SysHouseHoldInfo extends BaseEntity { ...@@ -249,7 +249,7 @@ public class SysHouseHoldInfo extends BaseEntity {
private String mediclPassword; private String mediclPassword;
/** /**
* 是否配置公章 * 是否配置公章 0有1无
*/ */
@ExcelAttribute(name = "是否配置公章" ) @ExcelAttribute(name = "是否配置公章" )
@Schema(description ="是否配置公章") @Schema(description ="是否配置公章")
......
...@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil; ...@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryAttaVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryAttaVo;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TAttaInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.social.service.FileUploadService; import com.yifu.cloud.plus.v1.yifu.social.service.FileUploadService;
import com.yifu.cloud.plus.v1.yifu.social.service.TAttaInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.TAttaInfoService;
...@@ -99,6 +100,10 @@ public class FileUploadController { ...@@ -99,6 +100,10 @@ public class FileUploadController {
TAttaInfo attaInfo = tAttaInfoService.getById(id); TAttaInfo attaInfo = tAttaInfoService.getById(id);
if (null == attaInfo) { if (null == attaInfo) {
return R.failed("无对应附件信息"); return R.failed("无对应附件信息");
} else if (CommonConstants.ONE_STRING.equals(attaInfo.getRelationType())
&& Common.isNotNull(attaInfo.getDomainId())) {
// 删除后解除户的章是否有为否
fileUploadService.updateSysHouseHoldInfoIsSign(attaInfo.getDomainId(), CommonConstants.ONE_STRING);
} }
if (tAttaInfoService.removeById(id)) { if (tAttaInfoService.removeById(id)) {
ossUtil.deleteObject(null, attaInfo.getAttaSrc()); ossUtil.deleteObject(null, attaInfo.getAttaSrc());
......
...@@ -21,4 +21,8 @@ public interface FileUploadService { ...@@ -21,4 +21,8 @@ public interface FileUploadService {
R<TAttaInfo> uploadFileReturnAtta(MultipartFile file, String filePath, Integer type, String domainId) throws IOException; R<TAttaInfo> uploadFileReturnAtta(MultipartFile file, String filePath, Integer type, String domainId) throws IOException;
R<T> uploadAsso(MultipartFile file, String filePath, Integer type, String domain, String uploadType); R<T> uploadAsso(MultipartFile file, String filePath, Integer type, String domain, String uploadType);
// 更新户的章是否有
void updateSysHouseHoldInfoIsSign(String domainId, String isSign);
} }
...@@ -8,9 +8,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil; ...@@ -8,9 +8,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.FileVo; import com.yifu.cloud.plus.v1.yifu.common.core.vo.FileVo;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TAttaInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.social.mapper.SysConfigLimitMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.SysConfigLimitMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.FileUploadService; import com.yifu.cloud.plus.v1.yifu.social.service.FileUploadService;
import com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService;
import com.yifu.cloud.plus.v1.yifu.social.service.TAttaInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.TAttaInfoService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -36,6 +38,7 @@ public class FileUploadServiceImpl implements FileUploadService { ...@@ -36,6 +38,7 @@ public class FileUploadServiceImpl implements FileUploadService {
private final OSSUtil ossUtil; private final OSSUtil ossUtil;
private final TAttaInfoService tAttaInfoService; private final TAttaInfoService tAttaInfoService;
private final SysHouseHoldInfoService sysHouseHoldInfoService;
private AtomicInteger atomicInteger = new AtomicInteger(0); private AtomicInteger atomicInteger = new AtomicInteger(0);
//初始化附件上传队列上限值 //初始化附件上传队列上限值
...@@ -143,6 +146,10 @@ public class FileUploadServiceImpl implements FileUploadService { ...@@ -143,6 +146,10 @@ public class FileUploadServiceImpl implements FileUploadService {
} }
//有实体id则插入关系,用于编辑 //有实体id则插入关系,用于编辑
if (Common.isNotNull(domain)) { if (Common.isNotNull(domain)) {
if (type == 1) {
// 户配置上传公章,将户配置变为 有章
this.updateSysHouseHoldInfoIsSign(domain, CommonConstants.ZERO_STRING);
}
url = ossUtil.getObjectUrl(null, attaInfo.getAttaSrc()); url = ossUtil.getObjectUrl(null, attaInfo.getAttaSrc());
fileVo = new FileVo(attaInfo.getId(), attaInfo.getAttaName(), url.toString()); fileVo = new FileVo(attaInfo.getId(), attaInfo.getAttaName(), url.toString());
return R.ok(fileVo, "success"); return R.ok(fileVo, "success");
...@@ -155,6 +162,23 @@ public class FileUploadServiceImpl implements FileUploadService { ...@@ -155,6 +162,23 @@ public class FileUploadServiceImpl implements FileUploadService {
} }
} }
/**
* @param domainId 主键
* @param isSign 0是1否
* @Description: 更新户的章是否有
* @Author: hgw
* @Date: 2025/5/19 10:59
* @return: void
**/
public void updateSysHouseHoldInfoIsSign(String domainId, String isSign) {
// 户配置上传公章,将户配置变为 有章
SysHouseHoldInfo sysHouseHoldInfo = sysHouseHoldInfoService.getById(domainId);
if (sysHouseHoldInfo != null) {
sysHouseHoldInfo.setIsSign(isSign);
sysHouseHoldInfoService.updateById(sysHouseHoldInfo);
}
}
private R<FileVo> uploadImg2(InputStream fileIn, String filePath, Integer type, String domain, String fileName) throws IOException { private R<FileVo> uploadImg2(InputStream fileIn, String filePath, Integer type, String domain, String fileName) throws IOException {
if (null == fileIn) { if (null == fileIn) {
return R.failed("文件上传异常,请重新上传!"); return R.failed("文件上传异常,请重新上传!");
......
...@@ -154,6 +154,9 @@ ...@@ -154,6 +154,9 @@
<if test="sysHouseHoldInfo.updateTime != null"> <if test="sysHouseHoldInfo.updateTime != null">
AND a.UPDATE_TIME = #{sysHouseHoldInfo.updateTime} AND a.UPDATE_TIME = #{sysHouseHoldInfo.updateTime}
</if> </if>
<if test="sysHouseHoldInfo.isSign != null and sysHouseHoldInfo.isSign.trim() != ''">
AND a.IS_SIGN = #{sysHouseHoldInfo.isSign}
</if>
</if> </if>
</sql> </sql>
<!--sysHouseHoldInfo简单分页查询--> <!--sysHouseHoldInfo简单分页查询-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment