bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

文档url中文编码

This commit is contained in:
liang.chao 2024-12-18 13:46:52 +08:00
parent b403c43c8b
commit 7a27de3e84
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java
View File

@ -3,6 +3,7 @@ package com.bonus.material.contract.service;
import com.bonus.material.contract.domain.BmContract; import com.bonus.material.contract.domain.BmContract;
import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.device.domain.vo.DevInfoVo;
import java.io.UnsupportedEncodingException;
import java.util.List; import java.util.List;
/** /**
@ -13,9 +14,9 @@ public interface BmContractService {
List<BmContract> list(BmContract bmContract); List<BmContract> list(BmContract bmContract);
Integer add(BmContract bmContract); Integer add(BmContract bmContract) throws UnsupportedEncodingException;
Integer edit(BmContract bmContract); Integer edit(BmContract bmContract) throws UnsupportedEncodingException;
Integer del(BmContract bmContract); Integer del(BmContract bmContract);

9
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java
View File

@ -12,6 +12,9 @@ import com.bonus.material.device.mapper.BmFileInfoMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -42,7 +45,7 @@ public class BmContractServiceImpl implements BmContractService {
} }
@Override @Override
public Integer add(BmContract bmContract) { public Integer add(BmContract bmContract) throws UnsupportedEncodingException {
bmContract.setContractCode(getString()); bmContract.setContractCode(getString());
bmContract.setOwnerId(SecurityUtils.getLoginUser().getUserid()); bmContract.setOwnerId(SecurityUtils.getLoginUser().getUserid());
bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
@ -55,6 +58,7 @@ public class BmContractServiceImpl implements BmContractService {
bmFileInfo.setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT); bmFileInfo.setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT);
// 合同照片附件 // 合同照片附件
bmFileInfo.setFileType(0L); bmFileInfo.setFileType(0L);
bmFileInfo.setFileName(URLEncoder.encode(bmFileInfo.getFileName(), StandardCharsets.UTF_8.toString()));
bmFileInfo.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); bmFileInfo.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
bmFileInfoMapper.insertBmFileInfo(bmFileInfo); bmFileInfoMapper.insertBmFileInfo(bmFileInfo);
} }
@ -64,7 +68,7 @@ public class BmContractServiceImpl implements BmContractService {
} }
@Override @Override
public Integer edit(BmContract bmContract) { public Integer edit(BmContract bmContract) throws UnsupportedEncodingException {
bmContract.setOwnerId(SecurityUtils.getLoginUser().getUserid()); bmContract.setOwnerId(SecurityUtils.getLoginUser().getUserid());
bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
Integer edit = bmContractMapper.edit(bmContract); Integer edit = bmContractMapper.edit(bmContract);
@ -78,6 +82,7 @@ public class BmContractServiceImpl implements BmContractService {
bmFileInfo.setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT); bmFileInfo.setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT);
// 合同照片附件 // 合同照片附件
bmFileInfo.setFileType(0L); bmFileInfo.setFileType(0L);
bmFileInfo.setFileName(URLEncoder.encode(bmFileInfo.getFileName(), StandardCharsets.UTF_8.toString()));
bmFileInfo.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); bmFileInfo.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
bmFileInfoMapper.insertBmFileInfo(bmFileInfo); bmFileInfoMapper.insertBmFileInfo(bmFileInfo);
} }

2
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
View File

@ -849,7 +849,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeId != null"> <if test="typeId != null">
AND d.type_id = #{typeId} AND d.type_id = #{typeId}
</if> </if>
<if test="startTime != null and endTime != null"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND d.update_time between #{startTime} and #{endTime} AND d.update_time between #{startTime} and #{endTime}
</if> </if>
ORDER BY ORDER BY