Guoyan
/
new_huozhou_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

文件提交新增校验,记录增量脚本

master
gjh 3 weeks ago
parent
519695669e
commit
c899fedb22
2 changed files with 47 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      db/update.sql
  2. 33
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java

15
db/update.sql
View File

@ -0,0 +1,15 @@
DROP TABLE IF EXISTS `project_manager`;
CREATE TABLE `project_manager` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '序号',
`project_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目名称',
`manager` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目联系人（支持多个）',
`phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '联系方式',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='项目信息负责人';
alter table huzhou_contractinfo add flag varchar(128) null comment '标识符:区分计划和实际';
INSERT INTO `guoyan_huzhou`.`huzhou_changefieldmanage`(`isshow`, `id`, `field_name`, `isChange`, `isuploadFile`, `isapproval`, `create_user`, `create_date`, `edit_user`, `edit_date`, `field_value`) VALUES ('1', '21', '项目负责人', '1', '0', '0', NULL, NULL, '1', NULL, 'manager');
INSERT INTO `guoyan_huzhou`.`huzhou_changefieldmanage`(`isshow`, `id`, `field_name`, `isChange`, `isuploadFile`, `isapproval`, `create_user`, `create_date`, `edit_user`, `edit_date`, `field_value`) VALUES ('1', '22', '项目负责人联系方式', '1', '0', '0', NULL, NULL, '1', NULL, 'managerPhone');

33
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
View File

@ -66,6 +66,8 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
@Autowired
private HuzhouContractinfoMapper contractinfoMapper;
@Autowired
private IHuzhouContractinfoService contractinfoService;
@Autowired
private HuzhouProjectinfoMoneyMapper projectinfoMoneyMapper;
@Autowired
private RepositoryService repositoryService;
@ -119,12 +121,15 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
String taskLevel = planinfo.getTaskLevel();
List<HuzhouPlaninfo> childPlanList = planinfoService.queryChildPlan(planinfo.getProjectId(), planinfo.getTaskLevel(),"0,1");
if(childPlanList.size()>0){
throw new EasyException("存在未完成(审批中)的子项。当前阶段不允许提交文件");
throw new EasyException("存在未完成(审批中)的子项。当前阶段不允许提交文件");
}
planinfoService.saveOrModifyPlanUploadFile(files,planinfoid,"1","1");
String taskName = planinfo.getTaskName();
taskName=StrUtil.trim(taskName);
String projectId = planinfoService.getById(planinfoid).getProjectId();
// 校验
hasRealContractInfo(taskName, projectId);
HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId);
String superLeader = "";
String adminDivision="";
@ -392,6 +397,30 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
}
}
/**
* 校验项目阶段是否存在 合同信息(计划) 如果存在则需要填写 合同信息(实际)
* @param taskName
* @param projectId
*/
private void hasRealContractInfo(String taskName, String projectId) {
LambdaQueryWrapper<HuzhouContractinfo> planQueryWrapper = new LambdaQueryWrapper<>();
planQueryWrapper.eq(HuzhouContractinfo::getProjectId, projectId);
planQueryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
planQueryWrapper.eq(HuzhouContractinfo::getFlag,"计划");
List<HuzhouContractinfo> planContractInfoList = contractinfoService.list(planQueryWrapper);
if (planContractInfoList.size() > 0) {
LambdaQueryWrapper<HuzhouContractinfo> realQueryWrapper = new LambdaQueryWrapper<>();
realQueryWrapper.eq(HuzhouContractinfo::getProjectId, projectId);
realQueryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
realQueryWrapper.eq(HuzhouContractinfo::getFlag, "实际");
List<HuzhouContractinfo> realContractInfoList = contractinfoService.list(realQueryWrapper);
// 有合同信息(计划) 但无合同信息(实际)则报错!
if (realContractInfoList.size() == 0) {
throw new EasyException("存在合同信息(计划)!请根据合同信息（计划）信息填写实际支付金额");
}
}
}
@Override
public void approvePlanFile(MultipartFile[] files, String taskId, String flag,
String planinfoid, String comment, String modifyNum,MultipartFile[] adviceFiles,
@ -485,6 +514,8 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
if(list.size()==0){
throw new EasyException("未找到造价评估报告确认阶段");
}
HuzhouPlaninfo planinfo1 = list.get(0);
String planinfo1Id = planinfo1.getId();
//获取项目上级指导室

Write Preview
Loading…
Cancel
Save