流程提示，文件上传用途，监听器server实例化修改

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

@@ -1756,7 +1756,7 @@ public class ActTaskService extends BaseService {
         // 对不同环节的业务逻辑进行操作
         String taskDefKey = act.getTaskDefKey();
         // 提交流程任务
-//        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
     }
 
     /**

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

@@ -454,7 +454,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传新图纸");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -562,7 +562,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传借款单据");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -609,7 +609,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传未签字版政策处理清单");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -637,7 +637,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传签字版政策处理清单");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -664,7 +664,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传签字版合同");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -690,7 +690,7 @@ public class ActTaskController extends BaseController {
             if (pic != null && !"".equals(pic)) {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImages.setImgName("新方案图纸");
                 uploadImagesService.save(uploadImages);
             }
@@ -738,7 +738,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("变更后图纸");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.insert(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1044,7 +1044,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传未盖章施工方案");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1073,7 +1073,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传盖章施工方案");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1121,7 +1121,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传收据");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1150,7 +1150,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传缴费单");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1175,7 +1175,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传借款单据");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1511,7 +1511,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1536,7 +1536,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1561,7 +1561,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1586,7 +1586,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1668,7 +1668,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1731,7 +1731,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1853,7 +1853,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传涉电开工流程");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1878,7 +1878,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");

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

@@ -1,9 +1,13 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.utils;
 
+import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.access.method.P;
 
 import java.beans.Expression;
 import java.io.Serializable;
@@ -14,12 +18,10 @@ public class EndTaskListen implements Serializable, ExecutionListener {
      */
     private static final long serialVersionUID = 8513750196548027535L;
 
-    @Autowired
-    private ProjectService projectService;
-
     @Override
     public void notify(DelegateExecution delegateExecution) throws Exception {
         try {
+            ProjectService projectService = SpringContextHolder.getBean(ProjectService.class);
             String processInstanceId = delegateExecution.getProcessInstanceId();
             projectService.updateStatusBy("2", processInstanceId);
         } catch (Exception e) {

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -142,7 +142,7 @@ public class ProjectController extends BaseController {
 		project.setStatus("2");
 		project.setWhetherCloseStatus("0");
 		project.setEarlyMaterial(1);
-		project.setConstructionUnitRole(UserUtils.getUser().getLoginName());
+		project.setConstructionUnitManage(UserUtils.getUser().getLoginName());
 		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
 		return getBootstrapData(page);
 	}

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/PickIngService.java

@@ -33,11 +33,12 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class PickIngService extends CrudService<PickIngMapper, PickIng> {
-	@Autowired
-	private PickIngMapper pickIngMapper;
+
 	@Autowired
 	private HttpServletRequest request;
 
+	@Autowired
+	private PickIngMapper pickIngMapper;
 
 	@Override
 	public Page<PickIng> findPage(Page<PickIng> page, PickIng entity) {

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

@@ -79,27 +79,7 @@ $(document).ready(function() {
 		onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-		columns: [/*{
-				   field: 'uId',
-				   title: '标题',
-				   sortable: true,
-				   sortName: 'uId'
-				   ,formatter:function(value, row , index){
-					   value = jp.unescapeHTML(value);
-				   <c:choose>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
-					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
-					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:otherwise>
-					   return value;
-				   </c:otherwise>
-					   </c:choose>
-				   }
-
-			   },*/{
+		columns: [{
 			field: 'path',
 			title: '图片路径',
 			sortable: true,

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

@@ -82,27 +82,7 @@ $(document).ready(function() {
                	onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-               columns: [/*{
-				   field: 'uId',
-				   title: '标题',
-				   sortable: true,
-				   sortName: 'uId'
-				   ,formatter:function(value, row , index){
-					   value = jp.unescapeHTML(value);
-				   <c:choose>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
-					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
-					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:otherwise>
-					   return value;
-				   </c:otherwise>
-					   </c:choose>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: true,

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

@@ -80,27 +80,7 @@ $(document).ready(function() {
 		onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-		columns: [/*{
-				   field: 'uId',
-				   title: '标题',
-				   sortable: true,
-				   sortName: 'uId'
-				   ,formatter:function(value, row , index){
-					   value = jp.unescapeHTML(value);
-				   <c:choose>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
-					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
-					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:otherwise>
-					   return value;
-				   </c:otherwise>
-					   </c:choose>
-				   }
-
-			   },*/{
+		columns: [{
 			field: 'path',
 			title: '图片路径',
 			sortable: true,

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

@@ -81,27 +81,7 @@ $(document).ready(function() {
                	onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-               columns: [/*{
-				   field: 'uId',
-				   title: '标题',
-				   sortable: true,
-				   sortName: 'uId'
-				   ,formatter:function(value, row , index){
-					   value = jp.unescapeHTML(value);
-				   <c:choose>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
-					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
-					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:otherwise>
-					   return value;
-				   </c:otherwise>
-					   </c:choose>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: false,
@@ -121,6 +101,11 @@ $(document).ready(function() {
 		        }
 		       
 		    },{
+				   field: 'imgName',
+				   title: '文件用途',
+				   sortable: true,
+				   sortName: 'imgName',
+			   },{
 				   field: 'uId',
 				   title: '上传人员',
 				   sortable: false,