|
|
@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
|
@Slf4j
|
|
|
@@ -133,16 +134,16 @@ public class ZywwService {
|
|
|
} else { // 修改操作
|
|
|
// 根据申请单ID和zywwApplyInfo对象中的当前属性值去修改当前申请记录
|
|
|
String applyFormIdExist = zywwApplyInfo.getApplyFormId();
|
|
|
- int updateRows = zywwApplyInfoMapper.updateById(zywwApplyInfo);
|
|
|
+ UpdateWrapper<ZywwApplyInfo> updateWrapper = new UpdateWrapper<>();
|
|
|
+ updateWrapper.eq("APPLY_FORM_ID", applyFormIdExist);
|
|
|
+ int updateRows = zywwApplyInfoMapper.update(zywwApplyInfo, updateWrapper);
|
|
|
if(updateRows > 0){
|
|
|
// 批量修改和申请信息关联的文件信息
|
|
|
- // 1.根据当前申请记录，先批量插入新的文件记录
|
|
|
+ // 1.先删除与当前申请记录相关联的全部原始文件记录
|
|
|
+ baseService.delBaseFileInfosByApplyFormId(applyFormIdExist);
|
|
|
+ // 2.再根据当前申请记录，批量插入新的文件记录，即可完成对文件信息的批量修改
|
|
|
baseFileInfoMapper.batchInsertBaseFileInfos(baseFileInfoList);
|
|
|
- // 2.再批量删除与当前申请记录相关联的全部原始文件记录，即可完成对文件信息的批量修改
|
|
|
- boolean optFlag = baseService.delBaseFileInfosByApplyFormId(applyFormIdExist);
|
|
|
- if(optFlag){
|
|
|
- log.info("【住院慰问】申请信息、文件信息均修改成功 申请单ID：{}", applyFormIdExist);
|
|
|
- }
|
|
|
+ log.info("【住院慰问】申请信息、文件信息均修改成功 申请单ID：{}", applyFormIdExist);
|
|
|
} else {
|
|
|
throw new RuntimeException("数据库【住院慰问】申请信息记录未修改 applyFormId：" + applyFormIdExist);
|
|
|
}
|
|
|
@@ -163,6 +164,7 @@ public class ZywwService {
|
|
|
zywwApplyInfoDTO.setApproveStatusCode(optFlag);
|
|
|
String optDesc = "1".equals(optFlag)? "同意":"驳回";
|
|
|
zywwApplyInfoDTO.setApproveStatusName(optDesc);
|
|
|
+ zywwApplyInfoDTO.setUpdateTime(new Date());
|
|
|
int updateRows = zywwApplyInfoMapper.update(zywwApplyInfoDTO, updateWrapper);
|
|
|
if(updateRows > 0){
|
|
|
log.info("【住院慰问】申请信息已审批 申请单ID：{}，审批操作描述：{}", applyFormId, optDesc);
|
|
|
@@ -170,13 +172,15 @@ public class ZywwService {
|
|
|
BaseApproveInfo baseApproveInfo = new BaseApproveInfo();
|
|
|
baseApproveInfo.setModuleCode("zyww");
|
|
|
baseApproveInfo.setApplyFormId(applyFormId);
|
|
|
- ZywwApplyInfo zywwApplyInfo = zywwApplyInfoMapper.selectById(applyFormId);
|
|
|
+ QueryWrapper<ZywwApplyInfo> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("APPLY_FORM_ID", applyFormId);
|
|
|
+ ZywwApplyInfo zywwApplyInfo = zywwApplyInfoMapper.selectOne(queryWrapper);
|
|
|
baseApproveInfo.setCreateUserId(zywwApplyInfo.getCreateUserId());
|
|
|
baseApproveInfo.setCreateUserName(zywwApplyInfo.getCreateUserName());
|
|
|
baseApproveInfo.setCreateUserPoliceNo(zywwApplyInfo.getCreateUserPoliceNo());
|
|
|
baseApproveInfo.setCreateTime(zywwApplyInfo.getCreateTime());
|
|
|
baseApproveInfo.setApproveUserId(String.valueOf(user.getUserId()));
|
|
|
- baseApproveInfo.setApproveUserName(user.getUserName());
|
|
|
+ baseApproveInfo.setApproveUserName(user.getNickName());
|
|
|
baseApproveInfo.setApproveUserPoliceNo(user.getPoliceNo());
|
|
|
baseApproveInfo.setApproveResultCode(optFlag);
|
|
|
baseApproveInfo.setApproveResultDesc(optDesc);
|
|
|
@@ -221,9 +225,8 @@ public class ZywwService {
|
|
|
queryWrapper.eq("APPLY_FORM_ID", applyFormId);
|
|
|
}
|
|
|
queryWrapper.eq("CREATE_USER_POLICE_NO", user.getPoliceNo());
|
|
|
- queryWrapper.eq("APPROVE_STATUS_CODE", 0); // 待审批
|
|
|
- queryWrapper.or();
|
|
|
- queryWrapper.eq("APPROVE_STATUS_CODE", 2); // 审批驳回（允许修改后继续提交）
|
|
|
+ // 待审批和审批驳回（允许修改后继续提交）
|
|
|
+ queryWrapper.and(qw -> qw.eq("APPROVE_STATUS_CODE", 0).or().eq("APPROVE_STATUS_CODE", 2));
|
|
|
}
|
|
|
// 3.查询当前用户提交的全量"已审批"的申请记录（只包含审批通过记录）
|
|
|
if (approveStatus != null && approveStatus == 1 && "apply".equals(type)){
|
|
|
@@ -236,7 +239,14 @@ public class ZywwService {
|
|
|
}
|
|
|
queryWrapper.orderByDesc("CREATE_TIME");
|
|
|
Page<ZywwApplyInfo> page = new Page<>(pageIndex, pageSize);
|
|
|
- return zywwApplyInfoMapper.selectPage(page, queryWrapper);
|
|
|
+ Page<ZywwApplyInfo> pageDataList = zywwApplyInfoMapper.selectPage(page, queryWrapper);
|
|
|
+ // 如果存在对应条件的用户申请记录，就关联查询该记录对应的文件信息记录
|
|
|
+// if(pageDataList.getTotal() > 0){
|
|
|
+// QueryWrapper<BaseFileInfo> qw = new QueryWrapper<>();
|
|
|
+// qw.eq("")
|
|
|
+// }
|
|
|
+// baseFileInfoMapper.selectList()
|
|
|
+ return pageDataList;
|
|
|
}
|
|
|
|
|
|
}
|
fangtasyj