流程项目名称，代办流程类型配置，交底结论数据查询

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -156,11 +156,11 @@ public class ActTaskController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "todo/data")
     public Map<String, Object> todoListData(Act act, HttpServletRequest request, HttpServletResponse response, Model model, String xmName) throws Exception {
-        Page<HashMap<String, String>> page = actTaskService.todoList(new Page<HashMap<String, String>>(request, response), act);
-        return getBootstrapData(page);
-/*        Page<HashMap<String, String>> page = actTaskService.newTodoList(new Page<HashMap<String, String>>(request, response), act, xmName);
-        Map<String, Object> map = new HashMap<String, Object>();
+/*        Page<HashMap<String, String>> page = actTaskService.todoList(new Page<HashMap<String, String>>(request, response), act);
         return getBootstrapData(page);*/
+        Page<HashMap<String, String>> page = actTaskService.newTodoList(new Page<HashMap<String, String>>(request, response), act, xmName);
+        Map<String, Object> map = new HashMap<String, Object>();
+        return getBootstrapData(page);
     }
 
     /**

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -493,23 +493,23 @@
     </select>
     <!--施工流程记录表根据流程定义号获取项目名称-->
     <select id="idProjectName3" resultType="string">
-        select projectName
+        select reserveProjectName
         from sg_construction_process
         where proc_ins_id = #{procInsId};
     </select>
     <select id="idProjectName4" resultType="java.lang.String">
-        select requireName
+        select reserveProjectName
         from xm_settlement_process
         where proc_ins_id = #{procInsId};
     </select>
     <select id="findNameByInsID" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project1">
-        select id, require_name
-        from xm_project_details
+        select id, reserveProjectName
+        from xm_material_project
         where id = (select project_id from md_picking_application where proc_ins_id = #{id})
     </select>
     <select id="idProjectName2" resultType="string">
-        select require_name
-        from xm_project_details
+        select reserveProjectName
+        from xm_material_project
         where id in (SELECT project_id from md_acquisition_process where proc_ins_id = #{procInsId})
     </select>
     <select id="insIdByName" resultType="java.lang.String">
@@ -525,26 +525,33 @@
     <select id="insIdByName3" resultType="java.lang.String">
         select proc_ins_id
         from sg_construction_process
-        where projectName like concat('%', #{projectName}, '%');
+        where reserveProjectName like concat('%', #{projectName}, '%');
     </select>
     <select id="insIdByName4" resultType="java.lang.String">
         select proc_ins_id
         from xm_settlement_process
-        where requireName like concat('%', #{projectName}, '%')
+        where reserveProjectName like concat('%', #{projectName}, '%')
     </select>
 
     <select id="findDisclosePage" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction">
-        select a.project_id,
-        a.require_name as `disclose.requireName`,
-        from xm_project_details a
-        LEFT JOIN xm_disclose_conclusion b
+        SELECT
+        <include refid="constructionColumns"/>,
+        c.projectId,
+        c.projectName,
+        <include refid="discloseColumns"/>
+        from xm_construction_clarificaiton a
+        LEFT JOIN xm_material_project c
+        on a.reserveProjectName = c.reserveProjectName
+        LEFT JOIN xm_disclose_conclusion d
+        on a.proc_ins_id = d.proc_ins_id
         <where>
             1=1
+            and c.secondPower = '0'
             <if test="projectId != null and projectId != ''">
-                and a.project_id = #{projectId}
+                and c.projectId = #{projectId}
             </if>
-            <if test="disclose.requireName != null and disclose.requireName != ''">
-                and b.requireName = #{disclose.requireName}
+            <if test="reserveProjectName != null and reserveProjectName != ''">
+                and c.reserveProjectName = #{reserveProjectName}
             </if>
         </where>
     </select>

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/service/MaterialProjectService.java

@@ -24,10 +24,12 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 	@Autowired
 	private MaterialInfoService materialInfoService;
 
+	@Override
 	public MaterialProject get(String id) {
 		return super.get(id);
 	}
 	
+	@Override
 	public List<MaterialProject> findList(MaterialProject materialProject) {
 		return super.findList(materialProject);
 	}
@@ -40,15 +42,19 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 		return materialProjectMapper.findByList(list);
 	}
 	
+	@Override
 	public Page<MaterialProject> findPage(Page<MaterialProject> page, MaterialProject materialProject) {
 		return super.findPage(page, materialProject);
 	}
 	
+	@Override
 	@Transactional(readOnly = false)
 	public void save(MaterialProject materialProject) {
 		super.save(materialProject);
 	}
-	
+
+
+	@Override
 	@Transactional(readOnly = false)
 	public void delete(MaterialProject materialProject) {
 		super.delete(materialProject);

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -1906,7 +1906,6 @@
         <where>
             1 = 1
             and a.secondPower = '0'
-            and a.whetherCloseStatus = '0'
             <if test="reserveList != null and  reserveList !='' ">
                 and t.reserveProjectName in
                 <foreach collection="reserveList" item="item" index="index" open="(" separator="," close=")">

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.js

@@ -2,8 +2,7 @@
 <script>
 $(document).ready(function() {
 	$('#actTable').bootstrapTable({
-
-		  //请求方法
+		  		//请求方法
 				method: 'post',
 				//类型json
 				dataType: "json",
@@ -130,8 +129,6 @@ $(document).ready(function() {
 
 
 	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
-
-
 		  $('#actTable').bootstrapTable("toggleView");
 		}
 
@@ -141,7 +138,6 @@ $(document).ready(function() {
             $('#edit').prop('disabled', $('#actTable').bootstrapTable('getSelections').length!=1);
         });
 
-
 	  $("#search").click("click", function() {// 绑定查询按扭
 		  var val = $("#xmName").val();
 		  console.log(val);
@@ -154,9 +150,9 @@ $(document).ready(function() {
 		});
 
 	 $("#reset").click("click", function() {// 绑定查询按扭
-		  $("#searchForm  input").val("");
-		  // $("#searchForm  select").val("");
-		 	$("#xmName").val("");
+	 	$("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#xmName").val("");
 		  $("#searchForm  .select-item").html("");
 		  $('#actTable').bootstrapTable('refresh');
 		});
@@ -177,7 +173,6 @@ $(document).ready(function() {
     }
 
   function deleteAll(){
-
 		jp.confirm('确认要删除该发起任务记录吗？', function(){
 			jp.loading();
 			jp.get("${ctx}/task/todo/act/deleteAll?ids=" + getIdSelections(), function(data){

src/main/webapp/webpage/modules/sg/managementcenter/activiti/discloseList.js

@@ -23,23 +23,23 @@ $(document).ready(function() {
     	       minimumCountColumns: 2,
                //是否显示行间隔色
                striped: true,
-               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
-               cache: false,    
-               //是否显示分页（*）  
-               pagination: true,   
-                //排序方式 
-               sortOrder: "asc",  
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+               cache: false,
+               //是否显示分页（*）
+               pagination: true,
+                //排序方式
+               sortOrder: "asc",
                //初始化加载第一页，默认第一页
-               pageNumber:1,   
-               //每页的记录行数（*）   
+               pageNumber:1,
+               //每页的记录行数（*）
                pageSize: 10,
-               //可供选择的每页的行数（*）    
+               //可供选择的每页的行数（*）
                pageList: [5,10, 25, 50, 100],
-               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
                url: "${ctx}/managementcenter/activiti/data",
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
-               //queryParamsType:'',   
-               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               //queryParamsType:'',
+               ////查询参数,每次调用是会带上这个参数，可自定义
                queryParams : function(params) {
                	var searchParam = $("#searchForm").serializeJSON();
                	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
@@ -68,169 +68,252 @@ $(document).ready(function() {
                    	  			jp.error(data.msg);
                    	  		}
                    	  	})
-                   	   
+
                    	});
-                      
-                   } 
+
+                   }
                },
-              
+
                onClickRow: function(row, $el){
                },
                	onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
                columns: [{
-                       field: 'projectNumber',
-                       title: '工程定义号',
+                       field: 'reserveProjectName',
+                       title: '储备项目暂定名称',
                        width:120
                    }
                    ,{
                        field: 'projectId',
                        title: '项目定义号',
-                       width:110
+                       width:160
                    }
                    ,{
-                       field: 'disclose.requireName',
-                       title: '需求项目名称',
-                       width:110
+                       field: 'disclose.hasImplemented',
+                       title: '是否已实施',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.channel',
-                       title: '施工通道',
-                       width:110
+                       field: 'disclose.sceneDescription',
+                       title: '现场情况描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.capacity',
-                       title: '设备基础是否可以扩容',
-                       width:110
+                       field: 'disclose.isImplement',
+                       title: '是否有实施必要性',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.sceneSize',
-                       title: '现场设备尺寸',
-                       width:110
+                       field: 'disclose.noImplementation',
+                       title: '实施无必要描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.capacitySize',
-                       title: '最多可扩容尺寸',
-                       width:110
+                       field: 'disclose.whetherComplete',
+                       title: '图纸是否完整',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.hiddenDanger',
-                       title: '方案安全隐患',
-                       width:110
+                       field: 'disclose.drawingDescription',
+                       title: '图纸完整性描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.influenceConstruction',
-                       title: '是否存在低压或通信线等影响施工',
-                       width:110
+                       field: 'disclose.whetherStandard',
+                       title: '图纸是否规范',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.projectRepetition',
-                       title: '立项重复',
-                       width:110
+                       field: 'disclose.normativeDrawings',
+                       title: '图纸规范性描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.implemented',
-                       title: '是否已实施',
-                       width:110
+                       field: 'disclose.whetherDrawing',
+                       title: '是否存在典设图问题',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.transformer',
-                       title: '变压器无负荷',
-                       width:110
+                       field: 'disclose.problemDescription',
+                       title: '典设图问题描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.explanationOfNecessity',
-                       title: '必要性问题说明',
-                       width:110
+                       field: 'disclose.whetherChannel',
+                       title: '是否存在施工通道',
+                       width:160
                    }
                    ,{
                        field: 'disclose.lineName',
                        title: '线路名称一致性',
-                       width:110
+                       width:160
                    }
                    ,{
-                       field: 'disclose.quantities',
-                       title: '工程量是否一致',
-                       width:110
+                       field: 'disclose.constructionDescription',
+                       title: '施工通道情况描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.rodNumber',
-                       title: '设备、开关、杆号一致性',
-                       width:110
+                       field: 'disclose.civilAdjusted',
+                       title: '土建是否需要调整',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.inconsistentDescription',
-                       title: '图纸现场不一致说明',
-                       width:110
+                       field: 'disclose.descriptionPlans',
+                       title: '土建方案变更内容描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.administrationType',
-                       title: '政处类型',
-                       width:110
+                       field: 'disclose.descriptionAdjustment',
+                       title: '土建工作量调整内容描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.precondition',
-                       title: '前置条件',
-                       width:110
+                       field: 'disclose.electricalAdjusted',
+                       title: '电气方案是否需要调整',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.policyHandlingInstructions',
-                       title: '政策处理说明',
-                       width:110
+                       field: 'disclose.adjustmentDescription',
+                       title: '调整原因描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.placementMode',
-                       title: 'DTU安放方式核查',
-                       width:110
+                       field: 'disclose.doesChange',
+                       title: '自动化是否需要变更',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.productionDate',
-                       title: '核查环网柜生产日期',
-                       width:110
+                       field: 'disclose.automatedContent',
+                       title: '自动化方案调整内容',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.IntegrateModule',
-                       title: '二次是否是集成模块',
-                       width:110
+                       field: 'disclose.automatedAdjustment',
+                       title: '自动化工作内容调整',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.needReplace',
-                       title: 'PT是否需要更换',
-                       width:110
+                       field: 'disclose.otherAdjusted',
+                       title: '其他方案是否需要调整',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.overallTransformation',
-                       title: '设备是否有整体改造的必要',
-                       width:110
+                       field: 'disclose.descriptionReasons',
+                       title: '其他方案调整原因描述',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.otherProblem',
-                       title: '其它问题描述',
-                       width:110
+                       field: 'disclose.difficultResolve',
+                       title: '是否存在难以解决的政处',
+                       width:160
                    }
                    ,{
-                       field: 'disclose.implementedContent',
-                       title: '已实施内容描述',
-                       width:110
+                       field: 'disclose.designChanges',
+                       title: '是否需要进行设计变更',
+                       width:160
+                   },{
+                       field: 'disclose.affairsDescription',
+                       title: '政处问题描述',
+                       width:160
+                   },{
+                       field: 'disclose.planningRequired',
+                       title: '是否需要规划报批',
+                       width:160
+                   },{
+                       field: 'disclose.highSpeed',
+                       title: '//是否涉及高铁、高速',
+                       width:160
+                   },{
+                       field: 'disclose.affairsOffice',
+                       title: '是否存在复杂民事政处',
+                       width:160
+                   },{
+                       field: 'disclose.preconditions',
+                       title: '图纸方案是否存在前置条件',
+                       width:160
+                   },{
+                       field: 'disclose.preconditionDescription',
+                       title: '前置条件描述',
+                       width:160
+                   },{
+                       field: 'disclose.customizedMaterials',
+                       title: '是否需要定制物资',
+                       width:160
+                   },{
+                       field: 'disclose.customizedCan',
+                       title: '是否能定制',
+                       width:160
+                   },{
+                       field: 'disclose.reasonDescription',
+                       title: '定制原因描述',
+                       width:160
+                   },{
+                       field: 'disclose.materialDescription',
+                       title: '定制物资描述',
+                       width:160
+                   },{
+                       field: 'disclose.demolitionMaterials',
+                       title: '拆旧物资是否与设计一致',
+                       width:160
+                   },{
+                       field: 'disclose.modelDescription',
+                       title: '型号不一致描述',
+                       width:160
+                   },{
+                       field: 'disclose.quantityDescription',
+                       title: '数量不一致描述',
+                       width:160
+                   },{
+                       field: 'disclose.drawingAnnotation',
+                       title: '图纸标注是否存在问题',
+                       width:160
+                   },{
+                       field: 'disclose.drawingProblem',
+                       title: '图纸标注问题描述',
+                       width:160
+                   },{
+                       field: 'disclose.powerOutage',
+                       title: '是否存在停电问题',
+                       width:160
+                   },{
+                       field: 'disclose.powerProblem',
+                       title: '停电问题问题描述',
+                       width:160
+                   },{
+                       field: 'disclose.nearLiveLine',
+                       title: '是否邻近带电线路',
+                       width:160
+                   },{
+                       field: 'disclose.highVoltageLine',
+                       title: '是否下穿高压线路',
+                       width:160
+                   },{
+                       field: 'disclose.complexPipeline',
+                       title: '是否存在复杂管线',
+                       width:160
+                   },{
+                       field: 'disclose.complicatedPower',
+                       title: '是否涉及复杂停电',
+                       width:160
                    }
 		     ]
-		
 		});
-		
-		  
+
+
 	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
 
-		 
+
 		  $('#projectTable').bootstrapTable("toggleView");
 		}
-	  
+
 	  $('#projectTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
                 'check-all.bs.table uncheck-all.bs.table', function () {
             $('#remove').prop('disabled', ! $('#projectTable').bootstrapTable('getSelections').length);
             $('#view,#edit').prop('disabled', $('#projectTable').bootstrapTable('getSelections').length!=1);
         });
-		  
+
 		$("#btnImport").click(function(){
 			jp.open({
 			    type: 2,
@@ -256,7 +339,7 @@ $(document).ready(function() {
 				  btn2: function(index){
 					//  jp.close(index);
 	    	       }
-			}); 
+			});
 		});
     $("#btnImportPicking").click(function(){
         jp.open({
@@ -292,18 +375,18 @@ $(document).ready(function() {
     //     jp.downloadFile('${ctx}/sg/managementcenter/project/export1');
     // });
 
-		    
+
 	  $("#search").click("click", function() {// 绑定查询按扭
 		  $('#projectTable').bootstrapTable('refresh');
 		});
-	 
+
 	 $("#reset").click("click", function() {// 绑定查询按扭
 		  $("#searchForm  input").val("");
 		  $("#searchForm  select").val("");
 		  $("#searchForm  .select-item").html("");
 		  $('#projectTable').bootstrapTable('refresh');
 		});
-		
+
 		$('#beginBeginDate').datetimepicker({
 			 format: "YYYY-MM-DD HH:mm:ss"
 		});
@@ -313,19 +396,19 @@ $(document).ready(function() {
 		$('#endDate').datetimepicker({
 			 format: "YYYY-MM-DD HH:mm:ss"
 		});
-		
+
 	});
-		
+
   function getIdSelections() {
         return $.map($("#projectTable").bootstrapTable('getSelections'), function (row) {
             return row.id
         });
     }
-  
+
   function deleteAll(){
 
 		jp.confirm('确认要删除该项目管理表单记录吗？', function(){
-			jp.loading();  	
+			jp.loading();
 			jp.get("${ctx}/sg/managementcenter/project/deleteAll?ids=" + getIdSelections(), function(data){
          	  		if(data.success){
          	  			$('#projectTable').bootstrapTable('refresh');
@@ -334,7 +417,7 @@ $(document).ready(function() {
          	  			jp.error(data.msg);
          	  		}
          	  	})
-          	   
+
 		})
   }
 
@@ -342,20 +425,20 @@ $(document).ready(function() {
   function refresh(){
   	$('#projectTable').bootstrapTable('refresh');
   }
-  
+
    function add(){
 	  jp.openSaveDialog('新增项目管理表单', "${ctx}/sg/managementcenter/project/form",'800px', '500px');
   }
 
 
-  
+
    function edit(id){//没有权限时，不显示确定按钮
        if(id == undefined){
 	      id = getIdSelections();
 	}
 	jp.openSaveDialog('编辑项目管理表单', "${ctx}/sg/managementcenter/project/form?id=" + id, '800px', '500px');
   }
-  
+
  function view(id){//没有权限时，不显示确定按钮
       if(id == undefined){
              id = getIdSelections();

src/main/webapp/webpage/modules/sg/managementcenter/activiti/discloseList.jsp

@@ -21,12 +21,12 @@
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="construction" class="form form-horizontal well clearfix">
 					<div class="col-xs-12 col-sm-6 col-md-4">
-						<label class="label-item single-overflow pull-left" title="项目需求名称：">项目定义号：</label>
-						<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+						<label class="label-item single-overflow pull-left" title="储备项目名称：">项目定义号：</label>
+						<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
-						<label class="label-item single-overflow pull-left" title="项目需求名称：">项目需求名称：</label>
-						<form:input path="disclose.requireName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+						<label class="label-item single-overflow pull-left" title="项目需求名称：">项目定义号：</label>
+						<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
 						<div style="margin-top:26px">

src/main/webapp/webpage/modules/sg/managementcenter/project/closureManagement.jsp

@@ -22,7 +22,7 @@
 				<form:form id="searchForm" modelAttribute="project" class="form form-horizontal well clearfix">
 					<div class="col-xs-12 col-sm-6 col-md-4">
 						<label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
-						<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+						<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
 						<div style="margin-top:26px">