流程 导入导出等修改

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

@@ -2252,13 +2252,18 @@ public class ActTaskService extends BaseService {
         Map<String, Object> vars = Maps.newHashMap();
         String flag = act.getFlag();
         Project user = MyActiviUtils.findUser(act.getProcInsId());
-        vars.put("pass", "yes".equals(act.getFlag()) ? true : false);
-        if ("yes".equals(flag)) {
-            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
-            constructionService.updateCloseStatus(act.getProcInsId());
-        }else{
+        vars.put("close", false);
+        vars.put("conditions", false);
+        vars.put("return", false);
+        if ("close".equals(flag)) {
+            vars.put("close", true);
+        } else if ("design".equals(flag)) {
+            vars.put("conditions", true);
             //配网运行人员
             vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        } else if ("no".equals(flag)) {
+            vars.put("return", true);
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
         }
         //变更项目状态
 

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

@@ -155,7 +155,7 @@ public class ActTaskController extends BaseController {
 
     @ResponseBody
     @RequestMapping(value = "todo/data")
-    public Map<String, Object> todoListData(Act act, HttpServletRequest request, HttpServletResponse response, Model model, String reserveProjectName,String projectId,String projectName) throws Exception {
+    public Map<String, Object> todoListData(Act act, HttpServletRequest request, HttpServletResponse response, Model model, String reserveProjectName, String projectId, String projectName) throws Exception {
 /*        Page<HashMap<String, String>> page = actTaskService.todoList(new Page<HashMap<String, String>>(request, response), act);
         return getBootstrapData(page);*/
         Page<HashMap<String, String>> page = actTaskService.newTodoList(new Page<HashMap<String, String>>(request, response), act, reserveProjectName, projectId, projectName);
@@ -562,10 +562,10 @@ public class ActTaskController extends BaseController {
 
                 } else {
                     //有政策处理问题，暂定为1
-                    constructionService.updatePolicyStatus(construction1.getReserveProjectName(),"1");
+                    constructionService.updatePolicyStatus(construction1.getReserveProjectName(), "1");
                 }
             }
-            actTaskService.engineering(act,construction1);
+            actTaskService.engineering(act, construction1);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
@@ -573,7 +573,7 @@ public class ActTaskController extends BaseController {
         return j;
     }
 
-     /**
+    /**
      * 政处是否自己进行
      */
     @ResponseBody
@@ -611,6 +611,7 @@ public class ActTaskController extends BaseController {
         j.setMsg("审批成功");
         return j;
     }
+
     /**
      * 是否需要行政政处
      */
@@ -628,6 +629,7 @@ public class ActTaskController extends BaseController {
         j.setMsg("审批成功");
         return j;
     }
+
     /**
      * 是否需要民事政处
      */
@@ -645,6 +647,7 @@ public class ActTaskController extends BaseController {
         j.setMsg("审批成功");
         return j;
     }
+
     /**
      * 是否需要农村政处
      */
@@ -668,7 +671,7 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "ruralFiles")
-    public AjaxJson ruralFiles(Act act,String path,String path1, String reserveProjectName,Construction construction) {
+    public AjaxJson ruralFiles(Act act, String path, String path1, String reserveProjectName, Construction construction) {
         AjaxJson j = new AjaxJson();
         try {
             constructionService.updateIfBorrow(construction);
@@ -692,7 +695,7 @@ public class ActTaskController extends BaseController {
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-            actTaskService.ruralFiles(act,construction);
+            actTaskService.ruralFiles(act, construction);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
@@ -987,7 +990,7 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "operatorUpload")
-    public AjaxJson operatorUpload(Act act, String path, String budget,String civil,String reserveProjectName) {
+    public AjaxJson operatorUpload(Act act, String path, String budget, String civil, String reserveProjectName) {
         AjaxJson j = new AjaxJson();
         try {
             if (path != null && !"".equals(path)) {
@@ -1380,7 +1383,7 @@ public class ActTaskController extends BaseController {
 
     /**
      * 配网工程专职判定变更或关闭
-     * */
+     */
     @ResponseBody
     @RequestMapping(value = "singleForm")
     public AjaxJson singleForm(Act act) {
@@ -1399,7 +1402,7 @@ public class ActTaskController extends BaseController {
 
     /**
      * 配网项目经理判定变更或关闭
-     * */
+     */
     @ResponseBody
     @RequestMapping(value = "documentsForm")
     public AjaxJson documentsForm(Act act) {
@@ -1417,7 +1420,7 @@ public class ActTaskController extends BaseController {
 
     /**
      * 配网系统专职确认系统关闭
-     * */
+     */
     @ResponseBody
     @RequestMapping(value = "confirmClose")
     public AjaxJson confirmClose(Act act) {
@@ -1597,14 +1600,14 @@ public class ActTaskController extends BaseController {
     //开具设计清单
     @ResponseBody
     @RequestMapping(value = "materialReport")
-    public AjaxJson materialReport(Act act, String selectNumber,String reserveName) {
+    public AjaxJson materialReport(Act act, String selectNumber, String reserveName) {
         AjaxJson j = new AjaxJson();
         try {
-            if (null!=reserveName&&reserveName!=""){
+            if (null != reserveName && reserveName != "") {
                 MaterialProject materialProject = new MaterialProject();
                 materialProject.setReserveProjectName(reserveName);
                 List<MaterialProject> list = materialProjectService.findJugdeReserve(materialProject);
-                if (list.size() > 0){
+                if (list.size() > 0) {
                     j.setMsg("项目名称已存在");
                     j.setSuccess(false);
                     return j;
@@ -1612,7 +1615,7 @@ public class ActTaskController extends BaseController {
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-            actTaskService.materialReport(act,selectNumber,reserveName);
+            actTaskService.materialReport(act, selectNumber, reserveName);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
@@ -1623,13 +1626,13 @@ public class ActTaskController extends BaseController {
     //审核材料清单
     @ResponseBody
     @RequestMapping(value = "materialReportBillOff")
-    public AjaxJson materialReportBillOff(Act act, String selectNumber,String reserveName) {
+    public AjaxJson materialReportBillOff(Act act, String selectNumber, String reserveName) {
         AjaxJson j = new AjaxJson();
         try {
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             Boolean aBoolean = actTaskService.materialReportBillOff(act);
-            if (aBoolean){
+            if (aBoolean) {
                 j.setSuccess(false);
                 j.setMsg("项目名称已存在，请联系流程发起人");
                 return j;
@@ -2019,7 +2022,7 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "electricalEndTask")
-    public AjaxJson electricalEndTask(Act act, String pic, UploadImages uploadImages,String id) {
+    public AjaxJson electricalEndTask(Act act, String pic, UploadImages uploadImages, String id) {
         AjaxJson j = new AjaxJson();
         try {
             if (pic != null && pic != "") {
@@ -2045,7 +2048,7 @@ public class ActTaskController extends BaseController {
                             //发送通知
                             OaNotify oaNotify = new OaNotify();
                             oaNotify.setType("4");
-                            oaNotify.setTitle(uploadImages.getReserveProjectName()+"：电气（涉电）需要验收");
+                            oaNotify.setTitle(uploadImages.getReserveProjectName() + "：电气（涉电）需要验收");
                             oaNotify.setStatus("1");
                             oaNotify.setContent(uploadImages.getReserveProjectName() + "：电气（涉电）需要验收");
                             oaNotify.setOaNotifyRecordIds(UserUtils.getByUserName(sgUser.getAssignment().getRepUnit()).getId());
@@ -2125,7 +2128,7 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "powerFileTask")
-    public AjaxJson powerFileTask(Act act, String pic, UploadImages uploadImages,String id) {
+    public AjaxJson powerFileTask(Act act, String pic, UploadImages uploadImages, String id) {
         AjaxJson j = new AjaxJson();
         try {
             if (pic != null && pic != "") {
@@ -2154,6 +2157,8 @@ public class ActTaskController extends BaseController {
     @RequestMapping(value = "nonPowerEndTask")
     public AjaxJson nonPowerEndTask(Act act, NonPower nonPower) {
         AjaxJson j = new AjaxJson();
+        int gg = 0;
+        int jc = 0;
         try {
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
@@ -2166,12 +2171,16 @@ public class ActTaskController extends BaseController {
                     j.setMsg("请先填写工程量信息");
                     return j;
                 }
-                engineering = nonPower1.getEngineeringAcceptance();
-                if ("是".equals(engineering)) {
+                String civilEndReport = nonPower1.getCivilEndReport();
+                if (null != civilEndReport && civilEndReport != "") {
+                    gg = civilEndReport.indexOf("管沟");
+                    jc = civilEndReport.indexOf("基础");
+                }
+                if (gg != -1 || jc != -1) {
                     Project user = MyActiviUtils.findTJUser(act.getProcInsId());
                     OaNotify oaNotify = new OaNotify();
                     oaNotify.setType("4");
-                    oaNotify.setTitle(nonPower1.getReserveProjectName()+"：土建需要验收");
+                    oaNotify.setTitle(nonPower1.getReserveProjectName() + "：土建需要验收");
                     oaNotify.setStatus("1");
                     oaNotify.setContent(nonPower1.getReserveProjectName() + "：土建需要验收");
                     oaNotify.setOaNotifyRecordIds(UserUtils.getByUserName(user.getAssignment().getRepUnit()).getId());
@@ -2195,7 +2204,7 @@ public class ActTaskController extends BaseController {
 
     /**
      * 土建在线审核流程
-     * */
+     */
     @ResponseBody
     @RequestMapping(value = "acceptanceTask")
     public AjaxJson acceptanceTask(Act act) {
@@ -2334,7 +2343,7 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "PowerWhetherTask")
-    public AjaxJson PowerWhetherTask(Act act,String severalTimes) {
+    public AjaxJson PowerWhetherTask(Act act, String severalTimes) {
         AjaxJson j = new AjaxJson();
         try {
             //对项目选择二次涉电的时候
@@ -2353,7 +2362,7 @@ public class ActTaskController extends BaseController {
                 //修改
                 projectService.insertSgProject(sgProject);
                 //跟新项目现有的状态
-                materialModuleService.updateSeveralTimes(act.getProcInsId(),i);
+                materialModuleService.updateSeveralTimes(act.getProcInsId(), i);
                 Project project = new Project();
                 //查询所有人员信息
                 Assignment sgAss = projectService.findSgAss(procInsId);

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

@@ -17,6 +17,8 @@ public class Construction extends ActEntity<Construction> {
     private static final long serialVersionUID = 1L;
     //储备项目暂定名称
     private String reserveProjectName;
+    //储备项目暂定名称列表
+    private List<String> reserveList;
     //项目定义
     private String projectId;
     //项目名称
@@ -48,7 +50,13 @@ public class Construction extends ActEntity<Construction> {
     //一二次融合成套柱上负荷开关（户外）数量
     private String poleMounted;
 
+    public List<String> getReserveList() {
+        return reserveList;
+    }
 
+    public void setReserveList(List<String> reserveList) {
+        this.reserveList = reserveList;
+    }
     public String getReserveProjectName() {
         return reserveProjectName;
     }

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

@@ -548,11 +548,23 @@
         <where>
             1=1
             and c.secondPower = '0'
-            <if test="projectId != null and projectId != ''">
-                and c.projectId = #{projectId}
+            <!--<if test="projectId != null and projectId != ''">-->
+                <!--and c.projectId = #{projectId}-->
+            <!--</if>-->
+            <!--<if test="reserveProjectName != null and reserveProjectName != ''">-->
+                <!--and c.reserveProjectName = #{reserveProjectName}-->
+            <!--</if>-->
+            <if test="reserveList != null and  reserveList !='' ">
+                and c.reserveProjectName in
+                <foreach collection="reserveList" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
-            <if test="reserveProjectName != null and reserveProjectName != ''">
-                and c.reserveProjectName = #{reserveProjectName}
+            <if test="projectId != null and projectId !=''">
+                and c.projectId like concat('%', #{projectId}, '%')
+            </if>
+            <if test="projectName !=null and projectName !=''">
+                and c.projectName like concat('%', #{projectName}, '%')
             </if>
         </where>
     </select>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/EndTaskListen.java

@@ -99,18 +99,8 @@ public class EndTaskListen implements Serializable, ExecutionListener {
                     }
                 } else {
                     if ("0".equals(projectProc.getAdvanceStatus())) {
-                    NonPower nonPower = new NonPower();
-                    //修改项目基础信息土建流程状态
-                    projectService.updateAdvanceStart(reserveProjectName, "1");
-                    //启动土建流程
-                    Map<String, Object> vars2 = Maps.newHashMap();
-                    vars2.put("nopass", true);
-                    vars2.put("pass", false);
-                    vars2.put("design", UserUtils.getByUserName(projectProc.getAssignment().getConstructionManage()).getLoginName());
-                    String procDefId2 = projectService.findDefId("tjys");
-                    ProcessDefinition p2 = actProcessService.getProcessDefinition(procDefId2);
-                    String title2 = nonPower.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p2.getName();
-                    actTaskService.startProcess(p2.getKey(), "xm_nonpower_process", "必要参数，无法避免", title2, vars2);
+                        //修改项目基础信息土建流程状态
+                        projectService.updateAdvanceStart(reserveProjectName, "1");
                     }
                 }
             }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/nonPowerListen.java

@@ -42,70 +42,72 @@ public class nonPowerListen implements Serializable, ExecutionListener {
             ProjectService projectService = SpringContextHolder.getBean(ProjectService.class);
             ActProcessService actProcessService = SpringContextHolder.getBean(ActProcessService.class);
             ActTaskService actTaskService = SpringContextHolder.getBean(ActTaskService.class);
-            MaterialModule materialModule = SpringContextHolder.getBean(MaterialModule.class);
+            MaterialModule materialModule = new MaterialModule();
             String procInsId = delegateExecution.getProcessInstanceId();
             //修改领料状态
             projectService.updateWzStatus("2", procInsId);
             //判断是否领料完成，是否进场完成，根据条件发送施工交底流程
             Project wzProcInsId = projectService.findWzProcInsId(procInsId);
+            String constructionStatus = wzProcInsId.getConstructionStatus();
             String canEnter = wzProcInsId.getCanEnter();
             String acquisitionStatus = wzProcInsId.getAcquisitionStatus();
-            if ("2".equals(canEnter) && "2".equals(acquisitionStatus)) {
-                //发送电气流程
-                boolean electric = false;
-                //判单钢管杠，水泥杠，存在电气，判断是否包含
-                List<MaterialInfo> allInfo = projectService.findWzInfo(procInsId);
-                if (allInfo.size() > 0) {
-                    for (MaterialInfo mi : allInfo
-                    ) {
-                        String materialName = mi.getMaterialName();
-                        if (null != materialName && !"".equals(materialName)) {
-                            //判断项目是否包含描述为钢管杆或水泥杠的物料，存在步入电气流程
-                            if (materialName.contains("钢管杆") || materialName.contains("水泥杆")) {
-                                electric = true;
-                                break;
+            if ("0".equals(constructionStatus)) {
+                if ("2".equals(canEnter) && "2".equals(acquisitionStatus)) {
+                    //发送电气流程
+                    boolean electric = false;
+                    //判单钢管杠，水泥杠，存在电气，判断是否包含
+                    List<MaterialInfo> allInfo = projectService.findWzInfo(procInsId);
+                    if (allInfo.size() > 0) {
+                        for (MaterialInfo mi : allInfo
+                        ) {
+                            String materialName = mi.getMaterialName();
+                            if (null != materialName && !"".equals(materialName)) {
+                                //判断项目是否包含描述为钢管杆或水泥杠的物料，存在步入电气流程
+                                if (materialName.contains("钢管杆") || materialName.contains("水泥杆")) {
+                                    electric = true;
+                                    break;
+                                }
                             }
                         }
                     }
-                }
-                //查询出项目的基础信息，停电线路（如果纯在），人员流转信息
-                Construction blockAss = projectService.findWzAss(procInsId);
-                Map<String, Object> vars = Maps.newHashMap();
-                //没用电气及涉电 运行条件
-                vars.put("no", false);
-                //没有电气，有涉电 运行条件
-                vars.put("notContain", false);
-                //包含电气/涉电-优先电气 运行条件
-                vars.put("electrical", false);
-                if (electric) {
-                    //发送开始电气流程
-                    vars.put("electrical", true);
-                } else {
-                    //没用电气进行涉电
-                    //获取项目的领料单，查询停电线路
-                    String blackoutLine = blockAss.getQuantity().getBlackoutLine();
-                    if (null != blackoutLine && !"".equals(blackoutLine) && "不涉电".equals(blackoutLine)) {
-                        //填写停电线路,不为空，-步入发起涉电流程
-                        vars.put("notContain", true);
+                    //查询出项目的基础信息，停电线路（如果纯在），人员流转信息
+                    Construction blockAss = projectService.findWzAss(procInsId);
+                    Map<String, Object> vars = Maps.newHashMap();
+                    //没用电气及涉电 运行条件
+                    vars.put("no", false);
+                    //没有电气，有涉电 运行条件
+                    vars.put("notContain", false);
+                    //包含电气/涉电-优先电气 运行条件
+                    vars.put("electrical", false);
+                    if (electric) {
+                        //发送开始电气流程
+                        vars.put("electrical", true);
                     } else {
-                        vars.put("no", true);
+                        //没用电气进行涉电
+                        //获取项目的领料单，查询停电线路
+                        String blackoutLine = blockAss.getQuantity().getBlackoutLine();
+                        if (null != blackoutLine && !"".equals(blackoutLine) && "不涉电".equals(blackoutLine)) {
+                            //填写停电线路,不为空，-步入发起涉电流程
+                            vars.put("notContain", true);
+                        } else {
+                            vars.put("no", true);
+                        }
+                    }
+                    if (StringUtils.isBlank(materialModule.getId())) {
+                        vars.put("manager", UserUtils.getByUserName(blockAss.getAssignment().getConstructionManage()).getLoginName());
+                        materialModule.setProjectId(blockAss.getProjectId());
+                        materialModule.setProjectName(blockAss.getProjectName());
+                        materialModule.setReserveProjectName(blockAss.getReserveProjectName());
+                        //保存项目储备项目名称，项目定义号，项目名称
+                        materialModuleService.save(materialModule);
+                        String procDefId = projectService.findDefId("sgys");
+                        //修改项目状态
+                        materialModuleService.updateConstructionStatus("1", blockAss.getReserveProjectName());
+                        // 启动流程
+                        ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
+                        String title = materialModule.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                        actTaskService.startProcess(p.getKey(), "sg_construction_process", materialModule.getId(), title, vars);
                     }
-                }
-
-                if (StringUtils.isBlank(materialModule.getId())) {
-                    vars.put("manager", UserUtils.getByUserName(blockAss.getAssignment().getConstructionManage()).getLoginName());
-                    materialModule.setProjectId(blockAss.getProjectId());
-                    materialModule.setProjectName(blockAss.getProjectName());
-                    materialModule.setReserveProjectName(blockAss.getReserveProjectName());
-                    //保存项目储备项目名称，项目定义号，项目名称
-                    materialModuleService.save(materialModule);
-                    String procDefId = projectService.findDefId("sgys");
-                    //修改项目状态
-                    materialModuleService.updateConstructionStatus("1", blockAss.getReserveProjectName());
-                    // 启动流程
-                    ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
-                    String title = materialModule.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-                    actTaskService.startProcess(p.getKey(), "sg_construction_process", materialModule.getId(), title, vars);
                 }
             }
         } catch (Exception e) {

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

@@ -149,8 +149,19 @@ public class ConstructionController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "data")
-    public Map<String, Object> data(Construction uploadImages, HttpServletRequest request, HttpServletResponse response, Model model) {
-        Page<Construction> page = constructionService.findDisclosePage(new Page<Construction>(request, response), uploadImages);
+    public Map<String, Object> data(Construction construction, HttpServletRequest request, HttpServletResponse response, Model model) {
+        String reserveProjectName = construction.getReserveProjectName();
+        List<String> reserveList = new ArrayList<>();
+        if (null != reserveProjectName && !"".equals(reserveProjectName)) {
+            String[] split = reserveProjectName.split("\\s+");
+            String reserveName = "";
+            for (int i = 0; i < split.length; i++) {
+                reserveName = split[i];
+                reserveList.add(reserveName);
+            }
+            construction.setReserveList(reserveList);
+        }
+        Page<Construction> page = constructionService.findDisclosePage(new Page<Construction>(request, response), construction);
         return getBootstrapData(page);
     }
 
@@ -414,6 +425,7 @@ public class ConstructionController extends BaseController {
         MaterialInfo materialInfo = new MaterialInfo();
         materialInfo.setProjectName(construction.getReserveProjectName());
         List<MaterialInfo> list = materialInfoService.findList(materialInfo);
+        if (list.size()>0){
         Integer count = 0;
         for (MaterialInfo m : list) {
             String materialName = m.getMaterialName();
@@ -439,6 +451,9 @@ public class ConstructionController extends BaseController {
                 if (materialName.equals("一二次融合成套柱上负荷开关（户外）数量")) {
                     count += 1;
                 }
+                if (null == construction.getQuantity()) {
+                    construction.setQuantity(new Quantity());
+                }
                 if (count > 0) {
                     construction.getQuantity().setIncludeAutomation("是");
                 } else {
@@ -447,7 +462,7 @@ public class ConstructionController extends BaseController {
 
             }
         }
-
+        }
         return "modules/sg/managementcenter/activiti/editEng";
     }
 
@@ -1176,14 +1191,31 @@ public class ConstructionController extends BaseController {
         }
         List<UploadImages> list1 = page.getList();
         for (UploadImages images : list1) {
-            String dictLabels = DictUtils.getDictLabel(images.getImgName(), "uploadFileType", "");
-            images.setImgName(dictLabels);
+            String imgName = images.getImgName();
+            boolean anInt = this.isInt(imgName);
+            if (anInt) {
+                String dictLabels = DictUtils.getDictLabel(imgName, "uploadFileType", "");
+                images.setImgName(dictLabels);
+            }
         }
         List<UploadImages> list = page.getList();
         //循环list
         return getBootstrapData(page);
     }
 
+    public boolean isInt(String s)
+    {
+        try
+        {
+            int i = Integer.parseInt(s);
+            return true;
+        }
+        catch(Exception _ex)
+        {
+            return false;
+        }
+    }
+
     /**
      * 导入物料表
      */

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

@@ -211,8 +211,12 @@ public class UploadController extends BaseController {
 		}
 		List<UploadImages> list1 = page.getList();
 		for (UploadImages images : list1) {
-			String dictLabels = DictUtils.getDictLabel(images.getImgName(), "uploadFileType","");
-			images.setImgName(dictLabels);
+			String imgName = images.getImgName();
+			boolean anInt = this.isInt(imgName);
+			if (anInt) {
+				String dictLabels = DictUtils.getDictLabel(imgName, "uploadFileType", "");
+				images.setImgName(dictLabels);
+			}
 		}
 		return getBootstrapData(page);
 	}
@@ -237,8 +241,12 @@ public class UploadController extends BaseController {
 		}
 		List<UploadImages> list1 = page.getList();
 		for (UploadImages images : list1) {
-			String dictLabels = DictUtils.getDictLabel(images.getImgName(), "uploadFileType","");
-			images.setImgName(dictLabels);
+			String imgName = images.getImgName();
+			boolean anInt = this.isInt(imgName);
+			if (anInt) {
+				String dictLabels = DictUtils.getDictLabel(imgName, "uploadFileType", "");
+				images.setImgName(dictLabels);
+			}
 		}
 		return getBootstrapData(page);
 	}
@@ -317,7 +325,19 @@ public class UploadController extends BaseController {
 
 		return j;
 	}
-	
+
+	public boolean isInt(String s)
+	{
+		try
+		{
+			int i = Integer.parseInt(s);
+			return true;
+		}
+		catch(Exception _ex)
+		{
+			return false;
+		}
+	}
 
 
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/xml/MaterialProjectMapper.xml

@@ -62,7 +62,7 @@
                 AND a.projectType = #{projectType}
             </if>
             <if test="batchPlan != null and batchPlan != ''">
-                AND a.reserveCode = #{batchPlan}
+                AND a.batchPlan = #{batchPlan}
             </if>
             <if test="issuePlan != null and issuePlan != ''">
                 AND a.issuePlan = #{issuePlan}

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/util/MaterialProUtil.java

@@ -14,7 +14,7 @@ public  class MaterialProUtil {
      * @param importUtil
      * @return List<MaterialProjectMapper> 导入表格数据
      */
-    public static List<MaterialProject> getProjectUtil(ImportUtil importUtil)  {
+    public static List<MaterialProject> getProjectUtil(ImportUtil importUtil) throws Exception {
         int lastRow = importUtil.getLastDataRowNum();
         List<MaterialProject> list = new ArrayList<MaterialProject>();
         MaterialProject materialProject = null;
@@ -22,19 +22,23 @@ public  class MaterialProUtil {
             materialProject = new MaterialProject();
             Row row = importUtil.getRow(i);
             String reserveProjectName = (String) importUtil.getCellValue(row,0);
-            if(StringUtils.isNotBlank(reserveProjectName)) {
-                materialProject.setReserveProjectName(reserveProjectName);
-                materialProject.setReserveCode((String)importUtil.getCellValue(row,1));//项目名称
-                materialProject.setProjectType((String)importUtil.getCellValue(row,2));
-                materialProject.setBatchPlan((String)importUtil.getCellValue(row,3));
-                materialProject.setIssuePlan((String)importUtil.getCellValue(row,4));
-                materialProject.setMonthPlan((String)importUtil.getCellValue(row,5));
-                materialProject.setHasPlan((String)importUtil.getCellValue(row,6));
-                materialProject.setHalfPlan((String)importUtil.getCellValue(row,7));
-                materialProject.setProjectId((String)importUtil.getCellValue(row,8));
-                materialProject.setProjectName((String)importUtil.getCellValue(row,9));
-                materialProject.setAttributionYear((String)importUtil.getCellValue(row,10));
-                list.add(materialProject);
+            try {
+                if(StringUtils.isNotBlank(reserveProjectName)) {
+                    materialProject.setReserveProjectName(reserveProjectName);
+                    materialProject.setReserveCode((String)importUtil.getCellValue(row,1));//项目名称
+                    materialProject.setProjectType((String)importUtil.getCellValue(row,2));
+                    materialProject.setBatchPlan((String)importUtil.getCellValue(row,3));
+                    materialProject.setIssuePlan((String)importUtil.getCellValue(row,4));
+                    materialProject.setMonthPlan((String)importUtil.getCellValue(row,5));
+                    materialProject.setHasPlan((String)importUtil.getCellValue(row,6));
+                    materialProject.setHalfPlan((String)importUtil.getCellValue(row,7));
+                    materialProject.setProjectId((String)importUtil.getCellValue(row,8));
+                    materialProject.setProjectName((String)importUtil.getCellValue(row,9));
+                    materialProject.setAttributionYear((String)importUtil.getCellValue(row,10));
+                    list.add(materialProject);
+                }
+            } catch (Exception e) {
+                throw new Exception("第 "+i+" 行数据读取错误！");
             }
         }
         return list;

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

@@ -175,6 +175,13 @@ public interface ProjectMapper extends BaseMapper<Project> {
      * @return 施工任务分配信息集合
      * @param project 查询条件实体类
      */
+    List<Project> findBasicList(Project project);
+
+    /**
+     * 施工任务分配信息数据
+     * @return 施工任务分配信息集合
+     * @param project 查询条件实体类
+     */
     List<Project> findAssList(Project project);
 
     /**

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

@@ -278,6 +278,34 @@
         </where>
     </select>
 
+    <select id="findBasicList" resultType="Project">
+        select
+        <include refid="projectColumns"/>,
+        <include refid="basicColumns"/>
+        from xm_material_project a
+        left join xm_project_basicinformation b
+        on a.reserveProjectName = b.reserveProjectName
+        <where>
+            1 = 1
+            and
+            a.secondPower = 0
+            and a.whetherCloseStatus = '0'
+            <if test="reserveList != null and  reserveList !='' ">
+                and a.reserveProjectName in
+                <foreach collection="reserveList" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="projectId != null and projectId !=''">
+                and a.projectId like concat('%', #{projectId}, '%')
+            </if>
+            <if test="projectName !=null and projectName !=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
+            ${dataScope}
+        </where>
+    </select>
+
     <select id="findAssList" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
         select
         <include refid="projectColumns"/>,
@@ -296,6 +324,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="projectId != null and projectId !=''">
+                and a.projectId like concat('%', #{projectId}, '%')
+            </if>
+            <if test="projectName !=null and projectName !=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
             ${dataScope}
         </where>
     </select>
@@ -321,6 +355,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="projectId != null and projectId !=''">
+                and a.projectId like concat('%', #{projectId}, '%')
+            </if>
+            <if test="projectName !=null and projectName !=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
             ${dataScope}
         </where>
     </select>
@@ -1883,6 +1923,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="projectId != null and projectId !=''">
+                and a.projectId like concat('%', #{projectId}, '%')
+            </if>
+            <if test="projectName !=null and projectName !=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
             ${dataScope}
         </where>
         order by a.reserveProjectName

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -37,6 +37,17 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
         return super.findPage(page, entity);
     }
 
+    public Page<Project> findBasicPage(Page<Project> page, Project project) {
+        dataRuleFilter(project);
+        project.setPage(page);
+        page.setList(mapper.findBasicList(project));
+        return page;
+    }
+
+    public List<Project> findBasicList(Project project){
+        return mapper.findBasicList(project);
+    }
+
     public Page<Project> findAssPage(Page<Project> page, Project project) {
         dataRuleFilter(project);
         project.setPage(page);
@@ -44,6 +55,10 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
         return page;
     }
 
+    public List<Project> findAssList(Project project){
+        return mapper.findAssList(project);
+    }
+
     /**
      * 交底计划安排
      */
@@ -54,6 +69,10 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
         return page;
     }
 
+    public List<Project> findPlanList(Project project){
+        return mapper.findPlanList(project);
+    }
+
     /**
      * 项目立项信息
      */

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ExportUtil.java

@@ -0,0 +1,281 @@
+package com.jeeplus.modules.sg.managementcenter.project.util;
+
+import com.github.abel533.echarts.code.X;
+import com.jeeplus.modules.sg.managementcenter.project.entity.*;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.List;
+
+public class ExportUtil {
+//    private static ExportUtil util = null;
+
+    private  XSSFCellStyle style = null;
+
+    public static ExportUtil getOne(){
+
+        return new ExportUtil();
+    }
+
+    /**
+     * 传入excel模板名称 获取workbook对象
+     * @param fileName excel模板名称
+     * @return
+     */
+    public  XSSFWorkbook getWorkbook(String fileName){
+        InputStream inputStream = null;
+        XSSFWorkbook workbook = null;
+        try {
+            String path = this.getClass().getResource("/").getPath() + "/freemarker/excelmodel/"+fileName+".xlsx";
+            File file = new File(path);
+            inputStream = new FileInputStream(file);// 将excel文件转为输入流
+            workbook = new XSSFWorkbook(inputStream);// 创建个workbook，
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return workbook;
+    }
+
+    /**
+     * 导出前期基本信息
+     * @param response
+     * @param workbook
+     * @param list
+     */
+    public void exportBasic(HttpServletResponse response, XSSFWorkbook workbook, List<Project> list){
+        try {
+            int index = 1;//第一列序号
+            int rowNum = 6;//数据起始列
+            Sheet sheet = workbook.getSheetAt(0);
+            for(int i=0;i<list.size();i++){
+                Row row = sheet.createRow(rowNum+i);
+                Cell cell0 = crateCell(workbook,row,0); //序号
+                Cell cell1 = crateCell(workbook,row,1); //储备项目名称
+                Cell cell2 = crateCell(workbook,row,2); //项目名称
+                Cell cell3 = crateCell(workbook,row,3); //项目定义
+                Cell cell4 = crateCell(workbook,row,4); //市公司
+                Cell cell5 = crateCell(workbook,row,5); //县公司
+                Cell cell6 = crateCell(workbook,row,6); //项目性质
+                Cell cell7 = crateCell(workbook,row,7); //需求单位
+                Cell cell8 = crateCell(workbook,row,8); //运维单位
+                Cell cell9 = crateCell(workbook,row,9); //供电区域
+                Cell cell10 = crateCell(workbook,row,10); //网格编号
+                Cell cell11 = crateCell(workbook,row,11); //单元格编号
+                Cell cell12 = crateCell(workbook,row,12); //项目储备编号
+                Cell cell13 = crateCell(workbook,row,13); //电网储备编号
+                Cell cell14 = crateCell(workbook,row,14); //ERP编号
+                Cell cell15 = crateCell(workbook,row,15); //建设必要性及内容
+                Cell cell16 = crateCell(workbook,row,16); //变电站名称
+                Cell cell17 = crateCell(workbook,row,17); //线路名称
+                Cell cell18 = crateCell(workbook,row,18); //项目类型
+                Cell cell19 = crateCell(workbook,row,19); //是否迎峰度夏项目
+                Cell cell20 = crateCell(workbook,row,20); //项目基本说明
+                Cell cell21 = crateCell(workbook,row,21); //工区备注
+
+                Project project = list.get(i);
+                BasicInformation export = project.getBasicInformation();
+
+                cell0.setCellValue(String.valueOf(index++));
+                cell1.setCellValue(export.getReserveProjectName());
+                cell2.setCellValue(project.getProjectName());
+                cell3.setCellValue(project.getProjectId());
+                cell4.setCellValue(export.getMunicipalCompany());
+                cell5.setCellValue(export.getCountyCompany());
+                cell6.setCellValue(export.getProjectNature());
+                cell7.setCellValue(export.getDemandUnit());
+                cell8.setCellValue(export.getOperationUnit());
+                cell9.setCellValue(export.getPowerSupplyArea());
+                cell10.setCellValue(export.getGridNumber());
+                cell11.setCellValue(export.getCellNumber());
+                cell12.setCellValue(export.getProjectReserveNo());
+                cell13.setCellValue(export.getGridProjectNo());
+                cell14.setCellValue(export.getErpNo());
+                cell15.setCellValue(export.getNecessityContent());
+                cell16.setCellValue(export.getSubStationName());
+                cell17.setCellValue(export.getLineName());
+                cell18.setCellValue(export.getProjectType());
+                cell19.setCellValue(export.getWhetherSummer());
+                cell20.setCellValue(export.getBasicDescription());
+                cell21.setCellValue(export.getWorkAreaRemarks());
+            }
+
+            String str = URLEncoder.encode("项目前期基本信息.xlsx", "UTF8");
+            response.setHeader("Content-Disposition", "attachment;filename="+str);
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            OutputStream outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 导出前期基本信息
+     * @param response
+     * @param workbook
+     * @param list
+     */
+    public void exportAss(HttpServletResponse response, XSSFWorkbook workbook, List<Project> list){
+        try {
+            int rowNum = 4;
+            Sheet sheet = workbook.getSheetAt(0);
+            for(int i=0;i<list.size();i++){
+                Row row = sheet.createRow(rowNum+i);
+                Cell cell0 = crateCell(workbook,row,0); //储备项目名称
+                Cell cell1 = crateCell(workbook,row,1); //交底类型
+                Cell cell2 = crateCell(workbook,row,2); //项目下达批次
+                Cell cell3 = crateCell(workbook,row,3); //正式图交付日期
+                Cell cell4 = crateCell(workbook,row,4); //施工包号
+                Cell cell5 = crateCell(workbook,row,5); //费率
+                Cell cell6 = crateCell(workbook,row,6); //合同单位
+                Cell cell7 = crateCell(workbook,row,7); //施工单位
+                Cell cell8 = crateCell(workbook,row,8); //施工分包单位
+                Cell cell9 = crateCell(workbook,row,9); //甲方代表
+                Cell cell10 = crateCell(workbook,row,10); //施工单位物资专职
+                Cell cell11 = crateCell(workbook,row,11); //施工单位技经专职
+                Cell cell12 = crateCell(workbook,row,12); //施工项目经理
+                Cell cell13 = crateCell(workbook,row,13); //施工单位领导
+                Cell cell14 = crateCell(workbook,row,14); //分包联系人
+                Cell cell15 = crateCell(workbook,row,15); //设计人员
+                Cell cell16 = crateCell(workbook,row,16); //设计单位领导
+                Cell cell17 = crateCell(workbook,row,17); //业主项目经理（配网项目经理）
+                Cell cell18 = crateCell(workbook,row,18); //配网工程专职
+                Cell cell19 = crateCell(workbook,row,19); //配网物资专职
+                Cell cell20 = crateCell(workbook,row,20); //配网系统维护专职
+                Cell cell21 = crateCell(workbook,row,21); //配网政策处理
+                Cell cell22 = crateCell(workbook,row,22); //项目管理中心领导
+                Cell cell23 = crateCell(workbook,row,23); //项目管理中心技经专职
+                Cell cell24 = crateCell(workbook,row,24); //经研所角色
+                Cell cell25 = crateCell(workbook,row,25); //运行单位业主代表
+                Cell cell26 = crateCell(workbook,row,26); //运行单位运检专职
+
+                Project project = list.get(i);
+                Assignment ass = project.getAssignment();
+
+                cell0.setCellValue(ass.getReserveProjectName());
+                cell1.setCellValue(ass.getDisclosureType());
+                cell2.setCellValue(ass.getProjectReleaseBatch());
+                cell3.setCellValue(ass.getDeliveryDate());
+                cell4.setCellValue(ass.getPackageNo());
+                cell5.setCellValue(ass.getRate());
+                cell6.setCellValue(ass.getAssignedUnit());
+                cell7.setCellValue(ass.getConstructionUnit());
+                cell8.setCellValue(ass.getConstructionSubcontractor());
+                cell9.setCellValue(ass.getBehalf());
+                cell10.setCellValue(ass.getConstructionFullTime());
+                cell11.setCellValue(ass.getConstructionTechnical());
+                cell12.setCellValue(ass.getConstructionManage());
+                cell13.setCellValue(ass.getConstructionLeader());
+                cell14.setCellValue(ass.getSubcontractingContact());
+                cell15.setCellValue(ass.getDesigner());
+                cell16.setCellValue(ass.getDesignLeader());
+                cell17.setCellValue(ass.getOwnerManager());
+                cell18.setCellValue(ass.getDistribution());
+                cell19.setCellValue(ass.getDistributionFullTime());
+                cell20.setCellValue(ass.getDistributionSystem());
+                cell21.setCellValue(ass.getDistributionPolicy());
+                cell22.setCellValue(ass.getCenterLeader());
+                cell23.setCellValue(ass.getCenterTechnical());
+                cell24.setCellValue(ass.getInstituteRole());
+                cell25.setCellValue(ass.getRepUnit());
+                cell26.setCellValue(ass.getInspectionUnit());
+            }
+
+            String str = URLEncoder.encode("施工任务分配信息.xlsx", "UTF8");
+            response.setHeader("Content-Disposition", "attachment;filename="+str);
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            OutputStream outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 导出前期基本信息
+     * @param response
+     * @param workbook
+     * @param list
+     */
+    public void exportPlan(HttpServletResponse response, XSSFWorkbook workbook, List<Project> list){
+        try {
+            int rowNum = 5;
+            Sheet sheet = workbook.getSheetAt(0);
+            for(int i=0;i<list.size();i++){
+                Row row = sheet.createRow(rowNum+i);
+                Cell cell0 = crateCell(workbook,row,0); //储备项目名称
+                Cell cell1 = crateCell(workbook,row,1); //交底类型
+                Cell cell2 = crateCell(workbook,row,2); //项目类型
+                Cell cell3 = crateCell(workbook,row,3); //交底方式
+                Cell cell4 = crateCell(workbook,row,4); //运维单位
+                Cell cell5 = crateCell(workbook,row,5); //施工单位
+                Cell cell6 = crateCell(workbook,row,6); //供电所
+                Cell cell7 = crateCell(workbook,row,7); //施工项目经理
+                Cell cell8 = crateCell(workbook,row,8); //运维人员
+                Cell cell9 = crateCell(workbook,row,9); //自动化联系人
+                Cell cell10 = crateCell(workbook,row,10); //带电查勘联系人
+                Cell cell11 = crateCell(workbook,row,11); //供电所查勘人
+                Cell cell12 = crateCell(workbook,row,12); //交底计划日期
+
+                Project project = list.get(i);
+                DisclosurePlan plan = project.getDisclosurePlan();
+
+                cell0.setCellValue(project.getReserveProjectName());
+                cell1.setCellValue(plan.getDisclosureType());
+                cell2.setCellValue(plan.getProjectType());
+                cell3.setCellValue(plan.getDisclosureMethod());
+                cell4.setCellValue(plan.getOperationUnit());
+                cell5.setCellValue(plan.getConstructionUnit());
+                cell6.setCellValue(plan.getPowerSupplyStation());
+                cell7.setCellValue(plan.getConstructionManage());
+                cell8.setCellValue(plan.getMaintenance());
+                cell9.setCellValue(plan.getAutomationContacts());
+                cell10.setCellValue(plan.getLiveSurveyContact());
+                cell11.setCellValue(plan.getInspector());
+                cell12.setCellValue(plan.getDisclosurePlanDate());
+            }
+
+            String str = URLEncoder.encode("交底计划安排.xlsx", "UTF8");
+            response.setHeader("Content-Disposition", "attachment;filename="+str);
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            OutputStream outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 创建Cell对象 同时设置style
+     * @param workbook
+     * @param row
+     * @param num
+     * @return
+     */
+    Cell crateCell(XSSFWorkbook workbook,Row row, int num){
+        Cell cell = row.createCell(num);
+        if(style == null){
+            style =workbook.createCellStyle();
+            style.setWrapText(true);
+            style.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
+        }
+        cell.setCellStyle(style);
+        return cell;
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProjectImportUtil.java

@@ -208,68 +208,129 @@ public class ProjectImportUtil {
         List<Project> noCompareList = new ArrayList<>();
         //获取所有的储备项目暂定名称，比对名称纯在的进行数据验证
         List<String> strings = projectMapper.allProjectName();
-        for (String a : strings) {
-            for (int i = 4; i < lastDataRowNum; i++) {
-                project = new Project();
-                Row row = ei.getRow(i);
-                //获取表格项目名称
-                Object reserveProjectName = ei.getCellValue(row, 0);
-                if (reserveProjectName != null && reserveProjectName != "" && a.equals(reserveProjectName)) {
-                    //获得储备项目暂定名称
+        for (int i = 4; i < lastDataRowNum; i++) {
+            project = new Project();
+            Row row = ei.getRow(i);
+            //获取表格项目名称
+            Object reserveProjectName = ei.getCellValue(row, 0);
+            if (reserveProjectName != null && reserveProjectName != "" && strings.contains(reserveProjectName)) {
+                //获得储备项目暂定名称
 
-                    //查询项目前期基本信息表中是否有该项目信息，如果有获取之前数据，修改部分信息
-                    Project proByName = projectMapper.findAssByName((String) reserveProjectName);
-                    project.setAssignment(new Assignment());
-                    if (proByName != null) {
-                        Boolean aBoolean = checkProcess((String) reserveProjectName);
-                        if (!aBoolean) {
-                            flagStr += proByName.getBasicInformation().getReserveProjectName() + "项目流程运行中，不能更改信息\n";
-                            continue;
-                        }
-                        project.getAssignment().setReserveProjectName((String) reserveProjectName);
-                        project.getAssignment().setDeliveryDate((String) ei.getCellValue(row, 3));
-                        project.getAssignment().setPackageNo((String) ei.getCellValue(row, 4));
-                        project.getAssignment().setRate(format.format(new BigDecimal((String) ei.getCellValue(row, 5))));
-                        project.getAssignment().setConstructionSubcontractor((String) ei.getCellValue(row, 8));
-                        project.getAssignment().setBehalf((String) ei.getCellValue(row, 9));
-                        project.getAssignment().setSubcontractingContact((String) ei.getCellValue(row, 14));
-                        noCompareList.add(project);
-                    } else {
-                        project.getAssignment().setReserveProjectName((String) reserveProjectName);
-                        project.getAssignment().setDisclosureType((String) ei.getCellValue(row, 1));
-                        project.getAssignment().setProjectReleaseBatch((String) ei.getCellValue(row, 2));
-                        project.getAssignment().setDeliveryDate((String) ei.getCellValue(row, 3));
-                        project.getAssignment().setPackageNo((String) ei.getCellValue(row, 4));
-                        project.getAssignment().setRate(format.format(new BigDecimal((String) ei.getCellValue(row, 5))));
-                        project.getAssignment().setAssignedUnit((String) ei.getCellValue(row, 6));
-                        project.getAssignment().setConstructionUnit((String) ei.getCellValue(row, 7));
-                        project.getAssignment().setConstructionSubcontractor((String) ei.getCellValue(row, 8));
-                        project.getAssignment().setBehalf((String) ei.getCellValue(row, 9));
-                        project.getAssignment().setConstructionFullTime((String) ei.getCellValue(row, 10));
-                        project.getAssignment().setConstructionTechnical((String) ei.getCellValue(row, 11));
-                        project.getAssignment().setConstructionManage((String) ei.getCellValue(row, 12));
-                        project.getAssignment().setConstructionLeader((String) ei.getCellValue(row, 13));
-                        project.getAssignment().setSubcontractingContact((String) ei.getCellValue(row, 14));
-                        project.getAssignment().setDesigner((String) ei.getCellValue(row, 15));
-                        project.getAssignment().setDesignLeader((String) ei.getCellValue(row, 16));
-                        project.getAssignment().setOwnerManager((String) ei.getCellValue(row, 17));
-                        project.getAssignment().setDistribution((String) ei.getCellValue(row, 18));
-                        project.getAssignment().setDistributionFullTime((String) ei.getCellValue(row, 19));
-                        project.getAssignment().setDistributionSystem((String) ei.getCellValue(row, 20));
-                        project.getAssignment().setDistributionPolicy((String) ei.getCellValue(row, 21));
-                        project.getAssignment().setCenterLeader((String) ei.getCellValue(row, 22));
-                        project.getAssignment().setCenterTechnical((String) ei.getCellValue(row, 23));
-                        String demandUnit = projectMapper.findDemandUnit((String) reserveProjectName);
-                        if ("经研所".equals(demandUnit)) {
-                            project.getAssignment().setInstituteRole((String) ei.getCellValue(row, 24));
-                        }
-                        project.getAssignment().setRepUnit((String) ei.getCellValue(row, 25));
-                        project.getAssignment().setInspectionUnit((String) ei.getCellValue(row, 26));
-                        compareList.add(project);
+                //查询项目前期基本信息表中是否有该项目信息，如果有获取之前数据，修改部分信息
+                Project proByName = projectMapper.findAssByName((String) reserveProjectName);
+                project.setAssignment(new Assignment());
+                if (proByName != null) {
+                    Boolean aBoolean = checkProcess((String) reserveProjectName);
+                    if (!aBoolean) {
+//                        flagStr += proByName.getBasicInformation().getReserveProjectName() + "项目流程运行中，不能更改信息\n";
+                        flagStr += proByName.getReserveProjectName() + "项目流程运行中，不能更改信息\n\n";
+                        continue;
+                    }
+                    project.getAssignment().setReserveProjectName((String) reserveProjectName);
+                    project.getAssignment().setDeliveryDate((String) ei.getCellValue(row, 3));
+                    project.getAssignment().setPackageNo((String) ei.getCellValue(row, 4));
+                    project.getAssignment().setRate(format.format(new BigDecimal((String) ei.getCellValue(row, 5))));
+                    project.getAssignment().setConstructionSubcontractor((String) ei.getCellValue(row, 8));
+                    project.getAssignment().setBehalf((String) ei.getCellValue(row, 9));
+                    project.getAssignment().setSubcontractingContact((String) ei.getCellValue(row, 14));
+                    noCompareList.add(project);
+                } else {
+                    project.getAssignment().setReserveProjectName((String) reserveProjectName);
+                    project.getAssignment().setDisclosureType((String) ei.getCellValue(row, 1));
+                    project.getAssignment().setProjectReleaseBatch((String) ei.getCellValue(row, 2));
+                    project.getAssignment().setDeliveryDate((String) ei.getCellValue(row, 3));
+                    project.getAssignment().setPackageNo((String) ei.getCellValue(row, 4));
+                    project.getAssignment().setRate(format.format(new BigDecimal((String) ei.getCellValue(row, 5))));
+                    project.getAssignment().setAssignedUnit((String) ei.getCellValue(row, 6));
+                    project.getAssignment().setConstructionUnit((String) ei.getCellValue(row, 7));
+                    project.getAssignment().setConstructionSubcontractor((String) ei.getCellValue(row, 8));
+                    project.getAssignment().setBehalf((String) ei.getCellValue(row, 9));
+                    project.getAssignment().setConstructionFullTime((String) ei.getCellValue(row, 10));
+                    project.getAssignment().setConstructionTechnical((String) ei.getCellValue(row, 11));
+                    project.getAssignment().setConstructionManage((String) ei.getCellValue(row, 12));
+                    project.getAssignment().setConstructionLeader((String) ei.getCellValue(row, 13));
+                    project.getAssignment().setSubcontractingContact((String) ei.getCellValue(row, 14));
+                    project.getAssignment().setDesigner((String) ei.getCellValue(row, 15));
+                    project.getAssignment().setDesignLeader((String) ei.getCellValue(row, 16));
+                    project.getAssignment().setOwnerManager((String) ei.getCellValue(row, 17));
+                    project.getAssignment().setDistribution((String) ei.getCellValue(row, 18));
+                    project.getAssignment().setDistributionFullTime((String) ei.getCellValue(row, 19));
+                    project.getAssignment().setDistributionSystem((String) ei.getCellValue(row, 20));
+                    project.getAssignment().setDistributionPolicy((String) ei.getCellValue(row, 21));
+                    project.getAssignment().setCenterLeader((String) ei.getCellValue(row, 22));
+                    project.getAssignment().setCenterTechnical((String) ei.getCellValue(row, 23));
+                    String demandUnit = projectMapper.findDemandUnit((String) reserveProjectName);
+                    if ("经研所".equals(demandUnit)) {
+                        project.getAssignment().setInstituteRole((String) ei.getCellValue(row, 24));
                     }
+                    project.getAssignment().setRepUnit((String) ei.getCellValue(row, 25));
+                    project.getAssignment().setInspectionUnit((String) ei.getCellValue(row, 26));
+                    compareList.add(project);
                 }
             }
         }
+//        for (String a : strings) {
+//            for (int i = 4; i < lastDataRowNum; i++) {
+//                project = new Project();
+//                Row row = ei.getRow(i);
+//                //获取表格项目名称
+//                Object reserveProjectName = ei.getCellValue(row, 0);
+//                if (reserveProjectName != null && reserveProjectName != "" && a.equals(reserveProjectName)) {
+//                    //获得储备项目暂定名称
+//
+//                    //查询项目前期基本信息表中是否有该项目信息，如果有获取之前数据，修改部分信息
+//                    Project proByName = projectMapper.findAssByName((String) reserveProjectName);
+//                    project.setAssignment(new Assignment());
+//                    if (proByName != null) {
+//                        Boolean aBoolean = checkProcess((String) reserveProjectName);
+//                        if (!aBoolean) {
+//                            flagStr += proByName.getBasicInformation().getReserveProjectName() + "项目流程运行中，不能更改信息\n";
+//                            continue;
+//                        }
+//                        project.getAssignment().setReserveProjectName((String) reserveProjectName);
+//                        project.getAssignment().setDeliveryDate((String) ei.getCellValue(row, 3));
+//                        project.getAssignment().setPackageNo((String) ei.getCellValue(row, 4));
+//                        project.getAssignment().setRate(format.format(new BigDecimal((String) ei.getCellValue(row, 5))));
+//                        project.getAssignment().setConstructionSubcontractor((String) ei.getCellValue(row, 8));
+//                        project.getAssignment().setBehalf((String) ei.getCellValue(row, 9));
+//                        project.getAssignment().setSubcontractingContact((String) ei.getCellValue(row, 14));
+//                        noCompareList.add(project);
+//                    } else {
+//                        project.getAssignment().setReserveProjectName((String) reserveProjectName);
+//                        project.getAssignment().setDisclosureType((String) ei.getCellValue(row, 1));
+//                        project.getAssignment().setProjectReleaseBatch((String) ei.getCellValue(row, 2));
+//                        project.getAssignment().setDeliveryDate((String) ei.getCellValue(row, 3));
+//                        project.getAssignment().setPackageNo((String) ei.getCellValue(row, 4));
+//                        project.getAssignment().setRate(format.format(new BigDecimal((String) ei.getCellValue(row, 5))));
+//                        project.getAssignment().setAssignedUnit((String) ei.getCellValue(row, 6));
+//                        project.getAssignment().setConstructionUnit((String) ei.getCellValue(row, 7));
+//                        project.getAssignment().setConstructionSubcontractor((String) ei.getCellValue(row, 8));
+//                        project.getAssignment().setBehalf((String) ei.getCellValue(row, 9));
+//                        project.getAssignment().setConstructionFullTime((String) ei.getCellValue(row, 10));
+//                        project.getAssignment().setConstructionTechnical((String) ei.getCellValue(row, 11));
+//                        project.getAssignment().setConstructionManage((String) ei.getCellValue(row, 12));
+//                        project.getAssignment().setConstructionLeader((String) ei.getCellValue(row, 13));
+//                        project.getAssignment().setSubcontractingContact((String) ei.getCellValue(row, 14));
+//                        project.getAssignment().setDesigner((String) ei.getCellValue(row, 15));
+//                        project.getAssignment().setDesignLeader((String) ei.getCellValue(row, 16));
+//                        project.getAssignment().setOwnerManager((String) ei.getCellValue(row, 17));
+//                        project.getAssignment().setDistribution((String) ei.getCellValue(row, 18));
+//                        project.getAssignment().setDistributionFullTime((String) ei.getCellValue(row, 19));
+//                        project.getAssignment().setDistributionSystem((String) ei.getCellValue(row, 20));
+//                        project.getAssignment().setDistributionPolicy((String) ei.getCellValue(row, 21));
+//                        project.getAssignment().setCenterLeader((String) ei.getCellValue(row, 22));
+//                        project.getAssignment().setCenterTechnical((String) ei.getCellValue(row, 23));
+//                        String demandUnit = projectMapper.findDemandUnit((String) reserveProjectName);
+//                        if ("经研所".equals(demandUnit)) {
+//                            project.getAssignment().setInstituteRole((String) ei.getCellValue(row, 24));
+//                        }
+//                        project.getAssignment().setRepUnit((String) ei.getCellValue(row, 25));
+//                        project.getAssignment().setInspectionUnit((String) ei.getCellValue(row, 26));
+//                        compareList.add(project);
+//                    }
+//                }
+//            }
+//        }
         //得到比对后list，进行数据验证，成功存入list返回，失败，返回
         for (Project p : compareList) {
             str = "";

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/NonPowerMapper.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.sg.materialmodule.activiti.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.NonPower;
@@ -40,4 +41,10 @@ public interface NonPowerMapper extends BaseMapper<NonPower> {
     NonPower getById(String procInsId);
 
     List<NonPower> findListPage(NonPower nonPower);
+
+    /**
+     * 土建流程上传文件
+     * */
+    void saveUpload(UploadImages uploadImages);
+
 }

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/xml/NonPowerMapper.xml

@@ -251,4 +251,33 @@
 			</if>
 		</where>
 	</select>
+	<insert id="saveUpload">
+		INSERT INTO xm_upload_images(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			imgName,
+			path,
+			proc_ins_id,
+			uid,
+			reserveProjectName
+		) VALUES (
+					 #{id},
+					 #{createBy.id},
+					 #{createDate},
+					 #{updateBy.id},
+					 #{updateDate},
+					 #{remarks},
+					 #{delFlag},
+					 #{imgName},
+					 #{path},
+					 #{procInsId},
+					 #{uid},
+					 #{reserveProjectName}
+				 )
+	</insert>
 </mapper>

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/service/NonPowerService.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.sg.materialmodule.activiti.service;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.NonPower;
@@ -94,4 +95,13 @@ public class NonPowerService extends CrudService<NonPowerMapper, NonPower> {
         page.setList(nonPowerMapper.findListPage(nonPower));
         return page;
     }
+
+    /**
+     * 土建流程上传文件
+     */
+    @Transactional(readOnly = false)
+    public void saveUpload(UploadImages uploadImages) {
+        uploadImages.preInsert();
+        nonPowerMapper.saveUpload(uploadImages);
+    }
 }

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/web/NonPowerController.java

@@ -13,7 +13,9 @@ import com.jeeplus.modules.sg.audit.information.utils.FreemarkerUtil;
 import com.jeeplus.modules.sg.audit.information.utils.ResponseUtil;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
+import com.jeeplus.modules.sg.managementcenter.moduleacquisition.entity.ModuleBlock;
 import com.jeeplus.modules.sg.managementcenter.project.entity.BasicInformation;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
@@ -27,6 +29,7 @@ import com.jeeplus.modules.test.one.dialog.entity.Leave1;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -131,6 +134,15 @@ public class NonPowerController extends BaseController {
     }
 
     /**
+     * 土建流程上传文件页面
+     */
+    @RequestMapping(value = "nonPowerStartUpload")
+    public String nonPowerStartUpload(UploadImages uploadImages, Model model) {
+        model.addAttribute("uploadImages", uploadImages);
+        return "modules/sg/materialmodule/activiti/nonPowerStartUpload";
+    }
+
+    /**
      * 在线验收
      */
     @RequestMapping(value = "acceptance")
@@ -391,6 +403,34 @@ public class NonPowerController extends BaseController {
 
         return j;
     }
+
+    /**
+     * 土建流程上传文件报错方法
+     * */
+    @ResponseBody
+    @RequestMapping(value = "saveUpload")
+    public AjaxJson saveOld(UploadImages uploadImages, Model model, HttpServletRequest request) throws Exception{
+        AjaxJson j = new AjaxJson();
+        NonPower nonPower = nonPowerService.get(uploadImages.getId());
+        String reserveProjectName = nonPower.getReserveProjectName();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String errMsg = beanValidator(uploadImages);
+        if (StringUtils.isNotBlank(errMsg)){
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
+        }
+        String loginName = UserUtils.getUser().getName();
+        uploadImages.setUid(loginName);
+        uploadImages.setReserveProjectName(reserveProjectName);
+        //保持上传文件
+        nonPowerService.saveUpload(uploadImages);
+        j.setSuccess(true);
+        j.setMsg("上传文件成功");
+        return j;
+    }
     /***************************************土建流程*************************************************/
 }
 

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

@@ -117,6 +117,12 @@
                 </foreach>
                 )
             </if>
+            <if test="reserveProjectName!=null and reserveProjectName!=''">
+                and a.reserveProjectName like concat('%',#{reserveProjectName}, '%')
+            </if>
+            <if test="projectName!=null and projectName!=''">
+                and a.projectName like concat('%', #{projectName}, '%')
+            </if>
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>

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

@@ -200,6 +200,7 @@ public class ScheduleViewController extends BaseController {
         boolean flag;
         boolean designFlag;
         boolean closeFlag;
+        boolean finalClose;
         boolean policyStart1;
         boolean policyStart2;
         boolean policyStart3;
@@ -210,9 +211,12 @@ public class ScheduleViewController extends BaseController {
         boolean policy2;
         boolean policy3;
         for (ScheduleView s : list) {
+            String status = s.getStatus();
+
             flag = false;
             designFlag = false;
             closeFlag = false;
+            finalClose = false;
             policyStart1 = false;
             policyStart2 = false;
             policyStart3 = false;
@@ -236,6 +240,12 @@ public class ScheduleViewController extends BaseController {
                     if (s.getDisView() == null) {
                         s.setDisView(new DisView());
                     }
+                    if ("2".equals(status)) {
+                        s.getDisView().setPolicyType("政策处理完成");
+                        s.getDisView().setProjectClosure("项目关闭完成");
+                        s.getDisView().setDesignChange("设计变更完成");
+                        continue;
+                    }
                     if ("开始".equals(activityName)) {
                         DisView disView = s.getDisView();
                         if (disView != null) {
@@ -268,26 +278,27 @@ public class ScheduleViewController extends BaseController {
                     }
 
 
-                        //设计变更
-                        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)
+                    ) {
+                        s.getDisView().setDesignChange("设计变更流程中");
+                    }
+                    //项目关闭
+                    if ("交底:项目经理判定是否关闭".equals(activityName)
+                            || "交底:配网工程专职判定是否关闭".equals(activityName)
+                            || "交底:配网运行人员判定是否关闭".equals(activityName)
+                            || "交底:配网工程专职判定变更或关闭".equals(activityName)
+                            || "交底:配网系统专职确认系统关闭".equals(activityName)
+
+                    ) {
+                        s.getDisView().setProjectClosure("项目关闭流程中");
+                    }
+
 
                     //如果因为各种原因完成了设计变更流程或者项目关闭流程
                     if ("交底:导入材料表和拆旧物资表".equals(activityName)) {
@@ -302,10 +313,14 @@ public class ScheduleViewController extends BaseController {
                         closeFlag = true;
                     }
 
+                    if ("交底:配网项目经理判定变更或关闭".equals(activityName) || "交底:配网系统专职确认系统关闭".equals(activityName)) {
+                        finalClose = true;
+                    }
 
                     //政策处理
                     if ("交底:农村政处".equals(activityName)
                             || "交底:政策处理专职判断".equals(activityName)
+                            || "交底:政策处理专职判断".equals(activityName)
                             || "交底:农村上传文件".equals(activityName)
                             || "交底:行政政处".equals(activityName)
                             || "行政:政策处理专职判断".equals(activityName)
@@ -333,17 +348,17 @@ public class ScheduleViewController extends BaseController {
                     }
                     //判断农村政处是否完成
                     if ("交底:民事是否支付".equals(activityName)
-                            || "交底:民事是否借款".equals(activityName)) {
+                            || "交底:民事是完成否借款".equals(activityName)) {
                         policyEnd1 = true;
                     }
                     //判断行政政处是否完成
                     if ("交底:行政是否支付".equals(activityName)
-                            || "交底:行政是否借款".equals(activityName)) {
+                            || "交底:行政是完成否借款".equals(activityName)) {
                         policyEnd2 = true;
                     }
                     //判断民事政处是否完成
                     if ("交底:农村是否支付".equals(activityName)
-                            || "交底:农村是否借款".equals(activityName)) {
+                            || "交底:农村是完成否借款".equals(activityName)) {
                         policyEnd3 = true;
                     }
                 }
@@ -357,9 +372,11 @@ public class ScheduleViewController extends BaseController {
                     if (designFlag) {
                         s.getDisView().setDesignChange("设计变更完成");
                     }
-                    //判断是否发起过项目关闭
-                    if (closeFlag) {
-                        s.getDisView().setProjectClosure("设计变更完成");
+                }
+                //判断是否发起过项目关闭
+                if (closeFlag) {
+                    if (finalClose) {
+                        s.getDisView().setProjectClosure("项目关闭完成");
                     }
                 }
                 if (policyStart1) {
@@ -368,8 +385,9 @@ public class ScheduleViewController extends BaseController {
                     } else {
                         policy1 = false;
                     }
-                }else {
+                } else {
                     policy1 = true;
+
                 }
                 if (policyStart2) {
                     if (policyEnd2) {
@@ -377,7 +395,7 @@ public class ScheduleViewController extends BaseController {
                     } else {
                         policy2 = false;
                     }
-                }else {
+                } else {
                     policy2 = true;
                 }
                 if (policyStart3) {
@@ -389,8 +407,12 @@ public class ScheduleViewController extends BaseController {
                 } else {
                     policy3 = true;
                 }
-                if (policy1==true && policy2==true && policy3==true) {
-                    s.getDisView().setPolicyType("政策处理完成");
+                if (policyStart1 == false && policyStart2 == false && policyStart3 == false) {
+
+                } else {
+                    if (policy1 == true && policy2 == true && policy3 == true) {
+                        s.getDisView().setPolicyType("政策处理完成");
+                    }
                 }
             }
         }
@@ -399,7 +421,7 @@ public class ScheduleViewController extends BaseController {
 
     /**
      * 项目进度查询-物资领料状态
-     * */
+     */
     @ResponseBody
     @RequestMapping(value = "recData")
     public Map<String, Object> recData(ScheduleView scheduleView, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -693,7 +715,7 @@ public class ScheduleViewController extends BaseController {
     }
 
     /**
-     *施工验收土建流程
+     * 施工验收土建流程
      */
     @ResponseBody
     @RequestMapping(value = "civilData")

src/main/resources/j2cache/j2cache.properties

@@ -88,9 +88,11 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-#redis.hosts = 127.0.0.1:6379
-redis.hosts = 192.168.2.4:6380
+redis.hosts = 127.0.0.1:6379
+#redis.hosts = 192.168.2.4:6380
 redis.timeout = 2000
+#192.168.2.4\u73AF\u5883
+#redis.password = 123456
 redis.password =
 redis.database = 0
 

src/main/resources/properties/jeeplus.properties

@@ -14,12 +14,19 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://localhost:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://106.12.212.98:3306/sg_audit_0731?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.username=root
-#jdbc.password=Xgxx1234!
+jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit_0916?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#\u9547\u6C5F\u73B0\u573A
+#jdbc.url=jdbc:mysql://localhost:3307/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#103\u79C1\u670D\u73AF\u5883
+#jdbc.url=jdbc:mysql://106.12.212.98:3306/sg_test?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#\u9547\u6C5F\u6D4B\u8BD5\u73AF\u5883
+#jdbc.url=jdbc:mysql://localhost:3306/sg_audit_0811?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#jdbc.url=jdbc:mysql://106.12.212.98:3306/sg_audit_0831?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 jdbc.username=root
+#\u9547\u6C5F\u73B0\u573A
+#jdbc.password=Zjsh5182!
+#103\u79C1\u670D\u73AF\u5883\u3001\u9547\u6C5F\u6D4B\u8BD5\u73AF\u5883
+#jdbc.password=Xgxx1234!
 jdbc.password=root
 jdbc.testSql=SELECT 'x'
 jdbc.dual =
@@ -127,5 +134,6 @@ spring.http.multipart.max-request-size=100MB
 #\u6388\u6743\u57DF\u540D
 domain.url=
 #\u6587\u4EF6\u4E0A\u4F20\u524D\u7F00\u8BBE\u7F6E
-linux.file.store.prefix=/data/nginx/file
+#linux.file.store.prefix=/data/nginx/file
+linux.file.store.prefix=/home/nginx/file
 

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

@@ -90,6 +90,11 @@ $(document).ready(function() {
                        width:160
                    }
                    ,{
+                       field: 'projectName',
+                       width:160,
+                       title: '项目名称',
+                   }
+                   ,{
                        field: 'disclose.hasImplemented',
                        title: '是否已实施',
                        width:160

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

@@ -20,15 +20,29 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="construction" class="form form-horizontal well clearfix">
+					<%--<div class="col-xs-12 col-sm-6 col-md-4">--%>
+						<%--<label class="label-item single-overflow pull-left" title="储备项目名称：">项目定义号：</label>--%>
+						<%--<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>--%>
+					<%--</div>--%>
+					<%--<div class="col-xs-12 col-sm-6 col-md-4">--%>
+						<%--<label class="label-item single-overflow pull-left" title="项目需求名称：">项目定义号：</label>--%>
+						<%--<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>--%>
+					<%--</div>--%>
+
 					<div class="col-xs-12 col-sm-6 col-md-4">
-						<label class="label-item single-overflow pull-left" title="储备项目名称：">项目定义号：</label>
+						<label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
 						<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
-						<label class="label-item single-overflow pull-left" title="项目需求名称：">项目定义号：</label>
+						<label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
 						<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+						<form:input path="projectName" htmlEscape="false" maxlength="100"  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>

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

@@ -16,7 +16,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-                            "flag": "yes",
+                            "flag": "close",
                             "comment": window.encodeURI(message)
                         },
                         function (data) {
@@ -28,6 +28,27 @@
                     )
                 })
             });
+            $("#design").click(function () {
+                jp.prompt("设计变更", function (message) {
+                    jp.post("${ctx}/act/task/documentsForm",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "design",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                })
+            })
             $("#no").click(function () {
                 jp.prompt("驳回", function (message) {
                     jp.post("${ctx}/act/task/documentsForm",
@@ -447,7 +468,8 @@
                         <div class="col-sm-3"></div>
                         <div class="col-sm-6">
                             <div class="form-group text-center">
-                                <input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核"/>&nbsp;
+                                <input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="结束流程"/>&nbsp;
+                                <input id="design" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="设计变更"/>&nbsp;
                                 <input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回"/>
                             </div>
                         </div>

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

@@ -528,7 +528,7 @@
                         <div class="col-sm-6">
                             <div class="form-group text-center">
                                 <input id="conditions" class="btn  btn-primary btn-lg btn-parsley" type="submit"
-                                       value="“完成”"/>&nbsp;
+                                       value="完成"/>&nbsp;
                             </div>
                         </div>
                     </div>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectAssignment.js

@@ -290,7 +290,13 @@ $(document).ready(function () {
     });
 
     $("#export").click(function () {//导出Excel文件
-        jp.downloadFile('${ctx}/sg/managementcenter/project/export');
+        var id = getIdSelections();
+        var projectId = encodeURI(encodeURI($("#projectId").val()));
+        var reserveProjectName = encodeURI(encodeURI($("#reserveProjectName").val()));
+        var projectName = encodeURI(encodeURI($("#projectName").val()));
+        jp.downloadFile('${ctx}/sg/managementcenter/project/assExport?id=' + id +
+            '&reserveProjectName=' + reserveProjectName + '&projectId=' + projectId +
+            '&projectName=' + projectName);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -13,18 +13,32 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">项目前期基本信息</h3>
+		<h3 class="panel-title">施工任务分配信息</h3>
 	</div>
 	<div class="panel-body">
 		<!-- 搜索 -->
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="project" class="form form-horizontal well clearfix">
+					<%--<div class="col-xs-12 col-sm-6 col-md-4">--%>
+						<%--<label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>--%>
+						<%--<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>--%>
+					<%--</div>--%>
+
 					<div class="col-xs-12 col-sm-6 col-md-4">
 						<label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
 						<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+						<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+						<form:input path="projectName" htmlEscape="false" maxlength="100"  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>
@@ -36,19 +50,19 @@
 	
 	<!-- 工具栏 -->
 	<div id="toolbar">
-			<shiro:hasPermission name="sg:managementcenter:project:add">
+			<shiro:hasPermission name="sg:managementcenter:project:assignment:edit">
 				<button id="edit" class="btn btn-primary" onclick="edit()">
 					<i class="glyphicon glyphicon-edit"></i> 修改
 				</button>
 			</shiro:hasPermission>
-			<shiro:hasPermission name="sg:managementcenter:project:import">
+			<shiro:hasPermission name="sg:managementcenter:project:assignment:import">
 				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
 			</shiro:hasPermission>
-<%--			<shiro:hasPermission name="sg:managementcenter:project:export">
-	        		<button id="export" class="btn btn-warning">
+			<shiro:hasPermission name="sg:managementcenter:project:assignment:export">
+                <button id="export" class="btn btn-warning">
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
-			</shiro:hasPermission>--%>
+			</shiro:hasPermission>
 		    </div>
 		
 	<!-- 表格 -->

src/main/webapp/webpage/modules/sg/managementcenter/project/projectBasicInformation.js

@@ -215,7 +215,7 @@ $(document).ready(function () {
                         jp.success(data.msg);
                         refresh();
                     } else {
-                        jp.error(data.msg);
+                        jp.alert(data.msg);
                     }
                     jp.close(index);
                 });//调用保存事件
@@ -230,9 +230,9 @@ $(document).ready(function () {
 
     $("#btnExport").click(function () {
         var id = getIdSelections();
-        var projectId = $("#projectId").val();
-        var reserveProjectName = $("#reserveProjectName").val();
-        var projectName = $("#projectName").val();
+        var projectId = encodeURI(encodeURI($("#projectId").val()));
+        var reserveProjectName = encodeURI(encodeURI($("#reserveProjectName").val()));
+        var projectName = encodeURI(encodeURI($("#projectName").val()));
         jp.downloadFile('${ctx}/sg/managementcenter/project/btnExport?id=' + id + '&reserveProjectName=' + reserveProjectName + '&projectId=' + projectId + '&projectName=' + projectName);
     });
 

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

@@ -44,17 +44,17 @@
 	
 	<!-- 工具栏 -->
 	<div id="toolbar">
-			<shiro:hasPermission name="sg:managementcenter:project:add">
+			<shiro:hasPermission name="sg:managementcenter:project:basicInformation:edit">
 				<button id="edit" class="btn btn-primary" onclick="edit()">
 					<i class="glyphicon glyphicon-edit"></i> 修改
 				</button>
 			</shiro:hasPermission>
-			<shiro:hasPermission name="sg:managementcenter:project:import">
+			<shiro:hasPermission name="sg:managementcenter:project:basicInformation:import">
 				<button id="btnImport" class="btn btn-info">
 					<i class="fa fa-folder-open-o"></i> 导入
 				</button>
 			</shiro:hasPermission>
-			<shiro:hasPermission name="sg:managementcenter:project:export">
+			<shiro:hasPermission name="sg:managementcenter:project:basicInformation:export">
 				<button id="btnExport" class="btn btn-warning">
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectDisclosurePlan.js

@@ -200,7 +200,13 @@ $(document).ready(function () {
 
 
     $("#export").click(function () {//导出Excel文件
-        jp.downloadFile('${ctx}/sg/managementcenter/project/export');
+        var id = getIdSelections();
+        var projectId = encodeURI(encodeURI($("#projectId").val()));
+        var reserveProjectName = encodeURI(encodeURI($("#reserveProjectName").val()));
+        var projectName = encodeURI(encodeURI($("#projectName").val()));
+        jp.downloadFile('${ctx}/sg/managementcenter/project/planExport?id=' + id +
+            '&reserveProjectName=' + reserveProjectName + '&projectId=' + projectId +
+            '&projectName=' + projectName);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

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

@@ -20,11 +20,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="project" class="form form-horizontal well clearfix">
+					<%--<div class="col-xs-12 col-sm-6 col-md-4">--%>
+						<%--<label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>--%>
+						<%--<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>--%>
+					<%--</div>--%>
+
 					<div class="col-xs-12 col-sm-6 col-md-4">
 						<label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
 						<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+						<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+						<form:input path="projectName" htmlEscape="false" maxlength="100"  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>
@@ -36,19 +50,19 @@
 	
 	<!-- 工具栏 -->
 	<div id="toolbar">
-			<shiro:hasPermission name="sg:managementcenter:project:add">
+			<shiro:hasPermission name="sg:managementcenter:project:disclosurePlan:edit">
 				<button id="edit" class="btn btn-primary" onclick="edit()">
 					<i class="glyphicon glyphicon-edit"></i> 修改
 				</button>
 			</shiro:hasPermission>
-			<shiro:hasPermission name="sg:managementcenter:project:import">
+			<shiro:hasPermission name="sg:managementcenter:project:disclosurePlan:import">
 				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
 			</shiro:hasPermission>
-<%--			<shiro:hasPermission name="sg:managementcenter:project:export">
-	        		<button id="export" class="btn btn-warning">
+			<shiro:hasPermission name="sg:managementcenter:project:disclosurePlan:export">
+				<button id="export" class="btn btn-warning">
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
-			</shiro:hasPermission>--%>
+			</shiro:hasPermission>
 		    </div>
 		
 	<!-- 表格 -->

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

@@ -60,21 +60,21 @@
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="">型号 ：</label></td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>型号 ：</label></td>
 					<td class="width-35">
 						<form:input path="tearDown.reserveModel"   htmlEscape="false" class="form-control required"/>
 					</td>
-					<td class="width-15 active"><label class="">单位：</label></td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>单位：</label></td>
 					<td class="width-35">
 						<form:input path="tearDown.reserveUnit"   htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
-					<td class="width-15 active"><label class="">数量：</label></td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>数量：</label></td>
 					<td class="width-35">
 						<form:input path="tearDown.reserveNumber"  htmlEscape="false" class="form-control number required"/>
 					</td>
-					<td class="width-15 active"><label class="">备注：</label></td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>备注：</label></td>
 					<td class="width-35">
 						<form:input path="tearDown.reserveNotes"  htmlEscape="false" class="form-control required"/>
 					</td>

src/main/webapp/webpage/modules/sg/managementcenter/project/tearDown.js

@@ -220,7 +220,7 @@ function edit(id) {//没有权限时，不显示确定按钮
 }
 
 function deleteAll(){
-    jp.confirm('确认要删除该请假表单记录吗？', function(){
+    jp.confirm('确认要删除该拆旧数据吗？', function(){
         jp.loading();
         jp.get("${ctx}/sg/managementcenter/project/deleteTearAll?ids=" + getIdSelections(), function(data){
             if(data.success){

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

@@ -20,11 +20,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="project" class="form form-horizontal well clearfix">
+					<%--<div class="col-xs-12 col-sm-6 col-md-4">--%>
+						<%--<label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>--%>
+						<%--<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>--%>
+					<%--</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" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
 						<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+						<form:input path="projectName" htmlEscape="false" maxlength="100"  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>

src/main/webapp/webpage/modules/sg/managementcenter/project/tearFinal.js

@@ -258,7 +258,7 @@ function edit(id) {//没有权限时，不显示确定按钮
 }
 
 function deleteAll(){
-    jp.confirm('确认要删除该请假表单记录吗？', function(){
+    jp.confirm('确认要删除该拆旧数据吗？', function(){
         jp.loading();
         jp.get("${ctx}/sg/managementcenter/project/deleteTearAll?ids=" + getIdSelections(), function(data){
             if(data.success){

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

@@ -20,11 +20,25 @@
 		<div id="search-collapse" class="collapse">
 			<div class="accordion-inner">
 				<form:form id="searchForm" modelAttribute="project" class="form form-horizontal well clearfix">
+					<%--<div class="col-xs-12 col-sm-6 col-md-4">--%>
+						<%--<label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>--%>
+						<%--<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>--%>
+					<%--</div>--%>
+
 					<div class="col-xs-12 col-sm-6 col-md-4">
 						<label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
 						<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+						<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+						<form:input path="projectName" htmlEscape="false" maxlength="100"  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>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerEnd.js

@@ -1,6 +1,127 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
 $(document).ready(function() {
+	var procInsId = $("#procInsId").val();
+	// alert(procInsId);
+	$('#engineeringTable').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}/managementcenter/activiti/uploadData?procInsId="+procInsId,
+		//默认值为 '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',
+		onContextMenuItem: function(row, $el){
+			if($el.data("item") == "edit"){
+				edit(row.id);
+			}else if($el.data("item") == "view"){
+				view(row.id);
+			} else if($el.data("item") == "delete"){
+				jp.confirm('确认要删除该图片管理记录吗？', function(){
+					jp.loading();
+					jp.get("${ctx}/test/pic/testPic/delete?id="+row.id, function(data){
+						if(data.success){
+							$('#testPicTable').bootstrapTable('refresh');
+							jp.success(data.msg);
+						}else{
+							jp.error(data.msg);
+						}
+					})
+
+				});
+
+			}
+		},
+
+		onClickRow: function(row, $el){
+		},
+		onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+		columns: [{
+			checkbox: true
+		}
+			, {
+				field: 'path',
+				title: '文件路径',
+				sortable: true,
+				sortName: 'path',
+				formatter:function(value, row , index){
+					var valueArray = value.split("|");
+					var labelArray = [];
+					for(var i =0 ; i<valueArray.length; i++){
+						if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
+						{
+							labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
+						}else{
+							labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+						}
+					}
+					return labelArray.join(" ");
+				}
+
+			},{
+				field: 'imgName',
+				title: '上传用途',
+				sortable: true,
+				sortName: 'imgName',
+			},{
+				field: 'uid',
+				title: '上传人员',
+				sortable: true,
+				sortName: 'uid',
+			}]
+	});
+
+	$('#engineeringTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+		'check-all.bs.table uncheck-all.bs.table', function () {
+		$('#remove').prop('disabled', ! $('#engineeringTable').bootstrapTable('getSelections').length);
+		$('#view,#edit').prop('disabled', $('#engineeringTable').bootstrapTable('getSelections').length!=1);
+	});
+
 	$("#agree").click(function () {
 		var civilEndReport = $("#civilEndReport").val();
 		var actualStart = $("#actualStart").val();
@@ -64,17 +185,37 @@ $(document).ready(function() {
 		jp.downloadFile('${ctx}/nonPower/civilStart?id='+ id);
 	});
 })
-		
-  function getIdSelections() {
-        return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
-            return row.id
-        });
-    }
 
-    //刷新列表
-  function refresh(){
-  	$('#testPicTable').bootstrapTable('refresh');
-  }
+function getIdSelections() {
+	return $.map($("#engineeringTable").bootstrapTable('getSelections'), function (row) {
+		return row.id
+	});
+}
+
+function deleteAll(){
+	jp.confirm('确认要删除该图片管理记录吗？', function(){
+		jp.loading();
+		jp.get("${ctx}/managementcenter/upload/delete?ids=" + getIdSelections(), function(data){
+			if(data.success){
+				$('#engineeringTable').bootstrapTable('refresh');
+				jp.success(data.msg);
+			}else{
+				jp.error(data.msg);
+			}
+		})
+
+	})
+}
+
+function refresh(){
+	$('#engineeringTable').bootstrapTable('refresh');
+}
+
+function add(){//没有权限时，不显示确定按钮
+	var id = $('#id').val();
+	var procInsId = $('#procInsId').val();
+	jp.openSaveDialog('模块清单', "${ctx}/nonPower/nonPowerStartUpload?id="+id+"&procInsId="+procInsId, '800px', '500px');
+}
 
 
 </script>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerEnd.jsp

@@ -6,6 +6,7 @@
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@include file="nonPowerEnd.js"%>
+	<%@ include file="/webpage/include/bootstraptable.jsp" %>
 </head>
 <body>
 	<div class="wrapper wrapper-content">
@@ -19,12 +20,20 @@
 			<button id="export" class="btn btn-warning">
 				<i class="fa fa-file-excel-o"></i> 导出土建开工报告
 			</button>
+			<button id="add" class="btn btn-info" onclick="add()">
+				<i class="glyphicon glyphicon-edit"></i> 上传
+			</button>
+			<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+				<i class="glyphicon glyphicon-remove"></i> 删除
+			</button>
+			<table id="engineeringTable" data-toolbar="#toolbar"></table>
 			<form:form id="inputForm" modelAttribute="nonPower" 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="procInsId"/>
 				<form:hidden path="act.procDefId"/>
 				<table class="table table-bordered">
 					<tbody>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerStart.js

@@ -1,7 +1,129 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
 $(document).ready(function() {
-	$("#agree").click(function () {
+	var procInsId = $("#procInsId").val();
+	// alert(procInsId);
+	$('#engineeringTable').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}/managementcenter/activiti/uploadData?procInsId="+procInsId,
+		//默认值为 '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',
+		onContextMenuItem: function(row, $el){
+			if($el.data("item") == "edit"){
+				edit(row.id);
+			}else if($el.data("item") == "view"){
+				view(row.id);
+			} else if($el.data("item") == "delete"){
+				jp.confirm('确认要删除该图片管理记录吗？', function(){
+					jp.loading();
+					jp.get("${ctx}/test/pic/testPic/delete?id="+row.id, function(data){
+						if(data.success){
+							$('#testPicTable').bootstrapTable('refresh');
+							jp.success(data.msg);
+						}else{
+							jp.error(data.msg);
+						}
+					})
+
+				});
+
+			}
+		},
+
+		onClickRow: function(row, $el){
+		},
+		onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+		columns: [{
+            checkbox: true
+        }
+            , {
+			field: 'path',
+			title: '文件路径',
+			sortable: true,
+			sortName: 'path',
+			formatter:function(value, row , index){
+				var valueArray = value.split("|");
+				var labelArray = [];
+				for(var i =0 ; i<valueArray.length; i++){
+					if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
+					{
+						labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
+					}else{
+						labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+					}
+				}
+				return labelArray.join(" ");
+			}
+
+		},{
+			field: 'imgName',
+			title: '上传用途',
+			sortable: true,
+			sortName: 'imgName',
+		},{
+			field: 'uid',
+			title: '上传人员',
+			sortable: true,
+			sortName: 'uid',
+		}]
+	});
+
+    $('#engineeringTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+        'check-all.bs.table uncheck-all.bs.table', function () {
+        $('#remove').prop('disabled', ! $('#engineeringTable').bootstrapTable('getSelections').length);
+        $('#view,#edit').prop('disabled', $('#engineeringTable').bootstrapTable('getSelections').length!=1);
+    });
+
+
+    $("#agree").click(function () {
 		var flag = check();
 		if (!flag){
 			jp.error("请将需要填写的内容填写完毕");
@@ -35,9 +157,35 @@ function check() {
 	}
 	return flag;
 }
-  function getIdSelections() {
-        return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
-            return row.id
-        });
-    }
+
+function getIdSelections() {
+    return $.map($("#engineeringTable").bootstrapTable('getSelections'), function (row) {
+        return row.id
+    });
+}
+
+function deleteAll(){
+    jp.confirm('确认要删除该图片管理记录吗？', function(){
+        jp.loading();
+        jp.get("${ctx}/managementcenter/upload/delete?ids=" + getIdSelections(), function(data){
+            if(data.success){
+                $('#engineeringTable').bootstrapTable('refresh');
+                jp.success(data.msg);
+            }else{
+                jp.error(data.msg);
+            }
+        })
+
+    })
+}
+
+function refresh(){
+    $('#engineeringTable').bootstrapTable('refresh');
+}
+
+function add(){//没有权限时，不显示确定按钮
+	var id = $('#id').val();
+	var procInsId = $('#procInsId').val();
+	jp.openSaveDialog('模块清单', "${ctx}/nonPower/nonPowerStartUpload?id="+id+"&procInsId="+procInsId, '800px', '500px');
+}
 </script>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerStart.jsp

@@ -16,6 +16,14 @@
             <h3 class="panel-title">配电网工程开工报告</h3>
         </div>
         <div class="panel-body">
+            <button id="add" class="btn btn-info" onclick="add()">
+                <i class="glyphicon glyphicon-edit"></i> 上传
+            </button>
+            <button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+                <i class="glyphicon glyphicon-remove"></i> 删除
+            </button>
+            <table id="engineeringTable" data-toolbar="#toolbar"></table>
+
             <!-- 表格 -->
             <%--	<table id="testPicTable"   data-toolbar="#toolbar"></table>--%>
             <div class="panel-body">
@@ -25,6 +33,7 @@
                     <form:hidden path="act.taskName"/>
                     <form:hidden path="act.taskDefKey"/>
                     <form:hidden path="act.procInsId"/>
+                    <form:hidden path="procInsId"/>
                     <form:hidden path="act.procDefId"/>
                     <table class="table table-bordered">
                         <tbody>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerStartUpload.jsp

@@ -0,0 +1,64 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>土建上传文件页面</title>
+	<meta name="decorator" content="ani"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+	        $('#beginDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+	        $('#endDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+		});
+		function save() {
+		    let mdImg = $("#mdImg").val();
+		    let uploadName = $("#uploadName").val();
+            let isValidate = jp.validateForm('#inputForm');//校验表单
+            if(!isValidate){
+                return false;
+			}else{
+				if (mdImg != '') {
+					jp.loading();
+					jp.post("${ctx}/nonPower/saveUpload", $('#inputForm').serialize(), function (data) {
+						if (data.success) {
+							jp.getParent().refresh();
+							let dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+							parent.layer.close(dialogIndex);
+							jp.success(data.msg)
+						} else {
+							jp.error(data.msg);
+						}
+					});
+				} else {
+					jp.error("请选择文件");
+				}
+			}
+
+        }
+	</script>
+</head>
+<body class="bg-white">
+		<form:form id="inputForm" modelAttribute="uploadImages" class="form-horizontal">
+		<form:hidden path="id"/>
+		<form:hidden path="reserveProjectName"/>
+		<form:hidden path="procInsId"/>
+		<table class="table table-bordered">
+			<tbody>
+				<tr>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件用途：</label></td>
+					<td class="width-35">
+						<form:input path="imgName" cssClass="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>上传附件：</label></td>
+					<td class="width-35">
+						<sys:fileUpload  path="path" fileNumLimit="50" fileSizeLimit="50"  value="${moduleBlock.mdImg}"  uploadPath="/pick"></sys:fileUpload>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</form:form>
+</body>
+</html>

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

@@ -85,7 +85,7 @@
 				title: '<span style="color:red">项目关闭</span>',
 				formatter:function(value, row , index){
 					if(value != null && value !=""){
-						value='<a href="${ctx}/scheduleView/closureView?projectId='+row.projectId+'"'+">"+value+"</a>";
+						value='<a href="${ctx}/scheduleView/closureView?reserveProjectName='+row.reserveProjectName+'"'+">"+value+"</a>";
 						return value;
 					}
 				}
@@ -94,7 +94,7 @@
 				title: '<span style="color:red">设计变更</span>',
 				formatter:function(value, row , index){
 					if(value != null && value !=""){
-						value='<a href="${ctx}/scheduleView/designView?projectId='+row.projectId+'"'+">"+value+"</a>";
+						value='<a href="${ctx}/scheduleView/designView?reserveProjectName='+row.reserveProjectName+'"'+">"+value+"</a>";
 						return value;
 					}
 				}
@@ -103,7 +103,7 @@
 				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>";
+						value='<a href="${ctx}/scheduleView/policyView?reserveProjectName='+row.reserveProjectName+'"'+">"+value+"</a>";
 						return value;
 					}
 				}

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

@@ -38,11 +38,25 @@
                     <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">
+                                    <label class="label-item single-overflow pull-left" title="储备项目暂定名称：">储备项目暂定名称：</label>
+                                    <form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+                                </div>
                                 <div class="col-xs-12 col-sm-6 col-md-4">
-                                    <label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
-                                    <form:input path="projectId" htmlEscape="false"  class=" form-control"/>
+                                    <label class="label-item single-overflow pull-left" title="项目定义：">项目定义号：</label>
+                                    <form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
                                 </div>
                                 <div class="col-xs-12 col-sm-6 col-md-4">
+                                    <label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+                                    <form:input path="projectName" htmlEscape="false" maxlength="100"  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>

src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp

@@ -41,6 +41,7 @@
 			</button>
 
 			<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">配网全过程</a>
+			<%--<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">甲供物资领退料</a>--%>
 		</div>
 	</div>
 	<div class="navbar-container container-fluid">

src/main/webapp/webpage/modules/sys/login/sysIndex.jsp

@@ -25,6 +25,7 @@
 			</button>
 
 			<a class="navbar-brand J_menuItem"  href="${ctx}/home">配网全过程</a>
+			<%--<a class="navbar-brand J_menuItem"  href="${ctx}/home">甲供物资领退料</a>--%>
 		</div>
 		<div class="collapse navbar-collapse">
 			<form class="navbar-form navbar-left" role="search">

src/main/webapp/webpage/modules/sys/login/sysLogin.jsp

@@ -45,6 +45,7 @@
 			<div class="col-md-4 col-lg-4 col-md-offset-4 col-lg-offset-4">
 				<img  class="img-circle" src="${ctxStatic}/common/images/flat-avatar.png" class="user-avatar" />
 				<h1>配网全过程管理系统</h1>
+				<%--<h1>甲供物资领退料管理系统</h1>--%>
 				<sys:message content="${message}" showType="1"/>
 				<form id="loginForm" role="form" action="${ctx}/login" method="post">
 					<div class="form-content">