Skip to content

S
syzy_se
Commit 8e06148f by luoxin1
Options

功能修改

parent 250313bb
Showing with 141 additions and 86 deletions
src/main/java/com/spk/zyse/laboratory/web/LaboratoryEquipmentMakeController.java
......@@ -295,10 +295,12 @@ public class LaboratoryEquipmentMakeController{
String endTime = laboratoryEquipmentMake.getEndTime()+" "+laboratoryEquipmentMake.getMinuteEnd()+":"+laboratoryEquipmentMake.getHourEnd();
laboratoryEquipmentMake.setStartTime(startTime);
laboratoryEquipmentMake.setEndTime(endTime);
Date date = fmt.parse(laboratoryEquipmentMakeTime.getMaxTime());
Date date2 = fmt.parse(startTime);
if(date.after(date2)) {
return new JsonResult().success("当前时间已被该设备占用,请重新选择时间段");
if(laboratoryEquipmentMakeTime.getMaxTime()!= null && !"".equals(laboratoryEquipmentMakeTime.getMaxTime())) {
Date date = fmt.parse(laboratoryEquipmentMakeTime.getMaxTime());
Date date2 = fmt.parse(startTime);
if(date.after(date2)) {
return new JsonResult().success("当前时间已被该设备占用,请重新选择时间段");
}
}
if("0".equals(flag)) {
laboratoryEquipmentMakeService.submit(laboratoryEquipmentMake);
......
src/main/java/com/spk/zyse/project/dao/ProjectApprovalDao.java
......@@ -9,9 +9,11 @@ import org.beetl.sql.core.mapper.BaseMapper;
import com.spk.admin.core.entity.CoreDict;
import com.spk.admin.core.entity.CoreOrg;
import com.spk.admin.core.entity.CoreUser;
import com.spk.zyse.fund.entity.ProFundsSubjectBase;
import com.spk.zyse.fund.entity.ProFundsSubjectSt;
import com.spk.zyse.project.entity.ProjectApproval;
import com.spk.zyse.result.entity.ResultPaper;
@SqlResource("project.projectApproval")
public interface ProjectApprovalDao extends BaseMapper<ProjectApproval>{
......@@ -36,4 +38,7 @@ public interface ProjectApprovalDao extends BaseMapper<ProjectApproval>{
public ProFundsSubjectSt querySubjectStBySt(String projectSource, String projectType);
@Sql("select * from pro_funds_subject_base where code=?")
public ProFundsSubjectBase querySubjectByCode(String key);
@Sql("select * from core_user where name=?")
public CoreUser getUserByName(String userName);
public void updateResultPaper(ResultPaper resultPaper);
}
\ No newline at end of file
src/main/java/com/spk/zyse/project/service/ProjectApprovalService.java
......@@ -275,6 +275,10 @@ public class ProjectApprovalService extends BaseService<ProjectApproval>{
return projectApprovalDao.queryDept(belongDept);
}
public void updateResultPaper(ResultPaper resultPaper) {
projectApprovalDao.updateResultPaper(resultPaper);
}
//项目立项综合查询
public PageQuery<ProjectApproval> synList(PageQuery page) {
PageQuery ret = projectApprovalDao.synList(page);
......@@ -298,14 +302,14 @@ public class ProjectApprovalService extends BaseService<ProjectApproval>{
public void paperProcessAttachment(List<ResultPaper> paperList, Map<String, File[]> map) throws Exception {
Long kyzlUserId=null;
Long kycUserId=36L;
Long kycUserId=5L;
for (ResultPaper resultPaper : paperList) {
sqlManager.insert(ResultPaper.class, resultPaper,true);
kyzlUserId=projectApprovalDao.getKymsUserId(resultPaper.getBelongDept());//根据科室id获取科研秘书id
if(null==kyzlUserId) {
Exception e=new Exception(resultPaper.getPaperTitle()+"--此信息所属科室无科研助理角色,导入失败");
throw new PlatformException(e.getMessage(), e);
}
// kyzlUserId=projectApprovalDao.getKymsUserId(resultPaper.getBelongDept());//根据科室id获取科研秘书id
// if(null==kyzlUserId) {
// Exception e=new Exception(resultPaper.getPaperTitle()+"--此信息所属科室无科研助理角色,导入失败");
// throw new PlatformException(e.getMessage(), e);
// }
//--添加流程开始
ProUwfProcessInst proUwfProcessInst=new ProUwfProcessInst();
......@@ -328,7 +332,7 @@ public class ProjectApprovalService extends BaseService<ProjectApproval>{
ProUwfActivityInst proUwfActivityInst1=new ProUwfActivityInst();//项目负责人流程记录
proUwfActivityInst1.setProcessdefId(5L);
proUwfActivityInst1.setActivitydefId(19L);
proUwfActivityInst1.setActivitydefId(17L);
proUwfActivityInst1.setProcessinstId(resultPaper.getProcessinstId());
proUwfActivityInst1.setActivityinstActUser(Long.parseLong(resultPaper.getUserId()));
proUwfActivityInst1.setActivityinstActRole("2");
......@@ -339,25 +343,25 @@ public class ProjectApprovalService extends BaseService<ProjectApproval>{
proUwfActivityInst1.setActivityinstCreateTime(new Date());
sqlManager.insert(proUwfActivityInst1,true);
ProUwfActivityInst proUwfActivityInst2=new ProUwfActivityInst();//科研助理流程记录
proUwfActivityInst2.setProcessdefId(5L);
proUwfActivityInst2.setActivitydefId(88L);
proUwfActivityInst2.setProcessinstId(resultPaper.getProcessinstId());
proUwfActivityInst2.setPreInstId(proUwfActivityInst1.getActivityinstId());//上一步
proUwfActivityInst2.setActivityinstActUser(kyzlUserId);
proUwfActivityInst2.setActivityinstActRole("5");
proUwfActivityInst2.setActivityinstStatus("hjzt_02");
proUwfActivityInst2.setActivityinstIsReturn(0);
proUwfActivityInst2.setActivityinstSignTime(new Date());
proUwfActivityInst2.setActivityinstSubmitTime(new Date());
proUwfActivityInst2.setActivityinstCreateTime(new Date());
sqlManager.insert(proUwfActivityInst2,true);
// ProUwfActivityInst proUwfActivityInst2=new ProUwfActivityInst();//科研助理流程记录
// proUwfActivityInst2.setProcessdefId(5L);
// proUwfActivityInst2.setActivitydefId(19L);
// proUwfActivityInst2.setProcessinstId(resultPaper.getProcessinstId());
// proUwfActivityInst2.setPreInstId(proUwfActivityInst1.getActivityinstId());//上一步
// proUwfActivityInst2.setActivityinstActUser(kyzlUserId);
// proUwfActivityInst2.setActivityinstActRole("5");
// proUwfActivityInst2.setActivityinstStatus("hjzt_02");
// proUwfActivityInst2.setActivityinstIsReturn(0);
// proUwfActivityInst2.setActivityinstSignTime(new Date());
// proUwfActivityInst2.setActivityinstSubmitTime(new Date());
// proUwfActivityInst2.setActivityinstCreateTime(new Date());
// sqlManager.insert(proUwfActivityInst2,true);
ProUwfActivityInst proUwfActivityInst3=new ProUwfActivityInst();//科研处流程记录
proUwfActivityInst3.setProcessdefId(5L);
proUwfActivityInst3.setActivitydefId(20L);
proUwfActivityInst3.setActivitydefId(18L);
proUwfActivityInst3.setProcessinstId(resultPaper.getProcessinstId());
proUwfActivityInst3.setPreInstId(proUwfActivityInst2.getActivityinstId());//上一步
proUwfActivityInst3.setPreInstId(proUwfActivityInst1.getActivityinstId());//上一步
proUwfActivityInst3.setActivityinstActUser(kycUserId);
proUwfActivityInst3.setActivityinstActRole("1");
proUwfActivityInst3.setActivityinstStatus("hjzt_02");
......@@ -366,10 +370,31 @@ public class ProjectApprovalService extends BaseService<ProjectApproval>{
proUwfActivityInst3.setActivityinstSubmitTime(new Date());
proUwfActivityInst3.setActivityinstCreateTime(new Date());
sqlManager.insert(proUwfActivityInst3,true);
proUwfActivityInst1.setNextInstId(proUwfActivityInst2.getActivityinstId());
proUwfActivityInst1.setNextInstId(proUwfActivityInst1.getActivityinstId());
sqlManager.updateTemplateById(proUwfActivityInst1);
proUwfActivityInst1.setNextInstId(proUwfActivityInst3.getActivityinstId());
sqlManager.updateTemplateById(proUwfActivityInst1);
proUwfActivityInst2.setNextInstId(proUwfActivityInst3.getActivityinstId());
sqlManager.updateTemplateById(proUwfActivityInst2);
//--添加流程结束
//上传附件开始
File[] files = map.get(resultPaper.getPaperTitle());
if(null!=files && files.length>0) {
for(int i=0;i<files.length;i++) {
if(files[i].isFile()) {
FileInputStream fileInputStream = new FileInputStream(files[i]);
MultipartFile multipartFile = new MockMultipartFile(files[i].getName(), files[i].getName(),ContentType.APPLICATION_OCTET_STREAM.toString(), fileInputStream);
FileItem fileItem = fileService.createFileItem(multipartFile.getOriginalFilename(),"textPdf","",Long.parseLong(resultPaper.getUserId()),resultPaper.getBelongDept(),resultPaper.getAttachmentId(),null,null,null);
dfs.saveFile(multipartFile.getInputStream(), fileItem);
}
}
}
//上传附件结束
}
}
public void paperProcessAttachments(List<ResultPaper> paperList, Map<String, File[]> map) throws Exception {
for (ResultPaper resultPaper : paperList) {
//sqlManager.insert(ResultPaper.class, resultPaper,true);
projectApprovalDao.updateResultPaper(resultPaper);
//--添加流程结束
//上传附件开始
File[] files = map.get(resultPaper.getPaperTitle());
......@@ -1269,5 +1294,10 @@ public class ProjectApprovalService extends BaseService<ProjectApproval>{
//上传附件结束
}
}
public CoreUser getUserByName(String userName) {
return projectApprovalDao.getUserByName(userName);
}
}
\ No newline at end of file
src/main/java/com/spk/zyse/project/web/ProjectApprovalController.java
......@@ -674,7 +674,8 @@ public class ProjectApprovalController{
paper.setCreateTime(new Date());
paper.setAttachmentId(attachmentId);
if(row.getCell(0)!=null && !"".equals(row.getCell(0).toString())) {//根据工号获取用户信息 提出用户id入库
CoreUser user = coreUserService.getUserByCode(row.getCell(0).toString());
//CoreUser user = coreUserService.getUserByCode(row.getCell(0).toString());
CoreUser user = projectApprovalService.getUserByName(row.getCell(0).toString());
if(user==null) {
return JsonResult.failMessage("第"+(rowNum+1)+"行,系统中无此用户");
}
......@@ -686,9 +687,9 @@ public class ProjectApprovalController{
if(row.getCell(2)!=null && !"".equals(row.getCell(2).toString())) {//刊物名称
paper.setPeriodicalName(row.getCell(2).toString());
}
if(row.getCell(3)!=null && !"".equals(row.getCell(3).toString())) {//期刊类型
paper.setPeriodicalType(row.getCell(3).toString());
}
// if(row.getCell(3)!=null && !"".equals(row.getCell(3).toString())) {//期刊类型
// paper.setPeriodicalType(row.getCell(3).toString());
// }
if(row.getCell(4)!=null && !"".equals(row.getCell(4).toString())) {//文章类型 中文核心/非中文核心
CoreDict dict=projectApprovalService.getDictByNameAndType(row.getCell(4).toString(),"text_type");
if(dict==null) {
......@@ -697,17 +698,17 @@ public class ProjectApprovalController{
paper.setTextType(dict.getValue());
}
if(row.getCell(5)!=null && !"".equals(row.getCell(5).toString())) {//年
paper.setYear(row.getCell(5).toString());
}
if(row.getCell(6)!=null && !"".equals(row.getCell(6).toString())) {//卷
paper.setJuan(row.getCell(6).toString());
}
if(row.getCell(7)!=null && !"".equals(row.getCell(7).toString())) {//期
paper.setQi(row.getCell(7).toString());
}
if(row.getCell(8)!=null && !"".equals(row.getCell(8).toString())) {//起止页码
paper.setPageNumber(row.getCell(8).toString());
paper.setYear(row.getCell(5).toString().replaceAll("\\.0$", ""));
}
// if(row.getCell(6)!=null && !"".equals(row.getCell(6).toString())) {//卷
// paper.setJuan(row.getCell(6).toString());
// }
// if(row.getCell(7)!=null && !"".equals(row.getCell(7).toString())) {//期
// paper.setQi(row.getCell(7).toString());
// }
// if(row.getCell(8)!=null && !"".equals(row.getCell(8).toString())) {//起止页码
// paper.setPageNumber(row.getCell(8).toString());
// }
if(row.getCell(9)!=null && !"".equals(row.getCell(9).toString())) {//影响因子
paper.setImpactFactor(BigDecimal.valueOf(Double.parseDouble(row.getCell(9).toString())));
}
......@@ -720,42 +721,49 @@ public class ProjectApprovalController{
if(row.getCell(12)!=null && !"".equals(row.getCell(12).toString())) {//通讯作者
paper.setTxAuthor(row.getCell(12).toString());
}
if(row.getCell(13)!=null && !"".equals(row.getCell(13).toString())) {//通讯作者单位
paper.setTxAuthorInfo(row.getCell(13).toString());
}
if(row.getCell(14)!=null && !"".equals(row.getCell(14).toString())) {//全部作者
paper.setAllAuthor(row.getCell(14).toString());
}
// if(row.getCell(13)!=null && !"".equals(row.getCell(13).toString())) {//通讯作者单位
// paper.setTxAuthorInfo(row.getCell(13).toString());
// }
// if(row.getCell(14)!=null && !"".equals(row.getCell(14).toString())) {//全部作者
// paper.setAllAuthor(row.getCell(14).toString());
// }
if(row.getCell(15)!=null && !"".equals(row.getCell(15).toString())) {//所属科室
CoreOrg org=projectApprovalService.getOrgByName(row.getCell(15).toString());
if(org==null) {
return JsonResult.failMessage("第"+(rowNum+1)+"行,所属科室选项有误");
CoreUser user = projectApprovalService.getUserByName(row.getCell(0).toString());
paper.setBelongDept(user.getOrgId());
//return JsonResult.failMessage("第"+(rowNum+1)+"行,所属科室选项有误");
}else {
paper.setBelongDept(org.getId());
}
paper.setBelongDept(org.getId());
}
if(row.getCell(16)!=null && !"".equals(row.getCell(16).toString())) {//发表时间
String date = ZipMultiFile.stringDateProcess(row.getCell(16));
paper.setPublishTime(format.parse(date));
}
if(row.getCell(17)!=null && !"".equals(row.getCell(17).toString())) {//论文分类
CoreDict dict=projectApprovalService.getDictByNameAndType(row.getCell(17).toString(),"paper_type");
if(dict==null) {
return JsonResult.failMessage("第"+(rowNum+1)+"行,论文分类选项有误");
}
paper.setPaperType(dict.getValue());
}
if(row.getCell(18)!=null && !"".equals(row.getCell(18).toString())) {//研究领域
CoreDict dict=projectApprovalService.getDictByNameAndType(row.getCell(18).toString(),"research_area");
if(dict==null) {
return JsonResult.failMessage("第"+(rowNum+1)+"行,研究领域选项有误");
}
paper.setResearchArea(dict.getValue());
}
if(row.getCell(19)!=null && !"".equals(row.getCell(19).toString())) {//所属学科
paper.setBelongSubject(row.getCell(19).toString());
}
if(row.getCell(20)!=null && !"".equals(row.getCell(20).toString())) {//备注
paper.setRemark(row.getCell(20).toString());
// if(row.getCell(17)!=null && !"".equals(row.getCell(17).toString())) {//论文分类
// CoreDict dict=projectApprovalService.getDictByNameAndType(row.getCell(17).toString(),"paper_type");
// if(dict==null) {
// return JsonResult.failMessage("第"+(rowNum+1)+"行,论文分类选项有误");
// }
// paper.setPaperType(dict.getValue());
// }
// if(row.getCell(18)!=null && !"".equals(row.getCell(18).toString())) {//研究领域
// CoreDict dict=projectApprovalService.getDictByNameAndType(row.getCell(18).toString(),"research_area");
// if(dict==null) {
// return JsonResult.failMessage("第"+(rowNum+1)+"行,研究领域选项有误");
// }
// paper.setResearchArea(dict.getValue());
// }
// if(row.getCell(19)!=null && !"".equals(row.getCell(19).toString())) {//所属学科
// paper.setBelongSubject(row.getCell(19).toString());
// }
// if(row.getCell(20)!=null && !"".equals(row.getCell(20).toString())) {//备注
// paper.setRemark(row.getCell(20).toString());
// }
if(row.getCell(21)!=null && !"".equals(row.getCell(21).toString())) {//第一作者
paper.setSpecialityCt(row.getCell(21).toString());
}
File attachmentDir=new File(listFiles[0].getPath() + "/附件/"+paper.getPaperTitle());
File[] files = attachmentDir.listFiles();//获取该论文下所有附件
......@@ -765,7 +773,8 @@ public class ProjectApprovalController{
paperList.add(paper);
}
projectApprovalService.paperProcessAttachment(paperList,map);
//projectApprovalService.paperProcessAttachment(paperList,map);
projectApprovalService.paperProcessAttachments(paperList,map);
}
//删除临时文件和文件夹
......
src/main/resources/application.properties
......@@ -33,7 +33,7 @@ spring.cache.type=SIMPLE
logging.level.root=info,debug
logging.level.org.springframework.web.servlet.mvc.method.annotation=warn
#logging.file = my.log
server.port=8090
server.port=8080
server.max-http-header-size=10000000
#应用访问路径
server.servlet.context-path=/console
......
src/main/resources/sql/project/projectApproval.md
......@@ -121,3 +121,9 @@ synList
@if(!isEmpty(specialityCt)){
and a.SPECIALITY_CT = #specialityCt#
@}
updateResultPaper
===
update result_paper set TEXT_TYPE=#textType#,YEAR=#year#,FIRST_AUTHOR=#firstAuthor#,FIRST_AUTHOR_INFO=#firstAuthorInfo#,SPECIALITY_CT=#specialityCt#
where PAPER_TITLE = #paperTitle# and PERIODICAL_NAME = #periodicalName#
\ No newline at end of file
src/main/resources/sql/result/resultPaper.md
......@@ -483,7 +483,7 @@ queryByHospitalCondition
select
@pageTag(){
'北京中医医院顺义医院' as yiyua,
(SELECT NAME FROM core_org WHERE ID="1")AS yiyua,
(SELECT
COUNT(*)
FROM
......
src/main/resources/static/js/ethics/ethics/checkExpert.js
......@@ -67,7 +67,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
title : '状态',
templet: function(d) {
if (d.state == '1') {
return '<span style="color:blue">科研处审核中</span>';
return '<span style="color:blue">伦理委员会审核中</span>';
} else if (d.state == '2') {
return '<span style="color:blue">专家初审中</span>';
} else if (d.state == '3') {
......@@ -75,9 +75,9 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}else if (d.state == '4') {
return '<span style="color:red">退回</span>';
}else if (d.state == '5') {
return '<span style="color:blue">科技处意见</span>';
return '<span style="color:blue">伦理委员会意见</span>';
}else if (d.state == '6') {
return '<span style="color:#00FF00">通过</span>';
return '<span style="color:#00FF00">审批完成</span>';
}
}
},
......
src/main/resources/static/js/ethics/ethics/checkExpertReview.js
......@@ -67,7 +67,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
title : '状态',
templet: function(d) {
if (d.state == '1') {
return '<span style="color:blue">科研处审核中</span>';
return '<span style="color:blue">伦理委员会审核中</span>';
} else if (d.state == '2') {
return '<span style="color:blue">专家初审中</span>';
} else if (d.state == '3') {
......@@ -75,9 +75,9 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}else if (d.state == '4') {
return '<span style="color:red">退回</span>';
}else if (d.state == '5') {
return '<span style="color:blue">科技处意见</span>';
return '<span style="color:blue">伦理委员会意见</span>';
}else if (d.state == '6') {
return '<span style="color:#00FF00">通过</span>';
return '<span style="color:#00FF00">审批完成</span>';
}
}
},
......
src/main/resources/static/js/ethics/ethics/checkIndex.js
......@@ -67,7 +67,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
title : '状态',
templet: function(d) {
if (d.state == '1') {
return '<span style="color:blue">科研处审核中</span>';
return '<span style="color:blue">伦理委员会审核中</span>';
} else if (d.state == '2') {
return '<span style="color:blue">专家初审中</span>';
} else if (d.state == '3') {
......@@ -75,9 +75,9 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}else if (d.state == '4') {
return '<span style="color:red">退回</span>';
}else if (d.state == '5') {
return '<span style="color:blue">科技处意见</span>';
return '<span style="color:blue">伦理委员会意见</span>';
}else if (d.state == '6') {
return '<span style="color:#00FF00">通过</span>';
return '<span style="color:#00FF00">审批完成</span>';
}
}
},
......
src/main/resources/static/js/ethics/ethics/index.js
......@@ -78,7 +78,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
title : '状态',
templet: function(d) {
if (d.state == '1') {
return '<span style="color:blue">科研处审核中</span>';
return '<span style="color:blue">伦理委员会审核中</span>';
} else if (d.state == '2') {
return '<span style="color:blue">专家初审中</span>';
} else if (d.state == '3') {
......@@ -86,9 +86,9 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}else if (d.state == '4') {
return '<span style="color:red">退回</span>';
}else if (d.state == '5') {
return '<span style="color:blue">科技处意见</span>';
return '<span style="color:blue">伦理委员会意见</span>';
}else if (d.state == '6') {
return '<span style="color:#00FF00">通过</span>';
return '<span style="color:#00FF00">审批完成</span>';
}else if (d.state == '0') {
return '<span style="color:blue">暂存</span>';
}
......
src/main/resources/templates/ethics/ethics/checkExpertReviews.html
......@@ -99,7 +99,7 @@
</div>
<div class="layui-footer">
<!--# if (exts =='1'){ -->
<button class="layui-btn layui-btn-warm" type="button" id="tonguo" lay-submit lay-filter="tonguo">通过</button>
<button class="layui-btn layui-btn-warm" type="button" id="tonguo" lay-submit lay-filter="tonguo">确定</button>
<button class="layui-btn layui-btn-sm" type="button" id="cancelButton1">取消</button>
<!--#} else {-->
<button class="layui-btn layui-btn-sm" type="button" id="cancelButton1">取消</button>
......
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