项目号显示问题，流程图片显示问题，类型比对问题

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

@@ -227,7 +227,7 @@
 	</select>
 
 	<select id="nameFindOffice" resultType="string">
-		select name from sys_role where id =(select role_id from sys_user_role where user_id = (SELECT id from sys_user where name = #{loginName}))
+		select name from sys_role where id =(select role_id from sys_user_role where user_id = (SELECT id from sys_user where login_name = #{loginName}))
 	</select>
 
 	<insert id="newSave">

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

@@ -347,7 +347,7 @@ public class MyImportUtils {
                 tips += "必要性问题说明不能为空;";
             }
         }
-        if ("".equals(disclose.getLineName()) || disclose.getLineName() == null||(!"是".equals(disclose.getLineName())&&!"否".equals(disclose.getLineName()))) {
+        if ("".equals(disclose.getLineName()) || disclose.getLineName() == null||(!"一致".equals(disclose.getLineName())&&!"不一致".equals(disclose.getLineName()))) {
             tips += "线路名称、设备、开关、杆号一致性填写有误;";
         }
         if ("".equals(disclose.getQuantities()) || disclose.getQuantities() == null||(!"是".equals(disclose.getQuantities())&&!"否".equals(disclose.getQuantities()))) {

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

@@ -358,7 +358,7 @@ public class ConstructionController extends BaseController {
                         vars.put("processer", user.getLoginName());
                         String id = each.getId();
                         construction.setApplyName(constructionUnitRole);
-                        construction.setProjectId(id);
+                        construction.setProjectId(each.getProjectId());
                         construction.setProjectName(each.getRequireName());
                         construction.setAcceptDate(new Date());
                         constructionService.newSave(construction);//保存

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

@@ -16,6 +16,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sys.entity.DictValue;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -198,6 +199,10 @@ public class UploadController extends BaseController {
 		if (procInsId!=null&&procInsId!="") {
 			uploadImages.setProcInsId(procInsId);
 		}
+		if (uploadImages.getProject() == null) {
+			Project project = new Project();
+			uploadImages.setProject(project);
+		}
 		//查询出所有的附件信息
 		Page<UploadImages> page = uploadImagesService.findPage(new Page<UploadImages>(request, response), uploadImages);
 		//当判定系统为linux的时候
@@ -214,6 +219,11 @@ public class UploadController extends BaseController {
 				upload.setPath(a);
 			}
 		}
+		List<UploadImages> list1 = page.getList();
+		for (UploadImages images : list1) {
+			String dictLabels = DictUtils.getDictLabel(images.getImgName(), "uploadFileType","");
+			images.setImgName(dictLabels);
+		}
 		List<UploadImages> list = page.getList();
 		//循环list
 		return getBootstrapData(page);

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

@@ -74,7 +74,7 @@
 				</div>
 				<div class="panel-body">
 					<button id="importConclusion" class="btn btn-info">
-						<i class="fa fa-folder-open-o"></i> 导入交地结论
+						<i class="fa fa-folder-open-o"></i> 导入交底结论
 					</button>
 					<button id="edit" class="btn btn-danger">
 						<i class="fa fa-folder-open-o"></i> 修改交底结论

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

@@ -104,10 +104,10 @@ $(document).ready(function() {
 					   }
 
 				   },{
-					   field: 'project.projectName',
-					   title: '项目名称',
+					   field: 'project.requireName',
+					   title: '项目需求名称',
 					   sortable: true,
-					   sortName: 'projectName',
+					   sortName: 'requireName',
 				   },{
 					   field: 'project.projectId',
 					   title: '流程定义号',

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

@@ -32,7 +32,7 @@
 			</form:select>
 		</div>
 		<div class="col-sm-4">
-			<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+			<label class="label-item single-overflow pull-left" title="项目需求名称：">项目需求名称：</label>
 			<form:input path="project.requireName" cssClass="form-control" htmlEscape="false"/>
 		</div>
 		<div class="col-sm-4">