项目信息：归口部门，施工单位，结算审计单位名称，由手动导入添加变更项目信息表抓取，结算审计单位名称由二级单位+送审部门

物料信息导出添加项目名称，项目类型，工作状态
项目报表变更数据判断来源
导入送审模板变更，导入原因类型规则变更

src/main/java/com/jeeplus/modules/sg/audit/information/entity/Information.java

@@ -38,7 +38,7 @@ public class Information extends DataEntity<Information>  {
 	private Date projectStop;
 //	施工单位
 	private String department;
-//	事务所名称
+//	结算审计单位名称
 	private String projectFirm;
 //	提交送审日期
 	private Date subDate;
@@ -88,7 +88,16 @@ public class Information extends DataEntity<Information>  {
 	private String extendedStatus;
 	//记录查询超期时间
 	private String extendedTime;
+	//工作状态
+	private String appendStatus;
 
+	public String getAppendStatus() {
+		return appendStatus;
+	}
+
+	public void setAppendStatus(String appendStatus) {
+		this.appendStatus = appendStatus;
+	}
 
 	public String getExtendedStatus() {
 		return extendedStatus;
@@ -275,7 +284,7 @@ public class Information extends DataEntity<Information>  {
 		this.projectStop = projectStop;
 	}
 
-	@ExcelField(title="事务所名称", align=2, sort=10)
+	@ExcelField(title="结算审计单位名称", align=2, sort=10)
 	public String getProjectFirm() {
 		return projectFirm;
 	}

src/main/java/com/jeeplus/modules/sg/audit/information/entity/OutInformation.java

@@ -54,7 +54,7 @@ public class OutInformation {
     private Date projectStop;
     //施工单位
     private String construction;
-    //	事务所名称
+    //	结算审计单位名称
     private String projectFirm;
     //	提交送审日期
     private Date subDate;
@@ -66,6 +66,9 @@ public class OutInformation {
     private Date resultDate;
     //结算单位
     private String settlement;
+    //工作状态
+    private String appendStatus;
+
 
     @ExcelField(title="项目定义号", align=2, sort=1)
     public String getProjectId() {
@@ -95,12 +98,12 @@ public class OutInformation {
     }
 
     @ExcelField(title="工作状态", align=2, sort=4)
-    public String getOutConstruction() {
-        return outConstruction;
+    public String getAppendStatus() {
+        return appendStatus;
     }
 
-    public void setOutConstruction(String outConstruction) {
-        this.outConstruction = outConstruction;
+    public void setAppendStatus(String appendStatus) {
+        this.appendStatus = appendStatus;
     }
 
     @ExcelField(title="审定日期", align=2, sort=5)
@@ -274,7 +277,7 @@ public class OutInformation {
         this.construction = construction;
     }
 
-    @ExcelField(title="事务所名称", align=2, sort=24)
+    @ExcelField(title="结算审计单位名称", align=2, sort=24)
     public String getProjectFirm() {
         return projectFirm;
     }
@@ -319,12 +322,12 @@ public class OutInformation {
         this.resultDate = resultDate;
     }
 
-    @ExcelField(title="结算单位", align=2, sort=29)
+/*    @ExcelField(title="结算单位", align=2, sort=29)
     public String getSettlement() {
         return settlement;
     }
 
     public void setSettlement(String settlement) {
         this.settlement = settlement;
-    }
+    }*/
 }

src/main/java/com/jeeplus/modules/sg/audit/information/entity/append.java

@@ -9,14 +9,14 @@ public class append {
     private String projectId;
     //是否决算送审
     private String trial;
-    //施工单位
-    private String construction;
+/*    //施工单位
+    private String construction;*/
     //工作状态（是否关闭）
-    private String outConstruction;
-    //结算单位
-    private String settlement;
-    //归口部门
-    private String underCentralized;
+    private String appendStatus;
+/*    //结算单位
+    private String settlement;*/
+/*    //归口部门
+    private String underCentralized;*/
 
 
     @ExcelField(title = "项目定义号", align = 2, sort = 1)
@@ -37,39 +37,38 @@ public class append {
         this.trial = trial;
     }
 
-    @ExcelField(title = "施工单位", align = 2, sort = 3)
+/*    @ExcelField(title = "施工单位", align = 2, sort = 3)
     public String getConstruction() {
         return construction;
     }
 
     public void setConstruction(String construction) {
         this.construction = construction;
-    }
+    }*/
 
-    @ExcelField(title = "工作状态（是否关闭）", align = 2, sort = 4)
-    public String getOutConstruction() {
-        return outConstruction;
+    @ExcelField(title = "工作状态（是否关闭）", align = 2, sort = 3)
+    public String getAppendStatus() {
+        return appendStatus;
     }
 
-    public void setOutConstruction(String outConstruction) {
-        this.outConstruction = outConstruction;
+    public void setAppendStatus(String appendStatus) {
+        this.appendStatus = appendStatus;
     }
-
-    @ExcelField(title = "结算单位", align = 2, sort = 5)
+/*    @ExcelField(title = "结算单位", align = 2, sort = 5)
     public String getSettlement() {
         return settlement;
     }
 
     public void setSettlement(String settlement) {
         this.settlement = settlement;
-    }
+    }*/
 
-    @ExcelField(title = "归口部门", align = 2, sort = 6)
+/*    @ExcelField(title = "归口部门", align = 2, sort = 4)
     public String getUnderCentralized() {
         return underCentralized;
     }
 
     public void setUnderCentralized(String underCentralized) {
         this.underCentralized = underCentralized;
-    }
+    }*/
 }

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

@@ -26,7 +26,8 @@
 		secondFinish,
 		secondFinishDate,
 		finishDate,
-		overdue
+		overdue,
+		underCentralized
 	</sql>
 
 	<sql id="newInformationColumns">
@@ -53,7 +54,8 @@
 		a.secondFinish,
 		a.secondFinishDate,
 		a.finishDate,
-		a.overdue
+		a.overdue,
+		a.underCentralized
 	</sql>
     <select id="findAllInformationList" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		select project_id,project_name from sj_project_information
@@ -233,7 +235,7 @@
 
     <select id="findList" resultType="Information">
         SELECT
-		<include refid="newInformationColumns"/>,b.trial,b.construction,b.outConstruction,b.settlement,b.underCentralized,
+		<include refid="newInformationColumns"/>,b.trial,b.appendStatus,
 		datediff(if(firstFinish='否' or secondFinish = '否',NOW(),if(secondFinish = '是',secondFinishDate,firstFinishDate)),approvalDate) as newdate
         FROM sj_project_information as a
 		left JOIN sj_project_append as b on a.project_id = b.project_id
@@ -352,7 +354,8 @@
 		del_flag,
 		firstFinishDate,
 		secondFinish,
-		secondFinishDate
+		secondFinishDate,
+		underCentralized
 		) VALUES
 		<foreach collection="information" item="item" index="index" separator="," >
 		(
@@ -382,7 +385,8 @@
 			#{item.delFlag},
 			#{item.firstFinishDate},
 			#{item.secondFinish},
-			#{item.secondFinishDate}
+			#{item.secondFinishDate},
+			#{item.underCentralized}
             )
 		</foreach>
 	</insert>
@@ -418,20 +422,14 @@
 		replace into sj_project_append(
 			project_id,
 			trial,
-			construction,
-			outConstruction,
-			settlement,
-			underCentralized
+			appendStatus
 		)
 		VALUES
 		<foreach collection="list" item="item" separator="," >
 			(
 			#{item.projectId},
 			#{item.trial},
-			#{item.construction},
-			#{item.outConstruction},
-			#{item.settlement},
-			#{item.underCentralized}
+			#{item.appendStatus}
 			)
 		</foreach>
 	</insert>
@@ -447,9 +445,15 @@
 	</select>
 
 	<select id="allNo" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
-		select *
-		from sj_material_information
-		where project_Id in(
+		SELECT
+		a.*, b.project_Name,
+		b.project_Type,
+		c.appendStatus
+		FROM
+		sj_material_information AS a
+		LEFT JOIN sj_project_information AS b ON a.project_id = b.project_id
+		LEFT JOIN sj_project_append AS c ON a.project_id = c.project_id
+		where a.project_Id in(
 		<foreach collection="list" item="items" index="index"  separator=",">
 			#{items.projectId}
 		</foreach>

src/main/java/com/jeeplus/modules/sg/audit/information/utils/ImportInformation.java

@@ -337,6 +337,7 @@ public  class ImportInformation {
                     Object endDate = ei.getCellValue(row, 43);
                     Object resultDate = ei.getCellValue(row, 44);
                     Object approvalDate = ei.getCellValue(row, 45);
+                    Object underCentralized = ei.getCellValue(row, 53);
                     Object secondUnits = ei.getCellValue(row, 54);
                     Object firstUnits = ei.getCellValue(row, 55);
                     if (projectTotal.equals("")) {
@@ -348,6 +349,7 @@ public  class ImportInformation {
                     information.setProjectGrade(projectGrade.toString());
                     information.setProjectYear(projectYear.toString());
                     information.setProjectTotal(projectTotal.toString());
+                    information.setUnderCentralized(secondUnits.toString()+underCentralized.toString());
                         if (!projectStart.equals("")&&projectStart!=null) {
                             information.setProjectStart(simpleDateFormat.parse(projectStart.toString()));
                         }
@@ -415,17 +417,17 @@ public  class ImportInformation {
                 Material material = new Material();
                 Row row = ei.getRow(i);
                 //项目定义号
-                Object projectId = ei.getCellValue(row, 0);
+                Object projectId = ei.getCellValue(row, 1);
                 //审定数量
-                Object authorizedNumber = ei.getCellValue(row, 7);
+                Object authorizedNumber = ei.getCellValue(row, 10);
                 //出库数量
-                Object outboundNumber = ei.getCellValue(row, 6);
+                Object outboundNumber = ei.getCellValue(row, 9);
                 //物料编号
-                Object inforId = ei.getCellValue(row, 1);
+                Object inforId = ei.getCellValue(row, 2);
                 //原因类型
-                Object status = ei.getCellValue(row, 14);
+                Object status = ei.getCellValue(row, 17);
                 //备注说明
-                Object info = ei.getCellValue(row, 15);
+                Object info = ei.getCellValue(row, 18);
                 //根据项目定义号，物料定义号查询出该条的物料信息
                 Material myProIn = materialService.findByProIn(projectId.toString(), inforId.toString());
                 //如果出库数量与记录的出库数量不一致，不与插入
@@ -541,23 +543,6 @@ public  class ImportInformation {
             }
             if (noChange.size() != 0) {
                 materialService.updateStatus(noChange);
-                List<Material> isBack = materialService.findIsBack(materialList);
-                for (Material maInfor:isBack) {
-                    Information upInfor = new Information();
-                    Information needInfor = materialService.findNeedInfor(maInfor);
-                    if (needInfor.getFirstFinish() == "" || needInfor.getFirstFinish() == null || ("否").equals(needInfor.getFirstFinish())) {
-                        upInfor.setProjectId(needInfor.getProjectId());
-                        upInfor.setFirstFinish("是");
-                        upInfor.setFirstFinishDate(new Date());
-                    } else if (("否").equals(needInfor.getSecondFinish())) {
-                        upInfor.setProjectId(needInfor.getProjectId());
-                        upInfor.setSecondFinish("是");
-                        upInfor.setSecondFinishDate(new Date());
-                    } else {
-                        continue;
-                    }
-                    materialService.updateNeed(upInfor);
-                }
                 noChange.clear();
             }
         } catch (Exception e) {
@@ -584,22 +569,13 @@ public  class ImportInformation {
                 Row row = ei.getRow(i);
                 //项目定义号
                 Object projectId = ei.getCellValue(row, 0);
-                //是否决算颂声
+                //是否决算送审
                 Object trial = ei.getCellValue(row, 1);
-                //施工单位
-                Object construction = ei.getCellValue(row, 2);
                 //工作状态
-                Object outConstruction = ei.getCellValue(row, 3);
-                //结算单位
-                Object settlement = ei.getCellValue(row, 4);
-                //归口部门
-                Object underCentralized = ei.getCellValue(row, 5);
+                Object appendStatus = ei.getCellValue(row, 2);
                 append.setProjectId(projectId.toString());
                 append.setTrial(trial.toString());
-                append.setConstruction(construction.toString());
-                append.setOutConstruction(outConstruction.toString());
-                append.setSettlement(settlement.toString());
-                append.setUnderCentralized(underCentralized.toString());
+                append.setAppendStatus(appendStatus.toString());
                 appendList.add(append);
                 if (appendList.size() == 1000) {
                     informationService.updateAppend(appendList);

src/main/java/com/jeeplus/modules/sg/audit/material/entity/Material.java

@@ -7,7 +7,7 @@ import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.DataEntity;
 
 /**
- * 项目信息Entity
+ * 物料信息Entity
  * @author qiuyue
  * @version 2019-09-04
  */
@@ -51,40 +51,23 @@ public class Material extends DataEntity<Material>  {
     private Double afterNumber;
     //用于记录修改原因后的审定数量，便于下次比对
     private Double afterAuthor;
+    //项目名称
+    private String projectName;
+    //项目类型
+    private String projectType;
+    //工作状态
+    private String appendStatus;
 
-    public Double getAfterAuthor() {
-        return afterAuthor;
-    }
-
-    public void setAfterAuthor(Double afterAuthor) {
-        this.afterAuthor = afterAuthor;
-    }
-
-    public Double getAfterNumber() {
-        return afterNumber;
-    }
-
-    public void setAfterNumber(Double afterNumber) {
-        this.afterNumber = afterNumber;
-    }
-
-    public int getIsBackNo() {
-        return isBackNo;
+    @ExcelField(title="项目名称", align=2, sort=1)
+    public String getProjectName() {
+        return projectName;
     }
 
-    public void setIsBackNo(int isBackNo) {
-        this.isBackNo = isBackNo;
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
     }
 
-    @ExcelField(title="是否完成领退料", align=2, sort=14)
-    public String getIsBack() {
-        return isBack;
-    }
-
-    public void setIsBack(String isBack) {
-        this.isBack = isBack;
-    }
-    @ExcelField(title="项目定义号", align=2, sort=1)
+    @ExcelField(title="项目定义号", align=2, sort=2)
     public String getProjectId() {
         return projectId;
     }
@@ -93,7 +76,7 @@ public class Material extends DataEntity<Material>  {
         this.projectId = projectId;
     }
 
-    @ExcelField(title="物料编号", align=2, sort=2)
+    @ExcelField(title="物料编号", align=2, sort=3)
     public String getInforId() {
         return inforId;
     }
@@ -102,7 +85,25 @@ public class Material extends DataEntity<Material>  {
         this.inforId = inforId;
     }
 
-    @ExcelField(title="物料描述", align=2, sort=3)
+    @ExcelField(title="项目类型", align=2, sort=4)
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    @ExcelField(title="工作状态", align=2, sort=5)
+    public String getAppendStatus() {
+        return appendStatus;
+    }
+
+    public void setAppendStatus(String appendStatus) {
+        this.appendStatus = appendStatus;
+    }
+
+    @ExcelField(title="物料描述", align=2, sort=6)
     public String getMaterialName() {
         return materialName;
     }
@@ -111,7 +112,7 @@ public class Material extends DataEntity<Material>  {
         this.materialName = materialName;
     }
 
-    @ExcelField(title="出库金额", align=2, sort=4)
+    @ExcelField(title="出库金额", align=2, sort=7)
     public Double getOutboundAmount() {
         return outboundAmount;
     }
@@ -120,7 +121,7 @@ public class Material extends DataEntity<Material>  {
         this.outboundAmount = outboundAmount;
     }
 
-    @ExcelField(title="审定金额", align=2, sort=5)
+    @ExcelField(title="审定金额", align=2, sort=8)
     public Double getAuthorizedAmount() {
         return authorizedAmount;
     }
@@ -129,7 +130,7 @@ public class Material extends DataEntity<Material>  {
         this.authorizedAmount = authorizedAmount;
     }
 
-    @ExcelField(title="差额", align=2, sort=6)
+    @ExcelField(title="差额", align=2, sort=9)
     public Double getDifference() {
         return difference;
     }
@@ -138,7 +139,7 @@ public class Material extends DataEntity<Material>  {
         this.difference = difference;
     }
 
-    @ExcelField(title="出库数量", align=2, sort=7)
+    @ExcelField(title="出库数量", align=2, sort=10)
     public Double getOutboundNumber() {
         return outboundNumber;
     }
@@ -147,7 +148,7 @@ public class Material extends DataEntity<Material>  {
         this.outboundNumber = outboundNumber;
     }
 
-    @ExcelField(title="审定数量", align=2, sort=8)
+    @ExcelField(title="审定数量", align=2, sort=11)
     public Double getAuthorizedNumber() {
         return authorizedNumber;
     }
@@ -156,7 +157,7 @@ public class Material extends DataEntity<Material>  {
         this.authorizedNumber = authorizedNumber;
     }
 
-    @ExcelField(title="平均价单价", align=2, sort=9)
+    @ExcelField(title="平均价单价", align=2, sort=12)
     public Double getPrice() {
         return price;
     }
@@ -165,7 +166,7 @@ public class Material extends DataEntity<Material>  {
         this.price = price;
     }
 
-    @ExcelField(title="单位", align=2, sort=10)
+    @ExcelField(title="单位", align=2, sort=13)
     public String getUnit() {
         return unit;
     }
@@ -174,7 +175,7 @@ public class Material extends DataEntity<Material>  {
         this.unit = unit;
     }
 
-    @ExcelField(title="物料小类", align=2, sort=11)
+    @ExcelField(title="物料小类", align=2, sort=14)
     public String getMaterialSmall() {
         return materialSmall;
     }
@@ -183,7 +184,7 @@ public class Material extends DataEntity<Material>  {
         this.materialSmall = materialSmall;
     }
 
-    @ExcelField(title="物料中类", align=2, sort=12)
+    @ExcelField(title="物料中类", align=2, sort=15)
     public String getMaterialMid() {
         return materialMid;
     }
@@ -192,7 +193,7 @@ public class Material extends DataEntity<Material>  {
         this.materialMid = materialMid;
     }
 
-    @ExcelField(title="物料大类", align=2, sort=13)
+    @ExcelField(title="物料大类", align=2, sort=16)
     public String getMaterialBig() {
         return materialBig;
     }
@@ -201,7 +202,16 @@ public class Material extends DataEntity<Material>  {
         this.materialBig = materialBig;
     }
 
-    @ExcelField(title="原因类型", align=2, sort=15)
+    @ExcelField(title="是否完成领退料", align=2, sort=17)
+    public String getIsBack() {
+        return isBack;
+    }
+
+    public void setIsBack(String isBack) {
+        this.isBack = isBack;
+    }
+
+    @ExcelField(title="原因类型", align=2, sort=18)
     public String getStatus() {
         return status;
     }
@@ -210,7 +220,7 @@ public class Material extends DataEntity<Material>  {
         this.status = status;
     }
 
-    @ExcelField(title="备注说明", align=2, sort=16)
+    @ExcelField(title="备注说明", align=2, sort=19)
     public String getInfo() {
         return info;
     }
@@ -218,4 +228,32 @@ public class Material extends DataEntity<Material>  {
     public void setInfo(String info) {
         this.info = info;
     }
+
+
+    public Double getAfterAuthor() {
+        return afterAuthor;
+    }
+
+    public void setAfterAuthor(Double afterAuthor) {
+        this.afterAuthor = afterAuthor;
+    }
+
+    public Double getAfterNumber() {
+        return afterNumber;
+    }
+
+    public void setAfterNumber(Double afterNumber) {
+        this.afterNumber = afterNumber;
+    }
+
+
+    public void setIsBackNo(int isBackNo) {
+        this.isBackNo = isBackNo;
+    }
+
+    public int getIsBackNo() {
+        return isBackNo;
+    }
+
+
 }

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

@@ -62,10 +62,10 @@
 		sum(a.st1) as finishCount,
 		SUM(a.st2) as unfinishCount
 		 from
-	    (SELECT if(t2.underCentralized is null,'未知部门',t2.underCentralized) as underCentralized,
+	    (SELECT if(t1.underCentralized is null,'未知部门',t1.underCentralized) as underCentralized,
 	            if(t1.firstFinish='否' or t1.secondFinish = '否',0,1) as st1,
 	            if(t1.firstFinish='否' or t1.secondFinish = '否',1,0) as st2
-	            from sj_project_information t1 left join sj_project_append t2 on t1.project_id = t2.project_id
+	            from sj_project_information t1
 		<where>
 			1=1
 			<if test="dataScope != null and dataScope != ''">
@@ -90,10 +90,10 @@
 		a.status as status
 		from
 		(SELECT id,
-		if(t2.underCentralized is null,'未知部门',t2.underCentralized) as underCentralized,
+		if(t1.underCentralized is null,'未知部门',t1.underCentralized) as underCentralized,
 		if(t1.firstFinish='否' or t1.secondFinish = '否',NOW(),if(t1.secondFinish = '是',t1.secondFinishDate,t1.firstFinishDate) )as da ,
 		t1.approvalDate ,if(t1.firstFinish='否' or t1.secondFinish = '否','0','1') as status
-		from sj_project_information t1 left join sj_project_append t2 on t1.project_id = t2.project_id
+		from sj_project_information t1
 		<where>
 			1=1
 			<if test="dataScope != null and dataScope != ''">

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

@@ -92,10 +92,10 @@ $(document).ready(function() {
 		        sortName: 'project_type'
 		    }
 		   ,{
-			   field: 'outConstruction',
+			   field: 'appendStatus',
 			   title: '工作</br>状态',
 			   width:'60px',
-			   sortName: 'outConstruction'
+			   sortName: 'appendStatus'
 		   }
 		   ,{
 			   field: 'approvalDate',
@@ -168,8 +168,8 @@ $(document).ready(function() {
 		   }
 		   ,{
 			   field: 'underCentralized',
-			   title: '归口</br>部门',
-			   width:'60px',
+			   title: '归口部门',
+			   width:'120px',
 			   sortName: 'underCentralized'
 		   }
 			,{
@@ -203,15 +203,15 @@ $(document).ready(function() {
 			   sortName: 'project_stop'
 		   }
 		   ,{
-			   field: 'construction',
+			   field: 'department',
 			   title: '施工</br>单位',
 			   width:'60px',
-			   sortName: 'construction'
+			   sortName: 'department'
 		   }
 		   ,{
 			   field: 'projectFirm',
-			   title: '事务所</br>名称',
-			   width:'60px',
+			   title: '结算审计</br>单位名称',
+			   width:'100px',
 			   sortName: 'project_firm'
 		   }
 		   ,{
@@ -238,13 +238,6 @@ $(document).ready(function() {
 			   width:'100px',
 			   sortName: 'resultDate'
 		   }
-
-		   ,{
-			   field: 'settlement',
-			   title: '结算单位',
-			   width:'100px',
-			   sortName: 'settlement'
-		   }
 			,{
 			   field: 'operate',
 			   title: '操作',