|
@@ -2674,7 +2674,7 @@ public class TaskController extends BladeController {
|
|
|
@ApiOperationSupport(order = 22)
|
|
|
@ApiOperation(value = "计量生成Pdf", notes = "计量生成Pdf")
|
|
|
public R meterPdfInfo(@RequestParam String reportId, @RequestParam Integer type) {
|
|
|
- return R.data(calculate(reportId, type));
|
|
|
+ return calculate(reportId, type);
|
|
|
}
|
|
|
|
|
|
public R<String> calculate(String reportId, Integer type) {
|
|
@@ -2837,10 +2837,14 @@ public class TaskController extends BladeController {
|
|
|
|
|
|
// 添加电签任务列表
|
|
|
public void addSignTaskBatch(Report report){
|
|
|
- String sql=" insert INTO u_task_batch(id,task_parallel_id,json_data,create_user,create_dept,create_time,update_user,update_time,status,is_deleted,nick_name) "+
|
|
|
- " SELECT a.id,a.process_instance_id,json_object('approvalFileList',json_array(),'approvalType',4+b.meter_task_type,'comment','','flag','OK','formDataId',b.form_data_id,'parallelProcessInstanceId',a.parallel_process_instance_id,'pass',true,'taskId',b.id) as json_data,a.task_user,a.create_dept,a.create_time,a.update_user,a.update_time,1 as status,0 as is_deleted,a.task_user_name as nick_name "+
|
|
|
- " from u_task_parallel a,u_task b where a.process_instance_id=b.process_instance_id and b.form_data_id="+report.getPeriodId()+" and b.meter_task_type="+(Func.toInt(report.getType())+1);
|
|
|
- jdbcTemplate.execute(sql);
|
|
|
+ try {
|
|
|
+ String sql=" insert INTO u_task_batch(id,task_parallel_id,json_data,create_user,create_dept,create_time,update_user,update_time,status,is_deleted,nick_name) "+
|
|
|
+ " SELECT a.id,a.process_instance_id,json_object('approvalFileList',json_array(),'approvalType',4+b.meter_task_type,'comment','','flag','OK','formDataId',b.form_data_id,'parallelProcessInstanceId',a.parallel_process_instance_id,'pass',true,'taskId',b.id) as json_data,a.task_user,a.create_dept,a.create_time,a.update_user,a.update_time,1 as status,0 as is_deleted,a.task_user_name as nick_name "+
|
|
|
+ " from u_task_parallel a,u_task b where a.process_instance_id=b.process_instance_id and b.form_data_id="+report.getPeriodId()+" and b.meter_task_type="+(Func.toInt(report.getType())+1);
|
|
|
+ jdbcTemplate.execute(sql);
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public void setTitle(Sheet sheet, String name) {
|