代码提交
This commit is contained in:
parent
6bb405d66f
commit
e1e41ecffa
|
|
@ -13,7 +13,7 @@ public class TransferApplyDto {
|
|||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
private Integer id;
|
||||
private String id;
|
||||
private String parentId;
|
||||
|
||||
/**
|
||||
|
|
@ -50,6 +50,7 @@ public class TransferApplyDto {
|
|||
*/
|
||||
private String auditUser;
|
||||
private String auditUserName;
|
||||
private String transfertTime;
|
||||
|
||||
/**
|
||||
* 申请时间
|
||||
|
|
|
|||
|
|
@ -41,7 +41,9 @@ public interface TransferApplyMapper {
|
|||
|
||||
List<String> getTransferApplyFilesContents(TransferApplyDto dto);
|
||||
|
||||
List<DaKyProFilesContentsDto> getTransferApplyFiles(String content);
|
||||
List<DaKyProFilesContentsDto> getTransferApplyFiles(TransferApplyDto content);
|
||||
|
||||
List<TransferFileDto> getTransferRecordFiles(TransferFileDto dto);
|
||||
|
||||
String getProNameById(TransferApplyDto dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import com.bonus.web.service.TransferApplyService;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
@ -38,15 +39,18 @@ public class TransferApplyServiceImpl implements TransferApplyService {
|
|||
dto.setCreateUserName(getLoginUser().getUsername());
|
||||
dto.setUpdateUserId(getLoginUser().getUserId().intValue());
|
||||
dto.setUpdateUserName(getLoginUser().getUsername());
|
||||
String proName = transferApplyMapper.getProNameById(dto);
|
||||
dto.setProName(proName);
|
||||
Integer i = transferApplyMapper.insert(dto);
|
||||
List<TransferFileDto> transferFileDtos = dto.getTransferFileDtos();
|
||||
for (TransferFileDto transferFileDto : transferFileDtos) {
|
||||
transferFileDto.setTransferApplyId(dto.getId());
|
||||
transferFileDto.setTransferApplyId(Integer.parseInt(dto.getId()));
|
||||
transferApplyMapper.insertTransferFile(transferFileDto);
|
||||
}
|
||||
return i > 0 ? AjaxResult.success("保存成功") : AjaxResult.error("保存失败");
|
||||
} catch (Exception e) {
|
||||
return AjaxResult.error("接口异常");
|
||||
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
||||
return AjaxResult.error("保存失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -68,7 +72,7 @@ public class TransferApplyServiceImpl implements TransferApplyService {
|
|||
Integer i = transferApplyMapper.delTransferFiles(dto);
|
||||
List<TransferFileDto> transferFileDtos = dto.getTransferFileDtos();
|
||||
for (TransferFileDto transferFileDto : transferFileDtos) {
|
||||
transferFileDto.setTransferApplyId(dto.getId());
|
||||
transferFileDto.setTransferApplyId(Integer.parseInt(dto.getId()));
|
||||
transferApplyMapper.insertTransferFile(transferFileDto);
|
||||
}
|
||||
return i > 0 ? AjaxResult.success("修改成功") : AjaxResult.error("修改失败");
|
||||
|
|
@ -119,7 +123,7 @@ public class TransferApplyServiceImpl implements TransferApplyService {
|
|||
List<DaKyProFilesContentsDto> list = new ArrayList<>();
|
||||
for (String content : contents) {
|
||||
dto.setParentId(content);
|
||||
List<DaKyProFilesContentsDto> dtos = transferApplyMapper.getTransferApplyFiles(content);
|
||||
List<DaKyProFilesContentsDto> dtos = transferApplyMapper.getTransferApplyFiles(dto);
|
||||
list.addAll(dtos);
|
||||
}
|
||||
return list;
|
||||
|
|
|
|||
|
|
@ -405,7 +405,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
ORDER BY id
|
||||
</select>
|
||||
<select id="getTransferApplyFiles" resultType="com.bonus.web.domain.DaKyProFilesContentsDto">
|
||||
SELECT
|
||||
SELECT distinct
|
||||
dkpfc.id AS id,
|
||||
dkpfc.pro_id AS proId,
|
||||
dkpfc.content_name AS contentName,
|
||||
|
|
@ -449,5 +449,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="getTransferRecordFiles" resultType="com.bonus.web.domain.TransferFileDto">
|
||||
|
||||
</select>
|
||||
<select id="getProNameById" resultType="java.lang.String">
|
||||
SELECT
|
||||
pro_name AS proName
|
||||
FROM
|
||||
da_ky_project
|
||||
WHERE
|
||||
id = #{id}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue