Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/DataMaintenanceMapper.java

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1035,6 +1035,38 @@ public class ActTaskService extends BaseService {
 
 	}
 
+	/**
+	 * 保存审核意见
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void newAuditSave(Act act) {
+		// 设置意见
+		if ("yes".equals(act.getFlag())) {
+			act.setComment("[项目经理]");
+		} else if ("yes".equals(act.getFlag())) {
+			act.setComment("[施工单位]");
+		} else {
+			act.setComment("[驳回]");
+		}
+/*		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());*/
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		if ("manager".equals(act.getFlag())) {
+			vars.put("manager", "manager");
+		} else if ("company".equals(act.getFlag())) {
+			vars.put("company","company" );
+		} else {
+			vars.put("reject", "reject");
+		}
+		/*vars.put("pass", "yes".equals(act.getFlag())? true : false);*/
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+
 
 	/**
 	 * 判断下一个节点是互斥网关还是用户任务节点

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

@@ -367,6 +367,20 @@ public class ActTaskController extends BaseController {
 	}
 
 	/**
+	 * 施工交底审批
+	 * @param act*/
+
+
+	@ResponseBody
+	@RequestMapping(value = "newAudit")
+	public AjaxJson newAuditTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		actTaskService.newAuditSave(act);
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
 	 * 取回流程
 	 * @param taskId
 	 */

src/main/java/com/jeeplus/modules/sg/audit/information/mapper/xml/InformationMapper.xml

@@ -256,6 +256,9 @@
             <if test="firstUnits != null and firstUnits != '' ">
                 AND a.first_units=#{firstUnits}
             </if>
+			<if test="projectYear !=null and projectYear != ''">
+				and a.project_year = #{projectYear}
+			</if>
         	<if test="projectType !=null and projectType != ''">
 				and a.project_type = #{projectType}
 			</if>

src/main/java/com/jeeplus/modules/sg/audit/information/web/InformationController.java

@@ -4,6 +4,7 @@
 package com.jeeplus.modules.sg.audit.information.web;
 
 import java.io.*;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -446,40 +447,40 @@ public class InformationController extends BaseController {
         String extendedTime = "";
         String hiddenSign = "";
         try {
-            projectId = request.getParameter("projectId");
-            projectId = new String(projectId.getBytes("iso8859-1"), "utf-8");
+            projectId = (String)request.getParameter("projectId");
+            projectId = URLDecoder.decode(projectId,"UTF-8");
             if (projectId.equals("")) {
 
             } else {
                 String[] strArr = projectId.split("\\s+");
                 information.setAttrs(strArr);
             }
-            projectName = request.getParameter("projectName");
-            projectName = new String(projectName.getBytes("iso8859-1"), "utf-8");
+            projectName = (String)request.getParameter("projectName");
+            projectName = URLDecoder.decode(projectName,"UTF-8");
+            projectType = (String)request.getParameter("projectType");
+            projectType = URLDecoder.decode(projectType,"UTF-8");
+            projectYear = (String)request.getParameter("projectYear");
+            projectYear = URLDecoder.decode(projectYear,"UTF-8");
+            firstUnits = (String)request.getParameter("firstUnits");
+            firstUnits = URLDecoder.decode(firstUnits,"UTF-8");
+            secondUnits = (String)request.getParameter("secondUnits");
+            secondUnits = URLDecoder.decode(secondUnits,"UTF-8");
+            firstFinish = (String)request.getParameter("firstFinish");
+            firstFinish = URLDecoder.decode(firstFinish,"UTF-8");
+            extendedStatus = (String)request.getParameter("extendedStatus");
+            extendedStatus = URLDecoder.decode(extendedStatus,"UTF-8");
+            extendedTime = (String)request.getParameter("extendedTime");
+            extendedTime = URLDecoder.decode(extendedTime,"UTF-8");
+            hiddenSign = (String)request.getParameter("hiddenSign");
+            hiddenSign = URLDecoder.decode(hiddenSign,"UTF-8");
             information.setProjectName(projectName);
-            projectType = request.getParameter("projectType");
-            projectType = new String(projectType.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectType);
-            projectYear = request.getParameter("projectYear");
-            projectYear = new String(projectYear.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectYear);
-            firstUnits = request.getParameter("firstUnits");
-            firstUnits = new String(firstUnits.getBytes("iso8859-1"), "utf-8");
             information.setFirstUnits(firstUnits);
-            secondUnits = request.getParameter("secondUnits");
-            secondUnits = new String(secondUnits.getBytes("iso8859-1"), "utf-8");
             information.setSecondUnits(secondUnits);
-            firstFinish = request.getParameter("firstFinish");
-            firstFinish = new String(firstFinish.getBytes("iso8859-1"), "utf-8");
             information.setFirstFinish(firstFinish);
-            extendedStatus = request.getParameter("extendedStatus");
-            extendedStatus = new String(extendedStatus.getBytes("iso8859-1"), "utf-8");
             information.setExtendedStatus(extendedStatus);
-            extendedTime = request.getParameter("extendedTime");
-            extendedTime = new String(extendedTime.getBytes("iso8859-1"), "utf-8");
             information.setExtendedTime(extendedTime);
-            hiddenSign = request.getParameter("hiddenSign");
-            hiddenSign = new String(hiddenSign.getBytes("iso8859-1"), "utf-8");
             information.setHiddenSign(hiddenSign);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -544,40 +545,40 @@ public class InformationController extends BaseController {
         String extendedTime = "";
         String hiddenSign = "";
         try {
-            projectId = request.getParameter("projectId");
-            projectId = new String(projectId.getBytes("iso8859-1"), "utf-8");
+            projectId = (String)request.getParameter("projectId");
+            projectId = URLDecoder.decode(projectId,"UTF-8");
             if (projectId.equals("")) {
 
             } else {
                 String[] strArr = projectId.split("\\s+");
                 information.setAttrs(strArr);
             }
-            projectName = request.getParameter("projectName");
-            projectName = new String(projectName.getBytes("iso8859-1"), "utf-8");
+            projectName = (String)request.getParameter("projectName");
+            projectName = URLDecoder.decode(projectName,"UTF-8");
+            projectType = (String)request.getParameter("projectType");
+            projectType = URLDecoder.decode(projectType,"UTF-8");
+            projectYear = (String)request.getParameter("projectYear");
+            projectYear = URLDecoder.decode(projectYear,"UTF-8");
+            firstUnits = (String)request.getParameter("firstUnits");
+            firstUnits = URLDecoder.decode(firstUnits,"UTF-8");
+            secondUnits = (String)request.getParameter("secondUnits");
+            secondUnits = URLDecoder.decode(secondUnits,"UTF-8");
+            firstFinish = (String)request.getParameter("firstFinish");
+            firstFinish = URLDecoder.decode(firstFinish,"UTF-8");
+            extendedStatus = (String)request.getParameter("extendedStatus");
+            extendedStatus = URLDecoder.decode(extendedStatus,"UTF-8");
+            extendedTime = (String)request.getParameter("extendedTime");
+            extendedTime = URLDecoder.decode(extendedTime,"UTF-8");
+            hiddenSign = (String)request.getParameter("hiddenSign");
+            hiddenSign = URLDecoder.decode(hiddenSign,"UTF-8");
             information.setProjectName(projectName);
-            projectType = request.getParameter("projectType");
-            projectType = new String(projectType.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectType);
-            projectYear = request.getParameter("projectYear");
-            projectYear = new String(projectYear.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectYear);
-            firstUnits = request.getParameter("firstUnits");
-            firstUnits = new String(firstUnits.getBytes("iso8859-1"), "utf-8");
             information.setFirstUnits(firstUnits);
-            secondUnits = request.getParameter("secondUnits");
-            secondUnits = new String(secondUnits.getBytes("iso8859-1"), "utf-8");
             information.setSecondUnits(secondUnits);
-            firstFinish = request.getParameter("firstFinish");
-            firstFinish = new String(firstFinish.getBytes("iso8859-1"), "utf-8");
             information.setFirstFinish(firstFinish);
-            extendedStatus = request.getParameter("extendedStatus");
-            extendedStatus = new String(extendedStatus.getBytes("iso8859-1"), "utf-8");
             information.setExtendedStatus(extendedStatus);
-            extendedTime = request.getParameter("extendedTime");
-            extendedTime = new String(extendedTime.getBytes("iso8859-1"), "utf-8");
             information.setExtendedTime(extendedTime);
-            hiddenSign = request.getParameter("hiddenSign");
-            hiddenSign = new String(hiddenSign.getBytes("iso8859-1"), "utf-8");
             information.setHiddenSign(hiddenSign);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -641,40 +642,40 @@ public class InformationController extends BaseController {
         String extendedTime = "";
         String hiddenSign = "";
         try {
-            projectId = request.getParameter("projectId");
-            projectId = new String(projectId.getBytes("iso8859-1"), "utf-8");
+            projectId = (String)request.getParameter("projectId");
+            projectId = URLDecoder.decode(projectId,"UTF-8");
             if (projectId.equals("")) {
 
             } else {
                 String[] strArr = projectId.split("\\s+");
                 information.setAttrs(strArr);
             }
-            projectName = request.getParameter("projectName");
-            projectName = new String(projectName.getBytes("iso8859-1"), "utf-8");
+            projectName = (String)request.getParameter("projectName");
+            projectName = URLDecoder.decode(projectName,"UTF-8");
+            projectType = (String)request.getParameter("projectType");
+            projectType = URLDecoder.decode(projectType,"UTF-8");
+            projectYear = (String)request.getParameter("projectYear");
+            projectYear = URLDecoder.decode(projectYear,"UTF-8");
+            firstUnits = (String)request.getParameter("firstUnits");
+            firstUnits = URLDecoder.decode(firstUnits,"UTF-8");
+            secondUnits = (String)request.getParameter("secondUnits");
+            secondUnits = URLDecoder.decode(secondUnits,"UTF-8");
+            firstFinish = (String)request.getParameter("firstFinish");
+            firstFinish = URLDecoder.decode(firstFinish,"UTF-8");
+            extendedStatus = (String)request.getParameter("extendedStatus");
+            extendedStatus = URLDecoder.decode(extendedStatus,"UTF-8");
+            extendedTime = (String)request.getParameter("extendedTime");
+            extendedTime = URLDecoder.decode(extendedTime,"UTF-8");
+            hiddenSign = (String)request.getParameter("hiddenSign");
+            hiddenSign = URLDecoder.decode(hiddenSign,"UTF-8");
             information.setProjectName(projectName);
-            projectType = request.getParameter("projectType");
-            projectType = new String(projectType.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectType);
-            projectYear = request.getParameter("projectYear");
-            projectYear = new String(projectYear.getBytes("iso8859-1"), "utf-8");
             information.setProjectType(projectYear);
-            firstUnits = request.getParameter("firstUnits");
-            firstUnits = new String(firstUnits.getBytes("iso8859-1"), "utf-8");
             information.setFirstUnits(firstUnits);
-            secondUnits = request.getParameter("secondUnits");
-            secondUnits = new String(secondUnits.getBytes("iso8859-1"), "utf-8");
             information.setSecondUnits(secondUnits);
-            firstFinish = request.getParameter("firstFinish");
-            firstFinish = new String(firstFinish.getBytes("iso8859-1"), "utf-8");
             information.setFirstFinish(firstFinish);
-            extendedStatus = request.getParameter("extendedStatus");
-            extendedStatus = new String(extendedStatus.getBytes("iso8859-1"), "utf-8");
             information.setExtendedStatus(extendedStatus);
-            extendedTime = request.getParameter("extendedTime");
-            extendedTime = new String(extendedTime.getBytes("iso8859-1"), "utf-8");
             information.setExtendedTime(extendedTime);
-            hiddenSign = request.getParameter("hiddenSign");
-            hiddenSign = new String(hiddenSign.getBytes("iso8859-1"), "utf-8");
             information.setHiddenSign(hiddenSign);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();

src/main/java/com/jeeplus/modules/sg/audit/report/mapper/xml/ReportMapper.xml

@@ -202,13 +202,13 @@
 			1=1
 			<if test="type!=null and type!=''">
 				<if test="type==0">
-					and a.department = #{condition}
+					and a.department like concat('%',#{condition},'%')
 				</if>
 				<if test="type==1">
-					and a.underCentralized = #{condition}
+					and a.underCentralized like concat('%',#{condition},'%')
 				</if>
 				<if test="type==2">
-					and a.second_units = #{condition}
+					and a.second_units like concat('%',#{condition},'%')
 				</if>
 			</if>
 			<if test="status!=null and status !=''">

src/main/java/com/jeeplus/modules/sg/audit/report/web/ReportController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -311,8 +312,12 @@ public class ReportController {
     public AjaxJson exportInformation(SgReport sgReport,HttpServletRequest request, HttpServletResponse response) {
         AjaxJson j = new AjaxJson();
         try {
+/*
             String condition =  request.getParameter("condition");
             condition = new String(condition.getBytes("iso8859-1"), "utf-8");
+*/
+            String condition = (String)request.getParameter("condition");
+            condition = URLDecoder.decode(condition,"UTF-8");
             String status =  request.getParameter("status");
             String type =  request.getParameter("type");
             sgReport.setStatus(status);

src/main/java/com/jeeplus/modules/sg/financial/settlement/entity/MaintainData.java

@@ -8,6 +8,11 @@ import java.util.Date;
 
 public class MaintainData extends DataEntity<MaintainData> {
     private String projectId;     //项目定义号
+    private String designUnits;    //设计单位
+    private String constructionUnits;    //施工单位
+    private String address;    //建筑地址
+    private String property;    //建筑属性
+    private String investment;    //发文总投资
     private Date startDate;      //开工时间
     private Date endDate;        //竣工时间
     private String approvalNumber;     //审批文号
@@ -51,6 +56,46 @@ public class MaintainData extends DataEntity<MaintainData> {
         this.projectId = projectId;
     }
 
+    public String getDesignUnits() {
+        return designUnits;
+    }
+
+    public void setDesignUnits(String designUnits) {
+        this.designUnits = designUnits;
+    }
+
+    public String getConstructionUnits() {
+        return constructionUnits;
+    }
+
+    public void setConstructionUnits(String constructionUnits) {
+        this.constructionUnits = constructionUnits;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property;
+    }
+
+    public String getInvestment() {
+        return investment;
+    }
+
+    public void setInvestment(String investment) {
+        this.investment = investment;
+    }
+
     @ExcelField(title="开工时间", align=2, sort=2)
     @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getStartDate() {

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/DataMaintenanceMapper.java

@@ -14,6 +14,4 @@ import java.util.List;
 @MyBatisMapper
 public interface DataMaintenanceMapper extends BaseMapper<MaintainData> {
 	int insertList(@Param("list") List<MaintainData> list);
-
-	List<MaintainData> getFindListMain(String[] ids);
 }

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DataMaintenanceMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.jeeplus.modules.sg.financial.settlement.mapper.DataMaintenanceMapper">
     
 	<sql id="infoColumns">
-		a.id AS "id",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
@@ -11,6 +10,11 @@
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
 		a.project_id AS "projectId",
+		a.design_units AS "designUnits",
+		a.construction_units AS "constructionUnits",
+		a.address,
+		a.property,
+		a.investment,
 		a.start_date AS "startDate",
 		a.end_date AS "endDate",
 		a.approval_number AS "approvalNumber",
@@ -31,7 +35,7 @@
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM js_maintain_data a
-		WHERE a.id = #{id}
+		WHERE a.project_id = #{id}
 	</select>
 	
 	<select id="findList" resultType="MaintainData" >
@@ -78,7 +82,7 @@
 	
 	<insert id="insert">
 		INSERT INTO js_maintain_data(
-			id,
+
 			create_by,
 			create_date,
 			update_by,
@@ -86,6 +90,11 @@
 			remarks,
 			del_flag,
 			project_id,
+			design_units,
+		    construction_units,
+		    address,
+		    property,
+		    investment,
 			start_date,
 			end_date,
 			approval_number,
@@ -100,7 +109,7 @@
 			management_fee,
 			total_fee
 		) VALUES (
-			#{id},
+
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
@@ -108,6 +117,11 @@
 			#{remarks},
 			#{delFlag},
 			#{projectId},
+			#{designUnits},
+			#{constructionUnits},
+			#{address},
+			#{property},
+			#{investment},
 			#{startDate},
 			#{endDate},
 			#{approvalNumber},
@@ -126,7 +140,6 @@
 
     <insert id="insertList">
         replace INTO js_maintain_data(
-			id,
 			create_by,
 			create_date,
 			update_by,
@@ -134,6 +147,11 @@
 			remarks,
 			del_flag,
 			project_id,
+		    design_units,
+		    construction_units,
+		    address,
+		    property,
+		    investment,
 			start_date,
 			end_date,
 			approval_number,
@@ -150,7 +168,7 @@
 		) VALUES
         <foreach collection="list" item="item" index="index" separator="," >
 		(
-			#{item.id},
+
 			#{item.createBy.id},
 			#{item.createDate},
 			#{item.updateBy.id},
@@ -158,6 +176,11 @@
 			#{item.remarks},
 			#{item.delFlag},
 			#{item.projectId},
+			#{item.designUnits},
+			#{item.constructionUnits},
+			#{item.address},
+			#{item.property},
+			#{item.investment},
 			#{item.startDate},
 			#{item.endDate},
 			#{item.approvalNumber},
@@ -179,9 +202,12 @@
 		UPDATE js_maintain_data SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
-			remarks = #{remarks},
+			design_units = #{designUnits},
+			construction_units = #{constructionUnits},
+			address = #{address},
+			property = #{property},
+			investment = #{investment},
 			start_date = #{startDate},
-			project_id = #{projectId},
 			end_date = #{endDate},
 			approval_number = #{approvalNumber},
 			building_fee = #{buildingFee},
@@ -194,21 +220,26 @@
 			damages = #{damages},
 			management_fee = #{managementFee},
 			total_fee = #{totalFee}
-		WHERE id = #{id}
+		WHERE project_id = #{id}
 	</update>
 	
 	
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM js_maintain_data
-		WHERE id = #{id}
+		WHERE project_id = #{id}
+	</update>
+
+	<update id="deleteData">
+		DELETE FROM js_maintain_data
+		WHERE project_id = #{projectId}
 	</update>
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
 		UPDATE js_maintain_data SET
 			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
+		WHERE project_id = #{id}
 	</update>
 	
 	

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DataMaintenanceService.java

@@ -56,6 +56,11 @@ public class DataMaintenanceService extends CrudService<DataMaintenanceMapper, M
 		super.delete(maintainData);
 	}
 
+	@Transactional(readOnly = false)
+	public void deleteData(String projectId){
+		dataMaintenanceMapper.deleteData(projectId);
+	}
+
 
 	public void export(MaintainData maintainData , HttpServletResponse response){
 		Workbook workbook = null;

src/main/java/com/jeeplus/modules/sg/financial/settlement/util/ExcelWriter.java

@@ -1,6 +1,7 @@
 package com.jeeplus.modules.sg.financial.settlement.util;
 
 
+import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
@@ -60,12 +61,17 @@ public class ExcelWriter {
         sheet.addMergedRegion(new CellRangeAddress(2, 0, 1, 1));
         sheet.addMergedRegion(new CellRangeAddress(2, 0, 2, 2));
         sheet.addMergedRegion(new CellRangeAddress(2, 0, 3, 3));
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 4, 13));
-        sheet.addMergedRegion(new CellRangeAddress(2, 1, 4, 4));
-        sheet.addMergedRegion(new CellRangeAddress(2, 1, 5, 5));
-        sheet.addMergedRegion(new CellRangeAddress(2, 1, 6, 6));
-        sheet.addMergedRegion(new CellRangeAddress(2, 1, 7, 7));
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 8, 13));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 4, 4));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 5, 5));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 6, 6));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 7, 7));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 8, 8));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 9, 18));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 9, 9));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 10, 10));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 11, 11));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 12, 12));
+        sheet.addMergedRegion(new CellRangeAddress(1, 1, 13, 18));
         // 构建头单元格样式
         styles = createStyles(sheet.getWorkbook());
         CellStyle cellStyle = buildHeadCellStyle(sheet.getWorkbook());
