diff --git a/src/main/java/com/budwk/app/zhgh/democratic/opinion/service/impl/OpinionSummaryServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/opinion/service/impl/OpinionSummaryServiceImpl.java index d5922e5e..8159c68c 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/opinion/service/impl/OpinionSummaryServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/opinion/service/impl/OpinionSummaryServiceImpl.java @@ -58,6 +58,8 @@ public class OpinionSummaryServiceImpl extends BaseServiceImpl impl t.finishTime, t.taskParentId, t.variable taskVariable, + GROUP_CONCAT(DISTINCT CASE WHEN oru.isMaster = 1 THEN oru.unitName END) AS masterUnitName, + GROUP_CONCAT(DISTINCT CASE WHEN oru.isMaster = 0 THEN oru.unitName END) AS slaveUnitNames, IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'待提交') curTaskName, IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask' AND taskState in (10,20)) AS startTaskId @@ -70,6 +72,7 @@ public class OpinionSummaryServiceImpl extends BaseServiceImpl impl LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10 LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 + LEFT JOIN opinion_reply_unit oru ON oru.opinionId = info.id $condition """); Cnd cnd = Cnd.NEW(); @@ -120,6 +123,8 @@ public class OpinionSummaryServiceImpl extends BaseServiceImpl impl entityList.add(new ExcelExportEntity("意见类别", "typeName", 20)); entityList.add(new ExcelExportEntity("建议人", "createUserName", 20)); entityList.add(new ExcelExportEntity("记录人", "suggestUserName", 20)); + entityList.add(new ExcelExportEntity("主办单位", "masterUnitName", 25)); + entityList.add(new ExcelExportEntity("协办单位", "slaveUnitNames", 25)); entityList.add(new ExcelExportEntity("届次", "sessionName", 25)); entityList.add(new ExcelExportEntity("当前节点", "curTaskName", 20)); entityList.add(new ExcelExportEntity("流程状态", "instanceStateName", 20)); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java index dec0dbc1..ccd9ddf4 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java @@ -168,6 +168,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp info.researchFindings, info.brief, info.measures, + info.createTime, info.createUserName, tcde.unitName, tcde.mobile, @@ -227,6 +228,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp exportEntities.add(new ExcelExportEntity("代表调研情况", "researchFindings", 40)); exportEntities.add(new ExcelExportEntity("代表建议措施", "measures", 40)); exportEntities.add(new ExcelExportEntity("提案人", "createUserName", 20)); + exportEntities.add(new ExcelExportEntity("撰写时间", "createTime", 20)); exportEntities.add(new ExcelExportEntity("提案人电话", "mobile", 20)); exportEntities.add(new ExcelExportEntity("附议人(两名)", "secondedUserNames", 20)); exportEntities.add(new ExcelExportEntity("提案单位", "unitName", 20)); @@ -546,6 +548,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp info.researchFindings, info.brief, info.measures, + info.createTime, info.createUserName, tcde.unitName, tcde.mobile, diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/summary/index.html b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/summary/index.html index f619d8d1..268da181 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/summary/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/summary/index.html @@ -88,6 +88,9 @@ layout("/layouts/platform.html"){ {label: "意见类别", prop: "typeName"}, {label: "建议人", prop: "createUserName"}, {label: "建议人所属代表团", prop: "delegationName"}, + {label: "建议承办单位", prop: "unitName"}, + {label: "主办单位", prop: "masterUnitName"}, + {label: "协办单位", prop: "slaveUnitNames"}, {label: "记录人", prop: "suggestUserName"}, {label: "记录人所属讨论组", prop: "suggestUserDelegationName"}, {label: "届次", prop: "sessionName"}, @@ -104,12 +107,12 @@ layout("/layouts/platform.html"){ }, { value: 'startTask', label: '撰写意见' - }, { - value: 'slave_reply', - label: '协办单位答复' }, { value: 'master_reply', label: '主办单位答复' + }, { + value: 'slave_reply', + label: '协办单位答复' }, { value: 'feedback', label: '代表评价' diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html index e5ee763d..0c151d30 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html @@ -195,6 +195,7 @@ layout("/layouts/platform.html"){ {label: "提案编号", prop: "code"}, {label: "提案名称", prop: "name"}, {label: "提案人", prop: "createUserName"}, + {label: "撰写时间", prop: "createTime", visible: false}, {label: "提案人单位", prop: "unitName", visible: false}, {label: "提案类别", prop: "typeName"}, {label: "届次", prop: "sessionName"},