项目进度查询模块提交

jeeplus.iml

@@ -23,6 +23,23 @@
         <naming-strategy-map />
       </configuration>
     </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerPreviousEnabledSelection" value="instance" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleSpecificSingleRemoteServer" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1594945346289" />
+            <entry key="savedRebelXmlBuildTool" />
+            <entry key="savedRebelXmlContent" />
+          </map>
+        </option>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />

src/main/java/com/jeeplus/modules/sg/fund/entity/Fund.java

@@ -3,9 +3,13 @@ package com.jeeplus.modules.sg.fund.entity;
 import com.jeeplus.core.persistence.ActEntity;
 import com.jeeplus.modules.sg.managementcenter.project.entity.BasicInformation;
 
+import java.util.List;
+
 public class Fund extends ActEntity<Fund> {
     //工程编号
     private String projectId;
+    //项目定义号查询list
+    private String[] projectIdList;
     //项目定义描述
     private String projectName;
     //储备项目名称
@@ -25,6 +29,14 @@ public class Fund extends ActEntity<Fund> {
         this.projectId = projectId;
     }
 
+    public String[] getProjectIdList() {
+        return projectIdList;
+    }
+
+    public void setProjectIdList(String[] projectIdList) {
+        this.projectIdList = projectIdList;
+    }
+
     public String getProjectName() {
         return projectName;
     }

src/main/java/com/jeeplus/modules/sg/fund/mapper/FundMapper.java

@@ -12,4 +12,6 @@ public interface FundMapper extends BaseMapper<Fund> {
 
     //修改项目资产卡片号
     void updateAsset(@Param("assetCardNumber") String assetCardNumber, @Param("procInsId")String procInsId);
+
+    void deleteList(String[] idList);
 }

src/main/java/com/jeeplus/modules/sg/fund/mapper/xml/FundMapper.xml

@@ -40,6 +40,11 @@
 		b.basicDescription AS `basicInformation.basicDescription`,
 		b.workAreaRemarks AS `basicInformation.workAreaRemarks`
     </sql>
+    <delete id="deleteList">
+        <foreach collection="array" item="item" separator=";" index="index">
+        delete from xm_fund_process where id = #{item}
+        </foreach>
+    </delete>
 
     <select id="get" resultType="Fund">
         SELECT
@@ -67,6 +72,12 @@
             <if test="reserveProjectName != null and reserveProjectName !=''">
                 and a.reserveProjectName = #{reserveProjectName}
             </if>
+            <if test="projectIdList != null and projectIdList != ''">
+                and a.projectid in
+                <foreach collection="projectIdList" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -128,10 +139,9 @@
 
     <update id="update">
         UPDATE xm_fund_process
-        SET proc_ins_id = #{procInsId},
-            update_by   = #{updateBy.id},
-            update_date = #{updateDate}
-        WHERE proc_ins_id = #{procInsIdid}
+        SET wbsEncoding = #{wbsEncoding},
+            assetCardNumber = #{assetCardNumber}
+        WHERE id = #{id}
     </update>
 
     <update id="updateWbs">

src/main/java/com/jeeplus/modules/sg/fund/service/FundService.java

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -44,10 +45,15 @@ public class FundService extends CrudService<FundMapper, Fund> {
 		super.delete(entity);
 	}
 
+	@Transactional(readOnly = false)
+	public void update(Fund fund) {
+		fundMapper.update(fund);
+	}
+
 	//修改项目wbs
 	@Transactional(readOnly = false)
 	public void updateWbs(String wbsEncoding, String procInsId) {
-				fundMapper.updateWbs(wbsEncoding, procInsId);
+		fundMapper.updateWbs(wbsEncoding, procInsId);
 	}
 
 	//修改项目资产卡片号
@@ -55,4 +61,10 @@ public class FundService extends CrudService<FundMapper, Fund> {
 	public void updateAsset(String assetCardNumber, String procInsId) {
 		fundMapper.updateAsset(assetCardNumber, procInsId);
 	}
+
+
+	@Transactional(readOnly = false)
+	public void deleteList(String[] idList) {
+		fundMapper.deleteList(idList);
+	}
 }

src/main/java/com/jeeplus/modules/sg/fund/web/FundController.java

@@ -22,6 +22,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.*;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
+import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.service.MaterialInfoService;
 import com.jeeplus.modules.sg.managementcenter.materialproject.service.MaterialProjectService;
@@ -126,6 +127,12 @@ public class FundController extends BaseController {
         return "modules/sg/fund/assetForm";
     }
 
+    @RequestMapping(value = "fundForm")
+    public String form(Fund fund, Model model) {
+        model.addAttribute("fund", fund);
+        return "modules/sg/fund/fundForm";
+    }
+
     /**
      * 项目管理列表数据
      */
@@ -133,19 +140,26 @@ public class FundController extends BaseController {
     @RequiresPermissions("modules:sg:information:information:list")
     @RequestMapping(value = "data")
     public Map<String, Object> data(Fund fund, HttpServletRequest request, HttpServletResponse response, Model model) {
+        String projectId = fund.getProjectId();
+        if (null != projectId && !"".equals(projectId)) {
+            String[] strArr = projectId.split("\\s+");
+            fund.setProjectIdList(strArr);
+            fund.setProjectId("");
+        }
         Page<Fund> page = fundService.findPage(new Page<Fund>(request, response), fund);
         return getBootstrapData(page);
     }
 
     /**
-     * 土建工程量添加，修改
+     * 转资修改
      */
     @ResponseBody
-    @RequestMapping(value = "EngAmountSave")
-    public AjaxJson EngAmountSave(EngineeringAmount engineeringAmount, Model model) throws Exception {
+    @RequestMapping(value = "fundUpdate")
+    public AjaxJson EngAmountSave(Fund fund, Model model) throws Exception {
         AjaxJson j = new AjaxJson();
         try {
 //            constructionService.EngAmountSave(engineeringAmount);
+//            fundService.fundUpdate();
             j.setSuccess(true);
             j.setMsg("修改成功");
         } catch (Exception e) {
@@ -155,77 +169,34 @@ public class FundController extends BaseController {
         return j;
     }
 
+
+
     /**
-     * 其它工程量添加，修改
+     * 转资删除
      */
     @ResponseBody
-    @RequestMapping(value = "addOther")
-    public AjaxJson addOther(OtherAmount otherAmount, Model model) throws Exception {
+    @RequestMapping(value = "delFund")
+    public AjaxJson delFund(Fund fund) {
         AjaxJson j = new AjaxJson();
-        try {
-//            constructionService.addOther(otherAmount);
-            j.setSuccess(true);
-            j.setMsg("修改成功");
-        } catch (Exception e) {
-            j.setSuccess(false);
-            j.setMsg("修改失败");
-        }
+        fundService.delete(fund);
+        j.setMsg("删除转资信息成功");
         return j;
     }
 
     /**
-     * 土建工程量删除
+     * 修改成功
      */
     @ResponseBody
-    @RequestMapping(value = "delEngAmount")
-    public AjaxJson delEngAmount(Fund fund) {
+    @RequestMapping(value = "update")
+    public AjaxJson update(Fund fund) {
         AjaxJson j = new AjaxJson();
-        fundService.delete(fund);
-        j.setMsg("删除工程量成功");
+        fundService.update(fund);
+        j.setMsg("修改成功");
         return j;
     }
 
-
-    /**
-     * 下载施工交底模板文件
-     */
-    @RequestMapping(value = "excelOut")
-    public void excelStandardTemplateOut(HttpServletRequest request,
-                                         HttpServletResponse response) throws IOException {
-        String fileName = "disclose.xlsx";
-        String filePath = getClass().getResource("/freemarker/" + fileName).getPath();
-        File f = new File(filePath);
-        // 设置response参数，可以打开下载页面
-        response.reset();
-        response.setContentType("application/vnd.ms-excel;charset=utf-8");
-        try {
-            response.setHeader("Content-Disposition", "attachment;filename=" + new String(("交底结论模板" + ".xlsx").getBytes(), "iso-8859-1"));//下载文件的名称
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        ServletOutputStream out = response.getOutputStream();
-        BufferedInputStream bis = null;
-        BufferedOutputStream bos = null;
-        try {
-            bis = new BufferedInputStream(new FileInputStream(f));
-            bos = new BufferedOutputStream(out);
-            byte[] buff = new byte[2048];
-            int bytesRead;
-            while (-1 != (bytesRead = bis.read(buff, 0, buff.length))) {
-                bos.write(buff, 0, bytesRead);
-            }
-        } catch (final IOException e) {
-            throw e;
-        } finally {
-            if (bis != null)
-                bis.close();
-            if (bos != null)
-                bos.close();
-        }
-    }
-
     /**
-     * 发起施工交底流程
+     * 发起转资流程
      */
     @ResponseBody
     @RequestMapping(value = "save")
@@ -286,6 +257,9 @@ public class FundController extends BaseController {
         return j;
     }
 
+    /**
+     * 转资提交wbs流程
+     * */
     @ResponseBody
     @RequestMapping(value = "wbsTask")
     public AjaxJson wbsTask(Act act, String wbsEncoding) {
@@ -317,4 +291,17 @@ public class FundController extends BaseController {
         j.setMsg("审批成功");
         return j;
     }
+
+    /**
+     * 批量删除
+     */
+    @ResponseBody
+    @RequestMapping(value = "deleteAll")
+    public AjaxJson deleteAll(String ids) {
+        AjaxJson j = new AjaxJson();
+        String idArray[] =ids.split(",");
+        fundService.deleteList(idArray);
+        j.setMsg("删除项目运营管理成功");
+        return j;
+    }
 }

src/main/java/com/jeeplus/modules/sg/scheduleView/entity/CivilView.java

@@ -0,0 +1,57 @@
+package com.jeeplus.modules.sg.scheduleView.entity;
+
+/**
+ * 项目进度查询-土建流程实体类
+ * */
+public class CivilView {
+    //土建开始
+    private String civilBegins;
+    //土建开工
+    private String civilStarts;
+    //土建竣工
+    private String civilCompleted;
+    //审核土建竣工
+    private String civilReview;
+    //土建完成时间
+    private String civilCompletion;
+
+    public String getCivilBegins() {
+        return civilBegins;
+    }
+
+    public void setCivilBegins(String civilBegins) {
+        this.civilBegins = civilBegins;
+    }
+
+    public String getCivilStarts() {
+        return civilStarts;
+    }
+
+    public void setCivilStarts(String civilStarts) {
+        this.civilStarts = civilStarts;
+    }
+
+    public String getCivilCompleted() {
+        return civilCompleted;
+    }
+
+    public void setCivilCompleted(String civilCompleted) {
+        this.civilCompleted = civilCompleted;
+    }
+
+    public String getCivilReview() {
+        return civilReview;
+    }
+
+    public void setCivilReview(String civilReview) {
+        this.civilReview = civilReview;
+    }
+
+    public String getCivilCompletion() {
+        return civilCompletion;
+    }
+
+    public void setCivilCompletion(String civilCompletion) {
+        this.civilCompletion = civilCompletion;
+    }
+}

src/main/java/com/jeeplus/modules/sg/scheduleView/entity/ClosureView.java

@@ -1,14 +1,22 @@
 package com.jeeplus.modules.sg.scheduleView.entity;
 
+/**
+ * 项目进度查询-项目关闭实体类
+ * */
 public class ClosureView {
 
-    //交底:判断项目是否需要关闭
+    //交底:项目经理判定是否关闭
     private String ifClose;
-    //交底:配网运行人员
+    //交底:配网工程专职判定是否关闭
     private String runMember;
-    //交底:确认项目关闭
+    //交底:配网运行人员判定是否关闭
     private String isClosed;
-
+    //交底:配网工程专职判定变更或关闭
+    private String determination;
+    //交底:配网项目经理判定变更或关闭
+    private String projectManager;
+    //交底:配网系统专职确认系统关闭
+    private String shutDown;
 
     public String getIfClose() {
         return ifClose;
@@ -33,4 +41,28 @@ public class ClosureView {
     public void setIsClosed(String isClosed) {
         this.isClosed = isClosed;
     }
+
+    public String getDetermination() {
+        return determination;
+    }
+
+    public void setDetermination(String determination) {
+        this.determination = determination;
+    }
+
+    public String getProjectManager() {
+        return projectManager;
+    }
+
+    public void setProjectManager(String projectManager) {
+        this.projectManager = projectManager;
+    }
+
+    public String getShutDown() {
+        return shutDown;
+    }
+
+    public void setShutDown(String shutDown) {
+        this.shutDown = shutDown;
+    }
 }

src/main/java/com/jeeplus/modules/sg/scheduleView/entity/DesignView.java

@@ -1,19 +1,22 @@
 package com.jeeplus.modules.sg.scheduleView.entity;
 
+/**
+ * 项目进度查询-设计变更实体类
+ * */
 public class DesignView {
-    //交底:判定设计变更
+    //交底:配网项目经理判定设计变更
     private String designChange;
-    //交底:项目经理判断是否需要再设计变更
+    //交底:经研所判定是否设计变更
     private String ifChange;
-    //交底:经研所设计变更
+    //交底:运行单位经理审核方案
     private String JYSChange;
-    //交底:运行人员审核图纸
+    //交底:设计单位人员重新设计
     private String unitReview;
-    //交底:重新设计
+    //交底:运行经理审核设计变更后
     private String designAgain;
-    //交底:运行人员判断变更后材料
+    //交底:配网经理审核设计变更后
     private String changeAfter;
-    //交底:配网项目经理判断变更后材料
+    //
     private String managerAfter;
 
     public String getDesignChange() {

src/main/java/com/jeeplus/modules/sg/scheduleView/entity/DisView.java

@@ -1,15 +1,18 @@
 package com.jeeplus.modules.sg.scheduleView.entity;
 
+/**
+ * 项目进度查询-施工交底实体类
+ * */
 public class DisView {
     //流程定义号
     private String procInsId;
-    //配网工程专职发起流程
+    //发起流程
     private String fullTimeStart;
-    //配网项目经理导入交底结论
+    //交底:项目经理交底内容
     private String projectManagerImport;
-    //施工单位项目经理判断是否存在问题
+    //交底:导入材料表和拆旧物资表
     private String unitManagerJudge;
-    //配网项目经理判断是否存在问题
+    //交底:填写部分工程量信息
     private String projectManagerJudge;
     //项目关闭
     private String projectClosure;

src/main/java/com/jeeplus/modules/sg/scheduleView/entity/ElectricView.java

@@ -0,0 +1,107 @@
+package com.jeeplus.modules.sg.scheduleView.entity;
+
+/**
+ * 项目进度查询-电气流程实体类
+ * */
+public class ElectricView {
+    //发起施工流程/填写项目类型
+    private String startTime;
+    //电气开工报告
+    private String electricStart;
+    //上传电气竣工资料
+    private String electricUploadCompletion;
+    //审核电气竣工流程
+    private String electricReviewCompletion;
+    //上传涉电开工资料
+    private String electricStartUpload;
+    //涉电开工报告
+    private String electricStartElectricity;
+    //涉电竣工报告
+    private String electricEndElectricity;
+    //审核涉电竣工
+    private String electricReviewRelated;
+    //是否完成所有涉电工作
+    private String electricWork;
+    //项目结束状态
+    private String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getElectricStart() {
+        return electricStart;
+    }
+
+    public void setElectricStart(String electricStart) {
+        this.electricStart = electricStart;
+    }
+
+    public String getElectricUploadCompletion() {
+        return electricUploadCompletion;
+    }
+
+    public void setElectricUploadCompletion(String electricUploadCompletion) {
+        this.electricUploadCompletion = electricUploadCompletion;
+    }
+
+    public String getElectricReviewCompletion() {
+        return electricReviewCompletion;
+    }
+
+    public void setElectricReviewCompletion(String electricReviewCompletion) {
+        this.electricReviewCompletion = electricReviewCompletion;
+    }
+
+    public String getElectricStartUpload() {
+        return electricStartUpload;
+    }
+
+    public void setElectricStartUpload(String electricStartUpload) {
+        this.electricStartUpload = electricStartUpload;
+    }
+
+    public String getElectricStartElectricity() {
+        return electricStartElectricity;
+    }
+
+    public void setElectricStartElectricity(String electricStartElectricity) {
+        this.electricStartElectricity = electricStartElectricity;
+    }
+
+    public String getElectricEndElectricity() {
+        return electricEndElectricity;
+    }
+
+    public void setElectricEndElectricity(String electricEndElectricity) {
+        this.electricEndElectricity = electricEndElectricity;
+    }
+
+    public String getElectricReviewRelated() {
+        return electricReviewRelated;
+    }
+
+    public void setElectricReviewRelated(String electricReviewRelated) {
+        this.electricReviewRelated = electricReviewRelated;
+    }
+
+    public String getElectricWork() {
+        return electricWork;
+    }
+
+    public void setElectricWork(String electricWork) {
+        this.electricWork = electricWork;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+}

src/main/java/com/jeeplus/modules/sg/scheduleView/entity/PolicyView.java

@@ -1,31 +1,40 @@
 package com.jeeplus.modules.sg.scheduleView.entity;
 
+/**
+ * 项目进度查询-政策处理实体类
+ * */
 public class PolicyView {
     //(行政政处)
-    //交底:上传未盖章施工方案(行政政处(城区道路))行政政处
+    //交底:农村政处
     private String urbanRoad;
-    //交底:项目经理判断是否需要政策处理行政政处
+    //交底:农村专职判断
     private String policyNeed;
-    //交底:施工方案盖章行政政处
+    //交底:农村上传文件
     private String sealScheme;
-    //交底:上传收据行政政处
+    //交底:农村是否支付
     private String uploadReceipt;
-    //交底:上传缴费单行政政处
+    //交底:农村是否借款
     private String payment;
-    //交底:上传借款单据行政政处
+    //交底:行政政处
     private String uploadLoan;
-    //交底:判断政策处理
+    //交底:行政专职判断
     private String handling;
-    //交底:上传未签字版政策处理清单
+    //交底:行政上传文件
     private String unsignedVersion;
-    //交底:项目经理判断农村是否需要政策处理
+    //交底:行政是否支付
     private String ruralNeed;
-    //交底:上传签字版政策处理清单
+    //交底:行政是否借款
     private String policyList;
-    //交底:上传签字版合同
+    //交底:民事政处
     private String signedContract;
-    //交底:上传借款单据1
+    //交底:民事专职判断
     private String uploadLoan1;
+    //交底:民事上传文件
+    private String civilUpload;
+    //交底:民事是否支付
+    private String civilPay;
+    //交底:民事是否借款
+    private String civilBorrow;
 
     public String getUrbanRoad() {
         return urbanRoad;
@@ -122,4 +131,28 @@ public class PolicyView {
     public void setUploadLoan1(String uploadLoan1) {
         this.uploadLoan1 = uploadLoan1;
     }
+
+    public String getCivilUpload() {
+        return civilUpload;
+    }
+
+    public void setCivilUpload(String civilUpload) {
+        this.civilUpload = civilUpload;
+    }
+
+    public String getCivilPay() {
+        return civilPay;
+    }
+
+    public void setCivilPay(String civilPay) {
+        this.civilPay = civilPay;
+    }
+
+    public String getCivilBorrow() {
+        return civilBorrow;
+    }
+
+    public void setCivilBorrow(String civilBorrow) {
+        this.civilBorrow = civilBorrow;
+    }
 }

src/main/java/com/jeeplus/modules/sg/scheduleView/entity/ReceiveView.java

@@ -1,5 +1,8 @@
 package com.jeeplus.modules.sg.scheduleView.entity;
 
+/**
+ * 项目进度查询-物资领料实体类
+ * */
 public class ReceiveView {
     //项目经理开领料单
     private String openList;

src/main/java/com/jeeplus/modules/sg/scheduleView/entity/ScheduleView.java

@@ -13,13 +13,17 @@ public class ScheduleView extends ActEntity<ScheduleView> {
     //项目定义号集合
     private List<String> projectList;
     //项目自定义描述
-    private String requireName;
+    private String projectName;
+    //储备项目名称
+    private String reserveProjectName;
     //项目交底类型
-    private String clarificaitonType;
+    private String projectType;
     //施工交底状态
     private String status;
     //物资领料状态
     private String acquisitionStatus;
+    //土建状态
+    private String advanceStatus;
     //施工状态
     private String constructionStatus;
     //结算状态
@@ -30,6 +34,10 @@ public class ScheduleView extends ActEntity<ScheduleView> {
     private ReceiveView receiveView;
     //结算流程
     private SettView settView;
+    //土建流程
+    private CivilView civilView;
+    //电气流程
+    private ElectricView electricView;
     //设计变更
     private DesignView designView;
     //项目关闭
@@ -53,20 +61,28 @@ public class ScheduleView extends ActEntity<ScheduleView> {
         this.projectList = projectList;
     }
 
-    public String getRequireName() {
-        return requireName;
+    public String getProjectName() {
+        return projectName;
     }
 
-    public void setRequireName(String requireName) {
-        this.requireName = requireName;
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
     }
 
-    public String getClarificaitonType() {
-        return clarificaitonType;
+    public String getReserveProjectName() {
+        return reserveProjectName;
     }
 
-    public void setClarificaitonType(String clarificaitonType) {
-        this.clarificaitonType = clarificaitonType;
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
+    }
+
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
     }
 
     public String getStatus() {
@@ -77,6 +93,14 @@ public class ScheduleView extends ActEntity<ScheduleView> {
         this.status = status;
     }
 
+    public String getAdvanceStatus() {
+        return advanceStatus;
+    }
+
+    public void setAdvanceStatus(String advanceStatus) {
+        this.advanceStatus = advanceStatus;
+    }
+
     public String getAcquisitionStatus() {
         return acquisitionStatus;
     }
@@ -125,6 +149,22 @@ public class ScheduleView extends ActEntity<ScheduleView> {
         this.settView = settView;
     }
 
+    public CivilView getCivilView() {
+        return civilView;
+    }
+
+    public void setCivilView(CivilView civilView) {
+        this.civilView = civilView;
+    }
+
+    public ElectricView getElectricView() {
+        return electricView;
+    }
+
+    public void setElectricView(ElectricView electricView) {
+        this.electricView = electricView;
+    }
+
     public DesignView getDesignView() {
         return designView;
     }

src/main/java/com/jeeplus/modules/sg/scheduleView/entity/SettView.java

@@ -1,5 +1,8 @@
 package com.jeeplus.modules.sg.scheduleView.entity;
 
+/**
+ * 项目进度查询-结算流程实体类
+ * */
 public class SettView {
     //结算验收发起模块
     private String settStart;

src/main/java/com/jeeplus/modules/sg/scheduleView/mapper/ScheduleViewMapper.java

@@ -26,4 +26,8 @@ public interface ScheduleViewMapper extends BaseMapper<ScheduleView> {
 
     List<ScheduleView> settAll(ScheduleView scheduleView);
 
+    List<ScheduleView> civilAll(ScheduleView scheduleView);
+
+    List<ScheduleView> electricAll(ScheduleView scheduleView);
+
 }

src/main/java/com/jeeplus/modules/sg/scheduleView/mapper/xml/ScheduleViewMapper.xml

@@ -60,17 +60,20 @@
 
 
     <select id="scheduleProjectAll" resultType="com.jeeplus.modules.sg.scheduleView.entity.ScheduleView">
-        select require_name,
-               project_id,
-               clarificaiton_type,
+        select reserveProjectName,
+               projectId,
+               projectName,
                status,
-               acquisition_status,
-               construction_status,
-               whether_close_status,
-               sett_status
-        from xm_project_details
+               acquisitionStatus,
+               advanceStatus,
+               constructionStatus,
+               whetherCloseStatus,
+               settStatus
+        from xm_material_project
         <where>
             1 = 1
+            and
+            secondPower = 0
             <if test="projectList!=null and projectList.size>0 and projectList!=''">
             and project_id in(
                 <foreach collection="projectList" item="item" separator=",">
@@ -82,22 +85,25 @@
     </select>
 
     <select id="disAll" resultType="com.jeeplus.modules.sg.scheduleView.entity.ScheduleView">
-        select a.require_name,
-            a.project_id,
-            a.clarificaiton_type,
+        select a.projectName,
+            a.reserveProjectName,
+            a.projectId,
+            a.projectType,
             a.status,
-            a.acquisition_status,
-            a.construction_status,
-            a.whether_close_status,
-            a.sett_status,
-            b.proc_ins_id,
-            c.channel
-            from xm_project_details a LEFT JOIN xm_construction_clarificaiton b
-        on a.project_id = b.project_id LEFT JOIN xm_disclose_conclusion c on b.proc_ins_id = c.proc_ins_id
+            a.acquisitionStatus,
+            a.advanceStatus,
+            a.constructionStatus,
+            a.settStatus,
+            b.proc_ins_id
+            from xm_material_project a
+            LEFT JOIN xm_construction_clarificaiton b
+            on a.reserveProjectName = b.reserveProjectName
         <where>
             1 = 1
+            and
+            a.secondPower = 0
             <if test="projectList!=null and projectList.size>0 and projectList!=''">
-                and a.project_id in(
+                and a.projectId in(
                 <foreach collection="projectList" item="item" separator=",">
                     #{item}
                 </foreach>
@@ -107,21 +113,24 @@
     </select>
 
     <select id="recAll" resultType="com.jeeplus.modules.sg.scheduleView.entity.ScheduleView">
-        select a.require_name,
-               a.project_id,
-               a.clarificaiton_type,
-               a.status,
-               a.acquisition_status,
-               a.construction_status,
-               a.whether_close_status,
-               a.sett_status,
-               b.proc_ins_id,
+        select a.projectName,
+                a.reserveProjectName,
+                a.projectId,
+                a.projectType,
+                a.status,
+                a.acquisitionStatus,
+                a.advanceStatus,
+                a.constructionStatus,
+                a.settStatus,
+                b.proc_ins_id,
                b.the_number as 'receiveView.theNumber'
-        from xm_project_details a left join md_acquisition_process b on a.id = b.project_id
+        from xm_material_project a left join md_acquisition_process b on a.reserveProjectName = b.reserveProjectName
         <where>
             1 = 1
+            and
+            a.secondPower = 0
             <if test="projectList!=null and projectList.size>0 and projectList!=''">
-                and a.project_id in(
+                and a.projectId in(
                 <foreach collection="projectList" item="item" separator=",">
                     #{item}
                 </foreach>
@@ -131,20 +140,75 @@
     </select>
     
     <select id="settAll" resultType="com.jeeplus.modules.sg.scheduleView.entity.ScheduleView">
-        select a.require_name,
-               a.project_id,
-               a.clarificaiton_type,
-               a.status,
-               a.acquisition_status,
-               a.construction_status,
-               a.whether_close_status,
-               a.sett_status,
-               b.proc_ins_id
-        from xm_project_details a left join xm_settlement_process b on a.project_id = b.projectId
+        select a.projectName,
+                a.reserveProjectName,
+                a.projectId,
+                a.projectType,
+                a.status,
+                a.acquisitionStatus,
+                a.advanceStatus,
+                a.constructionStatus,
+                a.settStatus,
+                b.proc_ins_id
+        from xm_material_project a left join xm_settlement_process b on a.reserveProjectName = b.reserveProjectName
         <where>
             1 = 1
+            and
+            a.secondPower = 0
             <if test="projectList!=null and projectList.size>0 and projectList!=''">
-                and a.project_id in(
+                and a.projectId in(
+                <foreach collection="projectList" item="item" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
+        </where>
+    </select>
+
+    <select id="civilAll" resultType="com.jeeplus.modules.sg.scheduleView.entity.ScheduleView">
+        select a.projectName,
+        a.reserveProjectName,
+        a.projectId,
+        a.projectType,
+        a.status,
+        a.acquisitionStatus,
+        a.advanceStatus,
+        a.constructionStatus,
+        a.settStatus,
+        b.proc_ins_id
+        from xm_material_project a left join xm_nonpower_process b on a.reserveProjectName = b.reserveProjectName
+        <where>
+            1 = 1
+            and
+            a.secondPower = 0
+            <if test="projectList!=null and projectList.size>0 and projectList!=''">
+                and a.projectId in(
+                <foreach collection="projectList" item="item" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
+        </where>
+    </select>
+
+    <select id="electricAll" resultType="com.jeeplus.modules.sg.scheduleView.entity.ScheduleView">
+        select a.projectName,
+        a.reserveProjectName,
+        a.projectId,
+        a.projectType,
+        a.status,
+        a.acquisitionStatus,
+        a.advanceStatus,
+        a.constructionStatus,
+        a.settStatus,
+        b.proc_ins_id
+        from xm_material_project a left join sg_construction_process b on a.reserveProjectName = b.reserveProjectName
+        <where>
+            1 = 1
+            and
+            a.secondPower = 0
+            <if test="projectList!=null and projectList.size>0 and projectList!=''">
+                and a.projectId in(
                 <foreach collection="projectList" item="item" separator=",">
                     #{item}
                 </foreach>

src/main/java/com/jeeplus/modules/sg/scheduleView/service/ScheduleViewService.java

@@ -47,10 +47,26 @@ public class ScheduleViewService extends CrudService<ScheduleViewMapper, Schedul
 		return page;
 	}
 
-	public Page<ScheduleView> setAll(Page<ScheduleView> page, ScheduleView scheduleView) {
+	public Page<ScheduleView> settAll(Page<ScheduleView> page, ScheduleView scheduleView) {
 		dataRuleFilter(scheduleView);
 		scheduleView.setPage(page);
 		page.setList(scheduleViewMapper.settAll(scheduleView));
 		return page;
 	}
+
+	public Page<ScheduleView> civilAll(Page<ScheduleView> page, ScheduleView scheduleView) {
+		dataRuleFilter(scheduleView);
+		scheduleView.setPage(page);
+		page.setList(scheduleViewMapper.civilAll(scheduleView));
+		return page;
+	}
+
+	public Page<ScheduleView> electricAll(Page<ScheduleView> page, ScheduleView scheduleView) {
+		dataRuleFilter(scheduleView);
+		scheduleView.setPage(page);
+		page.setList(scheduleViewMapper.electricAll(scheduleView));
+		return page;
+	}
+
+
 }

src/main/java/com/jeeplus/modules/sg/scheduleView/web/ScheduleViewController.java

@@ -53,6 +53,24 @@ public class ScheduleViewController extends BaseController {
     }
 
     /**
+     * 土建验收模块
+     */
+    @RequestMapping(value = "civilView")
+    public String civilView(ScheduleView scheduleView, Model model) {
+        model.addAttribute("scheduleView", scheduleView);
+        return "modules/sg/scheduleView/show/civilView";
+    }
+
+    /**
+     * 电气验收模块
+     */
+    @RequestMapping(value = "electricView")
+    public String electricView(ScheduleView scheduleView, Model model) {
+        model.addAttribute("scheduleView", scheduleView);
+        return "modules/sg/scheduleView/show/electricView";
+    }
+
+    /**
      * 结算模块
      */
     @RequestMapping(value = "settView")
@@ -114,6 +132,7 @@ public class ScheduleViewController extends BaseController {
             String acquisitionStatus = c.getAcquisitionStatus();
             String constructionStatus = c.getConstructionStatus();
             String settStatus = c.getSettStatus();
+            String advanceStatus = c.getAdvanceStatus();
             //对不同流程状态进行判断重新赋值
             if ("0".equalsIgnoreCase(status)) {
                 c.setStatus("未发起流程");
@@ -130,6 +149,15 @@ public class ScheduleViewController extends BaseController {
             } else {
                 c.setAcquisitionStatus("流程结束");
             }
+
+            if ("0".equalsIgnoreCase(advanceStatus)) {
+                c.setAdvanceStatus("未发起流程");
+            } else if ("1".equalsIgnoreCase(advanceStatus)) {
+                c.setAdvanceStatus("发起流程中");
+            } else {
+                c.setAdvanceStatus("流程结束");
+            }
+
             if ("0".equalsIgnoreCase(constructionStatus)) {
                 c.setConstructionStatus("未发起流程");
             } else if ("1".equalsIgnoreCase(constructionStatus)) {
@@ -171,7 +199,6 @@ public class ScheduleViewController extends BaseController {
         String fin = "";
         for (ScheduleView s : list) {
             String procInsId = s.getProcInsId();
-            String clarificaitonType = s.getClarificaitonType();
             if (procInsId != null && !"".equals(procInsId)) {
                 List<HistoricActivityInstance> historicActivityInstances = MyActiviUtils.hisTask(procInsId);
                 List<Task> tasks = MyActiviUtils.runNowTask(procInsId);
@@ -195,294 +222,67 @@ public class ScheduleViewController extends BaseController {
                             s.setDisView(disView1);
                         }
                     }
-                    if ("施工单位自行交底".equals(clarificaitonType)) {
-                        s.getDisView().setProjectManagerImport("施工单位交底没有此流程");
-                        if ("交底:施工单位组织交底".equals(activityName)) {
-                            s.getDisView().setUnitManagerJudge(format);
-                        }
-                        if ("交底:项目经理人工判断问题".equals(activityName)) {
-                            s.getDisView().setProjectManagerJudge(format);
-                            if (runNowName.contains("交底:判定设计变更")
-                                    || runNowName.contains("交底:项目经理判断是否需要再设计变更")
-                                    || runNowName.contains("交底:经研所设计变更")
-                                    || runNowName.contains("交底:运行人员审核图纸")
-                                    || runNowName.contains("交底:重新设计")
-                                    || runNowName.contains("交底:运行人员判断变更后材料")
-                                    || runNowName.contains("交底:配网项目经理判断变更后材料")
-                                    || runNowName.contains("交底:上传未盖章施工方案(行政政处(城区道路))")
-                                    || runNowName.contains("交底:项目经理判断是否需要政策处理")
-                                    || runNowName.contains("交底:施工方案盖章")
-                                    || runNowName.contains("交底:上传收据")
-                                    || runNowName.contains("交底:上传缴费单")
-                                    || runNowName.contains("交底:上传借款单据")
-                                    || runNowName.contains("交底:判断政策处理")
-                                    || runNowName.contains("交底:上传未签字版政策处理清单")
-                                    || runNowName.contains("交底:项目经理判断农村是否需要政策处理")
-                                    || runNowName.contains("交底:上传签字版政策处理清单")
-                                    || runNowName.contains("交底:上传签字版合同")
-                                    || runNowName.contains("交底:上传借款单据1")
-                                    || runNowName.contains("交底:判断项目是否需要关闭")
-                                    || runNowName.contains("交底:配网运行人员")
-                                    || runNowName.contains("交底:确认项目关闭")) {
-                                if (runNowName.contains("交底:判定设计变更")
-                                        || runNowName.contains("交底:项目经理判断是否需要再设计变更")
-                                        || runNowName.contains("交底:经研所设计变更")
-                                        || runNowName.contains("交底:运行人员审核图纸")
-                                        || runNowName.contains("交底:重新设计")
-                                        || runNowName.contains("交底:运行人员判断变更后材料")
-                                        || runNowName.contains("交底:配网项目经理判断变更后材料")) {
-                                    if (runNowName.contains("交底:判定设计变更")) {
-                                        s.getDisView().setDesignChange("交底:判定设计变更");
-                                    }
-                                    if (runNowName.contains("交底:项目经理判断是否需要再设计变更")) {
-                                        s.getDisView().setDesignChange("交底:项目经理判断是否需要再设计变更");
-                                    }
-                                    if (runNowName.contains("交底:经研所设计变更")) {
-                                        s.getDisView().setDesignChange("交底:经研所设计变更");
-                                    }
-                                    if (runNowName.contains("交底:运行人员审核图纸")) {
-                                        s.getDisView().setDesignChange("交底:运行人员审核图纸");
-                                    }
-                                    if (runNowName.contains("交底:重新设计")) {
-                                        s.getDisView().setDesignChange("交底:重新设计");
-                                    }
-                                    if (runNowName.contains("交底:运行人员判断变更后材料")) {
-                                        s.getDisView().setDesignChange("交底:运行人员判断变更后材料");
-                                    }
-                                    if (runNowName.contains("交底:配网项目经理判断变更后材料")) {
-                                        s.getDisView().setDesignChange("交底:配网项目经理判断变更后材料");
-                                    }
-                                }
-                                if (runNowName.contains("交底:上传未盖章施工方案(行政政处(城区道路))")
-                                        || runNowName.contains("交底:项目经理判断是否需要政策处理")
-                                        || runNowName.contains("交底:施工方案盖章")
-                                        || runNowName.contains("交底:上传收据")
-                                        || runNowName.contains("交底:上传缴费单")
-                                        || runNowName.contains("交底:上传借款单据")
-                                        || runNowName.contains("交底:判断政策处理")
-                                        || runNowName.contains("交底:上传未签字版政策处理清单")
-                                        || runNowName.contains("交底:项目经理判断农村是否需要政策处理")
-                                        || runNowName.contains("交底:上传签字版政策处理清单")
-                                        || runNowName.contains("交底:上传签字版合同")
-                                        || runNowName.contains("交底:上传借款单据1")) {
-                                    String info = "";
-                                    if (runNowName.contains("交底:上传未盖章施工方案(行政政处(城区道路))")) {
-                                        info += "交底:上传未盖章施工方案(行政政处(城区道路));";
-                                    }
-                                    if (runNowName.contains("交底:项目经理判断是否需要政策处理")) {
-                                        info += "交底:项目经理判断是否需要政策处理;";
-                                    }
-                                    if (runNowName.contains("交底:施工方案盖章")) {
-                                        info += "交底:施工方案盖章;";
-                                    }
-                                    if (runNowName.contains("交底:上传收据")) {
-                                        info += "交底:上传收据;";
-                                    }
-                                    if (runNowName.contains("交底:上传缴费单")) {
-                                        info += "交底:上传缴费单;";
-                                    }
-                                    if (runNowName.contains("交底:上传借款单据")) {
-                                        info += "交底:上传借款单据;";
-                                    }
-                                    if (runNowName.contains("交底:判断政策处理")) {
-                                        info += "交底:判断政策处理;";
-                                    }
-                                    if (runNowName.contains("交底:上传未签字版政策处理清单")) {
-                                        info += "交底:上传未签字版政策处理清单;";
-                                    }
-                                    if (runNowName.contains("交底:项目经理判断农村是否需要政策处理")) {
-                                        info += "交底:项目经理判断农村是否需要政策处理;";
-                                    }
-                                    if (runNowName.contains("交底:上传签字版政策处理清单")) {
-                                        info += "交底:上传签字版政策处理清单;";
-                                    }
-                                    if (runNowName.contains("交底:上传签字版合同")) {
-                                        info += "交底:上传签字版合同;";
-                                    }
-                                    if (runNowName.contains("交底:上传借款单据1")) {
-                                        info += "交底:农村上传借款单据;";
-                                    }
-                                    s.getDisView().setPolicyType(info);
-                                }
-                                if (runNowName.contains("交底:判断项目是否需要关闭")
-                                        || runNowName.contains("交底:配网运行人员")
-                                        || runNowName.contains("交底:确认项目关闭")) {
-                                    if (runNowName.contains("交底:判断项目是否需要关闭")) {
-                                        s.getDisView().setProjectClosure("交底:判断项目是否需要关闭");
-                                    }
-                                    if (runNowName.contains("交底:配网运行人员")) {
-                                        s.getDisView().setProjectClosure("交底:配网运行人员");
-                                    }
-                                    if (runNowName.contains("交底:确认项目关闭")) {
-                                        s.getDisView().setProjectClosure("交底:确认项目关闭");
-                                    }
-                                }
-                            }
-                        }
-
-                        if ("交底:配网项目经理判断变更后材料".equals(activityName)) {
-                            s.getDisView().setDesignChange(format);
-                        }
-                        if ("交底:上传借款单据".equals(activityName)) {
-                            s.getDisView().setPolicyType(format);
-                        }
-                        if ("交底:上传借款单据1".equals(activityName)) {
-                            s.getDisView().setPolicyType(format);
-                        }
-                        if ("交底:确认项目关闭".equals(activityName)) {
-                            s.getDisView().setProjectClosure(format);
-                        }
-                    } else {
-                        s.getDisView().setUnitManagerJudge("项目组织交底没有此流程");
-                        s.getDisView().setProjectManagerImport("项目组织交底没有此流程");
-                        //项目经理组织交底后
-                        if ("交底:项目经理组织交底".equals(activityName)||"交底:项目经理人工审核问题".equals(activityName)||"交底:项目经理人工判断问题".equals(activityName)) {
-                            s.getDisView().setProjectManagerImport(format);
-                        }
-                        if (runNowName!=null || !runNowName.equals("")) {
-                        if (runNowName.contains("交底:判定设计变更")
-                                || runNowName.contains("交底:项目经理判断是否需要再设计变更")
-                                || runNowName.contains("交底:经研所设计变更")
-                                || runNowName.contains("交底:运行人员审核图纸")
-                                || runNowName.contains("交底:重新设计")
-                                || runNowName.contains("交底:运行人员判断变更后材料")
-                                || runNowName.contains("交底:配网项目经理判断变更后材料")
-                                || runNowName.contains("交底:上传未盖章施工方案(行政政处(城区道路))")
-                                || runNowName.contains("交底:项目经理判断是否需要政策处理")
-                                || runNowName.contains("交底:施工方案盖章")
-                                || runNowName.contains("交底:上传收据")
-                                || runNowName.contains("交底:上传缴费单")
-                                || runNowName.contains("交底:上传借款单据")
-                                || runNowName.contains("交底:判断政策处理")
-                                || runNowName.contains("交底:上传未签字版政策处理清单")
-                                || runNowName.contains("交底:项目经理判断农村是否需要政策处理")
-                                || runNowName.contains("交底:上传签字版政策处理清单")
-                                || runNowName.contains("交底:上传签字版合同")
-                                || runNowName.contains("交底:上传借款单据1")
-                                || runNowName.contains("交底:判断项目是否需要关闭")
-                                || runNowName.contains("交底:配网运行人员")
-                                || runNowName.contains("交底:确认项目关闭")) {
-                            if (runNowName.contains("交底:判定设计变更")
-                                    || runNowName.contains("交底:项目经理判断是否需要再设计变更")
-                                    || runNowName.contains("交底:经研所设计变更")
-                                    || runNowName.contains("交底:运行人员审核图纸")
-                                    || runNowName.contains("交底:重新设计")
-                                    || runNowName.contains("交底:运行人员判断变更后材料")
-                                    || runNowName.contains("交底:配网项目经理判断变更后材料")) {
-                                if (runNowName.contains("交底:判定设计变更")) {
-                                    s.getDisView().setDesignChange("交底:判定设计变更");
-                                }
-                                if (runNowName.contains("交底:项目经理判断是否需要再设计变更")) {
-                                    s.getDisView().setDesignChange("交底:项目经理判断是否需要再设计变更");
-                                }
-                                if (runNowName.contains("交底:经研所设计变更")) {
-                                    s.getDisView().setDesignChange("交底:经研所设计变更");
-                                }
-                                if (runNowName.contains("交底:运行人员审核图纸")) {
-                                    s.getDisView().setDesignChange("交底:运行人员审核图纸");
-                                }
-                                if (runNowName.contains("交底:重新设计")) {
-                                    s.getDisView().setDesignChange("交底:重新设计");
-                                }
-                                if (runNowName.contains("交底:运行人员判断变更后材料")) {
-                                    s.getDisView().setDesignChange("交底:运行人员判断变更后材料");
-                                }
-                                if (runNowName.contains("交底:配网项目经理判断变更后材料")) {
-                                    s.getDisView().setDesignChange("交底:配网项目经理判断变更后材料");
-                                }
-                            }
-                            if (runNowName.contains("交底:上传未盖章施工方案(行政政处(城区道路))")
-                                    || runNowName.contains("交底:项目经理判断是否需要政策处理")
-                                    || runNowName.contains("交底:施工方案盖章")
-                                    || runNowName.contains("交底:上传收据")
-                                    || runNowName.contains("交底:上传缴费单")
-                                    || runNowName.contains("交底:上传借款单据")
-                                    || runNowName.contains("交底:判断政策处理")
-                                    || runNowName.contains("交底:上传未签字版政策处理清单")
-                                    || runNowName.contains("交底:项目经理判断农村是否需要政策处理")
-                                    || runNowName.contains("交底:上传签字版政策处理清单")
-                                    || runNowName.contains("交底:上传签字版合同")
-                                    || runNowName.contains("交底:上传借款单据1")) {
-                                String info = "";
-                                if (runNowName.contains("交底:上传未盖章施工方案(行政政处(城区道路))")) {
-                                    info += "交底:上传未盖章施工方案(行政政处(城区道路));";
-                                }
-                                if (runNowName.contains("交底:项目经理判断是否需要政策处理")) {
-                                    info += "交底:项目经理判断是否需要政策处理;";
-                                }
-                                if (runNowName.contains("交底:施工方案盖章")) {
-                                    info += "交底:施工方案盖章;";
-                                }
-                                if (runNowName.contains("交底:上传收据")) {
-                                    info += "交底:上传收据;";
-                                }
-                                if (runNowName.contains("交底:上传缴费单")) {
-                                    info += "交底:上传缴费单;";
-                                }
-                                if (runNowName.contains("交底:上传借款单据")) {
-                                    info += "交底:上传借款单据;";
-                                }
-                                if (runNowName.contains("交底:判断政策处理")) {
-                                    info += "交底:判断政策处理;";
-                                }
-                                if (runNowName.contains("交底:上传未签字版政策处理清单")) {
-                                    info += "交底:上传未签字版政策处理清单;";
-                                }
-                                if (runNowName.contains("交底:项目经理判断农村是否需要政策处理")) {
-                                    info += "交底:项目经理判断农村是否需要政策处理;";
-                                }
-                                if (runNowName.contains("交底:上传签字版政策处理清单")) {
-                                    info += "交底:上传签字版政策处理清单;";
-                                }
-                                if (runNowName.contains("交底:上传签字版合同")) {
-                                    info += "交底:上传签字版合同;";
-                                }
-                                if (runNowName.contains("交底:上传借款单据1")) {
-                                    info += "交底:农村上传借款单据;";
-                                }
-                                s.getDisView().setPolicyType(info);
-                            }
-                            if (runNowName.contains("交底:判断项目是否需要关闭")
-                                    || runNowName.contains("交底:配网运行人员")
-                                    || runNowName.contains("交底:确认项目关闭")) {
-                                if (runNowName.contains("交底:判断项目是否需要关闭")) {
-                                    s.getDisView().setProjectClosure("交底:判断项目是否需要关闭");
-                                }
-                                if (runNowName.contains("交底:配网运行人员")) {
-                                    s.getDisView().setProjectClosure("交底:配网运行人员");
-                                }
-                                if (runNowName.contains("交底:确认项目关闭")) {
-                                    s.getDisView().setProjectClosure("交底:确认项目关闭");
-                                }
-                            }
-                        }
-                        }
-                        if ("交底:配网项目经理判断变更后材料".equals(activityName)) {
-                            s.getDisView().setDesignChange(format);
-                        }
-                        if ("交底:上传借款单据".equals(activityName)) {
-                            s.getDisView().setPolicyType(format);
-                        }
-                        if ("交底:上传借款单据1".equals(activityName)) {
-                            s.getDisView().setPolicyType(format);
-                        }
-                        if ("交底:确认项目关闭".equals(activityName)) {
-                            s.getDisView().setProjectClosure(format);
-                        }
+                    //交底:项目经理交底内容
+                    if ("交底:项目经理交底内容".equals(activityName)) {
+                        s.getDisView().setProjectManagerImport(format);
                     }
-                    //
-                    if ("交底:配网项目经理判断变更后材料".equals(activityName)
-                            || "交底:上传借款单据".equals(activityName)
-                            || "交底:上传借款单据1".equals(activityName)
-                            || "交底:确认项目关闭".equals(activityName)) {
+                    //交底:导入材料表和拆旧物资表
+                    if ("交底:导入材料表和拆旧物资表".equals(activityName)) {
+                        s.getDisView().setUnitManagerJudge(format);
+                    }
+                    //交底:填写部分工程量信息
+                    if ("交底:填写部分工程量信息".equals(activityName)) {
+                        s.getDisView().setProjectManagerJudge(format);
+                    }
+                    if ("交底:填写部分工程量信息".equals(activityName)) {
                         if (fin.equals("")) {
                             fin = format;
                         }
-                        if ( fin.compareTo(format) < 1) {
+                        if (fin.compareTo(format) < 1) {
                             fin = format;
                         }
                     }
+                    //设计变更
+                    if ("交底:配网项目经理判定设计变更".equals(activityName)
+                            || "交底:经研所判定是否设计变更".equals(activityName)
+                            || "交底:运行单位经理审核方案".equals(activityName)
+                            || "交底:设计单位人员重新设计".equals(activityName)
+                            || "交底:运行经理审核设计变更后".equals(activityName)
+                            || "交底:配网经理审核设计变更后".equals(activityName)
+                    ) {
+                        s.getDisView().setDesignChange("设计变更流程中");
+                    }
+                    //项目关闭
+                    if ("交底:项目经理判定是否关闭".equals(activityName)
+                            || "交底:配网工程专职判定是否关闭".equals(activityName)
+                            || "交底:配网运行人员判定是否关闭".equals(activityName)
+                            || "交底:配网工程专职判定变更或关闭".equals(activityName)
+                            || "交底:配网系统专职确认系统关闭".equals(activityName)
+                            || "交底:配网项目经理判定变更或关闭".equals(activityName)
+                    ) {
+                        s.getDisView().setProjectClosure("项目关闭流程中");
+                    }
+                    //政策处理
+                    if ("交底:农村政处".equals(activityName)
+                            || "交底:农村专职判断".equals(activityName)
+                            || "交底:农村上传文件".equals(activityName)
+                            || "交底:农村是否支付".equals(activityName)
+                            || "交底:农村是否借款".equals(activityName)
+                            || "交底:行政政处".equals(activityName)
+                            || "交底:行政专职判断".equals(activityName)
+                            || "交底:行政上传文件".equals(activityName)
+                            || "交底:行政是否支付".equals(activityName)
+                            || "交底:行政是否借款".equals(activityName)
+                            || "交底:民事政处".equals(activityName)
+                            || "交底:民事专职判断".equals(activityName)
+                            || "交底:民事上传文件".equals(activityName)
+                            || "交底:民事是否支付".equals(activityName)
+                            || "交底:民事是否借款".equals(activityName)
+                    ) {
+                        s.getDisView().setPolicyType("政策处理流程中");
+                    }
                 }
+                //判断项目是否完成
                 if ("2".equals(s.getStatus())) {
                     s.getDisView().setFinTime(fin);
                 }
@@ -491,9 +291,12 @@ public class ScheduleViewController extends BaseController {
         return getBootstrapData(scheduleViewPage);
     }
 
+    /**
+     * 项目进度查询-物资领料状态
+     * */
     @ResponseBody
     @RequestMapping(value = "recData")
-    public Map<String, Object> recData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model){
+    public Map<String, Object> recData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model) {
         String projectId = scheduleView.getProjectId();
         String[] projectList = null;
         List<String> searchList = new ArrayList<>();
@@ -535,11 +338,12 @@ public class ScheduleViewController extends BaseController {
                     }
                     if ("领料:配网物资专职审核领料单".equals(activityName)) {
                         s.getReceiveView().setFullReviewed(format);
+                        s.getReceiveView().setRecFinTime(format);
                     }
-                    if ("领料:项目中心领导审核领料单".equals(activityName)) {
+/*                    if ("领料:项目中心领导审核领料单".equals(activityName)) {
                         s.getReceiveView().setLeaderReviewed(format);
                         s.getReceiveView().setRecFinTime(format);
-                    }
+                    }*/
                 }
             }
         }
@@ -548,10 +352,10 @@ public class ScheduleViewController extends BaseController {
 
     /**
      * 结算流程数据
-     * */
+     */
     @ResponseBody
     @RequestMapping(value = "settData")
-    public Map<String, Object> settData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model){
+    public Map<String, Object> settData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model) {
         String projectId = scheduleView.getProjectId();
         String[] projectList = null;
         List<String> searchList = new ArrayList<>();
@@ -562,14 +366,14 @@ public class ScheduleViewController extends BaseController {
             }
             scheduleView.setProjectList(searchList);
         }
-        Page<ScheduleView> scheduleViewPage = scheduleViewService.setAll(new Page<ScheduleView>(request, response), scheduleView);
+        Page<ScheduleView> scheduleViewPage = scheduleViewService.settAll(new Page<ScheduleView>(request, response), scheduleView);
         List<ScheduleView> list = scheduleViewPage.getList();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         for (ScheduleView s : list) {
             String procInsId = s.getProcInsId();
             if (procInsId != null && !"".equals(procInsId)) {
                 List<HistoricActivityInstance> historicActivityInstances = MyActiviUtils.hisTask(procInsId);
-                for (HistoricActivityInstance a: historicActivityInstances) {
+                for (HistoricActivityInstance a : historicActivityInstances) {
                     String activityName = a.getActivityName();
                     String format = formatter.format(a.getEndTime());
                     if (s.getSettView() == null) {
@@ -622,15 +426,24 @@ public class ScheduleViewController extends BaseController {
                     }
                     String activityName = a.getActivityName();
                     String format = formatter.format(a.getEndTime());
-                    if ("交底:判断项目是否需要关闭".equals(activityName)) {
+                    if ("交底:项目经理判定是否关闭".equals(activityName)) {
                         s.getClosureView().setIfClose(format);
                     }
-                    if ("交底:配网运行人员".equals(activityName)) {
+                    if ("交底:配网工程专职判定是否关闭".equals(activityName)) {
                         s.getClosureView().setRunMember(format);
                     }
-                    if ("交底:确认项目关闭".equals(activityName)) {
+                    if ("交底:配网运行人员判定是否关闭".equals(activityName)) {
                         s.getClosureView().setIsClosed(format);
                     }
+                    if ("交底:配网工程专职判定变更或关闭".equals(activityName)) {
+                        s.getClosureView().setDetermination(format);
+                    }
+                    if ("交底:配网项目经理判定变更或关闭".equals(activityName)) {
+                        s.getClosureView().setProjectManager(format);
+                    }
+                    if ("交底:配网系统专职确认系统关闭".equals(activityName)) {
+                        s.getClosureView().setShutDown(format);
+                    }
                 }
             }
         }
@@ -666,22 +479,22 @@ public class ScheduleViewController extends BaseController {
                     }
                     String activityName = a.getActivityName();
                     String format = formatter.format(a.getEndTime());
-                    if ("交底:判定设计变更".equals(activityName)) {
+                    if ("交底:配网项目经理判定设计变更".equals(activityName)) {
                         s.getDesignView().setDesignChange(format);
                     }
-                    if ("交底:项目经理判断是否需要再设计变更".equals(activityName)) {
+                    if ("交底:经研所判定是否设计变更".equals(activityName)) {
                         s.getDesignView().setIfChange(format);
                     }
-                    if ("交底:经研所设计变更".equals(activityName)) {
+                    if ("交底:运行单位经理审核方案".equals(activityName)) {
                         s.getDesignView().setJYSChange(format);
                     }
-                    if ("交底:运行人员审核图纸".equals(activityName)) {
+                    if ("交底:设计单位人员重新设计".equals(activityName)) {
                         s.getDesignView().setUnitReview(format);
                     }
-                    if ("交底:重新设计".equals(activityName)) {
+                    if ("交底:运行经理审核设计变更后".equals(activityName)) {
                         s.getDesignView().setDesignAgain(format);
                     }
-                    if ("交底:运行人员判断变更后材料".equals(activityName)) {
+                    if ("交底:配网经理审核设计变更后".equals(activityName)) {
                         s.getDesignView().setChangeAfter(format);
                     }
                     if ("交底:配网项目经理判断变更后材料".equals(activityName)) {
@@ -722,47 +535,174 @@ public class ScheduleViewController extends BaseController {
                     }
                     String activityName = a.getActivityName();
                     String format = formatter.format(a.getEndTime());
-                    if ("交底:上传未盖章施工方案(行政政处(城区道路))".equals(activityName)) {
+                    if ("交底:农村政处".equals(activityName)) {
                         s.getPolicyView().setUrbanRoad(format);
                     }
-                    if ("交底:项目经理判断是否需要政策处理".equals(activityName)) {
+                    if ("交底:农村专职判断".equals(activityName)) {
                         s.getPolicyView().setPolicyNeed(format);
                     }
-                    if ("交底:施工方案盖章".equals(activityName)) {
+                    if ("交底:农村上传文件".equals(activityName)) {
                         s.getPolicyView().setSealScheme(format);
                     }
-                    if ("交底:上传收据".equals(activityName)) {
+                    if ("交底:农村是否支付".equals(activityName)) {
                         s.getPolicyView().setUploadReceipt(format);
                     }
-                    if ("交底:上传缴费单".equals(activityName)) {
+                    if ("交底:农村是否借款".equals(activityName)) {
                         s.getPolicyView().setPayment(format);
                     }
-                    if ("交底:上传借款单据".equals(activityName)) {
+                    if ("交底:行政政处".equals(activityName)) {
                         s.getPolicyView().setUploadLoan(format);
                     }
-                    if ("交底:判断政策处理".equals(activityName)) {
+                    if ("交底:行政专职判断".equals(activityName)) {
                         s.getPolicyView().setHandling(format);
                     }
-                    if ("交底:上传未签字版政策处理清单".equals(activityName)) {
+                    if ("交底:行政上传文件".equals(activityName)) {
                         s.getPolicyView().setUnsignedVersion(format);
                     }
-                    if ("交底:项目经理判断农村是否需要政策处理".equals(activityName)) {
+                    if ("交底:行政是否支付".equals(activityName)) {
                         s.getPolicyView().setRuralNeed(format);
                     }
-                    if ("交底:上传签字版政策处理清单".equals(activityName)) {
+                    if ("交底:行政是否借款".equals(activityName)) {
                         s.getPolicyView().setPolicyList(format);
                     }
-                    if ("交底:上传签字版合同".equals(activityName)) {
+                    if ("交底:民事政处".equals(activityName)) {
                         s.getPolicyView().setSignedContract(format);
                     }
-                    if ("交底:上传借款单据1".equals(activityName)) {
+                    if ("交底:民事专职判断".equals(activityName)) {
                         s.getPolicyView().setUploadLoan1(format);
                     }
+                    if ("交底:民事上传文件".equals(activityName)) {
+                        s.getPolicyView().setCivilUpload(format);
+                    }
+                    if ("交底:民事是否支付".equals(activityName)) {
+                        s.getPolicyView().setCivilPay(format);
+                    }
+                    if ("交底:民事是否借款".equals(activityName)) {
+                        s.getPolicyView().setCivilBorrow(format);
+                    }
+                }
+            }
+        }
+        return getBootstrapData(scheduleViewPage);
+    }
+
+    /**
+     *施工验收土建流程
+     */
+    @ResponseBody
+    @RequestMapping(value = "civilData")
+    public Map<String, Object> civilData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model) {
+        String projectId = scheduleView.getProjectId();
+        String[] projectList = null;
+        List<String> searchList = new ArrayList<>();
+        if (!projectId.equals("")) {
+            projectList = projectId.split("\\s+");
+            for (int i = 0; i < projectList.length; i++) {
+                searchList.add(projectList[i]);
+            }
+            scheduleView.setProjectList(searchList);
+        }
+        Page<ScheduleView> scheduleViewPage = scheduleViewService.civilAll(new Page<ScheduleView>(request, response), scheduleView);
+        List<ScheduleView> list = scheduleViewPage.getList();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (ScheduleView s : list) {
+            String procInsId = s.getProcInsId();
+            if (procInsId != null && !"".equals(procInsId)) {
+                List<HistoricActivityInstance> historicActivityInstances = MyActiviUtils.hisTask(procInsId);
+                for (HistoricActivityInstance a : historicActivityInstances) {
+                    String activityName = a.getActivityName();
+                    String format = formatter.format(a.getEndTime());
+                    if (s.getCivilView() == null) {
+                        s.setCivilView(new CivilView());
+                    }
+                    if ("土建结算流程发起".equals(activityName)) {
+                        s.getCivilView().setCivilBegins(format);
+                    }
+                    if ("土建开工".equals(activityName)) {
+                        s.getCivilView().setCivilStarts(format);
+                    }
+                    if ("土建竣工".equals(activityName)) {
+                        s.getCivilView().setCivilCompleted(format);
+                    }
+                    if ("审核土建竣工".equals(activityName)) {
+                        s.getCivilView().setCivilReview(format);
+                    }
+                    if ("土建完成时间".equals(activityName)) {
+                        s.getCivilView().setCivilCompletion(format);
+                    }
                 }
             }
         }
         return getBootstrapData(scheduleViewPage);
     }
+
+
+    /**
+     * 施工验收电气流程数据
+     */
+    @ResponseBody
+    @RequestMapping(value = "electricData")
+    public Map<String, Object> electricData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model) {
+        String projectId = scheduleView.getProjectId();
+        String[] projectList = null;
+        List<String> searchList = new ArrayList<>();
+        if (!projectId.equals("")) {
+            projectList = projectId.split("\\s+");
+            for (int i = 0; i < projectList.length; i++) {
+                searchList.add(projectList[i]);
+            }
+            scheduleView.setProjectList(searchList);
+        }
+        Page<ScheduleView> scheduleViewPage = scheduleViewService.electricAll(new Page<ScheduleView>(request, response), scheduleView);
+        List<ScheduleView> list = scheduleViewPage.getList();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (ScheduleView s : list) {
+            String procInsId = s.getProcInsId();
+            if (procInsId != null && !"".equals(procInsId)) {
+                List<HistoricActivityInstance> historicActivityInstances = MyActiviUtils.hisTask(procInsId);
+                for (HistoricActivityInstance a : historicActivityInstances) {
+                    String activityName = a.getActivityName();
+                    String format = formatter.format(a.getEndTime());
+                    if (s.getElectricView() == null) {
+                        s.setElectricView(new ElectricView());
+                    }
+                    if ("发起施工流程/填写项目类型".equals(activityName)) {
+                        s.getElectricView().setStartTime(format);
+                    }
+                    if ("电气开工报告".equals(activityName)) {
+                        s.getElectricView().setElectricStart(format);
+                    }
+                    if ("上传电气竣工资料".equals(activityName)) {
+                        s.getElectricView().setElectricUploadCompletion(format);
+                    }
+                    if ("审核电气竣工流程".equals(activityName)) {
+                        s.getElectricView().setElectricReviewCompletion(format);
+                    }
+                    if ("上传涉电开工资料".equals(activityName)) {
+                        s.getElectricView().setElectricStartUpload(format);
+                    }
+                    if ("涉电开工报告".equals(activityName)) {
+                        s.getElectricView().setElectricStartElectricity(format);
+                    }
+                    if ("涉电竣工报告".equals(activityName)) {
+                        s.getElectricView().setElectricEndElectricity(format);
+                    }
+                    if ("审核涉电竣工".equals(activityName)) {
+                        s.getElectricView().setElectricReviewRelated(format);
+                    }
+                    if ("是否完成所有涉电工作".equals(activityName)) {
+                        s.getElectricView().setElectricWork(format);
+                        if ("2".equals(s.getConstructionStatus())) {
+                            s.getElectricView().setEndTime(format);
+                        }
+                    }
+                }
+            }
+        }
+        return getBootstrapData(scheduleViewPage);
+    }
+
+
     /* *//**
      * 导出excel文件
      *//*
@@ -780,7 +720,7 @@ public class ScheduleViewController extends BaseController {
         } catch (Exception e) {
             j.setSuccess(false);
             j.setMsg("导出需求基本信息记录失败！失败信息："+e.getMessage());
-        }
+}
         return j;
     }*/
 }

src/main/java/com/jeeplus/modules/sg/settActivi/mapper/xml/SettActiviMapper.xml

@@ -250,16 +250,16 @@
         reserveProjectName
         )VALUES
             (
-            #{item.id},
-            #{item.createBy.id},
-            #{item.createDate},
-            #{item.updateBy.id},
-            #{item.updateDate},
-            #{item.delFlag},
-            #{item.remarks},
-            #{item.projectId},
-            #{item.projectName},
-            #{item.reserveProjectName}
+            #{id},
+            #{createBy.id},
+            #{createDate},
+            #{updateBy.id},
+            #{updateDate},
+            #{delFlag},
+            #{remarks},
+            #{projectId},
+            #{projectName},
+            #{reserveProjectName}
             )
     </insert>
 </mapper>

src/main/resources/rebel.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
+
+	<classpath>
+		<dir name="D:/workspace/sgAudit/target/classes">
+		</dir>
+	</classpath>
+
+	<web>
+		<link target="/">
+			<dir name="D:/workspace/sgAudit/src/main/webapp">
+			</dir>
+		</link>
+	</web>
+
+</application>

src/main/webapp/webpage/modules/sg/fund/fundForm.js

@@ -0,0 +1,89 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+	<script>
+    /**
+     * 项目经理组织交底页面
+     * */
+    $(document).ready(function () {
+        jp.ajaxForm("#inputForm", function (data) {
+            if (data.success) {
+                jp.success(data.msg);
+                jp.go("${ctx}/managementcenter/divide");
+            } else {
+                jp.error(data.msg);
+                $("#inputForm").find("button:submit").button("reset");
+            }
+        });
+
+
+
+        $("#agree").click(function () {
+            var wbsEncoding = $("#wbsEncoding").val();
+            if (''==wbsEncoding) {
+                jp.error('请填写项目的wbs编码');
+            }
+            jp.prompt(" 审批意见", function (message) {
+                jp.post("${ctx}/fund/wbsTask",
+                    {
+                        "taskId": "${fund.act.taskId}",
+                        "taskName": "${fund.act.taskName}",
+                        "taskDefKey": "${fund.act.taskDefKey}",
+                        "procInsId": "${fund.act.procInsId}",
+                        "procDefId": "${fund.act.procDefId}",
+                        "flag":"yes",
+                        "wbsEncoding":wbsEncoding,
+                        "comment": window.encodeURI(message)
+                    },
+                    function (data) {
+                        if (data.success) {
+                            jp.success(data.msg);
+                            jp.go("${ctx}/act/task/todo");
+                        } else {
+                            jp.error(data.msg);
+                        }
+                    })
+            });
+        });
+
+
+        $('#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'));//取富文本的值
+                }
+            }
+        });
+
+
+    })
+
+function save() {
+    var isValidate = jp.validateForm('#inputForm');//校验表单
+    if(!isValidate){
+        return false;
+    }else{
+        jp.loading();
+        jp.post("${ctx}/fund/update",$('#inputForm').serialize(),function(data){
+            if(data.success){
+                jp.getParent().refresh();
+                var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(dialogIndex);
+                jp.success(data.msg)
+            }else{
+                jp.error(data.msg);
+            }
+        })
+    }
+
+}
+
+</script>

src/main/webapp/webpage/modules/sg/fund/fundForm.jsp

@@ -0,0 +1,156 @@
+<%@ page pageEncoding="UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>转资模块</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="fundForm.js" %>
+
+</head>
+<body>
+
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="fund" action="${ctx}/fund/updateWbs"
+                               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"/>
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">储备项目暂定名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.reserveProjectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">wbs编码：</label></td>
+                                <td class="width-35">
+                                    <form:input id="wbsEncoding" path="wbsEncoding"
+                                                cssClass="form-control required" placeholder="必填"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">资产卡片号：</label></td>
+                                <td class="width-35">
+                                    <form:input id="assetCardNumber" path="assetCardNumber"
+                                                cssClass="form-control required" placeholder="必填"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.projectId)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.projectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">市公司：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.municipalCompany)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 县公司：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.countyCompany)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目性质：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.projectNature)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 需求单位：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.demandUnit)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">运维单位：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.operationUnit)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 供电区域：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.powerSupplyArea)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">网格编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.gridNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 单元格编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.cellNumber)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目储备编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.projectReserveNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电网项目编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.gridProjectNo)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> ERP编号</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.erpNo)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">建设必要性及内容：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.necessityContent)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 变电站名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.subStationName)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">线路名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.lineName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.projectType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否迎峰度夏项目：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.whetherSummer)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 项目基本说明：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.basicDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">工区备注：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(fund.basicInformation.workAreaRemarks)}
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </form:form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/fund/fundList.js

@@ -1,125 +1,179 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
-	$(document).ready(function() {
-		$('#fundTable').bootstrapTable({
-			//请求方法
-			method: 'post',
-			//类型json
-			dataType: "json",
-			contentType: "application/x-www-form-urlencoded",
-			//显示检索按钮
-			showSearch: true,
-			//显示刷新按钮
-			showRefresh: true,
-			//显示切换手机试图按钮
-			showToggle: true,
-			//显示 内容列下拉框
-			showColumns: true,
-			//显示到处按钮
-			showExport: true,
-			//显示切换分页按钮
-			showPaginationSwitch: true,
-			//最低显示2行
-			minimumCountColumns: 2,
-			//是否显示行间隔色
-			striped: true,
-			//是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-			cache: false,
-			//是否显示分页（*）
-			pagination: true,
-			//排序方式
-			sortOrder: "asc",
-			//初始化加载第一页，默认第一页
-			pageNumber:1,
-			//每页的记录行数（*）
-			pageSize: 10,
-			//可供选择的每页的行数（*）
-			pageList: [10, 25, 50, 100],
-			//这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
-			url: "${ctx}/fund/data",
-			//默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
-			//queryParamsType:'',
-			////查询参数,每次调用是会带上这个参数，可自定义
-			queryParams : function(params) {
-				var searchParam = $("#searchForm").serializeJSON();
-				searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
-				searchParam.pageSize = params.limit === undefined? -1 : params.limit;
-				searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
-				return searchParam;
-			},
-			//分页方式：client客户端分页，server服务端分页（*）
-			sidePagination: "server",
-			contextMenuTrigger:"right",//pc端 按右键弹出菜单
-			contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
-			contextMenu: '#context-menu',
-			onClickRow: function(row, $el){
-			},
-			onLoadSuccess: function () {  //加载成功时执行
-			},
-			onShowSearch: function () {
-				$("#search-collapse").slideToggle();
-			},
-			columns: [
-				{
-					field: 'projectId',
-					title: '项目定义号',
-					sortName: 'projectId'
-				}
-				,{
-					field: 'projectName',
-					title: '项目名称',
-					sortName: 'projectName'
-				}
-				,{
-					field: 'reserveProjectName',
-					title: '储备项目名称',
-					sortName: 'reserveProjectName'
-				}
-				,{
-					field: 'wbsEncoding',
-					title: 'wbs编码',
-					sortName: 'wbsEncoding'
-				}
-				,{
-					field: 'assetCardNumber',
-					title: '资产卡片号',
-					sortName: 'assetCardNumber'
-				}
-			],
-			formatNoMatches:function(){
-				return "没有对应数据";
-			},
+$(document).ready(function () {
+    $('#fundTable').bootstrapTable({
+        //请求方法
+        method: 'post',
+        //类型json
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        //显示检索按钮
+        showSearch: true,
+        //显示刷新按钮
+        showRefresh: true,
+        //显示切换手机试图按钮
+        showToggle: true,
+        //显示 内容列下拉框
+        showColumns: true,
+        //显示到处按钮
+        showExport: true,
+        //显示切换分页按钮
+        showPaginationSwitch: true,
+        //最低显示2行
+        minimumCountColumns: 2,
+        //是否显示行间隔色
+        striped: true,
+        //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        cache: false,
+        //是否显示分页（*）
+        pagination: true,
+        //排序方式
+        sortOrder: "asc",
+        //初始化加载第一页，默认第一页
+        pageNumber: 1,
+        //每页的记录行数（*）
+        pageSize: 10,
+        //可供选择的每页的行数（*）
+        pageList: [10, 25, 50, 100],
+        //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+        url: "${ctx}/fund/data",
+        //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+        //queryParamsType:'',
+        ////查询参数,每次调用是会带上这个参数，可自定义
+        queryParams: function (params) {
+            var searchParam = $("#searchForm").serializeJSON();
+            searchParam.pageNo = params.limit === undefined ? "1" : params.offset / params.limit + 1;
+            searchParam.pageSize = params.limit === undefined ? -1 : params.limit;
+            searchParam.orderBy = params.sort === undefined ? "" : params.sort + " " + params.order;
+            return searchParam;
+        },
+        //分页方式：client客户端分页，server服务端分页（*）
+        sidePagination: "server",
+        contextMenuTrigger: "right",//pc端 按右键弹出菜单
+        contextMenuTriggerMobile: "press",//手机端 弹出菜单，click：单击， press：长按。
+        contextMenu: '#context-menu',
+        onClickRow: function (row, $el) {
+        },
+        onLoadSuccess: function () {  //加载成功时执行
+        },
+        onShowSearch: function () {
+            $("#search-collapse").slideToggle();
+        },
+        columns: [{
+            checkbox: true
 
-		})
+        },
+            {
+                field: 'projectId',
+                title: '项目定义号',
+                sortName: 'projectId'
+            }
+            , {
+                field: 'projectName',
+                title: '项目名称',
+                sortName: 'projectName'
+            }
+            , {
+                field: 'reserveProjectName',
+                title: '储备项目名称',
+                sortName: 'reserveProjectName'
+            }
+            , {
+                field: 'wbsEncoding',
+                title: 'wbs编码',
+                sortName: 'wbsEncoding'
+            }
+            , {
+                field: 'assetCardNumber',
+                title: '资产卡片号',
+                sortName: 'assetCardNumber'
+            }
+        ],
+        formatNoMatches: function () {
+            return "没有对应数据";
+        },
 
-		jp.ajaxForm("#inputForm",function(data){
-			if(data.success){
-				jp.alert(data.msg);
-				jp.go("${ctx}"+ data.body.targetUrl);
-			}else{
-				jp.alert(data.msg);
-				$("#inputForm").find("button:submit").button("reset");
-			}
-		});
+    })
 
-		$('#acceptDate').datetimepicker({
-			format: "YYYY-MM-DD HH:mm:ss"
-		});
+    jp.ajaxForm("#inputForm", function (data) {
+        if (data.success) {
+            jp.alert(data.msg);
+            jp.go("${ctx}" + data.body.targetUrl);
+        } else {
+            jp.alert(data.msg);
+            $("#inputForm").find("button:submit").button("reset");
+        }
+    });
 
-		$('#examineDate').datetimepicker({
-			format: "YYYY-MM-DD HH:mm:ss"
-		});
+    $('#acceptDate').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'));//取富文本的值
-				}
-			}
-		});
-	})
+    $('#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'));//取富文本的值
+            }
+        }
+    });
+
+    // 绑定查询按扭
+    $("#search").click("click", function () {
+        $('#fundTable').bootstrapTable('refresh');
+    });
+
+    // 绑定查询重置按扭
+    $("#reset").click("click", function () {
+        $("#searchForm  input").val("");
+        $("#searchForm  select").val("");
+        $('#fundTable').bootstrapTable('refresh');
+    });
+
+    $('#fundTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+        'check-all.bs.table uncheck-all.bs.table', function () {
+        $('#remove').prop('disabled', !$('#fundTable').bootstrapTable('getSelections').length);
+        $('#edit').prop('disabled', $('#fundTable').bootstrapTable('getSelections').length != 1);
+    });
+
+})
+
+function getIdSelections() {
+    return $.map($("#fundTable").bootstrapTable('getSelections'), function (row) {
+        return row.id
+    });
+}
+
+function deleteAll() {
+    jp.confirm('确认要删除该项目转资记录吗？', function () {
+        jp.loading();
+        jp.get("${ctx}/fund/deleteAll?ids=" + getIdSelections(), function (data) {
+            if (data.success) {
+                $('#fundTable').bootstrapTable('refresh');
+                jp.success(data.msg);
+            } else {
+                jp.error(data.msg);
+            }
+        })
+    })
+}
+
+//刷新列表
+function refresh(){
+    $('#fundTable').bootstrapTable('refresh');
+}
+
+function edit(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openSaveDialog('编辑项目管理表单', "${ctx}/fund/fundForm?id=" + id, '800px', '500px');
+}
 
 </script>

src/main/webapp/webpage/modules/sg/fund/fundList.jsp

@@ -24,6 +24,14 @@
                             <form:input path="projectId" htmlEscape="false" class=" form-control"/>
                         </div>
                         <div class="col-xs-12 col-sm-6 col-md-4">
+                            <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                            <form:input path="projectName" htmlEscape="false" class=" form-control"/>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
+                            <label class="label-item single-overflow pull-left" title="储备项目名称：">储备项目名称：</label>
+                            <form:input path="reserveProjectName" htmlEscape="false" class=" form-control"/>
+                        </div>
+                        <div class="col-xs-12 col-sm-6 col-md-4">
                             <div style="margin-top:26px">
                                 <a id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i
                                         class="fa fa-search"></i> 查询</a>
@@ -34,6 +42,14 @@
                     </form:form>
                 </div>
             </div>
+            <div id="toolbar">
+                    <button id="edit" class="btn btn-primary" disabled onclick="edit()">
+                        <i class="glyphicon glyphicon-plus"></i> 修改
+                    </button>
+                    <button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+                        <i class="glyphicon glyphicon-remove"></i> 删除
+                    </button>
+            </div>
             <table id="fundTable" data-toolbar="#toolbar" class="table" style="table-layout:fixed"></table>
         </div>
     </div>

src/main/webapp/webpage/modules/sg/scheduleView/show/civilView.js

@@ -0,0 +1,141 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script >
+$(document).ready(function () {
+    $('#settTable').bootstrapTable({
+        //请求方法
+        method: 'post',
+        //类型json
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        //显示检索按钮
+        showSearch: true,
+        //显示刷新按钮
+        showRefresh: true,
+        //显示切换手机试图按钮
+        showToggle: false,
+        //显示 内容列下拉框
+        showColumns: false,
+        //显示到处按钮
+        showExport: false,
+        //显示切换分页按钮
+        showPaginationSwitch: false,
+        //最低显示2行
+        minimumCountColumns: 2,
+        //是否显示行间隔色
+        striped: true,
+        //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        cache: false,
+        //是否显示分页（*）
+        pagination: true,
+        //排序方式
+        sortOrder: "asc",
+        //初始化加载第一页，默认第一页
+        pageNumber: 1,
+        //每页的记录行数（*）
+        pageSize: 10,
+        //可供选择的每页的行数（*）
+        pageList: [10, 25, 50, 100],
+        //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+        url: "${ctx}/scheduleView/civilData",
+        //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+        ////查询参数,每次调用是会带上这个参数，可自定义
+        queryParams: function (params) {
+            var searchParam = $("#searchForm").serializeJSON();
+            searchParam.pageNo = params.limit === undefined ? "1" : params.offset / params.limit + 1;
+            searchParam.pageSize = params.limit === undefined ? -1 : params.limit;
+            searchParam.orderBy = params.sort === undefined ? "" : params.sort + " " + params.order;
+            return searchParam;
+        },
+        //分页方式：client客户端分页，server服务端分页（*）
+        sidePagination: "server",
+        contextMenuTrigger: "right",//pc端 按右键弹出菜单
+        contextMenuTriggerMobile: "press",//手机端 弹出菜单，click：单击， press：长按。
+        contextMenu: '#context-menu',
+        onClickRow: function (row, $el) {
+        },
+        onShowSearch: function () {
+            $("#search-collapse").slideToggle();
+        },
+        formatNoMatches: function () {
+            return "你的自定义文字说明";
+        },
+        columns: [{
+                field: 'projectId',
+                title: '项目定义号',
+            }, {
+                field: 'projectName',
+                title: '项目名称',
+            }, {
+                field: 'reserveProjectName',
+                title: '储备项目名称',
+            }, {
+                field: 'civilView.civilBegins',
+                title: '土建开始',
+            }, {
+                field: 'civilView.civilStarts',
+                title: '土建竣工',
+            }, {
+                field: 'civilView.civilCompleted',
+                title: '审核土建竣工',
+            }, {
+                field: 'civilView.civilReview',
+                title: '土建完成时间',
+            }
+        ]
+    });
+
+
+    jp.ajaxForm("#inputForm", function (data) {
+        if (data.success) {
+            jp.alert(data.msg);
+            jp.go("${ctx}" + data.body.targetUrl);
+        } else {
+            jp.alert(data.msg);
+            $("#inputForm").find("button:submit").button("reset");
+        }
+    });
+
+    function getTime(value, row, index) {
+        return [
+            "<input  id=" + row.id + " type='number' name='usedQuantity' class='form-control required deal'  value=" + row.usedQuantity + ">",
+        ].join('');
+    }
+
+    $("#search").click("click", function() {// 绑定查询按扭
+        $('#settTable').bootstrapTable('refresh');
+    });
+
+    $("#reset").click("click", function() {// 绑定查询按扭
+        $("#searchForm  input").val("");
+        $("#searchForm  select").val("");
+        $("#searchForm  .select-item").html("");
+        $('#settTable').bootstrapTable('refresh');
+    });
+
+
+    $("#printf").click(function () {
+        var procInsId = $("#procInsId").val();
+        // jp.downloadFile('${ctx}/settActivi/exportSett?procInsId='+procInsId);
+        jp.downloadFile('${ctx}/settActivi/exportExcel?procInsId=' + procInsId);
+    });
+
+    $('#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>

src/main/webapp/webpage/modules/sg/scheduleView/show/civilView.jsp

@@ -0,0 +1,65 @@
+<%@ page pageEncoding="UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>所有项目信息</title>
+    <meta name="decorator" content="ani"/>
+    <!-- SUMMERNOTE -->
+    <%@ include file="/webpage/include/bootstraptable.jsp"%>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="civilView.js" %>
+    <style type="text/css">
+        /* 下边两行是去掉input 输入框右边的上下箭头按钮*/
+        .deal::-webkit-inner-spin-button {
+            -webkit-appearance: none !important;
+        }
+        .deal::-webkit-outer-spin-button {
+            -webkit-appearance: none !important;
+        }
+        input[type="number"]{
+            -moz-appearance:textfield;
+        }
+    </style>
+</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 id="search-collapse" class="collapse">
+                        <div class="accordion-inner">
+                            <form:form id="searchForm" modelAttribute="scheduleView" class="form form-horizontal well clearfix">
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目定义编码：">项目定义编码：</label>
+                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <div style="margin-top:26px">
+                                        <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+                                        <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+                                    </div>
+                                </div>
+                            </form:form>
+                        </div>
+                    </div>
+                    <!-- 工具栏 -->
+                    <div id="toolbar">
+                    </div>
+                    <!-- 表格 -->
+                    <table id="settTable" data-toolbar="#toolbar" class="table"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/scheduleView/show/closureView.js

@@ -63,17 +63,29 @@
 					field: 'projectId',
 					title: '项目定义号',
 				}, {
-					field: 'requireName',
-					title: '需求项目名称',
+					field: 'projectName',
+					title: '项目名称',
+				}, {
+					field: 'reserveProjectName',
+					title: '储备项目名称',
 				}, {
 					field: 'closureView.ifClose',
-					title: '判断项目是否需要关闭',
+					title: '项目经理判定是否关闭',
 				}, {
 					field: 'closureView.runMember',
-					title: '配网运行人员',
+					title: '配网工程专职判定是否关闭',
 				}, {
 					field: 'closureView.isClosed',
-					title: '确认项目关闭',
+					title: '配网运行人员判定是否关闭',
+				}, {
+					field: 'closureView.determination',
+					title: '配网工程专职判定变更或关闭',
+				}, {
+					field: 'closureView.projectManager',
+					title: '配网项目经理判定变更或关闭',
+				}, {
+					field: 'closureView.shutDown',
+					title: '配网系统专职确认系统关闭',
 				}
 			]
 		});

src/main/webapp/webpage/modules/sg/scheduleView/show/closureView.jsp

@@ -8,6 +8,7 @@
     <%@ include file="/webpage/include/bootstraptable.jsp"%>
     <%@include file="/webpage/include/summernote.jsp" %>
     <%@include file="closureView.js" %>
+    <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
     <style type="text/css">
         /* 下边两行是去掉input 输入框右边的上下箭头按钮*/
         .deal::-webkit-inner-spin-button {
@@ -19,6 +20,7 @@
         input[type="number"]{
             -moz-appearance:textfield;
         }
+
     </style>
 </head>
 <body>

src/main/webapp/webpage/modules/sg/scheduleView/show/designView.js

@@ -63,8 +63,11 @@
 					field: 'projectId',
 					title: '项目定义号',
 				}, {
-					field: 'requireName',
-					title: '需求项目名称',
+					field: 'projectName',
+					title: '项目名称',
+				}, {
+					field: 'reserveProjectName',
+					title: '储备项目名称',
 				}, {
 					field: 'designView.designChange',
 					title: '判定设计变更',

src/main/webapp/webpage/modules/sg/scheduleView/show/disView.js

@@ -1,20 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
 	$(document).ready(function() {
-		window.operateEvents = {
-			'change input': function (e, value, row, index) {
-				var ss = $('#'+row.id).val();
-				jp.confirm('确认要修改？', function () {
-					jp.get("${ctx}/settActivi/updateUsed?id="+row.id+"&usedQuantity="+ss, function (data) {
-						jp.success(data.msg);
-						$('#settTable').bootstrapTable('refresh');
-					})
-				},function () {
-					$('#settTable').bootstrapTable('refresh');
-				})
-			}
-		};
-		var procInsId = $('#procInsId').val();
 		$('#settTable').bootstrapTable({
 			//请求方法
 			method: 'post',
@@ -77,23 +63,23 @@
 					field: 'projectId',
 					title: '项目定义号',
 				}, {
-					field: 'requireName',
-					title: '需求项目名称',
+					field: 'projectName',
+					title: '项目名称',
 				}, {
-				field: 'clarificaitonType',
-				title: '项目交底类型',
+				field: 'reserveProjectName',
+				title: '储备项目名称',
 			}, {
 				field: 'disView.fullTimeStart',
-				title: '配网工程专职发起流程',
+				title: '发起流程',
 			}, {
 				field: 'disView.projectManagerImport',
-				title: '配网项目经理导入交底结论',
+				title: '项目经理交底内容',
 			}, {
 				field: 'disView.unitManagerJudge',
-				title: '施工单位项目经理判断是否存在问题',
+				title: '导入材料表和拆旧物资表',
 			}, {
 				field: 'disView.projectManagerJudge',
-				title: '配网项目经理判断是否存在问题',
+				title: '填写部分工程量信息',
 			}, {
 				field: 'disView.projectClosure',
 				title: '<span style="color:red">项目关闭</span>',
@@ -114,7 +100,7 @@
 				}
 			}, {
 				field: 'disView.policyType',
-				title: '<span style="color:red">政策处理类型</span>',
+				title: '<span style="color:red">政策处理</span>',
 				formatter:function(value, row , index){
 					if(value != null && value !=""){
 						value='<a href="${ctx}/scheduleView/policyView?projectId='+row.projectId+'"'+">"+value+"</a>";

src/main/webapp/webpage/modules/sg/scheduleView/show/electricView.js

@@ -0,0 +1,159 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script >
+$(document).ready(function () {
+    $('#settTable').bootstrapTable({
+        //请求方法
+        method: 'post',
+        //类型json
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        //显示检索按钮
+        showSearch: true,
+        //显示刷新按钮
+        showRefresh: true,
+        //显示切换手机试图按钮
+        showToggle: false,
+        //显示 内容列下拉框
+        showColumns: false,
+        //显示到处按钮
+        showExport: false,
+        //显示切换分页按钮
+        showPaginationSwitch: false,
+        //最低显示2行
+        minimumCountColumns: 2,
+        //是否显示行间隔色
+        striped: true,
+        //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        cache: false,
+        //是否显示分页（*）
+        pagination: true,
+        //排序方式
+        sortOrder: "asc",
+        //初始化加载第一页，默认第一页
+        pageNumber: 1,
+        //每页的记录行数（*）
+        pageSize: 10,
+        //可供选择的每页的行数（*）
+        pageList: [10, 25, 50, 100],
+        //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+        url: "${ctx}/scheduleView/electricData",
+        //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+        ////查询参数,每次调用是会带上这个参数，可自定义
+        queryParams: function (params) {
+            var searchParam = $("#searchForm").serializeJSON();
+            searchParam.pageNo = params.limit === undefined ? "1" : params.offset / params.limit + 1;
+            searchParam.pageSize = params.limit === undefined ? -1 : params.limit;
+            searchParam.orderBy = params.sort === undefined ? "" : params.sort + " " + params.order;
+            return searchParam;
+        },
+        //分页方式：client客户端分页，server服务端分页（*）
+        sidePagination: "server",
+        contextMenuTrigger: "right",//pc端 按右键弹出菜单
+        contextMenuTriggerMobile: "press",//手机端 弹出菜单，click：单击， press：长按。
+        contextMenu: '#context-menu',
+        onClickRow: function (row, $el) {
+        },
+        onShowSearch: function () {
+            $("#search-collapse").slideToggle();
+        },
+        formatNoMatches: function () {
+            return "你的自定义文字说明";
+        },
+        columns: [{
+                field: 'projectId',
+                title: '项目定义号',
+            }, {
+                field: 'projectName',
+                title: '项目名称',
+            }, {
+                field: 'reserveProjectName',
+                title: '储备项目名称',
+            }, {
+                field: 'electricView.startTime',
+                title: '发起施工流程',
+            }, {
+                field: 'electricView.electricStart',
+                title: '电气开工报告',
+            }, {
+                field: 'electricView.electricUploadCompletion',
+                title: '上传电气竣工资料',
+            }, {
+                field: 'electricView.electricReviewCompletion',
+                title: '审核电气竣工流程',
+            }, {
+                field: 'electricView.electricStartUpload',
+                title: '上传涉电开工资料',
+            }, {
+                field: 'electricView.electricStartElectricity',
+                title: '涉电开工报告',
+            }, {
+                field: 'electricView.electricEndElectricity',
+                title: '涉电竣工报告',
+            }, {
+                field: 'electricView.electricReviewRelated',
+                title: '审核涉电竣工',
+            }, {
+                field: 'electricView.electricWork',
+                title: '是否完成所有涉电工作',
+            }, {
+                field: 'electricView.endTime',
+                title: '项目结束状态',
+            }
+        ]
+    });
+
+
+    jp.ajaxForm("#inputForm", function (data) {
+        if (data.success) {
+            jp.alert(data.msg);
+            jp.go("${ctx}" + data.body.targetUrl);
+        } else {
+            jp.alert(data.msg);
+            $("#inputForm").find("button:submit").button("reset");
+        }
+    });
+
+    function getTime(value, row, index) {
+        return [
+            "<input  id=" + row.id + " type='number' name='usedQuantity' class='form-control required deal'  value=" + row.usedQuantity + ">",
+        ].join('');
+    }
+
+    $("#search").click("click", function() {// 绑定查询按扭
+        $('#settTable').bootstrapTable('refresh');
+    });
+
+    $("#reset").click("click", function() {// 绑定查询按扭
+        $("#searchForm  input").val("");
+        $("#searchForm  select").val("");
+        $("#searchForm  .select-item").html("");
+        $('#settTable').bootstrapTable('refresh');
+    });
+
+
+    $("#printf").click(function () {
+        var procInsId = $("#procInsId").val();
+        // jp.downloadFile('${ctx}/settActivi/exportSett?procInsId='+procInsId);
+        jp.downloadFile('${ctx}/settActivi/exportExcel?procInsId=' + procInsId);
+    });
+
+    $('#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>

src/main/webapp/webpage/modules/sg/scheduleView/show/electricView.jsp

@@ -0,0 +1,65 @@
+<%@ page pageEncoding="UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>所有项目信息</title>
+    <meta name="decorator" content="ani"/>
+    <!-- SUMMERNOTE -->
+    <%@ include file="/webpage/include/bootstraptable.jsp"%>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="electricView.js" %>
+    <style type="text/css">
+        /* 下边两行是去掉input 输入框右边的上下箭头按钮*/
+        .deal::-webkit-inner-spin-button {
+            -webkit-appearance: none !important;
+        }
+        .deal::-webkit-outer-spin-button {
+            -webkit-appearance: none !important;
+        }
+        input[type="number"]{
+            -moz-appearance:textfield;
+        }
+    </style>
+</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 id="search-collapse" class="collapse">
+                        <div class="accordion-inner">
+                            <form:form id="searchForm" modelAttribute="scheduleView" class="form form-horizontal well clearfix">
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目定义编码：">项目定义编码：</label>
+                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <div style="margin-top:26px">
+                                        <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+                                        <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+                                    </div>
+                                </div>
+                            </form:form>
+                        </div>
+                    </div>
+                    <!-- 工具栏 -->
+                    <div id="toolbar">
+                    </div>
+                    <!-- 表格 -->
+                    <table id="settTable" data-toolbar="#toolbar" class="table"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/scheduleView/show/policyView.js

@@ -63,44 +63,56 @@
 					field: 'projectId',
 					title: '项目定义号',
 				}, {
-					field: 'requireName',
-					title: '需求项目名称',
+					field: 'projectName',
+					title: '项目名称',
+				}, {
+					field: 'reserveProjectName',
+					title: '储备项目名称',
 				}, {
 					field: 'policyView.urbanRoad',
-					title: '上传未盖章施工方案(行政政处)',
+					title: '农村政处',
 				}, {
 					field: 'policyView.policyNeed',
-					title: '项目经理判断是否需要政策处理行政政处(行政政处)',
+					title: '农村专职判断',
 				}, {
 					field: 'policyView.sealScheme',
-					title: '施工方案盖章行政政处(行政政处)',
+					title: '农村上传文件',
 				}, {
 					field: 'policyView.uploadReceipt',
-					title: '上传收据行政政处(行政政处)',
+					title: '农村是否支付',
 				}, {
 					field: 'policyView.payment',
-					title: '上传缴费单行政政处(行政政处)',
+					title: '农村是否借款',
 				}, {
 					field: 'policyView.uploadLoan',
-					title: '上传借款单据行政政处(行政政处)',
+					title: '行政政处',
 				}, {
 					field: 'policyView.handling',
-					title: '判断政策处理',
+					title: '行政专职判断',
 				}, {
 					field: 'policyView.unsignedVersion',
-					title: '上传未签字版政策处理清单',
+					title: '行政上传文件',
 				}, {
 					field: 'policyView.ruralNeed',
-					title: '项目经理判断农村是否需要政策处理',
+					title: '行政是否支付',
 				}, {
 					field: 'policyView.policyList',
-					title: '上传签字版政策处理清单',
+					title: '行政是否借款',
 				}, {
 					field: 'policyView.signedContract',
-					title: '上传签字版合同',
+					title: '民事政处',
 				}, {
 					field: 'policyView.uploadLoan1',
-					title: '上传借款单据',
+					title: '民事专职判断',
+				}, {
+					field: 'policyView.civilUpload',
+					title: '民事上传文件',
+				}, {
+					field: 'policyView.civilPay',
+					title: '民事是否支付',
+				}, {
+					field: 'policyView.civilBorrow',
+					title: '民事是否借款',
 				}
 			]
 		});

src/main/webapp/webpage/modules/sg/scheduleView/show/recView.js

@@ -63,8 +63,11 @@ $(document).ready(function () {
                 field: 'projectId',
                 title: '项目定义号',
             }, {
-                field: 'requireName',
-                title: '需求项目名称',
+                field: 'projectName',
+                title: '项目名称',
+            }, {
+                field: 'reserveProjectName',
+                title: '储备项目名称',
             }, {
                 field: 'receiveView.theNumber',
                 title: '项目第几次领料',
@@ -87,9 +90,6 @@ $(document).ready(function () {
                 field: 'receiveView.fullReviewed',
                 title: '配网物资专职审核领料单',
             }, {
-                field: 'receiveView.leaderReviewed',
-                title: '项目中心领导审核领料单',
-            }, {
                 field: 'receiveView.recFinTime',
                 title: '完成时间',
             }

src/main/webapp/webpage/modules/sg/scheduleView/show/scheduleView.js

@@ -63,18 +63,21 @@
 					field: 'projectId',
 					title: '项目定义号',
 				}, {
-					field: 'requireName',
-					title: '需求项目名称',
-				}, {
-				field: 'clarificaitonType',
-				title: '项目交底类型',
+				field: 'projectName',
+				title: '项目名称',
 			}, {
+					field: 'reserveProjectName',
+					title: '储备项目名称',
+				}, {
 				field: 'status',
 				title: '施工交底状态',
 			}, {
 				field: 'acquisitionStatus',
 				title: '物资领料状态',
 			}, {
+				field: 'advanceStatus',
+				title: '土建状态',
+			}, {
 				field: 'constructionStatus',
 				title: '施工状态',
 			}, {
@@ -112,13 +115,6 @@
 			$('#settTable').bootstrapTable('refresh');
 		});
 
-
-		$("#printf").click(function () {
-			var procInsId = $("#procInsId").val();
-			// jp.downloadFile('${ctx}/settActivi/exportSett?procInsId='+procInsId);
-			 jp.downloadFile('${ctx}/settActivi/exportExcel?procInsId='+procInsId);
-		});
-
 		$('#acceptDate').datetimepicker({
 			format: "YYYY-MM-DD HH:mm:ss"
 		});

src/main/webapp/webpage/modules/sg/scheduleView/show/settView.js

@@ -63,19 +63,22 @@
 					field: 'projectId',
 					title: '项目定义号',
 				}, {
-					field: 'requireName',
-					title: '需求项目名称',
+					field: 'projectName',
+					title: '项目名称',
 				}, {
-					field: 'disView.settStart',
+					field: 'reserveProjectName',
+					title: '储备项目名称',
+				}, {
+					field: 'settView.settStart',
 					title: '结算发起',
 				}, {
-					field: 'disView.settNumber',
+					field: 'settView.settNumber',
 					title: '填写现场使用数量',
 				}, {
-					field: 'disView.settReview',
+					field: 'settView.settReview',
 					title: '审计现场复核数量',
 				}, {
-					field: 'disView.settFin',
+					field: 'settView.settFin',
 					title: '生成领料退料单',
 				}
 			]