Skip to content

platform
platform
Commit d72afa1a authored by 王飞龙's avatar 王飞龙
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents 41860799 07327ca4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1082 additions and 277 deletions
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @ d72afa1a
......@@ -90,9 +90,9 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
@Transactional
public Integer updateRecord(Record record) {
//先去查询 t_review 表里的审批状态是否全部为通过，都是通过的状态，更新列表的审批状态为已审批=3
if(record.getReviews() != null){
List<Review> reviewList = questionnaireDao.selectAnswerByStatus(record.getReviews().get(0).getRecordId());
reviewList.removeAll(Collections.singleton(null));
//查询审批页面问题通过的个数
List<Integer> reviews = questionnaireDao.selectAnswerByQuestion(record.getReviews().get(0).getRecordId());
//问题个数
......@@ -107,9 +107,11 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
record.setProcessStatus(2);
}else{
//列表状态为待审批
record.setProcessStatus(record.getProcessStatus());
record.setProcessStatus(2);
}
}
}
return questionnaireDao.updateRecord(record);
}
......
src/main/resources/mapper/Questionnaire.xml
View file @ d72afa1a
......@@ -231,7 +231,7 @@
MAX((CASE WHEN t_answer.`group`=21 THEN t_answer.score ELSE 0 END)) AS rewardIndexFive
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
GROUP BY t_record.create_by
GROUP BY t_record.id
</select>
<!--2022年10月新增加功能问卷管理-审批页面根据基础指标、引导指标和奖励指标导出所有空间的数据-->
......
src/main/webapp/WEB-INF/page/education/questionnaire_Information_list.jsp
View file @ d72afa1a
......@@ -48,7 +48,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
</select>
<input type="text" id="title" class="form-control" placeholder="众创空间" />
<button style="margin-top: 5px" class=" btn btn-sm btn-primary m-t-n-xs" onclick="search();">搜 索</button>
<button style="margin-top: 5px" class=" btn btn-sm btn-primary m-t-n-xs" onclick="">导 出</button>
<button style="margin-top: 5px" class=" btn btn-sm btn-primary m-t-n-xs" onclick="ShowCreateModal()">导 出</button>
</div>
<table id="hidden-table-info" width="100%" class="table table-striped table-bordered table-hover dataTables-example"></table>
</div>
......@@ -87,6 +87,69 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
</div>
</div>
</div>
<div class="modal fade" id="createFileMModal" style="padding-left: 10%" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" style="padding-top: 10%;" role="document">
<div class="modal-content" style="width: 710px">
<div id="exportSelect" class="modal-body">
<h5>请选择需要导出的指标</h5>
<br>
<form>
<h5>基础指标</h5>
<div>
<span style="line-height: 14px">基础指标1<input name="index" type="radio" value="1"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标2<input name="index" type="radio" value="2"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标3<input name="index" type="radio" value="3"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标4<input name="index" type="radio" value="4"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标5<input name="index" type="radio" value="5"></span>
</div>
<div>
<span style="line-height: 14px">基础指标6<input name="index" type="radio" value="6"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标7<input name="index" type="radio" value="7"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标8<input name="index" type="radio" value="8"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">基础指标9<input name="index" type="radio" value="9"></span>
</div>
<br>
<h5>引导指标</h5>
<div>
<span style="line-height: 14px">引导指标1<input name="index" type="radio" value="10"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标2<input name="index" type="radio" value="11"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标3<input name="index" type="radio" value="12"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标4<input name="index" type="radio" value="13"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标5<input name="index" type="radio" value="14"></span>
</div>
<div>
<span style="line-height: 14px">引导指标6<input name="index" type="radio" value="15"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标7<input name="index" type="radio" value="16"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标8<input name="index" type="radio" value="17"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标9<input name="index" type="radio" value="18"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">引导指标10<input name="index" type="radio" value="19"></span>
</div>
<div>
<span style="line-height: 14px">引导指标11<input name="index" type="radio" value="20"></span>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;
<span style="line-height: 14px">引导指标12<input name="index" type="radio" value="21"></span>&emsp;&emsp;&emsp;&emsp;&nbsp;
<span style="line-height: 14px">引导指标13<input name="index" type="radio" value="22"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
</div>
<br>
<h5>奖励指标</h5>
<div>
<span style="line-height: 14px">奖励指标1<input name="index" type="radio" value="23"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标2<input name="index" type="radio" value="24"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标3<input name="index" type="radio" value="25"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标4<input name="index" type="radio" value="26"></span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px">奖励指标5<input name="index" type="radio" value="27"></span>
</div>
<br>
<div class="ibox-content">
<div class="form-inline pull-right ">
<button style="margin-top: 5px" class=" btn btn-sm btn-primary m-t-n-xs" onclick="exportData()">确定</button>
<button id="abadonExport" style="margin-top: 5px;background-color: white;" class=" btn btn-sm btn-primary m-t-n-xs"><span style="color: black">取消</span></button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<!-- 全局js -->
<script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
<script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script>
......
src/main/webapp/WEB-INF/page/education/questionnaire_information.jsp
View file @ d72afa1a
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/res/js/education/questionnaire_Information_list.js
View file @ d72afa1a
......@@ -114,3 +114,20 @@ function setAllMaterial_detail(projectID){
window.location.href=webroot+"goto/education/questionnaire_information?recordId="+projectID;
}
// 修改弹出框的title, 显示弹框
function ShowCreateModal(){
$('#createFileMModal').modal('show');
}
// 关闭弹框， 获取输入值，然后执行逻辑
$("#abadonExport").click(function (){
$("#createFileMModal").modal("hide");
});
//导出
function exportData() {
if($("#exportSelect input:radio:checked").val()){
window.open(webroot+"questionnaire/exportFullTimeWorkPerson?index="+$("#exportSelect input:radio:checked").val(),"_parent")
}else {
swal("失败！", "请选择导出指标！", "error");
}
}
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