施工交底模块变更：提交申请后项目选择状态，撤销申请后项目选择状态，上传文件前缀写入配置文件

src/main/java/com/jeeplus/common/config/Global.java

@@ -11,10 +11,12 @@ import java.util.Map;
 import java.util.Properties;
 
 import com.jeeplus.common.utils.FileUtils;
+import com.jeeplus.common.utils.base.PropertiesUtil;
 import com.jeeplus.core.web.Servlets;
 import com.jeeplus.modules.sys.security.SystemAuthorizingRealm;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.ibatis.io.Resources;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.DefaultResourceLoader;
 
 import com.google.common.collect.Maps;
@@ -76,6 +78,7 @@ public class Global {
     public static final String SYS_TYPE = System.getProperty("os.name").toLowerCase().startsWith("win") ? "1" : "2";
 
 
+
     /**
      * 共享文档物理存储地址
      *
@@ -139,11 +142,12 @@ public class Global {
     public static String getAttachmentDir2() {
         SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) UserUtils.getPrincipal();
         String dir = "";
+        String FILE_PREFIX = loader.getProperty("linux.file.store.prefix");
         if (SYS_TYPE.equals("1")) {
             dir = Global.getUserfilesBaseDir() + Global.FILES_FILESERVER;
         } else {
-            //liunx file store priefix
-            dir =  "/data/nginx/file" + Servlets.getRequest().getContextPath() + Global.FILES_FILESERVER;
+            //liunx file store prefix
+            dir =  FILE_PREFIX + Servlets.getRequest().getContextPath() + Global.FILES_FILESERVER;
         }
 
         FileUtils.createDirectory(dir);

src/main/java/com/jeeplus/common/utils/ConfigMapUtil.java

@@ -0,0 +1,64 @@
+package com.jeeplus.common.utils;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+public class ConfigMapUtil {
+    private static Map<String, String> map = new HashMap<>();
+
+    static {
+        try {
+            //读取文件流
+            InputStream resourceAsStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("jeeplus.properties");
+            //转变为字符流
+            InputStreamReader inputStreamReader = new InputStreamReader(resourceAsStream, "utf-8");
+            //创建 Properties 对象
+            Properties properties = new Properties();
+            // prop.load(new InputStreamReader(in, "utf-8"));
+            //加载字符流
+            properties.load(inputStreamReader);
+            //获取所有key
+            Enumeration enumeration = properties.propertyNames();
+            while (enumeration.hasMoreElements()) {
+                //遍历key
+                String key = (String) enumeration.nextElement();
+                //根据key取值
+                String value = properties.getProperty(key);
+
+                //放入map中
+
+                map.put(key, value);
+
+            }
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+
+        }
+
+    }
+
+
+    public static String getValueByKey(String key) {
+
+        return map.get(key);
+
+    }
+
+    public static Map<String, String> getMap() {
+
+        return map;
+
+    }
+
+    public static void setMap(Map<String, String> map) {
+
+        ConfigMapUtil.map = map;
+
+    }
+}

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

@@ -39,6 +39,7 @@ public class Construction extends ActEntity<Construction> {
     private String inSitu;
     private String networkCabinet;
     private String station;
+    private String applyName;
 
     public User getTuser() {
         return tuser;
@@ -257,4 +258,12 @@ public class Construction extends ActEntity<Construction> {
     public void setStation(String station) {
         this.station = station;
     }
+
+    public String getApplyName() {
+        return applyName;
+    }
+
+    public void setApplyName(String applyName) {
+        this.applyName = applyName;
+    }
 }

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

@@ -16,6 +16,7 @@
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
+		applyName,
 		powerLine,
 		blackoutArea,
 		projectType,
@@ -101,6 +102,7 @@
 			project_name,
 			accept_date,
 			examine_date,
+			applyName,
 			create_by,
 			create_date,
 			update_by,
@@ -115,6 +117,7 @@
 			#{projectName},
 			#{acceptDate},
 			#{examineDate},
+			#{applyName},
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
@@ -130,6 +133,7 @@
 			user_name = #{userName},
 			project_id = #{projectId},
 			project_name = #{projectName},
+			applyName = #{applyName},
 			accept_date = #{acceptDate},
 			examine_date = #{examineDate},
 			update_by = #{updateBy.id},

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

@@ -154,14 +154,15 @@ public class ConstructionController extends BaseController {
             j.setMsg(errMsg);
             return j;
         }
-
+        Project project = new Project();
         /**
          * 流程审批
          */
         if (StringUtils.isBlank(construction.getId())) {
             //新增或编辑表单保存
+            construction.setApplyName(construction.getTuser().getName());
             constructionService.save(construction);//保存
-            Project project = new Project();
+
             project.setStatus("1");
             project.setRequireName(construction.getProjectName());
             projectService.updateStatus(project);
@@ -180,8 +181,14 @@ public class ConstructionController extends BaseController {
             construction.getAct().setComment(("yes".equals(construction.getAct().getFlag()) ? "[重新申请] " : "[销毁申请] "));
             // 完成流程任务
             Map<String, Object> vars = Maps.newHashMap();
-            vars.put("reapply", "yes".equals(construction.getAct().getFlag()) ? true : false);
-            vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
+            String flag = construction.getAct().getFlag();
+            vars.put("reapply", "yes".equals(flag) ? true : false);
+            if ("no".equals(flag)) {
+                project.setStatus("0");
+                project.setRequireName(construction.getProjectName());
+                projectService.updateStatus(project);
+            }
+            vars.put("processer", construction.getApplyName());
             actTaskService.complete(construction.getAct().getTaskId(), construction.getAct().getProcInsId(), construction.getAct().getComment(), construction.getContent(), vars);
             j.setMsg("提交成功！");
             j.getBody().put("targetUrl", "/act/task/todo/");

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

@@ -173,8 +173,6 @@
 	</select>
 
 	<update id="updateStatus">
-		UPDATE sm_project_detail SET
-			status = #{status}
-		WHERE a.require_name = #{requireName},
+		update sm_project_detail set status = #{status} where require_name = #{requireName};
 	</update>
 </mapper>

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
 
+import com.jeeplus.common.utils.ConfigMapUtil;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.session.Session;
@@ -103,6 +104,7 @@ public class UserController extends BaseController {
     @ResponseBody
     @RequestMapping(value = {"list", ""})
     public Map<String, Object> list(User user, HttpServletRequest request, HttpServletResponse response, Model model, String roleNeedName) {
+
         String[] split = roleNeedName.split(";");
         if (split != null && split.length > 0) {
             Role role = null;

src/main/resources/properties/jeeplus.properties

@@ -123,3 +123,6 @@ spring.http.multipart.max-file-size=100MB
 spring.http.multipart.max-request-size=100MB
 #\u6388\u6743\u57DF\u540D
 domain.url=
+#ÉÏ´«µØÖ·±äÁ¿
+linux.file.store.prefix=/data/nginx/file
+

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

@@ -168,6 +168,7 @@
 								"procInsId":"${construction.act.procInsId}",
 								"procDefId":"${construction.act.procDefId}",
 								"flag":"reject",
+								"projectName":"${fns:unescapeHtml(construction.projectName)}",
 								"comment":window.encodeURI(message)
 							},
 							function (data) {

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

@@ -129,7 +129,7 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审批人：</label></td>
 								<td class="width-35">
-									<sys:userselect roleName="项目经理;" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+									<sys:userselect roleName="项目经理;" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.applyName}"
 													cssClass="form-control required"/>
 								</td>
 							</tr>
@@ -141,7 +141,7 @@
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称：</label></td>
 								<td class="width-35">
 									<%--<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>--%>
-									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="project" name="project.id" value="${project.id}" labelName="project.requireName" labelValue="${project.requireName}"
+									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="project" name="project.id" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
 													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('需求编号|项目需求名称|需求提出单位|变电站名称|线路名称|设备基本情况|运行班')}" fieldKeys="id|requireName|demandUnit|bdzName|lineName|asicEquipment|runTheClass" searchLabels="${fns:urlEncode('需求编号|项目需求名称')}" searchKeys="id|requireName" ></sys:itemselect>
 								</td>
 								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>