@@ -79,13 +85,28 @@ public class ExcelWriter {
         Cell cell1 = row1.createCell(0);
         cell1.setCellValue("项目定义编码");
         cell1.setCellStyle(styles.get("header"));
-        Cell cell2 = row1.createCell(1);
+        Cell cella1 = row1.createCell(1);
+        cella1.setCellValue("设计单位");
+        cella1.setCellStyle(styles.get("header"));
+        Cell cellb1 = row1.createCell(2);
+        cellb1.setCellValue("施工单位");
+        cellb1.setCellStyle(styles.get("header"));
+        Cell cellc1 = row1.createCell(3);
+        cellc1.setCellValue("建筑地址");
+        cellc1.setCellStyle(styles.get("header"));
+        Cell celld1 = row1.createCell(4);
+        celld1.setCellValue("建筑属性");
+        celld1.setCellStyle(styles.get("header"));
+        Cell celle1 = row1.createCell(5);
+        celle1.setCellValue("发文总投资");
+        celle1.setCellStyle(styles.get("header"));
+        Cell cell2 = row1.createCell(6);
         cell2.setCellValue("开工时间");
         cell2.setCellStyle(styles.get("header"));
-        Cell cell3 = row1.createCell(2);
+        Cell cell3 = row1.createCell(7);
         cell3.setCellValue("竣工时间");
         cell3.setCellStyle(styles.get("header"));
-        Cell cell4 = row1.createCell(3);
+        Cell cell4 = row1.createCell(8);
         cell4.setCellValue("批准文号");
         cell4.setCellStyle(styles.get("header"));
 
@@ -93,90 +114,120 @@ public class ExcelWriter {
         Cell cella = row2.createCell(0);
         cella.setCellValue("");
         cella.setCellStyle(styles.get("header"));
-        Cell cellb = row2.createCell(1);
+        Cell cella2 = row2.createCell(1);
+        cella2.setCellValue("");
+        cella2.setCellStyle(styles.get("header"));
+        Cell cella3 = row2.createCell(2);
+        cella3.setCellValue("");
+        cella3.setCellStyle(styles.get("header"));
+        Cell cella4 = row2.createCell(3);
+        cella4.setCellValue("");
+        cella4.setCellStyle(styles.get("header"));
+        Cell cella5 = row2.createCell(4);
+        cella5.setCellValue("");
+        cella5.setCellStyle(styles.get("header"));
+        Cell cella6 = row2.createCell(5);
+        cella6.setCellValue("");
+        cella6.setCellStyle(styles.get("header"));
+        Cell cellb = row2.createCell(6);
         cellb.setCellValue("");
         cellb.setCellStyle(styles.get("header"));
-        Cell cellc = row2.createCell(2);
+        Cell cellc = row2.createCell(7);
         cellc.setCellValue("");
         cellc.setCellStyle(styles.get("header"));
-        Cell celld = row2.createCell(3);
+        Cell celld = row2.createCell(8);
         celld.setCellValue("");
         celld.setCellStyle(styles.get("header"));
 
-        Cell cellm = row2.createCell(9);
+        Cell cellm = row2.createCell(14);
         cellm.setCellValue("");
         cellm.setCellStyle(styles.get("header"));
-        Cell celln = row2.createCell(10);
+        Cell celln = row2.createCell(15);
         celln.setCellValue("");
         celln.setCellStyle(styles.get("header"));
-        Cell cello = row2.createCell(11);
+        Cell cello = row2.createCell(16);
         cello.setCellValue("");
         cello.setCellStyle(styles.get("header"));
-        Cell cellp = row2.createCell(12);
+        Cell cellp = row2.createCell(17);
         cellp.setCellValue("");
         cellp.setCellStyle(styles.get("header"));
-        Cell cellq = row2.createCell(13);
+        Cell cellq = row2.createCell(18);
         cellq.setCellValue("");
         cellq.setCellStyle(styles.get("header"));
 
         Cell celle = row3.createCell(0);
         celle.setCellValue("");
         celle.setCellStyle(styles.get("header"));
-        Cell cellf = row3.createCell(1);
+        Cell celle6 = row3.createCell(1);
+        celle6.setCellValue("");
+        celle6.setCellStyle(styles.get("header"));
+        Cell celle2 = row3.createCell(2);
+        celle2.setCellValue("");
+        celle2.setCellStyle(styles.get("header"));
+        Cell celle3 = row3.createCell(3);
+        celle3.setCellValue("");
+        celle3.setCellStyle(styles.get("header"));
+        Cell celle4 = row3.createCell(4);
+        celle4.setCellValue("");
+        celle4.setCellStyle(styles.get("header"));
+        Cell celle5 = row3.createCell(5);
+        celle5.setCellValue("");
+        celle5.setCellStyle(styles.get("header"));
+        Cell cellf = row3.createCell(6);
         cellf.setCellValue("");
         cellf.setCellStyle(styles.get("header"));
-        Cell cellg = row3.createCell(2);
+        Cell cellg = row3.createCell(7);
         cellg.setCellValue("");
         cellg.setCellStyle(styles.get("header"));
-        Cell cellh = row3.createCell(3);
+        Cell cellh = row3.createCell(8);
         cellh.setCellValue("");
         cellh.setCellStyle(styles.get("header"));
 
-        Cell cell5 = row1.createCell(4);
+        Cell cell5 = row1.createCell(9);
         cell5.setCellValue("概算数");
         cell5.setCellStyle(styles.get("header"));
-        Cell cell6 = row2.createCell(4);
+        Cell cell6 = row2.createCell(9);
         cell6.setCellValue("建筑费");
         cell6.setCellStyle(styles.get("header"));
-        Cell cell7 = row2.createCell(5);
+        Cell cell7 = row2.createCell(10);
         cell7.setCellValue("安装费");
         cell7.setCellStyle(styles.get("header"));
-        Cell cell8 = row2.createCell(6);
+        Cell cell8 = row2.createCell(11);
         cell8.setCellValue("设备购置费");
         cell8.setCellStyle(styles.get("header"));
 
-        Cell cellj = row3.createCell(4);
+        Cell cellj = row3.createCell(9);
         cellj.setCellValue("");
         cellj.setCellStyle(styles.get("header"));
-        Cell cellk = row3.createCell(5);
+        Cell cellk = row3.createCell(10);
         cellk.setCellValue("");
         cellk.setCellStyle(styles.get("header"));
-        Cell celll = row3.createCell(6);
+        Cell celll = row3.createCell(11);
         celll.setCellValue("");
         celll.setCellStyle(styles.get("header"));
 
-        Cell cell9 = row2.createCell(7);
+        Cell cell9 = row2.createCell(12);
         cell9.setCellValue("主材费");
         cell9.setCellStyle(styles.get("header"));
-        Cell cell10 = row2.createCell(8);
+        Cell cell10 = row2.createCell(13);
         cell10.setCellValue("其他费用");
         cell10.setCellStyle(styles.get("header"));
-        Cell cell11 = row3.createCell(8);
+        Cell cell11 = row3.createCell(13);
         cell11.setCellValue("设计费");
         cell11.setCellStyle(styles.get("header"));
-        Cell cell12 = row3.createCell(9);
+        Cell cell12 = row3.createCell(14);
         cell12.setCellValue("监理费");
         cell12.setCellStyle(styles.get("header"));
-        Cell cell13 = row3.createCell(10);
+        Cell cell13 = row3.createCell(15);
         cell13.setCellValue("项目前期工作费");
         cell13.setCellStyle(styles.get("header"));
-        Cell cell14 = row3.createCell(11);
+        Cell cell14 = row3.createCell(16);
         cell14.setCellValue("线路施工赔偿费");
         cell14.setCellStyle(styles.get("header"));
-        Cell cell15 = row3.createCell(12);
+        Cell cell15 = row3.createCell(17);
         cell15.setCellValue("法人管理费（余物清理费）");
         cell15.setCellStyle(styles.get("header"));
-        Cell cell16 = row3.createCell(13);
+        Cell cell16 = row3.createCell(18);
         cell16.setCellValue("合计");
         cell16.setCellStyle(styles.get("header"));
         return sheet;
@@ -206,6 +257,11 @@ public class ExcelWriter {
         return style;
     }
 
+    /**
+     * 设置导出表格样式
+     * @param wb
+     * @return
+     */
     private static Map<String, CellStyle> createStyles(Workbook wb) {
         Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
 
@@ -285,15 +341,51 @@ public class ExcelWriter {
         }
         cell = row.createCell(cellNum++);
         cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getDesignUnits()) {
+            cell.setCellValue(maintainData.getDesignUnits());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getConstructionUnits()) {
+            cell.setCellValue(maintainData.getConstructionUnits());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getAddress()) {
+            cell.setCellValue(maintainData.getAddress());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getProperty()) {
+            cell.setCellValue(maintainData.getProperty());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
+        if (null != maintainData.getInvestment()) {
+            cell.setCellValue(maintainData.getInvestment());
+        } else {
+            cell.setCellValue("");
+        }
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
         if (null != maintainData.getStartDate()) {
-            cell.setCellValue(maintainData.getStartDate());
+            cell.setCellValue(DateUtils.formatDate(maintainData.getStartDate()));
+
         } else {
             cell.setCellValue("");
         }
         cell = row.createCell(cellNum++);
         cell.setCellStyle(styles.get("data"));
         if (null != maintainData.getEndDate()) {
-            cell.setCellValue(maintainData.getEndDate());
+            cell.setCellValue(DateUtils.formatDate(maintainData.getEndDate()));
         } else {
             cell.setCellValue("");
         }

src/main/java/com/jeeplus/modules/sg/financial/settlement/web/DataMaintenanceController.java

@@ -64,7 +64,7 @@ public class DataMaintenanceController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(MaintainData maintainData, Model model) {
 		model.addAttribute("maintainData", maintainData);
-		return "modules/sg/settlement/dataMaintenanceList";
+		return "modules/sg/financial/settlement/dataMaintenanceList";
 	}
 	
 		/**
@@ -76,22 +76,18 @@ public class DataMaintenanceController extends BaseController {
 	public Map<String, Object> data(MaintainData maintainData, HttpServletRequest request, HttpServletResponse response, Model model,HttpSession session) {
 		String id = UserUtils.getUser().getId();
 		String state = maintainData.getState();
-		StringBuilder stringBuilder = new StringBuilder();
+		String st = "";
 		if(state.equals("0")) {
-			String st = (String) session.getAttribute(id);
-			if (StringUtils.isNotBlank(st)) {
-				stringBuilder.append(st);
-			}
+			st = (String) session.getAttribute(id);
 		}else {
 			session.removeAttribute(id);
 		}
 		String projectId = maintainData.getProjectId();
 		if(StringUtils.isNotBlank(projectId)){
-			stringBuilder.append(projectId);
+			st = projectId;
 		}
-		String newstr = stringBuilder.toString();
-		if(StringUtils.isNotBlank(newstr)){
-			String[] sts = newstr.split("\\s+");
+		if(StringUtils.isNotBlank(st)){
+			String[] sts = st.split("\\s+");
 			maintainData.setProjectIds(sts);
 		}
 		Page<MaintainData> page = dataMaintenanceService.findPage(new Page<MaintainData>(request, response), maintainData);
@@ -103,8 +99,8 @@ public class DataMaintenanceController extends BaseController {
 	@ResponseBody
 	@RequiresPermissions("sg:settlement:import")
 	@RequestMapping(value = "importsel")
-	public Map<String, Object> importSelect(@RequestParam("file")MultipartFile file, MaintainData maintainData, HttpServletResponse response, HttpServletRequest request, HttpSession session) throws IOException, InvalidFormatException {
-//		try {
+	public Map<String, Object> importSelect(@RequestParam("file")MultipartFile file, MaintainData maintainData, HttpServletResponse response, HttpServletRequest request, HttpSession session){
+		try {
 			ImportExcel importExcel = new ImportExcel(file, 1, 0);
 			int lastRow = importExcel.getLastDataRowNum();
 			StringBuilder stringBuilder = new StringBuilder();
@@ -117,16 +113,16 @@ public class DataMaintenanceController extends BaseController {
 			}
 			String st = stringBuilder.toString();
 			String sts = st.substring(0,st.length()-1);
+			//把id作为key，把查询条件存入session
 			String id = UserUtils.getUser().getId();
 			session.setAttribute(id,st);
 			String[] strs = st.split(" ");
 			maintainData.setProjectIds(strs);
 			Page<MaintainData> page = dataMaintenanceService.findPage(new Page<MaintainData>(request, response), maintainData);
 			return getBootstrapData(page);
-//			return "redirect:/a/sg/settlement/data";
-//		}catch (Exception e){
-//			return  null;
-//		}
+		}catch (Exception e){
+			return  null;
+		}
 	}
 	/**
 	 * 查看，增加，编辑表单页面
@@ -135,7 +131,7 @@ public class DataMaintenanceController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(MaintainData maintainData, Model model) {
 		model.addAttribute("maintainData", maintainData);
-		return "modules/sg/settlement/dataMaintenanceForm";
+		return "modules/sg/financial/settlement/dataMaintenanceForm";
 	}
 
 	/**
@@ -185,7 +181,7 @@ public class DataMaintenanceController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		String idArray[] =ids.split(",");
 		for(String id : idArray){
-			dataMaintenanceService.delete(dataMaintenanceService.get(id));
+			dataMaintenanceService.deleteData(id);
 		}
 		j.setMsg("删除成功");
 		return j;
@@ -257,7 +253,9 @@ public class DataMaintenanceController extends BaseController {
 		return j;
     }
 
-
+	/**
+	 *excel文件数据读取
+	 */
 	private List<MaintainData> getData(ImportExcel importExcel) throws ParseException {
 		int lastRow = importExcel.getLastDataRowNum();
 		List<MaintainData> list = new ArrayList<>();
@@ -268,25 +266,33 @@ public class DataMaintenanceController extends BaseController {
 			String projectId = (String) importExcel.getCellValue(row,0);
 			if(StringUtils.isNotBlank(projectId)) {
 				maintainData.setProjectId(projectId);
-			    maintainData.setStartDate(getDate(importExcel,row,1));
-			    maintainData.setEndDate(getDate(importExcel,row,2));
-				maintainData.setApprovalNumber((String) importExcel.getCellValue(row, 3));
-				maintainData.setBuildingFee(getDouble(importExcel,row,4));
-				maintainData.setInstallFee(getDouble(importExcel,row,5));
-				maintainData.setEquipmentFee(getDouble(importExcel,row,6));
-				maintainData.setMaterialFee(getDouble(importExcel,row,7));
-				maintainData.setDesignFee(getDouble(importExcel,row,8));
-				maintainData.setSupervisionFee(getDouble(importExcel,row,9));
-				maintainData.setPreliminaryWorkFee(getDouble(importExcel,row,10));
-				maintainData.setDamages(getDouble(importExcel,row,11));
-				maintainData.setManagementFee(getDouble(importExcel,row,12));
-				maintainData.setTotalFee(getDouble(importExcel,row,13));
+				maintainData.setDesignUnits((String) importExcel.getCellValue(row, 1));
+				maintainData.setConstructionUnits((String) importExcel.getCellValue(row, 2));
+				maintainData.setAddress((String) importExcel.getCellValue(row, 3));
+				maintainData.setProperty((String) importExcel.getCellValue(row, 4));
+				maintainData.setInvestment((String) importExcel.getCellValue(row, 5));
+			    maintainData.setStartDate(getDate(importExcel,row,6));
+			    maintainData.setEndDate(getDate(importExcel,row,7));
+				maintainData.setApprovalNumber((String) importExcel.getCellValue(row, 8));
+				maintainData.setBuildingFee(getDouble(importExcel,row,9));
+				maintainData.setInstallFee(getDouble(importExcel,row,10));
+				maintainData.setEquipmentFee(getDouble(importExcel,row,11));
+				maintainData.setMaterialFee(getDouble(importExcel,row,12));
+				maintainData.setDesignFee(getDouble(importExcel,row,13));
+				maintainData.setSupervisionFee(getDouble(importExcel,row,14));
+				maintainData.setPreliminaryWorkFee(getDouble(importExcel,row,15));
+				maintainData.setDamages(getDouble(importExcel,row,16));
+				maintainData.setManagementFee(getDouble(importExcel,row,17));
+				maintainData.setTotalFee(getDouble(importExcel,row,18));
 				list.add(maintainData);
 			}
 		}
 		return list;
 	}
 
+	/**
+	 *获取excel double类型的值
+	 */
 	private double getDouble(ImportExcel importExcel,Row row,int col){
 		double d = 0.00;
         Object o = importExcel.getCellValue(row,col);
@@ -296,7 +302,9 @@ public class DataMaintenanceController extends BaseController {
       return d;
 	}
 
-
+	/**
+	 *获取excel date类型的值
+	 */
 	private Date getDate(ImportExcel importExcel,Row row,int col) throws ParseException {
 		Date d = null;
 		Object o = importExcel.getCellValue(row,col);

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/Construction.java

@@ -0,0 +1,72 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.entity;
+
+import com.jeeplus.core.persistence.ActEntity;
+
+import java.util.Date;
+
+/**
+ * 施工交底Entity
+ * @author
+ * @version 2019-11-08
+ */
+public class Construction extends ActEntity<Construction> {
+    private static final long serialVersionUID = 1L;
+    private String procInsId;		// 流程实例编号
+    private String userName;		// 申请人
+    private String projectId;		// 项目号
+    private String projectName;		// 项目名称
+    private Date acceptDate;		// 接收图纸时间
+    private Date examineDate;		// 查看时间
+
+
+
+    @Override
+    public String getProcInsId() {
+        return procInsId;
+    }
+
+    @Override
+    public void setProcInsId(String procInsId) {
+        this.procInsId = procInsId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public Date getAcceptDate() {
+        return acceptDate;
+    }
+
+    public void setAcceptDate(Date acceptDate) {
+        this.acceptDate = acceptDate;
+    }
+
+    public Date getExamineDate() {
+        return examineDate;
+    }
+
+    public void setExamineDate(Date examineDate) {
+        this.examineDate = examineDate;
+    }
+}

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

@@ -0,0 +1,20 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.test.activiti.entity.OALeave;
+
+/**
+ * 施工交底MAPPER接口
+ * @author
+ * @version 2019-11-08
+ */
+
+@MyBatisMapper
+public interface ConstructionMapper extends BaseMapper<Construction> {
+	
+}

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

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper">
+    
+	<sql id="constructionColumns">
+		a.id AS "id",
+		a.proc_ins_id AS "procInsId",
+		a.user_name AS "userName",
+		a.project_id AS "projectId",
+		a.project_name AS "projectName",
+		a.accept_date AS "acceptDate",
+		a.examine_date AS "examineDate",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag"
+	</sql>
+	
+	<sql id="constructionJoins">
+		LEFT JOIN sys_user updateBy ON updateBy.id = a.update_by
+	</sql>
+	
+    <resultMap type="Construction" id="ConstructionResult" autoMapping="true">
+    	<result column="reason" property="reason"   typeHandler="com.jeeplus.core.mapper.ConvertBlobTypeHandler"/>
+    </resultMap>
+
+	<select id="get" resultMap="ConstructionResult" >
+		SELECT 
+			<include refid="constructionColumns"/>
+		FROM xm_construction_clarificaiton a
+		<include refid="constructionJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultMap="ConstructionResult" >
+		SELECT 
+			<include refid="constructionColumns"/>
+		FROM xm_construction_clarificaiton a
+		<include refid="constructionJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultMap="ConstructionResult" >
+		SELECT 
+			<include refid="constructionColumns"/>
+		FROM xm_construction_clarificaiton a
+		<include refid="constructionJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO xm_construction_clarificaiton(
+			id,
+			proc_ins_id,
+			user_name,
+			project_id,
+			project_name,
+			accept_date,
+			examine_date,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+			#{id},
+			#{procInsId},
+			#{userName},
+			#{projectId},
+			#{projectName},
+			#{acceptDate},
+			#{examineDate},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE xm_construction_clarificaiton SET
+			proc_ins_id = #{procInsId},
+			leave_type = #{leaveType},
+			start_time = #{startTime},
+			end_time = #{endTime},
+			reason = #{reason},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM xm_construction_clarificaiton
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE xm_construction_clarificaiton SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+	<select id="findUniqueByProperty" resultType="OALeave" statementType="STATEMENT">
+		select * FROM xm_construction_clarificaiton  where ${propertyName} = '${value}'
+	</select>
+	
+</mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/ConstructionService.java

@@ -0,0 +1,52 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper;
+import com.jeeplus.modules.test.activiti.entity.OALeave;
+import com.jeeplus.modules.test.activiti.mapper.OALeaveMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 施工交底Service
+ * @author
+ * @version 2019-11-08
+ */
+@Service
+@Transactional(readOnly = true)
+public class ConstructionService extends CrudService<ConstructionMapper, Construction> {
+
+
+
+	public Construction get(String id) {
+		return super.get(id);
+	}
+	
+	public List<Construction> findList(Construction construction) {
+		return super.findList(construction);
+	}
+	
+	public Page<Construction> findPage(Page<Construction> page, Construction construction) {
+		return super.findPage(page, construction);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(Construction construction) {
+		super.save(construction);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(Construction construction) {
+		super.delete(construction);
+	}
+
+
+
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -0,0 +1,115 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.web;
+
+import com.google.common.collect.Maps;
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.act.service.ActProcessService;
+import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
+import com.jeeplus.modules.test.activiti.entity.OALeave;
+import com.jeeplus.modules.test.activiti.service.OALeaveService;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 施工交底Controller
+ * @author
+ * @version 2019-11-08
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/managementcenter/activiti")
+
+public class ConstructionController extends BaseController {
+
+	@Autowired
+	private ConstructionService constructionService;
+	@Autowired
+	private ActProcessService actProcessService;
+	@Autowired
+	private ActTaskService actTaskService;
+	
+	@ModelAttribute
+	public Construction get(@RequestParam(required=false) String id) {
+		Construction entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = constructionService.get(id);
+		}
+		if (entity == null){
+			entity = new Construction();
+		}
+		return entity;
+	}
+	
+
+	/**
+	 * 查看，增加，编辑请假申请表单页面
+	 */
+	@RequestMapping(value = "form/{mode}")
+	public String form(@PathVariable String mode, Construction construction, Model model) {
+		model.addAttribute("construction", construction);
+		if("add".equals(mode) || "edit".equals(mode)){
+			return "modules/sg/managementcenter/activiti/constructionForm";
+		}else{//audit
+			return "modules/sg/managementcenter/activiti/constructionAudit";
+		}
+	}
+
+	/**
+	 * 保存请假申请
+	 */
+	@ResponseBody
+	@RequestMapping(value = "save")
+	public AjaxJson save(Construction construction, Model model) throws Exception{
+		AjaxJson j = new AjaxJson();
+		/**
+		 * 后台hibernate-validation插件校验
+		 */
+		String errMsg = beanValidator(construction);
+		if (StringUtils.isNotBlank(errMsg)){
+			j.setSuccess(false);
+			j.setMsg(errMsg);
+			return j;
+		}
+
+
+		/**
+		 * 流程审批
+		 */
+		if (StringUtils.isBlank(construction.getId())){
+			//新增或编辑表单保存
+			constructionService.save(construction);//保存
+			// 启动流程
+			ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
+			String title = construction.getCurrentUser().getName()+"在"+ DateUtils.getDateTime()+"发起"+p.getName();
+			actTaskService.startProcess(p.getKey(),  "xm_construction_clarificaiton", construction.getId(), title);
+			j.setMsg("发起流程审批成功!");
+			j.getBody().put("targetUrl",  "/act/task/process/");
+		}else{
+			//新增或编辑表单保存
+			constructionService.save(construction);//保存
+			construction.getAct().setComment(("yes".equals(construction.getAct().getFlag())?"[重新申请] ":"[销毁申请] "));
+			// 完成流程任务
+			Map<String, Object> vars = Maps.newHashMap();
+			vars.put("reapply", "yes".equals(construction.getAct().getFlag())? true : false);
+			actTaskService.complete(construction.getAct().getTaskId(), construction.getAct().getProcInsId(), construction.getAct().getComment(), construction.getContent(), vars);
+			j.setMsg("提交成功！");
+			j.getBody().put("targetUrl",  "/act/task/todo/");
+		}
+
+		return j;
+	}
+	
+
+
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/service/MaterialInfoService.java

@@ -73,12 +73,17 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
 		super.delete(materialInfo);
 	}
 
+	/**
+	 *根据项目名称删除物料信息
+	 */
 	@Transactional(readOnly = false)
 	public void deleteByPro(String projectName) {
 		materialInfoMapper.deleteByPro(projectName);
 	}
 
-
+	/**
+	 *物料信息合并保存
+	 */
     @Transactional(readOnly = false)
 	public void export(MultipartFile file,String batch,String itemBatch) throws IOException, InvalidFormatException {
 		ImportExcel mo = new ImportExcel(file,1,"模块表");
@@ -106,7 +111,9 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
         materialProjectService.save(materialProject);
 	}
 
-
+	/**
+	 *根据项目名称获取物料信息
+	 */
 	public List<MaterialInfo> findByBatch(List<MaterialProject> list){
 		List<MaterialInfo> list1 = materialInfoMapper.findByList(list);
 		 List<MaterialInfo> list2 = getNewData(list1); //合并数据

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/service/MaterialVersionService.java

@@ -51,6 +51,9 @@ public class MaterialVersionService extends CrudService<MaterialVersionMapper, M
 		super.save(materialVersion);
 	}
 
+	/**
+	 *物料保存
+	 */
 	@Transactional(readOnly = false)
 	public void saveList(List<MaterialStandard> list,String batch) {
 		MaterialVersion materialVersion = new MaterialVersion();
@@ -63,13 +66,19 @@ public class MaterialVersionService extends CrudService<MaterialVersionMapper, M
         save(materialVersion);
 		materialVersionMapper.insertList(list);
 	}
-	
+
+	/**
+	 *删除物料信息
+	 */
 	@Transactional(readOnly = false)
 	public void delete(MaterialVersion materialVersion) {
 		super.delete(materialVersion);
 		deleteByPro(materialVersion.getBatch());
 	}
 
+	/**
+	 * 更加批次号删除物料信息
+	 */
 	@Transactional(readOnly = false)
 	public void deleteByPro(String batch) {
 		materialVersionMapper.deleteByBatch(batch);

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/web/MaterialInfoController.java

@@ -116,40 +116,17 @@ public class MaterialInfoController extends BaseController {
 		j.setMsg("删除成功");
 		return j;
 	}
-	
-	/**
-	 * 导出excel文件
-	 */
-	@ResponseBody
-	@RequiresPermissions("managementcenter:materialinfo:export")
-    @RequestMapping(value = "export")
-    public AjaxJson exportFile(MaterialInfo materialInfo, HttpServletRequest request, HttpServletResponse response) {
-		AjaxJson j = new AjaxJson();
-		try {
-//            String fileName = DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-//            Page<MaintainData> page = dataMaintenanceService.findPage(new Page<MaintainData>(request, response, -1), maintainData);
-//    		new ExportExcel(null, MaintainData.class).setDataList(page.getList()).write(response, fileName).dispose();
-//			dataMaintenanceService.export(maintainData,response);
-    		j.setSuccess(true);
-    		j.setMsg("导出成功！");
-    		return j;
-		} catch (Exception e) {
-			j.setSuccess(false);
-			j.setMsg("导出失败！失败信息："+e.getMessage());
-		}
-			return j;
-    }
+
 
 	/**
 	 * 导入Excel数据
-
 	 */
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialinfo:import")
     @RequestMapping(value = "import")
    	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
-		String batch = request.getParameter("batch");
-		String itemBatch = request.getParameter("itemBatch");
+		String batch = request.getParameter("batch");   //物料批次
+		String itemBatch = request.getParameter("itemBatch");  //项目批次
 		AjaxJson j = new AjaxJson();
 		try {
 			materialInfoService.export(file,batch,itemBatch);
@@ -169,8 +146,8 @@ public class MaterialInfoController extends BaseController {
     @RequiresPermissions("managementcenter:materialinfo:import")
     @RequestMapping(value = "imports")
     public AjaxJson importFile(@RequestParam("file")MultipartFile[] file, HttpServletResponse response, HttpServletRequest request) {
-        String batch = request.getParameter("batch");
-        String itemBatch = request.getParameter("itemBatch");
+        String batch = request.getParameter("batch");   //物料批次
+        String itemBatch = request.getParameter("itemBatch");   //项目批次
         AjaxJson j = new AjaxJson();
         try {
             for(int i=0;i<file.length;i++) {
@@ -213,11 +190,6 @@ public class MaterialInfoController extends BaseController {
 
 	/**
 	 * 项目验证
-	 * @param file
-	 * @param batch
-	 * @return
-	 * @throws IOException
-	 * @throws InvalidFormatException
 	 */
 
 	@ResponseBody

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/web/MaterialVersionController.java

@@ -108,15 +108,23 @@ public class MaterialVersionController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 导入页面跳转
+	 * @param model
+	 * @return
+	 */
 	@RequestMapping(value = "importExcel")
 	public String importExcel(Model model) {
 		return "modules/sg/managementcenter/materialversion/importexcel";
 	}
 
+	/**
+	 *导入
+	 */
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialversion:import")
 	@RequestMapping(value = "import")
-	public AjaxJson importFile(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+	public AjaxJson importFile(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request){
 		String batch = request.getParameter("batch");
 		AjaxJson j = new AjaxJson();
 		try {
@@ -134,9 +142,12 @@ public class MaterialVersionController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 导入验证，如果批次号存在，则返回，不存在，则直接读入
+	 */
 	@ResponseBody
 	@RequestMapping(value = "importValidation")
-	public AjaxJson importValidation(@RequestParam("file")MultipartFile file,String batch) throws IOException, InvalidFormatException, IllegalAccessException, InstantiationException {
+	public AjaxJson importValidation(@RequestParam("file")MultipartFile file,String batch) {
 		AjaxJson j = new AjaxJson();
 		try {
 			MaterialVersion materialVersion = new MaterialVersion();

src/main/resources/properties/jeeplus.properties

@@ -14,7 +14,7 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #jdbc.url=jdbc:mysql://localhost:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 jdbc.username=root
 jdbc.password=root

src/main/webapp/webpage/modules/sg/audit/information/informationList.js

@@ -416,17 +416,17 @@ $(document).ready(function() {
 
 //导出物料清单
 	$("#export").click(function(){
-		var projectId = $("#projectId").val();
-		var projectName = $("#projectName").val();
-		var projectType = $("#projectType").val();
-		var projectYear = $("#projectYear").val();
-		var firstUnits = $("#firstUnits").val();
-		var secondUnits = $("#secondUnits").val();
-		var firstFinish = $("#firstFinish").val();
-		var extendedStatus = $("#extendedStatus").val();
-		var extendedTime = $("#extendedTime").val();
-		var hiddenSign = $("#hiddenSign").val();
-		console.log(projectId );
+		var projectId = encodeURI(encodeURI($("#projectId").val()));
+		var projectName = encodeURI(encodeURI($("#projectName").val()));
+		var projectType = encodeURI(encodeURI($("#projectType").val()));
+		var projectYear = encodeURI(encodeURI($("#projectYear").val()));
+		var firstUnits = encodeURI(encodeURI($("#firstUnits").val()));
+		var secondUnits = encodeURI(encodeURI($("#secondUnits").val()));
+		var firstFinish = encodeURI(encodeURI($("#firstFinish").val()));
+		var extendedStatus = encodeURI(encodeURI($("#extendedStatus").val()));
+		var extendedTime = encodeURI(encodeURI($("#extendedTime").val()));
+		var hiddenSign = encodeURI(encodeURI($("#hiddenSign").val()));
+/*		console.log(projectId );
 		console.log(projectName);
 		console.log(projectType);
 		console.log(projectYear);
@@ -435,23 +435,23 @@ $(document).ready(function() {
 		console.log(firstFinish);
 		console.log(extendedStatus);
 		console.log(extendedTime);
-		console.log(hiddenSign);
+		console.log(hiddenSign);*/
 		jp.downloadFile('${ctx}/sg/information/exportMaterial?projectId='+projectId+'&projectName='+projectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits+'&firstFinish='+firstFinish+'&extendedStatus='+extendedStatus+'&extendedTime='+extendedTime+'&hiddenSign='+hiddenSign);
 	});
 
 //导出项目清单
 	$("#exportMaterial").click(function(){
-		var projectId = $("#projectId").val();
-		var projectName = $("#projectName").val();
-		var projectType = $("#projectType").val();
-		var projectYear = $("#projectYear").val();
-		var firstUnits = $("#firstUnits").val();
-		var secondUnits = $("#secondUnits").val();
-		var firstFinish = $("#firstFinish").val();
-		var extendedStatus = $("#extendedStatus").val();
-		var extendedTime = $("#extendedTime").val();
-		var hiddenSign = $("#hiddenSign").val();
-		console.log(projectId );
+		var projectId = encodeURI(encodeURI($("#projectId").val()));
+		var projectName = encodeURI(encodeURI($("#projectName").val()));
+		var projectType = encodeURI(encodeURI($("#projectType").val()));
+		var projectYear = encodeURI(encodeURI($("#projectYear").val()));
+		var firstUnits = encodeURI(encodeURI($("#firstUnits").val()));
+		var secondUnits = encodeURI(encodeURI($("#secondUnits").val()));
+		var firstFinish = encodeURI(encodeURI($("#firstFinish").val()));
+		var extendedStatus = encodeURI(encodeURI($("#extendedStatus").val()));
+		var extendedTime = encodeURI(encodeURI($("#extendedTime").val()));
+		var hiddenSign = encodeURI(encodeURI($("#hiddenSign").val()));
+/*		console.log(projectId );
 		console.log(projectName);
 		console.log(projectType);
 		console.log(projectYear);
@@ -460,24 +460,24 @@ $(document).ready(function() {
 		console.log(firstFinish);
 		console.log(extendedStatus);
 		console.log(extendedTime);
-		console.log(hiddenSign);
+		console.log(hiddenSign);*/
 		jp.downloadFile('${ctx}/sg/information/export?projectId='+projectId+'&projectName='+projectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits+'&firstFinish='+firstFinish+'&extendedStatus='+extendedStatus+'&extendedTime='+extendedTime+'&hiddenSign='+hiddenSign);
 
 	});
 
 //导出说明word
 	$("#exportInformation").click(function(){
-		var projectId = $("#projectId").val();
-		var projectName = $("#projectName").val();
-		var projectType = $("#projectType").val();
-		var projectYear = $("#projectYear").val();
-		var firstUnits = $("#firstUnits").val();
-		var secondUnits = $("#secondUnits").val();
-		var firstFinish = $("#firstFinish").val();
-		var extendedStatus = $("#extendedStatus").val();
-		var extendedTime = $("#extendedTime").val();
-		var hiddenSign = $("#hiddenSign").val();
-		console.log(projectId );
+		var projectId = encodeURI(encodeURI($("#projectId").val()));
+		var projectName = encodeURI(encodeURI($("#projectName").val()));
+		var projectType = encodeURI(encodeURI($("#projectType").val()));
+		var projectYear = encodeURI(encodeURI($("#projectYear").val()));
+		var firstUnits = encodeURI(encodeURI($("#firstUnits").val()));
+		var secondUnits = encodeURI(encodeURI($("#secondUnits").val()));
+		var firstFinish = encodeURI(encodeURI($("#firstFinish").val()));
+		var extendedStatus = encodeURI(encodeURI($("#extendedStatus").val()));
+		var extendedTime = encodeURI(encodeURI($("#extendedTime").val()));
+		var hiddenSign = encodeURI(encodeURI($("#hiddenSign").val()));
+/*		console.log(projectId );
 		console.log(projectName);
 		console.log(projectType);
 		console.log(projectYear);
@@ -486,7 +486,7 @@ $(document).ready(function() {
 		console.log(firstFinish);
 		console.log(extendedStatus);
 		console.log(extendedTime);
-		console.log(hiddenSign);
+		console.log(hiddenSign);*/
 		jp.downloadFile('${ctx}/sg/information/exportInformation?projectId='+projectId+'&projectName='+projectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits+'&firstFinish='+firstFinish+'&extendedStatus='+extendedStatus+'&extendedTime='+extendedTime+'&hiddenSign='+hiddenSign);
 	});
 

src/main/webapp/webpage/modules/sg/audit/report/reportList.jsp

@@ -46,13 +46,13 @@
 			<tr>
 				<th>完成</th>
 				<c:forEach items="${list}" var="data" varStatus="index">
-					<th><a href="${ctx}/sg/report/exportInformation?condition=${data.name}&status=0&type=0">${data.finishCount}</a></th>
+					<th><a class="finish"><input class="finishOne" type="hidden" value="${data.name}"/>${data.finishCount}</a></th>
 				</c:forEach>
 			</tr>
 			<tr>
 				<th>未完成</th>
 				<c:forEach items="${list}" var="data" varStatus="index">
-					<th><a href="${ctx}/sg/report/exportInformation?condition=${data.name}&status=1&type=0">${data.unfinishCount}</a></th>
+					<th><a class="noFinish"><input class="finishOne" type="hidden" value="${data.name}"/>${data.unfinishCount}</a></th>
 				</c:forEach>
 			</tr>
 			</thead>
@@ -121,6 +121,22 @@
 					// 使用刚指定的配置项和数据显示图表。
 					myChart.setOption(option);
 				})
+				//点击完成的数量导出对应项目文件
+				$(".finish").on("click", function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition=' + condition + '&status=0&type=0')
+				});
+				//点击为完成的数量导出对应项目文件
+				$(".noFinish").click(function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition=' + condition + '&status=1&type=0');
+				})
 			})
 		</script>
 	</div>

src/main/webapp/webpage/modules/sg/audit/report/reportList1.jsp

@@ -46,13 +46,13 @@
 			<tr>
 				<th>完成</th>
 				<c:forEach items="${list}" var="data" varStatus="index">
-					<th><a href="${ctx}/sg/report/exportInformation?condition=${data.name}&status=0&type=1">${data.finishCount}</a></th>
+					<th><a class="finish"><input class="finishOne" type="hidden" value="${data.name}"/>${data.finishCount}</a></th>
 				</c:forEach>
 			</tr>
 			<tr>
 				<th>未完成</th>
 				<c:forEach items="${list}" var="data" varStatus="index">
-					<th><a href="${ctx}/sg/report/exportInformation?condition=${data.name}&status=1&type=1">${data.unfinishCount}</a></th>
+					<th><a class="noFinish"><input class="finishOne" type="hidden" value="${data.name}"/>${data.unfinishCount}</a></th>
 				</c:forEach>
 			</tr>
 			</thead>
@@ -121,6 +121,23 @@
 					// 使用刚指定的配置项和数据显示图表。
 					myChart.setOption(option);
 				})
+
+				//点击完成的数量导出对应项目文件
+				$(".finish").click(function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=0&type=1')
+				})
+				//点击为完成的数量导出对应项目文件
+				$(".noFinish").click(function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=1&type=1')
+				})
 			})
 		</script>
 	</div>

src/main/webapp/webpage/modules/sg/audit/report/reportList2.jsp

@@ -46,13 +46,13 @@
 			<tr>
 				<th>完成</th>
 				<c:forEach items="${list}" var="data" varStatus="index">
-					<th><a href="${ctx}/sg/report/exportInformation?condition=${data.name}&status=0&type=2">${data.finishCount}</a></th>
+					<th><a class="finish"><input class="finishOne" type="hidden" value="${data.name}"/>${data.finishCount}</a></th>
 				</c:forEach>
 			</tr>
 			<tr>
 				<th>未完成</th>
 				<c:forEach items="${list}" var="data" varStatus="index">
-					<th><a href="${ctx}/sg/report/exportInformation?condition=${data.name}&status=1&type=2">${data.unfinishCount}</a></th>
+					<th><a class="noFinish"><input class="finishOne" type="hidden" value="${data.name}"/>${data.unfinishCount}</a></th>
 				</c:forEach>
 			</tr>
 			</thead>
@@ -121,6 +121,23 @@
 					// 使用刚指定的配置项和数据显示图表。
 					myChart.setOption(option);
 				})
+
+				//点击完成的数量导出对应项目文件
+				$(".finish").click(function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=0&type=2')
+				})
+				//点击为完成的数量导出对应项目文件
+				$(".noFinish").click(function () {
+					var conditionBe = $(this).find("input").val();
+					var condition = encodeURI(encodeURI(conditionBe));
+					console.log(conditionBe);
+					console.log(condition);
+					jp.downloadFile('${ctx}/sg/report/exportInformation?condition='+condition+'&status=1&type=2')
+				})
 			})
 		</script>
 	</div>

src/main/webapp/webpage/modules/sg/settlement/dataMaintenanceForm.jsp

@@ -46,17 +46,41 @@
 					<td class="width-35">
 						<form:input path="projectId" htmlEscape="false"    class="form-control required"/>
 					</td>
+					<td class="width-15 active"><label class="pull-right">设计单位：</label></td>
+					<td class="width-35">
+						<form:input path="designUnits" htmlEscape="false"    class="form-control "/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="pull-right">施工单位：</label></td>
+					<td class="width-35">
+						<form:input path="constructionUnits" htmlEscape="false"    class="form-control "/>
+					</td>
+					<td class="width-15 active"><label class="pull-right">建筑地址：</label></td>
+					<td class="width-35">
+						<form:input path="address" htmlEscape="false"    class="form-control "/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="pull-right">建设性质：</label></td>
+					<td class="width-35">
+						<form:input path="property" htmlEscape="false"    class="form-control "/>
+					</td>
+					<td class="width-15 active"><label class="pull-right">发文总投资：</label></td>
+					<td class="width-35">
+						<form:input path="investment" htmlEscape="false"    class="form-control "/>
+					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">开工时间：</label></td>
 					<td class="width-35">
-					<div class='input-group form_datetime' id='startDate'>
-						<input type='text'  name="startDate" class="form-control required"  value="<fmt:formatDate value="${maintainData.startDate}" pattern="yyyy-MM-dd"/>"/>
-						<span class="input-group-addon">
+						<div class='input-group form_datetime' id='startDate'>
+							<input type='text'  name="startDate" class="form-control required"  value="<fmt:formatDate value="${maintainData.startDate}" pattern="yyyy-MM-dd"/>"/>
+							<span class="input-group-addon">
 			                        <span class="glyphicon glyphicon-calendar"></span>
 			                    </span>
-					</div>
+						</div>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">竣工时间：</label></td>
 					<td class="width-35">
 						<div class='input-group form_datetime' id='endDate'>
@@ -66,56 +90,58 @@
 			                    </span>
 						</div>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">批准文号：</label></td>
 					<td class="width-35">
 						<form:input path="approvalNumber" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">建筑费：</label></td>
 					<td class="width-35">
 						<form:input path="buildingFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">安装费：</label></td>
 					<td class="width-35">
 						<form:input path="installFee" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">设备购置费：</label></td>
 					<td class="width-35">
 						<form:input path="equipmentFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">主材费：</label></td>
 					<td class="width-35">
 						<form:input path="materialFee" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">设计费：</label></td>
 					<td class="width-35">
 						<form:input path="designFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">监理费：</label></td>
 					<td class="width-35">
 						<form:input path="supervisionFee" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">前期工作费：</label></td>
 					<td class="width-35">
 						<form:input path="preliminaryWorkFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">线路施工赔偿费：</label></td>
 					<td class="width-35">
 						<form:input path="damages" htmlEscape="false"    class="form-control required"/>
 					</td>
-				</tr>
-				<tr>
 					<td class="width-15 active"><label class="pull-right">法人管理费：</label></td>
 					<td class="width-35">
 						<form:input path="managementFee" htmlEscape="false"    class="form-control required"/>
 					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class="pull-right">合计：</label></td>
 					<td class="width-35">
 						<form:input path="totalFee" htmlEscape="false"    class="form-control required"/>

src/main/webapp/webpage/modules/sg/settlement/dataMaintenanceList.js

@@ -61,7 +61,7 @@ $(document).ready(function() {
                    } else if($el.data("item") == "delete"){
                         jp.confirm('确认要删除该数据记录吗？', function(){
                        	jp.loading();
-                       	jp.get("${ctx}/sg/settlement/delete?id="+row.id, function(data){
+                       	jp.get("${ctx}/sg/settlement/delete?id="+row.projectId, function(data){
                    	  		if(data.success){
                    	  			$('#dataTable').bootstrapTable('refresh');
                    	  			jp.success(data.msg);
@@ -91,10 +91,10 @@ $(document).ready(function() {
 		        	value = jp.unescapeHTML(value);
 				   <c:choose>
 					   <c:when test="${fns:hasPermission('sg:settlement:edit')}">
-					      return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
+					      return "<a href='javascript:edit(\""+row.projectId+"\")'>"+value+"</a>";
 				      </c:when>
 					  <c:when test="${fns:hasPermission('sg:settlement:view')}">
-					      return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+					      return "<a href='javascript:view(\""+row.projectId+"\")'>"+value+"</a>";
 				      </c:when>
 					  <c:otherwise>
 					      return value;
@@ -103,6 +103,26 @@ $(document).ready(function() {
 		         }
 		       
 		    }
+		    ,{
+                       field: 'designUnits',
+                       title: '设计单位'
+                   }
+		    ,{
+                       field: 'constructionUnits',
+                       title: '施工单位'
+                   }
+		    ,{
+                       field: 'address',
+                       title: '建筑地址'
+                   }
+		    ,{
+                       field: 'property',
+                       title: '建筑属性'
+                   }
+		    ,{
+                       field: 'investment',
+                       title: '发文总投资'
+                   }
 			,{
 		              field: 'startDate',
 		              title: '开工时间',
@@ -183,11 +203,11 @@ $(document).ready(function() {
                 auto: true,
 			    title:"导入数据",
 			    content: "${ctx}/tag/importExcel" ,
-			    btn: ['下载模板','确定', '关闭'],
-				    btn1: function(index, layero){
-					  jp.downloadFile('${ctx}/sg/settlement/import/template');
-				  },
-			    btn2: function(index, layero){
+			    btn: ['确定', '关闭'],
+				  //   btn1: function(index, layero){
+					//   jp.downloadFile('${ctx}/sg/settlement/import/template');
+				  // },
+			    btn1: function(index, layero){
 				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
 						iframeWin.contentWindow.importExcel('${ctx}/sg/settlement/import', function (data) {
 							if(data.success){
@@ -201,7 +221,7 @@ $(document).ready(function() {
                     return false;
 				  },
 				 
-				  btn3: function(index){ 
+				  btn2: function(index){
 					  jp.close(index);
 	    	       }
 			}); 
@@ -222,7 +242,6 @@ $(document).ready(function() {
                       top.layer.msg('成功', {icon:1})
                        $('#dataTable').bootstrapTable('load',data);
                      jp.close(index);
-                     getTdValue();
                       });//调用保存事件
                        return false;
                     },
@@ -254,7 +273,7 @@ $(document).ready(function() {
 		
   function getIdSelections() {
         return $.map($("#dataTable").bootstrapTable('getSelections'), function (row) {
-            return row.id
+            return row.projectId
         });
     }
   

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

@@ -0,0 +1,175 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>请假申请管理</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+			jp.ajaxForm("#inputForm",function(data){
+				if(data.success){
+					jp.success(data.msg);
+					jp.go("${ctx}/managementcenter/activiti");
+				}else{
+					jp.error(data.msg);
+					$("#inputForm").find("button:submit").button("reset");
+				}
+			});
+
+
+			$("#agree").click(function () {
+				jp.prompt("同意, 审批意见", function (message) {
+					jp.post("${ctx}/act/task/newAudit",
+							{
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.act.procDefId}",
+								"flag":"manager",
+								"comment":message
+
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			})
+
+
+			$("#reject").click(function () {
+				jp.prompt("驳回, 审批意见", function (message) {
+					jp.post("${ctx}/act/task/newAudit",
+							{
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.act.procDefId}",
+								"flag":"reject",
+								"comment":message
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			})
+
+
+			$('#startTime').datetimepicker({
+				format: "YYYY-MM-DD HH:mm:ss"
+			});
+			$('#endTime').datetimepicker({
+				format: "YYYY-MM-DD HH:mm:ss"
+			});
+			//富文本初始化
+			$('#reason').summernote({
+				height: 300,
+				lang: 'zh-CN',
+				readonly: true,
+				callbacks: {
+					onChange: function(contents, $editable) {
+						$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<div class="form-group text-center">
+						<%--<h3>${oALeave.act.taskName}</h3>--%>
+					</div>
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/activiti/save" method="post" class="form-horizontal">
+						<form:hidden path="id"/>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>申请人：</label>
+							<div class="col-sm-10">
+									${fns:unescapeHtml(construction.userName)}
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>项目号：</label>
+							<div class="col-sm-10">
+									${fns:unescapeHtml(construction.projectId)}
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>项目名称：</label>
+							<div class="col-sm-10">
+									${fns:unescapeHtml(construction.projectName)}
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>接收图纸时间：</label>
+							<div class="col-sm-10">
+								<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>查看时间：</label>
+							<div class="col-sm-10">
+								<fmt:formatDate value="${construction.examineDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+							</div>
+						</div>
+						<hr>
+					</form:form>
+
+
+					<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && construction.act.isNextGatewaty}">
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<div class="col-sm-6">
+								<div class="form-group text-center">
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="同 意" />&nbsp;
+									<input id="reject" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳 回" />&nbsp;
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && !construction.act.isNextGatewaty}">
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<div class="col-sm-6">
+								<div class="form-group text-center">
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="办 理" />&nbsp;
+								</div>
+							</div>
+						</div>
+					</c:if>
+
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,145 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>请假申请管理</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+			jp.ajaxForm("#inputForm",function(data){
+				if(data.success){
+					jp.success(data.msg);
+					jp.go("${ctx}"+ data.body.targetUrl);
+				}else{
+					jp.error(data.msg);
+					$("#inputForm").find("button:submit").button("reset");
+				}
+			});
+
+			$('#acceptDate').datetimepicker({
+				format: "YYYY-MM-DD HH:mm:ss"
+			});
+			$('#examineDate').datetimepicker({
+				format: "YYYY-MM-DD HH:mm:ss"
+			});
+			//富文本初始化
+			$('#reason').summernote({
+				height: 300,
+				lang: 'zh-CN',
+				callbacks: {
+					onChange: function(contents, $editable) {
+						$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/activiti/save" method="post" class="form-horizontal">
+						<form:hidden path="id"/>
+						<form:hidden path="act.taskId"/>
+						<form:hidden path="act.taskName"/>
+						<form:hidden path="act.taskDefKey"/>
+						<form:hidden path="act.procInsId"/>
+						<form:hidden path="act.procDefId"/>
+						<form:hidden id="flag" path="act.flag" />
+						<div class="form-group text-center">
+							<h3> 施工交底申请</h3>
+						</div>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>申请人：</label>
+							<div class="col-sm-10">
+								<div class='input-group' id='userName'>
+									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
+								</div>
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>项目号：</label>
+							<div class="col-sm-10">
+								<div class='input-group' id='projectId'>
+									<input type='text'  name="projectId" class="form-control required"  value="${construction.projectId}"/>
+								</div>
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>项目名称：</label>
+							<div class="col-sm-10">
+								<div class='input-group form-control' id='projectName'>
+									<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>
+								</div>
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>接收图纸时间：</label>
+							<div class="col-sm-10">
+									<div class='input-group form_datetime' id='acceptDate'>
+									<input type='text'  name="acceptDate" class="form-control required"  value="<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+									<span class="input-group-addon">
+								<span class="glyphicon glyphicon-calendar"></span>
+							</span>
+								</div>
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>查看时间：</label>
+							<div class="col-sm-10">
+								<div class='input-group form_datetime' id='examineDate'>
+									<input type='text'  name="examineDate" class="form-control required"  value="<fmt:formatDate value="${construction.examineDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+									<span class="input-group-addon">
+								<span class="glyphicon glyphicon-calendar"></span>
+							</span>
+								</div>
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<div class="col-lg-3"></div>
+							<c:if test="${construction.act.taskDefKey ne '' && !construction.act.finishTask && construction.act.isNextGatewaty}">
+								<div class="col-sm-6">
+									<div class="form-group text-center">
+										<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="重新提交" onclick="$('#flag').val('yes')"/>&nbsp;
+										<input id="reject" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="销毁申请" onclick="$('#flag').val('no')"/>&nbsp;
+									</div>
+								</div>
+							</c:if>
+							<c:if test="${construction.act.startTask}">
+								<div class="col-lg-6">
+									<div class="form-group text-center">
+										<div>
+											<button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>
+										</div>
+									</div>
+								</div>
+							</c:if>
+						</div>
+					</form:form>
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/materialinfo/materialInfoList.js

@@ -231,6 +231,7 @@ $(document).ready(function() {
         });
     }
 
+
     function getTdValue(){
             var tableId = document.getElementById("dataTable");
              for(var i = 1;i < tableId.rows.length;i++) {